Changeset 32422 in vbox

Timestamp:

Sep 10, 2010 4:48:22 PM (14 years ago)

Author:

vboxsync

Message:

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

File:

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

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

@@ -53 +53 @@
 # include <sys/systeminfo.h>
 # include <sys/mman.h>
+# include <ucontext.h>
 #endif  /* RT_OS_SOLARIS */
 
@@ -63 +64 @@
 static RTNATIVETHREAD volatile  g_CoreDumpThread             = NIL_RTNATIVETHREAD;
 static bool volatile            g_fCoreDumpSignalSetup       = false;
-static bool volatile            g_fCoreDumpDeliberate        = false;
 static uint32_t volatile        g_fCoreDumpFlags             = 0;
 static char                     g_szCoreDumpDir[PATH_MAX]    = { 0 };
@@ -1275 +1275 @@
     {
         CORELOGRELSYS((CORELOG_NAME "rtCoreDumperSuspendThreads: possible thread bomb!?\n"));
-        rc = VERR_GENERAL_FAILURE;   /* @todo better error code */
+        rc = VERR_TIMEOUT;
     }
     return rc;
@@ -1929 +1929 @@
  * @param pVBoxCore         Pointer to a core object.
  * @param pContext          Pointer to the caller context thread.
+ * @param pszCoreFilePath   Path to the core file (Optional, can be NULL).
  *
  * @remarks Halts all threads.
  * @return IPRT status code.
  */
-static int rtCoreDumperCreateCore(PVBOXCORE pVBoxCore, ucontext_t *pContext)
+static int rtCoreDumperCreateCore(PVBOXCORE pVBoxCore, ucontext_t *pContext, const char *pszCoreFilePath)
 {
     AssertReturn(pVBoxCore, VERR_INVALID_POINTER);
@@ -1958 +1959 @@
 
     /*
-     * If no output directory is specified, use current directory.
-     */
-    if (g_szCoreDumpDir[0] == '\0')
-        g_szCoreDumpDir[0] = '.';
-
-    if (g_szCoreDumpFile[0] == '\0')
-    {
-        /* We cannot call RTPathAbs*() as they call getcwd() which calls malloc. */
-        RTStrPrintf(pVBoxCore->szCorePath, sizeof(pVBoxCore->szCorePath), "%s/core.vb.%s.%d",
-                    g_szCoreDumpDir, pVBoxProc->pszExecName, (int)pVBoxProc->Process);
+     * If a path has been specified, use it. Otherwise use the global path.
+     */
+    if (!pszCoreFilePath)
+    {
+        /*
+         * If no output directory is specified, use current directory.
+         */
+        if (g_szCoreDumpDir[0] == '\0')
+            g_szCoreDumpDir[0] = '.';
+
+        if (g_szCoreDumpFile[0] == '\0')
+        {
+            /* We cannot call RTPathAbs*() as they call getcwd() which calls malloc. */
+            RTStrPrintf(pVBoxCore->szCorePath, sizeof(pVBoxCore->szCorePath), "%s/core.vb.%s.%d",
+                        g_szCoreDumpDir, pVBoxProc->pszExecName, (int)pVBoxProc->Process);
+        }
+        else
+            RTStrPrintf(pVBoxCore->szCorePath, sizeof(pVBoxCore->szCorePath), "%s/core.vb.%s", g_szCoreDumpDir, g_szCoreDumpFile);
     }
     else
-        RTStrPrintf(pVBoxCore->szCorePath, sizeof(pVBoxCore->szCorePath), "%s/core.vb.%s", g_szCoreDumpDir, g_szCoreDumpFile);
+        RTStrCopy(pVBoxCore->szCorePath, sizeof(pVBoxCore->szCorePath), pszCoreFilePath);
 
     CORELOG((CORELOG_NAME  "CreateCore: Taking Core %s from Thread %d\n", pVBoxCore->szCorePath, (int)pVBoxProc->hCurThread));
@@ -2081 +2090 @@
  *
  * @param   pContext            The context of the caller.
+ * @param   pszOutputFile       Path of the core file. If NULL is passed, the
+ *                              global path passed in RTCoreDumperSetup will
+ *                              be used.
  * @returns IPRT status code.
  */
-static int rtCoreDumperTakeDump(ucontext_t *pContext)
+static int rtCoreDumperTakeDump(ucontext_t *pContext, const char *pszOutputFile)
 {
     if (!pContext)
@@ -2098 +2110 @@
     VBOXCORE VBoxCore;
     RT_ZERO(VBoxCore);
-    int rc = rtCoreDumperCreateCore(&VBoxCore, pContext);
+    int rc = rtCoreDumperCreateCore(&VBoxCore, pContext, pszOutputFile);
     if (RT_SUCCESS(rc))
     {
@@ -2135 +2147 @@
     if (fRc)
     {
-        rc = rtCoreDumperTakeDump((ucontext_t *)pvArg);
+        rc = rtCoreDumperTakeDump((ucontext_t *)pvArg, NULL /* Use Global Core filepath */);
         ASMAtomicWriteHandle(&g_CoreDumpThread, NIL_RTNATIVETHREAD);
 
@@ -2215 +2227 @@
 RTDECL(int) RTCoreDumperTakeDump(const char *pszOutputFile, bool fLiveCore)
 {
-    /** @todo r=bird: No setup should be required for this call and it
-     * shouldn't change the globals.
-     *
-     * Would probably be best to serialize RTCoreDumperTakeDump callers using a
-     * lazily initialized critsect (see RTOnce) and use different globals to
-     * communicate with the signal handlers.
-     *
-     * Another improvement is to use getcontext() to get the thread context and
-     * call rtCoreDumperTakeDump directly.  Extend rtCoreDumperTakeDump so that
-     * it takes pszOutputFile as an optional argument.  Mask the other fatal +
-     * SIGUSR2 while doing this.
-     */
-
-    /*
-     * 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_REPLACE_SYSTEM_DUMP))
-        return VERR_INVALID_PARAMETER;
-
-    RT_ZERO(g_szCoreDumpFile);
-    if (pszOutputFile)
-        RTStrCopy(g_szCoreDumpFile, sizeof(g_szCoreDumpFile), pszOutputFile);
-
-    ASMAtomicWriteBool(&g_fCoreDumpDeliberate, true);
-
-    if (fLiveCore == false)
-        raise(SIGSEGV);
+    ucontext_t Context;
+    int rc = getcontext(&Context);
+    if (!rc)
+    {
+        /*
+         * Block SIGSEGV and co. while we write the core.
+         */
+        sigset_t SigSet, OldSigSet;
+        sigemptyset(&SigSet);
+        sigaddset(&SigSet, SIGSEGV);
+        sigaddset(&SigSet, SIGBUS);
+        sigaddset(&SigSet, SIGTRAP);
+        sigaddset(&SigSet, SIGUSR2);
+        pthread_sigmask(SIG_BLOCK, &SigSet, &OldSigSet);
+        rc = rtCoreDumperTakeDump(&Context, pszOutputFile);
+        if (!fLiveCore)
+        {
+            signal(SIGSEGV, SIG_DFL);
+            signal(SIGBUS, SIG_DFL);
+            signal(SIGTRAP, SIG_DFL);
+            if (RT_SUCCESS(rc))
+                raise(SIGKILL);
+            else
+                abort();
+        }
+        pthread_sigmask(SIG_SETMASK, &OldSigSet, NULL);
+    }
     else
-        raise(SIGUSR2);
-
-    ASMAtomicWriteBool(&g_fCoreDumpDeliberate, false);
-    return VINF_SUCCESS;
+    {
+        CORELOGRELSYS(("RTCoreDumperTakeDump: getcontext failed rc=%d.\n"));
+        rc = VERR_INVALID_CONTEXT;
+    }
+
+    return rc;
 }
 
@@ -2267 +2274 @@
                  VERR_INVALID_PARAMETER);
 
-/** @todo r=bird: The idea here was that we shouldn't register the handler
- *        more than once.  I.e. skip it if g_fCoreDumpSignalSetup and the
- *        flags didn't change in any way.  The rational/usecase is that that
- *        allows the user to chain handlers before our SIGSEGV/SIGBUS/SIGTRAP
- *        core dumping + crashing handler.  Since we're registering our stuff
- *        in Main somewhere it's important that only the first call messes with
- *        the signal handlers.  The front end could for instance do a
- *        RTCoreDumperSetup(NULL, RTCOREDUMPER_FLAGS_REPLACE_SYSTEM_DUMP |
- *        RTCOREDUMPER_FLAGS_LIVE_CORE) call in it's main() before setting up
- *        it's own SIGBUS/SIGSEGV/SIGTRAP handlers.
- *
- *        Adding the conditional registration via the two flags complicates
- *        the implementation of this use case. */
-
-    /*
-     * Install core dump signal handler.
+    /*
+     * Install core dump signal handler only if the flags changed or if it's the first time.
      */
     if (   ASMAtomicReadBool(&g_fCoreDumpSignalSetup) == false