From ed4c2b52bead2215f39de1d75bc3d09daa83caa9 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 27 May 2020 21:45:00 +0100
Subject: [PATCH] new dbgtrace command

Avoid the use of Carp long/short_message and replace it with our own.
---
 perl/DXDebug.pm | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index d901c6b5..28ae8fe5 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -24,9 +24,11 @@
 
 package DXDebug;
 
+use 5.10.1;
+
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck carp);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose dbgtrace confess croak cluck carp);
 
 use strict;
 use vars qw(%dbglevel $fp $callback $cleandays $keepdays $dbgringlth);
@@ -54,23 +56,27 @@ if (!defined $DB::VERSION) {
 	    \$SIG{__DIE__} = 'DEFAULT'; 
         DXDebug::dbgprintring() if DXDebug::isdbg('nologchan');
         DXDebug::dbg(\$@);
-		DXDebug::dbg(Carp::shortmess(\@_));
+#		DXDebug::dbg(Carp::shortmess(\@_));
+        DXDebug::longmess(\@_);
 	    exit(-1); 
 	}
 	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
         DXDebug::dbgprintring() if DXDebug::isdbg('nologchan');
         DXDebug::dbg(\$@);
-		DXDebug::dbg(Carp::longmess(\@_));
+#		DXDebug::dbg(Carp::longmess(\@_));
+        DXDebug::shortmess(\@_);
 		exit(-1); 
 	}
 	sub carp { 
         DXDebug::dbgprintring(25) if DXDebug('nologchan');
-        DXDebug::dbg(Carp::shortmess(\@_)); 
+#        DXDebug::dbg(Carp::shortmess(\@_)); 
+        DXDebug::longmess(\@_);
     }
 	sub cluck { 
         DXDebug::dbgprintring(25) if DXDebug('nologchan');
-        DXDebug::dbg(Carp::longmess(\@_)); 
+#        DXDebug::dbg(Carp::longmess(\@_)); 
+        DXDebug::longmess(\@_);
     } );
 
     CORE::die(Carp::shortmess($@)) if $@;
@@ -85,6 +91,24 @@ if (!defined $DB::VERSION) {
 
 my $_isdbg = '';						# current dbg level we are processing
 
+# print stack trace
+sub dbgtrace
+{
+#	say "*** in dbgtrace";
+	$_isdbg = 'trace';
+	dbg(@_);
+	for (my $i = 1; (my ($pkg, $fn, $l, $subr) = caller($i)); ++$i) {
+#		say "*** in dbgtrace $i";
+		next if $pkg eq 'DXDebug';
+#		say "*** in dbgtrace after package";
+		last if $pkg =~ /Mojo/;
+#		say "*** in dbgtrace $i after mojo";
+		$_isdbg = 'trace';
+		dbg("Stack ($i): $pkg::$subr in $fn line: $l");
+	}
+	$_isdbg = '';
+}
+
 sub dbg
 {
 #	return unless $fp;
@@ -106,7 +130,6 @@ sub dbg
 			$fp->writeunix($t, $str) unless !$fp || $dbglevel{"nolog$_isdbg"} ; 
 		}
 	}
-	$_isdbg = '';
 }
 
 sub dbginit
@@ -207,12 +230,12 @@ sub isdbg($)
 
 sub shortmess 
 {
-	return Carp::shortmess(@_);
+	return dbgtrace(@_);
 }
 
 sub longmess 
 {
-	return Carp::longmess(@_);
+	return dbgtrace(@_);
 }
 
 sub dbgprintring
-- 
2.34.1