ncurses 5.6 - patch 20080925

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

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index d634438a97ac6330ee6ead8066d9adc9b4fd4cbe..743b1f64f1aeaf39476190b7a89f1e08bb7fc4cd 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -46,7 +46,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.65 2007/09/29 21:47:46 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.71 2008/08/23 18:04:29 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -95,10 +95,13 @@ trace(const unsigned int tracelevel)
        const char *mode = _nc_globals.init_trace ? "ab" : "wb";
 
        if (TracePath[0] == '\0') {
-           if (getcwd(TracePath, sizeof(TracePath) - 12) == 0) {
+           int size = sizeof(TracePath) - 12;
+           if (getcwd(TracePath, size) == 0) {
                perror("curses: Can't get working directory");
                exit(EXIT_FAILURE);
            }
+           TracePath[size] = '\0';
+           assert(strlen(TracePath) <= size);
            strcat(TracePath, "/trace");
            if (_nc_is_dir_path(TracePath)) {
                strcat(TracePath, ".log");
@@ -167,6 +170,21 @@ _nc_va_tracef(const char *fmt, va_list ap)
     if (doit != 0) {
        if (TraceFP == 0)
            TraceFP = stderr;
+#ifdef USE_PTHREADS
+       /*
+        * TRACE_ICALLS is "really" needed to show normal use with threaded
+        * applications, since anything can be running during a napms(),
+        * making it appear in the hierarchical trace as it other functions
+        * are being called.
+        *
+        * Rather than add the complication of a per-thread stack, just
+        * show the thread-id in each line of the trace.
+        */
+# if USE_WEAK_SYMBOLS
+       if ((pthread_self))
+# endif
+           fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self());
+#endif
        if (before || after) {
            int n;
            for (n = 1; n < TraceLevel; n++)
@@ -280,9 +298,9 @@ _nc_use_tracef(unsigned mask)
 
     _nc_lock_global(tst_tracef);
     if (!_nc_globals.nested_tracef++) {
-       if ((result = (_nc_tracing & (mask))) != 0) {
+       if ((result = (_nc_tracing & (mask))) != 0
+           && _nc_try_global(tracef) == 0) {
            /* we will call _nc_locked_tracef(), no nesting so far */
-           _nc_lock_global(tracef);
        } else {
            /* we will not call _nc_locked_tracef() */
            _nc_globals.nested_tracef = 0;