ncurses 6.3 - patch 20220917

[ncurses.git] / ncurses / trace / lib_trace.c

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 9acbd4716575116e833e3ff54fa9039ad392aee0..effd3c1c158e2675dbdff506a750c9f4bc377265 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.99 2021/06/26 20:44:59 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.101 2022/09/17 14:57:02 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -94,12 +94,47 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 #define MyNested       _nc_globals.nested_tracef
 #endif /* TRACE */
 
+#if USE_REENTRANT
+#define Locked(statement) { \
+       _nc_lock_global(tst_tracef); \
+       statement; \
+       _nc_unlock_global(tst_tracef); \
+    }
+#else
+#define Locked(statement) statement
+#endif
+
 NCURSES_EXPORT(unsigned)
 curses_trace(unsigned tracelevel)
 {
     unsigned result;
+
 #if defined(TRACE)
-    result = _nc_tracing;
+    int bit;
+
+#define DATA(name) { name, #name }
+    static struct {
+       unsigned mask;
+       const char *name;
+    } trace_names[] = {
+       DATA(TRACE_TIMES),
+           DATA(TRACE_TPUTS),
+           DATA(TRACE_UPDATE),
+           DATA(TRACE_MOVE),
+           DATA(TRACE_CHARPUT),
+           DATA(TRACE_CALLS),
+           DATA(TRACE_VIRTPUT),
+           DATA(TRACE_IEVENT),
+           DATA(TRACE_BITS),
+           DATA(TRACE_ICALLS),
+           DATA(TRACE_CCALLS),
+           DATA(TRACE_DATABASE),
+           DATA(TRACE_ATTRS)
+    };
+#undef DATA
+
+    Locked(result = _nc_tracing);
+
     if ((MyFP == 0) && tracelevel) {
        MyInit = TRUE;
        if (MyFD >= 0) {
@@ -125,7 +160,7 @@ curses_trace(unsigned tracelevel)
                ;               /* EMPTY */
            }
        }
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
        /* Try to set line-buffered mode, or (failing that) unbuffered,
         * so that the trace-output gets flushed automatically at the
         * end of each line.  This is useful in case the program dies.
@@ -141,15 +176,33 @@ curses_trace(unsigned tracelevel)
                NCURSES_VERSION,
                NCURSES_VERSION_PATCH,
                tracelevel);
+
+#define SPECIAL_MASK(mask) \
+           if ((tracelevel & mask) == mask) \
+               _tracef("- %s (%u)", #mask, mask)
+
+       for (bit = 0; bit < TRACE_SHIFT; ++bit) {
+           unsigned mask = (1U << bit) & tracelevel;
+           if ((mask & trace_names[bit].mask) != 0) {
+               _tracef("- %s (%u)", trace_names[bit].name, mask);
+           }
+       }
+       SPECIAL_MASK(TRACE_MAXIMUM);
+       else
+       SPECIAL_MASK(TRACE_ORDINARY);
+
+       if (tracelevel > TRACE_MAXIMUM) {
+           _tracef("- DEBUG_LEVEL(%u)", tracelevel >> TRACE_SHIFT);
+       }
     } else if (tracelevel == 0) {
        if (MyFP != 0) {
            MyFD = dup(MyFD);   /* allow reopen of same file */
            fclose(MyFP);
            MyFP = 0;
        }
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
     } else if (_nc_tracing != tracelevel) {
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
        _tracef("tracelevel=%#x", tracelevel);
     }
 #else