ncurses 6.5 - patch 20240622

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

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index b6f2a75e5ed3ee0a821a8bde2768f81261b6cc79..0904c132fee12d85c0fec9687e529f6d78191055 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 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.100 2022/07/23 20:08:45 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.106 2024/02/24 18:28:19 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -89,17 +89,17 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 #define MyFP           _nc_globals.trace_fp
 #define MyFD           _nc_globals.trace_fd
 #define MyInit         _nc_globals.trace_opened
-#define MyPath         _nc_globals.trace_fname
 #define MyLevel                _nc_globals.trace_level
 #define MyNested       _nc_globals.nested_tracef
 #endif /* TRACE */
 
 #if USE_REENTRANT
-#define Locked(statement) { \
+#define Locked(statement) \
+    do { \
        _nc_lock_global(tst_tracef); \
        statement; \
        _nc_unlock_global(tst_tracef); \
-    }
+    } while (0)
 #else
 #define Locked(statement) statement
 #endif
@@ -108,29 +108,47 @@ NCURSES_EXPORT(unsigned)
 curses_trace(unsigned tracelevel)
 {
     unsigned result;
+
 #if defined(TRACE)
+    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) {
            MyFP = fdopen(MyFD, BIN_W);
        } else {
-           if (MyPath[0] == '\0') {
-               size_t size = sizeof(MyPath) - 12;
-               if (getcwd(MyPath, size) == 0) {
-                   perror("curses: Can't get working directory");
-                   exit(EXIT_FAILURE);
-               }
-               MyPath[size] = '\0';
-               assert(strlen(MyPath) <= size);
-               _nc_STRCAT(MyPath, "/trace", sizeof(MyPath));
-               if (_nc_is_dir_path(MyPath)) {
-                   _nc_STRCAT(MyPath, ".log", sizeof(MyPath));
-               }
+           char myFile[80];
+
+           _nc_STRCPY(myFile, "trace", sizeof(myFile));
+           if (_nc_is_dir_path(myFile)) {
+               _nc_STRCAT(myFile, ".log", sizeof(myFile));
            }
 #define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR)
-           if (_nc_access(MyPath, W_OK) < 0
-               || (MyFD = safe_open3(MyPath, SAFE_MODE, 0600)) < 0
+           if (_nc_access(myFile, W_OK) < 0
+               || (MyFD = safe_open3(myFile, SAFE_MODE, 0600)) < 0
                || (MyFP = fdopen(MyFD, BIN_W)) == 0) {
                ;               /* EMPTY */
            }
@@ -151,6 +169,24 @@ 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 */
@@ -224,11 +260,13 @@ _nc_va_tracef(const char *fmt, va_list ap)
 # if USE_WEAK_SYMBOLS
        if ((pthread_self))
 # endif
+           fprintf(fp, "%#" PRIxPTR ":",
 #ifdef _NC_WINDOWS
-           fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p);
+                   CASTxPTR(pthread_self().p)
 #else
-           fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self());
+                   CASTxPTR(pthread_self())
 #endif
+               );
 #endif
        if (before || after) {
            int n;