patches/strace/4.5.15/180-undef-PACKET_MEMBERSHIP.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13)
branch1.13
changeset 2847 c0bf2319af08
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts: fix dumping execution backtrace

Dumping the backtrace has been broken since changeset #652e56d6d35a:
scripts: execute each steps in a subshell

We can spawn sub-sub-shells in some cases.

The way the fault handler works is to dump the backtrace, but to avoid
printing it once for every sub-shell (which could get quite confusing),
it simply exits when it detects that it is being run in a sub-shell,
leaving to the top-level shell the work to dump the backtrace.

Because each step is executed in its own sub-shell, the variable arrays
that contain the step name, the source file and line number, are lost
when exiting the per-step sub-shell.

Hence, the backtrace is currently limited to printing only the top-level
main procedure of the shell.

Fix this thus:
- when dumping the bckatraces for the steps & the functions, remember
it was dumped, and only dump it if it was not already dumped
- at the top-level shell, print the hints

Also, rename the top-level step label.

Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4193d6e6a17430a177fa88c287879c2c35e319f3)
yann@257
     1
diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
yann@257
     2
--- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
yann@257
     3
+++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
yann@257
     4
@@ -800,8 +800,12 @@
yann@257
     5
 
yann@257
     6
 #ifdef SOL_PACKET
yann@257
     7
 static const struct xlat sockpacketoptions[] = {
yann@257
     8
+#if defined(PACKET_ADD_MEMBERSHIP)
yann@257
     9
 	{ PACKET_ADD_MEMBERSHIP,	"PACKET_ADD_MEMBERSHIP"	},
yann@257
    10
+#endif
yann@257
    11
+#if defined(PACKET_DROP_MEMBERSHIP)
yann@257
    12
 	{ PACKET_DROP_MEMBERSHIP,	"PACKET_DROP_MEMBERSHIP"},
yann@257
    13
+#endif
yann@257
    14
 #if defined(PACKET_RECV_OUTPUT)
yann@257
    15
 	{ PACKET_RECV_OUTPUT,		"PACKET_RECV_OUTPUT"	},
yann@257
    16
 #endif