Changeset 32411 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 10, 2010 2:40:01 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/r3/coredumper: addressed some todos in r65763.

File:

• trunk/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp (modified) (14 diffs)

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

@@ -61 +61 @@
 *   Globals                                                                    *
 *******************************************************************************/
-static RTNATIVETHREAD volatile  g_CoreDumpThread = NIL_RTNATIVETHREAD;
+static RTNATIVETHREAD volatile  g_CoreDumpThread             = NIL_RTNATIVETHREAD;
 static bool volatile            g_fCoreDumpSignalSetup       = false;
 static bool volatile            g_fCoreDumpDeliberate        = false;
@@ -541 +541 @@
                 /* Terminate list of vectors */
                 pVBoxProc->cAuxVecs = cbAuxFile / sizeof(auxv_t);
-                CORELOG((CORELOG_NAME "ProcReadAuxVecs: cbAuxFile=%u auxv_t size %d cAuxVecs=%u\n", cbAuxFile, sizeof(auxv_t), pVBoxProc->cAuxVecs));
+                CORELOG((CORELOG_NAME "ProcReadAuxVecs: cbAuxFile=%u auxv_t size %d cAuxVecs=%u\n", cbAuxFile, sizeof(auxv_t),
+                         pVBoxProc->cAuxVecs));
                 if (pVBoxProc->cAuxVecs > 0)
                 {
@@ -666 +667 @@
                                     if (RT_FAILURE(rc2))
                                     {
-                                        CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: skipping mapping. vaddr=%#x rc=%Rrc\n", pCur->pMap.pr_vaddr, rc2));
+                                        CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: skipping mapping. vaddr=%#x rc=%Rrc\n",
+                                                       pCur->pMap.pr_vaddr, rc2));
 
                                         /*
@@ -695 +697 @@
                         else
                         {
-                            CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: GetMemoryChunk failed %u\n", pVBoxProc->cMappings * sizeof(VBOXSOLMAPINFO)));
+                            CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: GetMemoryChunk failed %u\n",
+                                           pVBoxProc->cMappings * sizeof(VBOXSOLMAPINFO)));
                             rc = VERR_NO_MEMORY;
                         }
@@ -873 +876 @@
                 CORELOGRELSYS((CORELOG_NAME "ProcReadThreads: huh!? cbStatusHdrAndData=%u prheader_t=%u entsize=%u\n", cbStatusHdrAndData,
                             sizeof(prheader_t), pStatusHdr->pr_entsize));
-                CORELOGRELSYS((CORELOG_NAME "ProcReadThreads: huh!? cbInfoHdrAndData=%u entsize=%u\n", cbInfoHdrAndData, pStatusHdr->pr_entsize));
+                CORELOGRELSYS((CORELOG_NAME "ProcReadThreads: huh!? cbInfoHdrAndData=%u entsize=%u\n", cbInfoHdrAndData,
+                               pStatusHdr->pr_entsize));
                 rc = VERR_INVALID_STATE;
             }
@@ -922 +926 @@
     if (rc < 0)
     {
-        CORELOGRELSYS((CORELOG_NAME "ProcReadMiscInfo: getzonenamebyid failed. rc=%d errno=%d zoneid=%d\n", rc, errno, pVBoxProc->ProcInfo.pr_zoneid));
+        CORELOGRELSYS((CORELOG_NAME "ProcReadMiscInfo: getzonenamebyid failed. rc=%d errno=%d zoneid=%d\n", rc, errno,
+                       pVBoxProc->ProcInfo.pr_zoneid));
         return VERR_GENERAL_FAILURE;
     }
@@ -1778 +1783 @@
      * Create the core file.
      */
-    rc = RTFileOpen(&pVBoxCore->hCoreFile, pVBoxCore->szCorePath, RTFILE_O_OPEN_CREATE | RTFILE_O_TRUNCATE | RTFILE_O_READWRITE | RTFILE_O_DENY_ALL);
+    rc = RTFileOpen(&pVBoxCore->hCoreFile, pVBoxCore->szCorePath,
+                    RTFILE_O_OPEN_CREATE | RTFILE_O_TRUNCATE | RTFILE_O_READWRITE | RTFILE_O_DENY_ALL);
     if (RT_FAILURE(rc))
     {
@@ -2135 +2141 @@
             CORELOGRELSYS((CORELOG_NAME "TakeDump failed! rc=%Rrc\n", rc));
     }
-    else if (Sig == SIGSEGV || Sig == SIGBUS)
+    else if (Sig == SIGSEGV || Sig == SIGBUS || Sig == SIGTRAP)
     {
         /*
@@ -2181 +2187 @@
     }
 
-    if (Sig == SIGSEGV || Sig == SIGBUS)
+    if (Sig == SIGSEGV || Sig == SIGBUS || Sig == SIGTRAP)
     {
         /*
@@ -2189 +2195 @@
         signal(SIGSEGV, SIG_DFL);
         signal(SIGBUS, SIG_DFL);
+        signal(SIGTRAP, SIG_DFL);
 
         /*
@@ -2255 +2262 @@
      * Validate flags.
      */
-    AssertReturn(fFlags, VERR_INVALID_PARAMETER); /** @todo r=bird: Update the function docs to reflect this.  It currently reads
-                                                   * as if RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP was standard behavior.
-                                                   * The SIGUSR2/RTCOREDUMPER_FLAGS_LIVE_CORE behavior isn't mentioned at all. */
+    AssertReturn(fFlags, VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & ~(  RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP
                               | RTCOREDUMPER_FLAGS_LIVE_CORE)),
@@ -2275 +2280 @@
  *        Adding the conditional registration via the two flags complicates
  *        the implementation of this use case. */
+
     /*
      * Install core dump signal handler.
      */
-    struct sigaction sigAct;
-    RT_ZERO(sigAct);
-    sigAct.sa_sigaction = &rtCoreDumperSignalHandler;
-    sigemptyset(&sigAct.sa_mask); /** @todo r=bird: We're probably better off blocking all signals here. */
-    sigAct.sa_flags = SA_RESTART | SA_SIGINFO | SA_NODEFER; /** @todo r=bird: SA_NODEFER doesn't make sense for SIGUSR2. For the hardware triggered ones, I don't think you can efficiently mask them, but it doesn't hurt playing safe ofc. */
-
-    if (fFlags & RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP)
-    {
-        sigaction(SIGSEGV, &sigAct, NULL);
-        sigaction(SIGBUS, &sigAct, NULL);
-/** @todo Add SIGTRAP or release+fatal assertions. */
-    }
-
-    if (fFlags & RTCOREDUMPER_FLAGS_LIVE_CORE)
-        sigaction(SIGUSR2, &sigAct, NULL);
-
-    ASMAtomicWriteBool(&g_fCoreDumpSignalSetup, true);
+    if (   ASMAtomicReadBool(&g_fCoreDumpSignalSetup) == false
+        || ASMAtomicReadU32(&g_fCoreDumpFlags) != fFlags)
+    {
+        struct sigaction sigAct;
+        RT_ZERO(sigAct);
+        sigAct.sa_sigaction = &rtCoreDumperSignalHandler;
+        sigfillset(&sigAct.sa_mask);                        /* Block all signals while in the signal handler */
+        sigAct.sa_flags = SA_RESTART | SA_SIGINFO;
+
+        if (   (fFlags & RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP)
+            && !(g_fCoreDumpFlags & RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP))
+        {
+            sigAct.sa_flags |= SA_NODEFER;                  /* Don't block the below signal while in it's signal handler. */
+            sigaction(SIGSEGV, &sigAct, NULL);
+            sigaction(SIGBUS, &sigAct, NULL);
+            sigaction(SIGTRAP, &sigAct, NULL);
+        }
+
+        if (   fFlags & RTCOREDUMPER_FLAGS_LIVE_CORE
+            && !(g_fCoreDumpFlags & RTCOREDUMPER_FLAGS_LIVE_CORE))
+        {
+            sigAct.sa_flags = SA_RESTART | SA_SIGINFO;
+            sigaction(SIGUSR2, &sigAct, NULL);
+        }
+
+        ASMAtomicWriteU32(&g_fCoreDumpFlags, fFlags);
+        ASMAtomicWriteBool(&g_fCoreDumpSignalSetup, true);
+    }
 
     RT_ZERO(g_szCoreDumpDir);
@@ -2300 +2317 @@
         RTStrCopy(g_szCoreDumpDir, sizeof(g_szCoreDumpDir), pszOutputDir);
 
-    ASMAtomicWriteU32(&g_fCoreDumpFlags, fFlags);
-
     return VINF_SUCCESS;
 }
@@ -2315 +2330 @@
         signal(SIGSEGV, SIG_DFL);
         signal(SIGBUS, SIG_DFL);
+        signal(SIGTRAP, SIG_DFL);
         signal(SIGUSR2, SIG_DFL);
         ASMAtomicWriteBool(&g_fCoreDumpSignalSetup, false);