perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r1241983 - /perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
Date Wed, 08 Feb 2012 17:12:11 GMT
Author: torsten
Date: Wed Feb  8 17:12:11 2012
New Revision: 1241983

URL: http://svn.apache.org/viewvc?rev=1241983&view=rev
Log:
improve MP_TRACE output a bit: include current perl context for
threaded perls

Modified:
    perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c?rev=1241983&r1=1241982&r2=1241983&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c Wed Feb  8 17:12:11
2012
@@ -49,14 +49,27 @@ void modperl_trace(const char *func, con
         return;
     }
 
+    /* for more information on formatting codes see
+       http://apr.apache.org/docs/apr/1.4/group__apr__lib.html#gad2cd3594aeaafd45931d1034965f48c1
+     */
     if (modperl_threaded_mpm()) {
-        apr_file_printf(logfile, "[%lu/%lu] ", (unsigned long)getpid(),
-                        modperl_threads_started()
-                        ? (unsigned long)apr_os_thread_current()
-                        : 0);
+        if (modperl_threads_started()) {
+            apr_file_printf(logfile, "[pid=%lu, tid=%pt, perl=%pp] ",
+                            (unsigned long)getpid(),
+                            (void*)apr_os_thread_current(), PERL_GET_CONTEXT);
+        }
+        else {
+            apr_file_printf(logfile, "[pid=%lu, perl=%pp] ",
+                            (unsigned long)getpid(), PERL_GET_CONTEXT);
+        }
     }
     else {
-        apr_file_printf(logfile, "[%lu] ", (unsigned long)getpid());
+#ifdef USE_ITHREADS
+        apr_file_printf(logfile, "[pid=%lu, perl=%pp] ",
+                        (unsigned long)getpid(), PERL_GET_CONTEXT);
+#else
+        apr_file_printf(logfile, "[pid=%lu] ", (unsigned long)getpid());
+#endif
     }
 
     if (func && *func) {



Mime
View raw message