patches/strace/4.5.19/140-undef-CTL_PROC.patch
author |
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
|
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13) |
changeset 2807 |
4193d6e6a174 |
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>
yann@1613
|
1 |
diff -durN strace-4.5.19.orig/system.c strace-4.5.19/system.c
|
yann@1613
|
2 |
--- strace-4.5.19.orig/system.c 2009-06-01 11:59:11.000000000 +0200
|
yann@1613
|
3 |
+++ strace-4.5.19/system.c 2009-10-28 18:47:18.000000000 +0100
|
yann@1613
|
4 |
@@ -1654,7 +1654,9 @@
|
yann@1613
|
5 |
{ CTL_KERN, "CTL_KERN" },
|
yann@1613
|
6 |
{ CTL_VM, "CTL_VM" },
|
yann@1613
|
7 |
{ CTL_NET, "CTL_NET" },
|
yann@1613
|
8 |
+#ifdef CTL_PROC
|
yann@1613
|
9 |
{ CTL_PROC, "CTL_PROC" },
|
yann@1613
|
10 |
+#endif
|
yann@1613
|
11 |
{ CTL_FS, "CTL_FS" },
|
yann@1613
|
12 |
{ CTL_DEBUG, "CTL_DEBUG" },
|
yann@1613
|
13 |
{ CTL_DEV, "CTL_DEV" },
|