Make sure that the traces are always complete.

[apitrace] / os_posix.cpp

diff --git a/os_posix.cpp b/os_posix.cpp
index fdcaca9aa80685837efeccd1c2e9f1b5820d53a1..3a864720735740207346fa5b98fa4b86de4a3807 100644 (file)
--- a/os_posix.cpp
+++ b/os_posix.cpp
@@ -31,6 +31,9 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <pthread.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
 
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
@@ -77,6 +80,15 @@ GetProcessName(char *str, size_t size)
     ssize_t len;
     len = readlink("/proc/self/exe", szProcessPath, sizeof(szProcessPath) - 1);
     if (len == -1) {
+        // /proc/self/exe is not available on setuid processes, so fallback to
+        // /proc/self/cmdline.
+        int fd = open("/proc/self/cmdline", O_RDONLY);
+        if (fd >= 0) {
+            len = read(fd, szProcessPath, sizeof(szProcessPath) - 1);
+            close(fd);
+        }
+    }
+    if (len <= 0) {
         snprintf(str, size, "%i", (int)getpid());
         return true;
     }
@@ -126,5 +138,28 @@ Abort(void)
 }
 
 
+void
+CatchInterrupts(void (*func)(int))
+{
+    struct sigaction new_action, old_action;
+
+    new_action.sa_handler = func;
+    sigemptyset(&new_action.sa_mask);
+    new_action.sa_flags = 0;
+
+#define SET_IF_NOT_IGNORED(sig)                \
+    do {                                       \
+        sigaction(sig, NULL, &old_action);     \
+        if (old_action.sa_handler != SIG_IGN)  \
+            sigaction(sig, &new_action, NULL); \
+    } while (0)
+
+    SET_IF_NOT_IGNORED(SIGINT);
+    SET_IF_NOT_IGNORED(SIGHUP);
+    SET_IF_NOT_IGNORED(SIGTERM);
+
+#undef SET_IF_NOT_IGNORED
+}
+
 } /* namespace OS */