儲存庫 vbox 的更動 41686

時間撮記:

2012-6-13 下午04:27:49 (12 年 以前)

作者:

vboxsync

訊息:

Runtime/r3/solaris: coredumper cleanup.

檔案:

• trunk/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp (修改) (13 筆差異)

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

@@ -706 +706 @@
                          * Allocate for each prmap_t object, a corresponding RTSOLCOREMAPINFO object.
                          */
-                        pSolProc->pMapInfoHead = (PRTSOLCOREMAPINFO)GetMemoryChunk(pSolCore, pSolProc->cMappings * sizeof(RTSOLCOREMAPINFO));
+                        pSolProc->pMapInfoHead = (PRTSOLCOREMAPINFO)GetMemoryChunk(pSolCore,
+                                                                                pSolProc->cMappings * sizeof(RTSOLCOREMAPINFO));
                         if (pSolProc->pMapInfoHead)
                         {
@@ -774 +775 @@
                 }
                 else
-                    CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: FileReadNoIntr failed. rc=%Rrc cbMapFile=%u\n", rc, cbMapFile));
+                {
+                    CORELOGRELSYS((CORELOG_NAME "ProcReadMappings: FileReadNoIntr failed. rc=%Rrc cbMapFile=%u\n", rc,
+                                   cbMapFile));
+                }
             }
             else
@@ -904 +908 @@
                                     pStatus->pr_ustack = (uintptr_t)&pSolProc->pCurThreadCtx->uc_stack;
 
-                                    CORELOG((CORELOG_NAME "ProcReadThreads: patched dumper thread context with pre-dump time context.\n"));
+                                    CORELOG((CORELOG_NAME "ProcReadThreads: patched dumper thread with pre-dump time context.\n"));
                                 }
 
@@ -939 +943 @@
             else
             {
-                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!? 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));
@@ -1324 +1328 @@
      * The assumption here is that threads can only increase not decrease across iterations.
      */
-#if 1
     uint16_t cTries = 0;
     uint64_t aThreads[4];
@@ -1344 +1347 @@
     }
     return rc;
-#else
-    PRTSOLCOREPROCESS pSolProc = &pSolCore->SolProc;
-
-    char szCurThread[128];
-    char szPath[PATH_MAX];
-    PRTDIR pDir = NULL;
-
-    RTStrPrintf(szPath, sizeof(szPath), "/proc/%d/lwp", (int)pSolProc->Process);
-    RTStrPrintf(szCurThread, sizeof(szCurThread), "%d", (int)pSolProc->hCurThread);
-
-    int rc = -1;
-    uint32_t cThreads = 0;
-    uint16_t cTries = 0;
-    for (cTries = 0; cTries < 10; cTries++)
-    {
-        uint32_t cRunningThreads = 0;
-        rc = RTDirOpen(&pDir, szPath);
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Loop through all our threads & suspend them, multiple calls to _lwp_suspend() are okay.
-             */
-            RTDIRENTRY DirEntry;
-            while (RT_SUCCESS(RTDirRead(pDir, &DirEntry, NULL)))
-            {
-                if (   !strcmp(DirEntry.szName, ".")
-                    || !strcmp(DirEntry.szName, ".."))
-                    continue;
-
-                if ( !strcmp(DirEntry.szName, szCurThread))
-                    continue;
-
-                int32_t ThreadId = RTStrToInt32(DirEntry.szName);
-                _lwp_suspend((lwpid_t)ThreadId);
-                ++cRunningThreads;
-            }
-
-            if (cTries > 5 && cThreads == cRunningThreads)
-            {
-                rc = VINF_SUCCESS;
-                break;
-            }
-            cThreads = cRunningThreads;
-            RTDirClose(pDir);
-        }
-        else
-        {
-            CORELOGRELSYS((CORELOG_NAME "SuspendThreads: Failed to open %s cTries=%d\n", szPath, cTries));
-            rc = VERR_READ_ERROR;
-            break;
-        }
-    }
-
-    if (RT_SUCCESS(rc))
-        CORELOG((CORELOG_NAME "SuspendThreads: Stopped %u threads successfully with %u tries\n", cThreads, cTries));
-
-    return rc;
-#endif
 }
 
@@ -1446 +1391 @@
 
     /*
-     * This is a known violation of the 64-bit ELF spec., see xTracker #5211 comment#3
+     * This is a known violation of the 64-bit ELF spec., see xTracker @bugref{5211}
      * for the historic reasons as to the padding and namesz anomalies.
      */
@@ -1599 +1544 @@
                 if (RT_FAILURE(rc))
                 {
-                    CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader failed for %s. rc=%Rrc\n", aElfNotes[i].pszType, rc));
+                    CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader failed for %s. rc=%Rrc\n",
+                                   aElfNotes[i].pszType, rc));
                     break;
                 }
@@ -1656 +1602 @@
                 if (RT_FAILURE(rc))
                 {
-                    CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader failed for %s. rc=%Rrc\n", aElfNotes[i].pszType, rc));
+                    CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader failed for %s. rc=%Rrc\n",
+                                   aElfNotes[i].pszType, rc));
                     break;
                 }
@@ -1680 +1627 @@
                     if (RT_FAILURE(rc))
                     {
-                        CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader for NT_LWPSTATUS failed. rc=%Rrc\n", rc));
+                        CORELOGRELSYS((CORELOG_NAME "ElfWriteNoteSection: ElfWriteNoteHeader for NT_LWPSTATUS failed. rc=%Rrc\n",
+                                       rc));
                         break;
                     }
@@ -1811 +1759 @@
 }
 
-/** 
- * Inner worker for rtCoreDumperWriteCore, which purpose is to 
- * squash cleanup gotos. 
- */
-static int rtCoreDumperWriteCoreDoIt(PRTSOLCORE pSolCore, PFNRTCOREWRITER pfnWriter, 
+/**
+ * Inner worker for rtCoreDumperWriteCore, which purpose is to
+ * squash cleanup gotos.
+ */
+static int rtCoreDumperWriteCoreDoIt(PRTSOLCORE pSolCore, PFNRTCOREWRITER pfnWriter,
                                      PRTSOLCOREPROCESS pSolProc)
 {
@@ -2078 +2026 @@
             {
                 /*
-                 * Read process status, information such as number of active LWPs will be invalid since we just quiesced the process.
+                 * Read process status, information such as number of active LWPs will be
+                 * invalid since we just quiesced the process.
                  */
                 rc = ProcReadStatus(pSolCore);
@@ -2261 +2210 @@
              * to let our core dumper finish, on timeout trigger system dump.
              */
-            CORELOGRELSYS((CORELOG_NAME "SignalHandler: Core dump already in progress! Waiting a while for completion Sig=%d.\n", Sig));
+            CORELOGRELSYS((CORELOG_NAME "SignalHandler: Core dump already in progress! Waiting a while for completion Sig=%d.\n",
+                           Sig));
             int64_t iTimeout = 16000;  /* timeout (ms) */
             for (;;)