From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 24 Jan 2007 21:42:53 +0000 (+0000)
Subject: Display the process id as part of the trace output if running with -Dv
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=185c8bac9a83b61c2b0e64dfc37d5aa2c2f4ecda;p=p5sagit%2Fp5-mst-13.2.git

Display the process id as part of the trace output if running with -Dv
(Might be nice to display the thread ID too under ithreads, but I can't
 see a clean way to get that)

p4raw-id: //depot/perl@29960
---

diff --git a/deb.c b/deb.c
index 1d3de4c..37d7a7c 100644
--- a/deb.c
+++ b/deb.c
@@ -57,10 +57,15 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
 {
 #ifdef DEBUGGING
     dVAR;
-    const char* const file = OutCopFILE(PL_curcop);
-
-    PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
-		  (long)CopLINE(PL_curcop));
+    const char* const file = PL_curcop ? OutCopFILE(PL_curcop) : "<null>";
+    const char* const display_file = file ? file : "<free>";
+    const long line = PL_curcop ? (long)CopLINE(PL_curcop) : 0;
+
+    if (DEBUG_v_TEST)
+	PerlIO_printf(Perl_debug_log, "(%ld:%s:%ld)\t",
+		      (long)PerlProc_getpid(), display_file, line);
+    else
+	PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", display_file, line);
     (void) PerlIO_vprintf(Perl_debug_log, pat, *args);
 #else
     PERL_UNUSED_CONTEXT;