Changeset 75239 in vbox

Timestamp:

Nov 3, 2018 2:54:26 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/dbg: Added RTDbgCfgOpenEx.

Location:

trunk

Files:

• include/iprt/dbg.h (modified) (4 diffs)
• src/VBox/Runtime/common/dbg/dbgcfg.cpp (modified) (10 diffs)

trunk/include/iprt/dbg.h

@@ -674 +674 @@
  *          list.  These status codes will not necessarily be propagated to the
  *          caller in any consistent manner.
- * @retval  VINF_CALLBACK_RETURN if successuflly opened the file and it's time
+ * @retval  VINF_CALLBACK_RETURN if successfully opened the file and it's time
  *          to return
- * @retval  VERR_CALLBACK_RETURN if we shouldn't stop searching.
+ * @retval  VERR_CALLBACK_RETURN if we should stop searching immediately.
  *
  * @param   hDbgCfg             The debugging configuration handle.
@@ -688 +688 @@
 
 
+RTDECL(int) RTDbgCfgOpenEx(RTDBGCFG hDbgCfg, const char *pszFilename, const char *pszCacheSubDir,
+                           const char *pszUuidMappingSubDir, uint32_t fFlags,
+                           PFNRTDBGCFGOPEN pfnCallback, void *pvUser1, void *pvUser2);
 RTDECL(int) RTDbgCfgOpenPeImage(RTDBGCFG hDbgCfg, const char *pszFilename, uint32_t cbImage, uint32_t uTimestamp,
                                 PFNRTDBGCFGOPEN pfnCallback, void *pvUser1, void *pvUser2);
@@ -702 +705 @@
 RTDECL(int) RTDbgCfgOpenMachOImage(RTDBGCFG hDbgCfg, const char *pszFilename, PCRTUUID pUuid,
                                    PFNRTDBGCFGOPEN pfnCallback, void *pvUser1, void *pvUser2);
+
+/** @name RTDBGCFG_O_XXX - Open flags for RTDbgCfgOpen.
+ * @{ */
+/** The operative system mask.  The values are RT_OPSYS_XXX. */
+#define RTDBGCFG_O_OPSYS_MASK           UINT32_C(0x000000ff)
+/** Same as RTDBGCFG_FLAGS_NO_SYSTEM_PATHS. */
+#define RTDBGCFG_O_NO_SYSTEM_PATHS      RT_BIT_32(25)
+/** The files may be compressed MS styled. */
+#define RTDBGCFG_O_MAYBE_COMPRESSED_MS  RT_BIT_32(26)
+/** Whether to make a recursive search. */
+#define RTDBGCFG_O_RECURSIVE            RT_BIT_32(27)
+/** We're looking for a separate debug file. */
+#define RTDBGCFG_O_EXT_DEBUG_FILE       RT_BIT_32(28)
+/** We're looking for an executable image. */
+#define RTDBGCFG_O_EXECUTABLE_IMAGE     RT_BIT_32(29)
+/** The file search should be done in an case insensitive fashion. */
+#define RTDBGCFG_O_CASE_INSENSITIVE     RT_BIT_32(30)
+/** Use Windbg style symbol servers when encountered in the path. */
+#define RTDBGCFG_O_SYMSRV               RT_BIT_32(31)
+/** Mask of valid flags. */
+#define RTDBGCFG_O_VALID_MASK           UINT32_C(0xfe0000ff)
+/** @} */
 
 
@@ -1524 +1549 @@
  * @retval  VERR_DBG_ADDRESS_WRAP if off+cb wraps around.
  * @retval  VERR_INVALID_PARAMETER if the symbol flags sets undefined bits.
+ * @retval  VERR_DBG_DUPLICATE_SYMBOL
+ * @retval  VERR_DBG_ADDRESS_CONFLICT
  *
  * @param   hDbgMod         The module handle.

trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp

@@ -131 +131 @@
 /** Pointer to a read only mnemonic map entry for a uint64_t property. */
 typedef RTDBGCFGU64MNEMONIC const *PCRTDBGCFGU64MNEMONIC;
-
-
-/** @name Open flags.
- * @{ */
-/** The operative system mask.  The values are RT_OPSYS_XXX. */
-#define RTDBGCFG_O_OPSYS_MASK           UINT32_C(0x000000ff)
-/** The files may be compressed MS styled. */
-#define RTDBGCFG_O_MAYBE_COMPRESSED_MS  RT_BIT_32(26)
-/** Whether to make a recursive search. */
-#define RTDBGCFG_O_RECURSIVE            RT_BIT_32(27)
-/** We're looking for a separate debug file. */
-#define RTDBGCFG_O_EXT_DEBUG_FILE       RT_BIT_32(28)
-/** We're looking for an executable image. */
-#define RTDBGCFG_O_EXECUTABLE_IMAGE     RT_BIT_32(29)
-/** The file search should be done in an case insensitive fashion. */
-#define RTDBGCFG_O_CASE_INSENSITIVE     RT_BIT_32(30)
-/** Use Windbg style symbol servers when encountered in the path. */
-#define RTDBGCFG_O_SYMSRV               RT_BIT_32(31)
-/** @} */
 
 
@@ -631 +612 @@
      */
     if (   (fFlags & RTDBGCFG_O_RECURSIVE)
+        && pThis
         && !(pThis->fFlags & RTDBGCFG_FLAGS_NO_RECURSIV_SEARCH) )
     {
@@ -746 +728 @@
         return VWRN_NOT_FOUND;
     if (!pszCacheSubDir || !*pszCacheSubDir)
+        return VWRN_NOT_FOUND;
+    if (!(fFlags & RTDBGCFG_O_SYMSRV))
         return VWRN_NOT_FOUND;
 
@@ -1207 +1191 @@
     AssertPtrReturn(pszCacheSubDir, VERR_INVALID_POINTER);
     AssertPtrReturn(pfnCallback, VERR_INVALID_POINTER);
+    AssertReturn(!(fFlags & ~RTDBGCFG_O_VALID_MASK), VERR_INVALID_FLAGS);
 
     /*
@@ -1212 +1197 @@
      * it's case exact or not.
      */
-    bool fDosPath = strchr(pszFilename, ':')  != NULL
-                 || strchr(pszFilename, '\\') != NULL
-                 || RT_OPSYS_USES_DOS_PATHS(fFlags & RTDBGCFG_O_OPSYS_MASK)
-                 || (fFlags & RTDBGCFG_O_CASE_INSENSITIVE);
+    bool fDosPath = RT_OPSYS_USES_DOS_PATHS(fFlags & RTDBGCFG_O_OPSYS_MASK)
+                 || (fFlags & RTDBGCFG_O_CASE_INSENSITIVE)
+                 || strchr(pszFilename, ':')  != NULL
+                 || strchr(pszFilename, '\\') != NULL;
     if (fDosPath)
         fFlags |= RTDBGCFG_O_CASE_INSENSITIVE;
@@ -1282 +1267 @@
                     && rc2 != VERR_CALLBACK_RETURN
                     && (fFlags & RTDBGCFG_O_EXECUTABLE_IMAGE)
+                    && !(fFlags & RTDBGCFG_O_NO_SYSTEM_PATHS)
                     && !(pThis->fFlags & RTDBGCFG_FLAGS_NO_SYSTEM_PATHS) )
                 {
@@ -1292 +1278 @@
                 if (   rc2 != VINF_CALLBACK_RETURN
                     && rc2 != VERR_CALLBACK_RETURN
+                    && !(fFlags & RTDBGCFG_O_NO_SYSTEM_PATHS)
                     && !(pThis->fFlags & RTDBGCFG_FLAGS_NO_SYSTEM_PATHS) )
                 {
@@ -1315 +1302 @@
     return rcRet;
 }
+
+
+RTDECL(int) RTDbgCfgOpenEx(RTDBGCFG hDbgCfg, const char *pszFilename, const char *pszCacheSubDir,
+                           const char *pszUuidMappingSubDir, uint32_t fFlags,
+                           PFNRTDBGCFGOPEN pfnCallback, void *pvUser1, void *pvUser2)
+{
+    return rtDbgCfgOpenWithSubDir(hDbgCfg, pszFilename, pszCacheSubDir, pszUuidMappingSubDir, fFlags,
+                                  pfnCallback, pvUser1, pvUser2);
+}
+
+
 
 
@@ -1917 +1915 @@
         rtDbgCfgFreeStrList(pList);
 
+    PRTLISTNODE pPrependTo = pList;
     while (*pszValue)
     {
@@ -1965 +1964 @@
 
             if (enmOp == RTDBGCFGOP_PREPEND)
-                RTListPrepend(pList, &pNew->ListEntry);
+            {
+                RTListNodeInsertAfter(pPrependTo, &pNew->ListEntry);
+                pPrependTo = &pNew->ListEntry;
+            }
             else
                 RTListAppend(pList, &pNew->ListEntry);