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

Timestamp:

Aug 23, 2010 2:31:44 PM (14 years ago)

Author:

vboxsync

Message:

RTCoreDumper: cleanup.

Location:

trunk/src/VBox/Runtime/r3/solaris

Files:

• coredumper-solaris.cpp (modified) (9 diffs)
• coredumper-solaris.h (modified) (1 diff)

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

@@ -260 +260 @@
 
     /*
-     * Make Room for our own mapping accountant entry which will also be included in the core.
+     * Make room for our own mapping accountant entry which will also be included in the core.
      */
     cb += sizeof(VBOXSOLMAPINFO);
@@ -1070 +1070 @@
  * @return VBox error code.
  */
-static int ResumeAllThreads(PVBOXPROCESS pVBoxProc)
+static int rtCoreDumperResumeThreads(PVBOXPROCESS pVBoxProc)
 {
     AssertReturn(pVBoxProc, VERR_INVALID_POINTER);
@@ -1124 +1124 @@
  * @return VBox error code.
  */
-static int SuspendAllThreads(PVBOXPROCESS pVBoxProc)
+static int rtCoreDumperSuspendThreads(PVBOXPROCESS pVBoxProc)
 {
     char szCurThread[128];
@@ -1170 +1170 @@
         else
         {
-            CORELOGRELSYS((CORELOG_NAME "SuspendAllThreads: Failed to open %s cTries=%d\n", szPath, cTries));
+            CORELOGRELSYS((CORELOG_NAME "SuspendThreads: Failed to open %s cTries=%d\n", szPath, cTries));
             rc = VERR_READ_ERROR;
             break;
@@ -1177 +1177 @@
 
     if (RT_SUCCESS(rc))
-        CORELOG((CORELOG_NAME "Stopped %u threads successfully with %u tries\n", cThreads, cTries));
+        CORELOG((CORELOG_NAME "SuspendThreads: Stopped %u threads successfully with %u tries\n", cThreads, cTries));
 
     return rc;
@@ -1613 +1613 @@
      * Create the core file.
      */
-    RTStrPrintf(szPath, sizeof(szPath), "/export/home/ram/vbox/out/solaris.amd64/release/bin/%s", pVBoxCore->szCorePath, pVBoxCore->VBoxProc.Process); /* @todo fix this */
-    rc = RTFileOpen(&pVBoxCore->hCoreFile, szPath, 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))
     {
-        CORELOGRELSYS((CORELOG_NAME "WriteCore: failed to open %s. rc=%Rrc\n", szPath, rc));
+        CORELOGRELSYS((CORELOG_NAME "WriteCore: failed to open %s. rc=%Rrc\n", pVBoxCore->szCorePath, rc));
         goto WriteCoreDone;
     }
@@ -1747 +1746 @@
     }
 
-    ResumeAllThreads(pVBoxProc);
+    rtCoreDumperResumeThreads(pVBoxProc);
     return rc;
 }
@@ -1807 +1806 @@
      * Quiesce the process.
      */
-    int rc = SuspendAllThreads(pVBoxProc);
+    int rc = rtCoreDumperSuspendThreads(pVBoxProc);
     if (RT_SUCCESS(rc))
     {
@@ -1878 +1877 @@
          * Resume threads on failure.
          */
-        ResumeAllThreads(pVBoxProc);
+        rtCoreDumperResumeThreads(pVBoxProc);
     }
     else

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

@@ -89 +89 @@
 {
     enmOldEra       = 0x01d,        /* old */
-    enmNewEra       = 0x5c151       /* sci-fi */
+    enmNewEra       = 0x5c1f1       /* sci-fi */
 } VBOXSOLCORETYPE;