Changeset 100913 in vbox for trunk/src/VBox

Timestamp:

Aug 19, 2023 11:03:51 AM (19 months ago)

Author:

vboxsync

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

158850

Message:

IPRT: Moved the PDB cache subdir string composition to the pdbvfs and expose it via RTVFSQIEX_VOL_LABEL. Extended the RTVFSQIEX_VOL_LABEL_ALT with the compiler date/version.

Location:

trunk/src/VBox/Runtime

Files:

• common/fs/pdbvfs.cpp (modified) (1 diff)
• tools/RTDbgSymCache.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/fs/pdbvfs.cpp

@@ -798 +798 @@
     RT_NOREF(pThis, pvInfo, cbInfo, pcbRet);
 
+    ssize_t cchRet;
     switch (enmInfo)
     {
+        /* This is the same as the symbol chache subdir name: */
         case RTVFSQIEX_VOL_LABEL:
-            /** @todo return the UUID + age. */
-            return VERR_NOT_SUPPORTED;
-
+            if (   pThis->enmVersion == RTFSPDBVER_2
+                || RTUuidIsNull(&pThis->Uuid))
+                cchRet = RTStrPrintf2((char *)pvInfo, cbInfo, "%08X%x", pThis->uTimestamp, pThis->uAge);
+            else
+                cchRet = RTStrPrintf2((char *)pvInfo, cbInfo, "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%x",
+                                      pThis->Uuid.Gen.u32TimeLow,
+                                      pThis->Uuid.Gen.u16TimeMid,
+                                      pThis->Uuid.Gen.u16TimeHiAndVersion,
+                                      pThis->Uuid.Gen.u8ClockSeqHiAndReserved,
+                                      pThis->Uuid.Gen.u8ClockSeqLow,
+                                      pThis->Uuid.Gen.au8Node[0],
+                                      pThis->Uuid.Gen.au8Node[1],
+                                      pThis->Uuid.Gen.au8Node[2],
+                                      pThis->Uuid.Gen.au8Node[3],
+                                      pThis->Uuid.Gen.au8Node[4],
+                                      pThis->Uuid.Gen.au8Node[5],
+                                      pThis->uAge);
+            break;
+
+        /* This exposes the PDB and VC versions: */
         case RTVFSQIEX_VOL_LABEL_ALT:
-            return RTStrCopy((char *)pvInfo, cbInfo, pThis->enmVersion == RTFSPDBVER_2 ? "pdb-v2" : "pdb-v7");
+            cchRet = RTStrPrintf2((char *)pvInfo, cbInfo,
+                                  "pdb-v%u-%u", pThis->enmVersion == RTFSPDBVER_2 ? 2 : 7, pThis->uVcDate);
+            break;
 
         case RTVFSQIEX_VOL_SERIAL:
-            /** @todo return the UUID. */
-            return VERR_NOT_SUPPORTED;
+            if (cbInfo == sizeof(uint64_t) || cbInfo == sizeof(uint32_t))
+            {
+                *pcbRet = cbInfo;
+                ((uint32_t *)pvInfo)[0] = pThis->uTimestamp;
+                if (cbInfo == sizeof(uint64_t))
+                    ((uint32_t *)pvInfo)[1] = pThis->uAge;
+                return VINF_SUCCESS;
+            }
+            if (   pThis->enmVersion != RTFSPDBVER_2
+                && !RTUuidIsNull(&pThis->Uuid))
+            {
+                *pcbRet = sizeof(RTUUID);
+                if (cbInfo == sizeof(RTUUID))
+                {
+                    *(PRTUUID)pvInfo = pThis->Uuid;
+                    return VINF_SUCCESS;
+                }
+            }
+            else
+                *pcbRet = sizeof(uint64_t);
+            return cbInfo < *pcbRet ? VERR_BUFFER_OVERFLOW : VERR_BUFFER_UNDERFLOW;
 
         default:
             return VERR_NOT_SUPPORTED;
-
-    }
+    }
+
+    if (cchRet > 0)
+    {
+        *pcbRet = (size_t)cchRet;
+        return VINF_SUCCESS;
+    }
+    *pcbRet = (size_t)-cchRet;
+    return VERR_BUFFER_OVERFLOW;
 }
 

trunk/src/VBox/Runtime/tools/RTDbgSymCache.cpp

@@ -755 +755 @@
         {
             /*
-             * Get the version.
+             * The cache subdirectory name can be retrieved via RTVFSQIEX_VOL_LABEL,
+             * the primary volume label.  Then we just add it to the cache.
              */
-            char szPdbVer[16];
-            rc = RTVfsQueryLabel(hVfsPdb, true /*fAlternative*/, szPdbVer, sizeof(szPdbVer), NULL);
+            char szSubDir[64];
+            rc = RTVfsQueryLabel(hVfsPdb, false /*fAlternative*/, szSubDir, sizeof(szSubDir), NULL);
             if (RT_SUCCESS(rc))
-            {
-                /*
-                 * Read the PDB metadata header.
-                 */
-                RTVFSFILE hVfsFileHdr = NIL_RTVFSFILE;
-                rc = RTVfsFileOpen(hVfsPdb, "1", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hVfsFileHdr);
-                if (RT_SUCCESS(rc))
-                {
-                    union
-                    {
-                        uint8_t         abHdr[128];
-                        RTPDB70NAMES    Hdr70;
-                        RTPDB20NAMES    Hdr20;
-                    } uBuf = {{0}};
-                    size_t  cbHdr      = 0;
-                    rc = RTVfsFileRead(hVfsFileHdr, &uBuf, sizeof(uBuf), &cbHdr);
-                    RTVfsFileRelease(hVfsFileHdr);
-                    if (RT_SUCCESS(rc))
-                    {
-                        /*
-                         * Use the header to determine the subdirectory name.
-                         */
-                        char szSubDir[48];
-                        if (strcmp(szPdbVer, "pdb-v7") == 0)
-                            RTStrPrintf(szSubDir, sizeof(szSubDir), "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%x",
-                                        uBuf.Hdr70.Uuid.Gen.u32TimeLow,
-                                        uBuf.Hdr70.Uuid.Gen.u16TimeMid,
-                                        uBuf.Hdr70.Uuid.Gen.u16TimeHiAndVersion,
-                                        uBuf.Hdr70.Uuid.Gen.u8ClockSeqHiAndReserved,
-                                        uBuf.Hdr70.Uuid.Gen.u8ClockSeqLow,
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[0],
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[1],
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[2],
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[3],
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[4],
-                                        uBuf.Hdr70.Uuid.Gen.au8Node[5],
-                                        uBuf.Hdr70.uAge);
-                        else if (strcmp(szPdbVer, "pdb-v2") == 0)
-                            RTStrPrintf(szSubDir, sizeof(szSubDir), "%08X%x", uBuf.Hdr20.uTimestamp, uBuf.Hdr20.uAge);
-                        else
-                        {
-                            szSubDir[0] = '\0';
-                            rc = RTMsgErrorRc(VERR_VERSION_MISMATCH, "Unsupported PDB version string: %s", szPdbVer);
-                        }
-
-                        /*
-                         * Add it to the symbol cache if that went well.
-                         */
-                        if (RT_SUCCESS(rc))
-                            rc = rtDbgSymCacheAddOneFile(pszPath, pszDstName, NULL, szSubDir, NULL, NULL, pCfg);
-                    }
-                    else
-                        RTMsgErrorRc(rc, "RTVfsFileRead('1',) failed on '%s': %Rrc", pszPath, rc);
-                }
-                else
-                    RTMsgErrorRc(rc, "RTVfsFileOpen('1',) failed on '%s': %Rrc", pszPath, rc);
-            }
+                rc = rtDbgSymCacheAddOneFile(pszPath, pszDstName, NULL, szSubDir, NULL, NULL, pCfg);
             else
                 RTMsgErrorRc(rc, "RTVfsQueryLabel failed on '%s': %Rrc", pszPath, rc);