From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 12 Feb 2015 22:43:02 +0000 (+0000)
Subject: Enhance wait status decoding
X-Git-Tag: v4.10~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8b3404555b9a324610d0caaa0b9237f14605818;p=strace

Enhance wait status decoding

* xlat/ptrace_events.in: New file.
* wait.c: Include "xlat/ptrace_events.h".
(printstatus): In case of WIFSTOPPED, print 0x80 flag separately from
the stop signal name.
[WIFCONTINUED]: Add WIFCONTINUED support.
Decode PTRACE_EVENT_* events.
---

diff --git a/wait.c b/wait.c
index 53808641..ad368d27 100644
--- a/wait.c
+++ b/wait.c
@@ -29,6 +29,11 @@
 #ifndef W_EXITCODE
 # define W_EXITCODE(ret, sig)  ((ret) << 8 | (sig))
 #endif
+#ifndef W_CONTINUED
+# define W_CONTINUED 0xffff
+#endif
+
+#include "xlat/ptrace_events.h"
 
 static int
 printstatus(int status)
@@ -41,9 +46,11 @@ printstatus(int status)
 	 * are no wait status constructors it will have to do.
 	 */
 	if (WIFSTOPPED(status)) {
-		tprintf("[{WIFSTOPPED(s) && WSTOPSIG(s) == %s}",
-			signame(WSTOPSIG(status)));
-		status &= ~W_STOPCODE(WSTOPSIG(status));
+		int sig = WSTOPSIG(status);
+		tprintf("[{WIFSTOPPED(s) && WSTOPSIG(s) == %s%s}",
+			signame(sig & 0x7f),
+			sig & 0x80 ? " | 0x80" : "");
+		status &= ~W_STOPCODE(sig);
 	}
 	else if (WIFSIGNALED(status)) {
 		tprintf("[{WIFSIGNALED(s) && WTERMSIG(s) == %s%s}",
@@ -57,15 +64,29 @@ printstatus(int status)
 		exited = 1;
 		status &= ~W_EXITCODE(WEXITSTATUS(status), 0);
 	}
+#ifdef WIFCONTINUED
+	else if (WIFCONTINUED(status)) {
+		tprints("[{WIFCONTINUED(s)}");
+		status &= ~W_CONTINUED;
+	}
+#endif
 	else {
 		tprintf("[%#x]", status);
 		return 0;
 	}
 
-	if (status == 0)
-		tprints("]");
-	else
-		tprintf(" | %#x]", status);
+	if (status) {
+		unsigned int event = (unsigned int) status >> 16;
+		if (event) {
+			tprints(" | ");
+			printxval(ptrace_events, event, "PTRACE_EVENT_???");
+			tprints(" << 16");
+			status &= 0xffff;
+		}
+		if (status)
+			tprintf(" | %#x", status);
+	}
+	tprints("]");
 
 	return exited;
 }
diff --git a/xlat/ptrace_events.in b/xlat/ptrace_events.in
new file mode 100644
index 00000000..9e8f2a1e
--- /dev/null
+++ b/xlat/ptrace_events.in
@@ -0,0 +1,8 @@
+PTRACE_EVENT_FORK
+PTRACE_EVENT_VFORK
+PTRACE_EVENT_CLONE
+PTRACE_EVENT_EXEC
+PTRACE_EVENT_VFORK_DONE
+PTRACE_EVENT_EXIT
+PTRACE_EVENT_SECCOMP
+PTRACE_EVENT_STOP