Changeset 40504 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Mar 16, 2012 4:38:06 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76890

Message:

Solaris 11 build fixes.

Location:

trunk/src/VBox/Runtime/r3/solaris

Files:

• coredumper-solaris.cpp (modified) (9 diffs)
• fileaio-solaris.cpp (modified) (2 diffs)

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

@@ -247 +247 @@
     struct stat st;
     if (fstat(fd, &st) == 0)
-        return st.st_size < ~(size_t)0 ? (size_t)st.st_size : ~(size_t)0;
+    {
+        if (st.st_size <= 0)
+            return 0;
+        size_t cbFile = (size_t)st.st_size;
+        return (off_t)cbFile == st.st_size ? cbFile : ~(size_t)0;
+    }
 
     CORELOGRELSYS((CORELOG_NAME "GetFileSizeByFd: fstat failed rc=%Rrc\n", RTErrConvertFromErrno(errno)));
@@ -1806 +1811 @@
 }
 
-
-/**
- * Write a prepared core file using a user-passed in writer function, requires all threads
- * to be in suspended state (i.e. called after CreateCore).
- *
- * @param pSolCore          Pointer to the core object.
- * @param pfnWriter         Pointer to the writer function to override default writer (NULL uses default).
- *
- * @remarks Resumes all suspended threads, unless it's an invalid core. This
- *          function must be called only -after- rtCoreDumperCreateCore().
- * @return IPRT status.
- */
-static int rtCoreDumperWriteCore(PRTSOLCORE pSolCore, PFNRTCOREWRITER pfnWriter)
-{
-    AssertReturn(pSolCore, VERR_INVALID_POINTER);
-
-    if (!pSolCore->fIsValid)
-        return VERR_INVALID_STATE;
-
-    if (pfnWriter)
-        pSolCore->pfnWriter = pfnWriter;
-
-    PRTSOLCOREPROCESS pSolProc = &pSolCore->SolProc;
-    char szPath[PATH_MAX];
-    int rc = VINF_SUCCESS;
-
-    /*
-     * Open the process address space file.
-     */
-    RTStrPrintf(szPath, sizeof(szPath), "/proc/%d/as", (int)pSolProc->Process);
-    int fd = open(szPath, O_RDONLY);
-    if (fd < 0)
-    {
-        rc = RTErrConvertFromErrno(fd);
-        CORELOGRELSYS((CORELOG_NAME "WriteCore: Failed to open address space, %s. rc=%Rrc\n", szPath, rc));
-        goto WriteCoreDone;
-    }
-
-    pSolProc->fdAs = fd;
-
-    /*
-     * Create the core file.
-     */
-    fd = open(pSolCore->szCorePath, O_CREAT | O_TRUNC | O_RDWR, S_IRUSR);
-    if (fd < 0)
-    {
-        rc = RTErrConvertFromErrno(fd);
-        CORELOGRELSYS((CORELOG_NAME "WriteCore: failed to open %s. rc=%Rrc\n", pSolCore->szCorePath, rc));
-        goto WriteCoreDone;
-    }
-
-    pSolCore->fdCoreFile = fd;
-
+/** 
+ * Inner worker for rtCoreDumperWriteCore, which purpose is to 
+ * squash cleanup gotos. 
+ */
+static int rtCoreDumperWriteCoreDoIt(PRTSOLCORE pSolCore, PFNRTCOREWRITER pfnWriter, 
+                                     PRTSOLCOREPROCESS pSolProc)
+{
     pSolCore->offWrite = 0;
-    uint32_t cProgHdrs  = pSolProc->cMappings + 2; /* two PT_NOTE program headers (old, new style) */
+    uint32_t cProgHdrs = pSolProc->cMappings + 2; /* two PT_NOTE program headers (old, new style) */
 
     /*
@@ -1889 +1848 @@
     ElfHdr.e_phentsize       = sizeof(Elf_Phdr);
     ElfHdr.e_shentsize       = sizeof(Elf_Shdr);
-    rc = pSolCore->pfnWriter(pSolCore->fdCoreFile, &ElfHdr, sizeof(ElfHdr));
+    int rc = pSolCore->pfnWriter(pSolCore->fdCoreFile, &ElfHdr, sizeof(ElfHdr));
     if (RT_FAILURE(rc))
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: pfnWriter failed writing ELF header. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1914 +1873 @@
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: pfnWriter failed writing old-style ELF program Header. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1927 +1886 @@
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: pfnWriter failed writing new-style ELF program header. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1938 +1897 @@
     {
         CORELOGRELSYS((CORELOG_NAME "Write: ElfWriteMappings failed. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1948 +1907 @@
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: ElfWriteNoteSection old-style failed. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1958 +1917 @@
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: ElfWriteNoteSection new-style failed. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
+        return rc;
     }
 
@@ -1968 +1927 @@
     {
         CORELOGRELSYS((CORELOG_NAME "WriteCore: ElfWriteMappings failed. rc=%Rrc\n", rc));
-        goto WriteCoreDone;
-    }
-
-
-WriteCoreDone:
-    if (pSolCore->fdCoreFile != -1)     /* Initialized in rtCoreDumperCreateCore() */
-    {
-        close(pSolCore->fdCoreFile);
-        pSolCore->fdCoreFile = -1;
-    }
-
-    if (pSolProc->fdAs != -1)           /* Initialized in rtCoreDumperCreateCore() */
-    {
+        return rc;
+    }
+
+    return rc;
+}
+
+
+/**
+ * Write a prepared core file using a user-passed in writer function, requires all threads
+ * to be in suspended state (i.e. called after CreateCore).
+ *
+ * @param pSolCore          Pointer to the core object.
+ * @param pfnWriter         Pointer to the writer function to override default writer (NULL uses default).
+ *
+ * @remarks Resumes all suspended threads, unless it's an invalid core. This
+ *          function must be called only -after- rtCoreDumperCreateCore().
+ * @return IPRT status.
+ */
+static int rtCoreDumperWriteCore(PRTSOLCORE pSolCore, PFNRTCOREWRITER pfnWriter)
+{
+    AssertReturn(pSolCore, VERR_INVALID_POINTER);
+
+    if (!pSolCore->fIsValid)
+        return VERR_INVALID_STATE;
+
+    if (pfnWriter)
+        pSolCore->pfnWriter = pfnWriter;
+
+    PRTSOLCOREPROCESS pSolProc = &pSolCore->SolProc;
+    char szPath[PATH_MAX];
+    int  rc;
+
+    /*
+     * Open the process address space file.
+     */
+    RTStrPrintf(szPath, sizeof(szPath), "/proc/%d/as", (int)pSolProc->Process);
+    int fd = open(szPath, O_RDONLY);
+    if (fd >= 0)
+    {
+        pSolProc->fdAs = fd;
+
+        /*
+         * Create the core file.
+         */
+        fd = open(pSolCore->szCorePath, O_CREAT | O_TRUNC | O_RDWR, S_IRUSR);
+        if (fd >= 0)
+        {
+            pSolCore->fdCoreFile = fd;
+
+            /*
+             * Do the actual writing.
+             */
+            rc = rtCoreDumperWriteCoreDoIt(pSolCore, pfnWriter, pSolProc);
+
+            close(pSolCore->fdCoreFile);
+            pSolCore->fdCoreFile = -1;
+        }
+        else
+        {
+            rc = RTErrConvertFromErrno(fd);
+            CORELOGRELSYS((CORELOG_NAME "WriteCore: failed to open %s. rc=%Rrc\n", pSolCore->szCorePath, rc));
+        }
         close(pSolProc->fdAs);
         pSolProc->fdAs = -1;
+    }
+    else
+    {
+        rc = RTErrConvertFromErrno(fd);
+        CORELOGRELSYS((CORELOG_NAME "WriteCore: Failed to open address space, %s. rc=%Rrc\n", szPath, rc));
     }
 

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

@@ -167 +167 @@
 
     pReqInt->AioCB.aio_lio_opcode = uTransferDirection;
-    pReqInt->AioCB.aio_fildes     = (int)hFile;
+    pReqInt->AioCB.aio_fildes     = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset     = off;
     pReqInt->AioCB.aio_nbytes     = cbTransfer;
@@ -202 +202 @@
 
     pReqInt->fFlush           = true;
-    pReqInt->AioCB.aio_fildes = (int)hFile;
+    pReqInt->AioCB.aio_fildes = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset = 0;
     pReqInt->AioCB.aio_nbytes = 0;