Changeset 32347 in vbox

Timestamp:

Sep 9, 2010 12:18:38 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/r3/coredumper: Setup SIGUSR2 and flags, allow taking live cores.

Location:

trunk

Files:

• include/iprt/coredumper.h (modified) (3 diffs)
• src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp (modified) (10 diffs)
• src/VBox/Runtime/testcase/tstRTCoreDump.cpp (modified) (2 diffs)

trunk/include/iprt/coredumper.h

@@ -37 +37 @@
  */
 
+/** @name RTCoreDumperSetup flags
+ * @{ */
+/** Override system core dumper. */
+#define RTCOREDUMPER_FLAGS_OVERRIDE_SYS_DUMPER     RT_BIT(0)
+/** Allow taking live process dumps (without killing process). */
+#define RTCOREDUMPER_FLAGS_LIVE_CORE               RT_BIT(1)
+/** @}  */
+
 /**
  * Take a core dump of the current process without terminating it.
@@ -43 +51 @@
  * @param   pszOutputFile       Name of the core file.  If NULL use the
  *                              default naming scheme.
+ * @param   fLiveCore           When true, the process is not killed after
+ *                              taking a core. Otherwise it will be killed. This
+ *                              works in conjuction with the flags set during
+ *                              RTCoreDumperSetup().
  */
-RTDECL(int) RTCoreDumperTakeDump(const char *pszOutputFile);
+RTDECL(int) RTCoreDumperTakeDump(const char *pszOutputFile, bool fLiveCore);
 
 /**
@@ -61 +73 @@
  * @param   pszBaseName         Base file name, no directory.  If NULL the
  *                              dumper will generate an appropriate name.
- * @param   fFlags              Reserved for later, MBZ.
+ * @param   fFlags              Setup flags, see RTCOREDUMPER_FLAGS_*.
  */
 RTDECL(int) RTCoreDumperSetup(const char *pszOutputDir, uint32_t fFlags);

trunk/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp

@@ -45 +45 @@
 # include <syslog.h>
 # include <signal.h>
+# include <stdlib.h>
 # include <unistd.h>
 # include <errno.h>
@@ -64 +65 @@
 volatile static bool       g_fCoreDumpDeliberate = false;
 volatile static bool       g_fCoreDumpInProgress = false;
+volatile static bool       g_fCoreDumpLiveCore = false;
 volatile static uint32_t   g_fCoreDumpFlags = 0;
 static char                g_szCoreDumpDir[PATH_MAX] = { 0 };
@@ -2135 +2137 @@
 
         if (RT_FAILURE(rc))
-        {
-            /*
-             * If it is NOT a deliberate dump taken by us & our handler fails we assume the
-             * worst, try to use the system signal handler and abort the process.
-             */
             CORELOGRELSYS((CORELOG_NAME "TakeDump failed! rc=%Rrc\n", rc));
-            if (ASMAtomicReadBool(&g_fCoreDumpDeliberate) == false)
-                fCallSystemDump = true;
-        }
     }
     else
     {
         /*
-         * Core dumping is already in  progress and we've somehow ended up being
+         * Core dumping is already in progress and we've somehow ended up being
          * signalled again.
          */
@@ -2163 +2157 @@
             CORELOGRELSYS((CORELOG_NAME "SignalHandler: Core dump already in progress! Waiting before signalling Sig=%d.\n", Sig));
             int64_t iTimeout = 10000;  /* timeout (ms) */
-            while (ASMAtomicUoReadBool(&g_fCoreDumpInProgress) == true)
+            while (ASMAtomicReadBool(&g_fCoreDumpInProgress) == true)
             {
                 RTThreadSleep(200);
@@ -2178 +2172 @@
     }
 
-    if (fCallSystemDump)
-    {
-        signal(Sig, SIG_DFL);
-        raise(Sig);
+    if (ASMAtomicReadBool(&g_fCoreDumpLiveCore) == false)
+    {
+        /*
+         * Reset signal handlers, we're not a live core we will be blown away
+         * one way or another.
+         */
+        signal(SIGSEGV, SIG_DFL);
+        signal(SIGBUS, SIG_DFL);
+
+        /*
+         * Hard terminate the process if this is not a live dump without invoking
+         * the system core dumping behaviour.
+         */
+        if (RT_SUCCESS(rc))
+            raise(SIGKILL);
+
+        /*
+         * Something went wrong, fall back to the system core dumper.
+         */
+        if (fCallSystemDump)
+            abort();
     }
 }
@@ -2192 +2203 @@
  * @param   pszOutputFile       Name of the core file.  If NULL use the
  *                              default naming scheme.
- */
-RTDECL(int) RTCoreDumperTakeDump(const char *pszOutputFile)
-{
+ * @param   fLiveCore           When true, the process is not killed after
+ *                              taking a core. Otherwise it will be killed. This
+ *                              works in conjuction with the flags set during
+ *                              RTCoreDumperSetup().
+ */
+RTDECL(int) RTCoreDumperTakeDump(const char *pszOutputFile, bool fLiveCore)
+{
+    /*
+     * Validate input.
+     */
     if (ASMAtomicReadBool(&g_fCoreDumpSignalSetup) == false)
         return VERR_WRONG_ORDER;
+
+    uint32_t fFlags = ASMAtomicReadU32(&g_fCoreDumpFlags);
+    if (fLiveCore && !(fFlags & RTCOREDUMPER_FLAGS_LIVE_CORE))
+        return VERR_INVALID_PARAMETER;
+
+    if (!fLiveCore && !(fFlags & RTCOREDUMPER_FLAGS_OVERRIDE_SYS_DUMPER))
+        return VERR_INVALID_PARAMETER;
 
     RT_ZERO(g_szCoreDumpFile);
@@ -2203 +2228 @@
 
     ASMAtomicWriteBool(&g_fCoreDumpDeliberate, true);
-    raise(SIGSEGV);
+    ASMAtomicWriteBool(&g_fCoreDumpLiveCore, fLiveCore);
+
+    if (fLiveCore == false)
+        raise(SIGSEGV);
+    else
+    {
+        raise(SIGUSR2);
+        ASMAtomicWriteBool(&g_fCoreDumpLiveCore, false);
+    }
+
     ASMAtomicWriteBool(&g_fCoreDumpDeliberate, false);
     return VINF_SUCCESS;
@@ -2224 +2258 @@
  * @param   pszBaseName         Base file name, no directory.  If NULL the
  *                              dumper will generate an appropriate name.
- * @param   fFlags              Reserved for later, MBZ.
+ * @param   fFlags              Setup flags, see RTCOREDUMPER_FLAGS_*.
  */
 RTDECL(int) RTCoreDumperSetup(const char *pszOutputDir, uint32_t fFlags)
@@ -2231 +2265 @@
      * Validate flags.
      */
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(  RTCOREDUMPER_FLAGS_OVERRIDE_SYS_DUMPER
+                              | RTCOREDUMPER_FLAGS_LIVE_CORE)),
+                 VERR_INVALID_PARAMETER);
 
     /*
@@ -2237 +2273 @@
      */
     struct sigaction sigAct;
+    RT_ZERO(sigAct);
     sigAct.sa_sigaction = &rtCoreDumperSignalHandler;
     sigemptyset(&sigAct.sa_mask);
     sigAct.sa_flags = SA_RESTART | SA_SIGINFO;
-    sigaction(SIGSEGV, &sigAct, NULL);
-    sigaction(SIGBUS, &sigAct, NULL);
+
+    if (fFlags & RTCOREDUMPER_FLAGS_OVERRIDE_SYS_DUMPER)
+    {
+        sigaction(SIGSEGV, &sigAct, NULL);
+        sigaction(SIGBUS, &sigAct, NULL);
+    }
+
+    if (fFlags & RTCOREDUMPER_FLAGS_LIVE_CORE)
+        sigaction(SIGUSR2, &sigAct, NULL);
 
     ASMAtomicWriteBool(&g_fCoreDumpSignalSetup, true);

trunk/src/VBox/Runtime/testcase/tstRTCoreDump.cpp

@@ -56 +56 @@
      * Setup core dumping.
      */
-    int rc = RTCoreDumperSetup(NULL, 0);
+    int rc = RTCoreDumperSetup(NULL, RTCOREDUMPER_FLAGS_OVERRIDE_SYS_DUMPER | RTCOREDUMPER_FLAGS_LIVE_CORE);
     if (RT_SUCCESS(rc))
     {
@@ -76 +76 @@
         }
         RTPrintf("Spawned %d threads.\n", i);
-    
+
         /*
          * Write the core to disk.
          */
-        rc = RTCoreDumperTakeDump(NULL);
+        rc = RTCoreDumperTakeDump(NULL, false /* fLiveCore*/);
         if (RT_FAILURE(rc))
         {