Changeset 21046 in vbox for trunk/src/VBox

Timestamp:

Jun 30, 2009 1:11:28 AM (16 years ago)

Author:

vboxsync

Message:

IPRT: Added a reader of NM-style map files. (Mainly for linux /proc/kallsyms and System.map.)

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/dbg/dbgmod.cpp (modified) (8 diffs)
• common/dbg/dbgmodcontainer.cpp (modified) (3 diffs)
• include/internal/dbgmod.h (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -204 +204 @@
         common/dbg/dbgmod.cpp \
         common/dbg/dbgmodcontainer.cpp \
+        common/dbg/dbgmodnm.cpp \
         common/err/errmsg.cpp \
         common/err/RTErrConvertFromErrno.cpp \

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

@@ -42 +42 @@
 #include <iprt/once.h>
 #include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/semaphore.h>
 #include <iprt/strcache.h>
@@ -112 +113 @@
 static RTSEMRW          g_hDbgModRWSem = NIL_RTSEMRW;
 /** List of registered image interpreters.  */
-static RTDBGMODREGIMG   g_pImgHead;
+static PRTDBGMODREGIMG  g_pImgHead;
 /** List of registered debug infor interpreters.  */
-static RTDBGMODREGDBG   g_pDbgHead;
+static PRTDBGMODREGDBG  g_pDbgHead;
 /** String cache for the debug info interpreters.
  * RTSTRCACHE is thread safe. */
 DECLHIDDEN(RTSTRCACHE)  g_hDbgModStrCache = NIL_RTSTRCACHE;
+
 
 
@@ -137 +139 @@
         g_hDbgModStrCache = NIL_RTSTRCACHE;
 
-        /** @todo deregister interpreters. */
+        PRTDBGMODREGDBG pCur = g_pDbgHead;
+        g_pDbgHead = NULL;
+        while (pCur)
+        {
+            PRTDBGMODREGDBG pNext = pCur->pNext;
+            AssertMsg(pCur->cUsers == 0, ("%#x %s\n", pCur->cUsers, pCur->pVt->pszName));
+            RTMemFree(pCur);
+            pCur = pNext;
+        }
+
+        Assert(!g_pImgHead);
     }
+}
+
+
+/**
+ * Internal worker for register a debug interpreter.
+ *
+ * Called while owning the write lock or when locking isn't required.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_NO_MEMORY
+ * @retval  VERR_ALREADY_EXISTS
+ *
+ * @param   pVt                 The virtual function table of the debug
+ *                              module interpreter.
+ */
+static int rtDbgModDebugInterpreterRegister(PCRTDBGMODVTDBG pVt)
+{
+    /*
+     * Search or duplicate registration.
+     */
+    PRTDBGMODREGDBG pPrev = NULL;
+    for (PRTDBGMODREGDBG pCur = g_pDbgHead; pCur; pCur = pCur->pNext)
+    {
+        if (pCur->pVt == pVt)
+            return VERR_ALREADY_EXISTS;
+        if (!strcmp(pCur->pVt->pszName, pVt->pszName))
+            return VERR_ALREADY_EXISTS;
+        pPrev = pCur;
+    }
+
+    /*
+     * Create a new record and add it to the end of the list.
+     */
+    PRTDBGMODREGDBG pReg = (PRTDBGMODREGDBG)RTMemAlloc(sizeof(*pReg));
+    if (!pReg)
+        return VERR_NO_MEMORY;
+    pReg->pVt    = pVt;
+    pReg->cUsers = 0;
+    pReg->pNext  = NULL;
+    if (pPrev)
+        pPrev->pNext = pReg;
+    else
+        g_pDbgHead   = pReg;
+    return VINF_SUCCESS;
 }
 
@@ -164 +220 @@
          * Register the interpreters.
          */
-        /** @todo */
-
+        rc = rtDbgModDebugInterpreterRegister(&g_rtDbgModVtDbgNm);
         if (RT_SUCCESS(rc))
         {
@@ -174 +229 @@
             if (RT_SUCCESS(rc))
                 return VINF_SUCCESS;
+
+            /* bail out: use the termination callback. */
         }
-
-        RTStrCacheDestroy(g_hDbgModStrCache);
+    }
+    else
         g_hDbgModStrCache = NIL_RTSTRCACHE;
-    }
-
-    RTSemRWDestroy(g_hDbgModRWSem);
-    g_hDbgModRWSem = NIL_RTSEMRW;
-
+    rtDbgModTermCallback(RTTERMREASON_UNLOAD, 0, NULL);
     return rc;
 }
@@ -265 +318 @@
 }
 
-RTDECL(int)         RTDbgModCreateFromMap(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName, RTUINTPTR uSubtrahend, uint32_t fFlags)
-{
-    return VERR_NOT_IMPLEMENTED;
+
+RTDECL(int) RTDbgModCreateFromMap(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName, RTUINTPTR uSubtrahend, uint32_t fFlags)
+{
+    /*
+     * Input validation and lazy initialization.
+     */
+    AssertPtrReturn(phDbgMod, VERR_INVALID_POINTER);
+    *phDbgMod = NIL_RTDBGMOD;
+    AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
+    AssertReturn(*pszFilename, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pszName, VERR_INVALID_POINTER);
+    AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER);
+
+    int rc = rtDbgModLazyInit();
+    if (RT_FAILURE(rc))
+        return rc;
+
+    if (!pszName)
+        pszName = RTPathFilename(pszFilename);
+
+    /*
+     * Allocate a new module instance.
+     */
+    PRTDBGMODINT pDbgMod = (PRTDBGMODINT)RTMemAllocZ(sizeof(*pDbgMod));
+    if (!pDbgMod)
+        return VERR_NO_MEMORY;
+    pDbgMod->u32Magic = RTDBGMOD_MAGIC;
+    pDbgMod->cRefs = 1;
+    rc = RTCritSectInit(&pDbgMod->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        if (pDbgMod->pszName)
+        {
+            pDbgMod->pszDbgFile = RTStrCacheEnter(g_hDbgModStrCache, pszFilename);
+            if (pDbgMod->pszDbgFile)
+            {
+                /*
+                 * Try the map file readers.
+                 */
+                rc = RTSemRWRequestRead(g_hDbgModRWSem, RT_INDEFINITE_WAIT);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
+                    for (PRTDBGMODREGDBG pCur = g_pDbgHead; pCur; pCur = pCur->pNext)
+                    {
+                        if (pCur->pVt->fSupports & RT_DBGTYPE_MAP)
+                        {
+                            pDbgMod->pDbgVt = pCur->pVt;
+                            pDbgMod->pvDbgPriv = NULL;
+                            rc = pCur->pVt->pfnTryOpen(pDbgMod);
+                            if (RT_SUCCESS(rc))
+                            {
+                                ASMAtomicIncU32(&pCur->cUsers);
+                                RTSemRWReleaseRead(g_hDbgModRWSem);
+
+                                *phDbgMod = pDbgMod;
+                                return rc;
+                            }
+                        }
+                    }
+
+                    /* bail out */
+                    RTSemRWReleaseRead(g_hDbgModRWSem);
+                }
+                RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
+            }
+            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszDbgFile);
+        }
+        RTCritSectDelete(&pDbgMod->CritSect);
+    }
+
+    RTMemFree(pDbgMod);
+    return rc;
 }
 
@@ -454 +578 @@
     RTDBGMOD_VALID_RETURN_RC(pDbgMod, VERR_INVALID_HANDLE);
     AssertMsgReturn(uRva + cb >= uRva, ("uRva=%RTptr cb=%RTptr\n", uRva, cb), VERR_DBG_ADDRESS_WRAP);
-    AssertPtr(*pszName);
+    Assert(*pszName);
     size_t cchName = strlen(pszName);
     AssertReturn(cchName > 0, VERR_DBG_SEGMENT_NAME_OUT_OF_RANGE);
@@ -525 +649 @@
 
     RTDBGMOD_UNLOCK(pDbgMod);
-    return RT_SUCCESS(rc);
+    return rc;
 }
 

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

@@ -247 +247 @@
     AssertMsgReturn(iSeg < pThis->cSegs,          ("iSeg=%#x cSegs=%#x\n", pThis->cSegs),
                     VERR_DBG_INVALID_SEGMENT_INDEX);
-    AssertMsgReturn(pThis->paSegs[iSeg].cb < off, ("off=%RTptr cbSeg=%RTptr\n", off, pThis->paSegs[iSeg].cb),
+    AssertMsgReturn(off < pThis->paSegs[iSeg].cb, ("off=%RTptr cbSeg=%RTptr\n", off, pThis->paSegs[iSeg].cb),
                     VERR_DBG_INVALID_SEGMENT_OFFSET);
 
@@ -385 +385 @@
                     VERR_DBG_INVALID_SEGMENT_INDEX);
     AssertMsgReturn(    iSeg >= RTDBGSEGIDX_SPECIAL_FIRST
-                    ||  pThis->paSegs[iSeg].cb <= off + cb,
+                    ||  off + cb <= pThis->paSegs[iSeg].cb,
                     ("off=%RTptr cb=%RTptr cbSeg=%RTptr\n", off, cb, pThis->paSegs[iSeg].cb),
                     VERR_DBG_INVALID_SEGMENT_OFFSET);
@@ -397 +397 @@
 
     pSymbol->AddrCore.Key       = off;
-    pSymbol->AddrCore.KeyLast   = off + RT_MAX(cb, 1);
+    pSymbol->AddrCore.KeyLast   = off + (cb ? cb - 1 : 0);
     pSymbol->OrdinalCore.Key    = pThis->iNextSymbolOrdinal;
     pSymbol->iSeg               = iSeg;

trunk/src/VBox/Runtime/include/internal/dbgmod.h

@@ -400 +400 @@
 
 
-extern DECLHIDDEN(RTSTRCACHE) g_hDbgModStrCache;
-
+extern DECLHIDDEN(RTSTRCACHE)           g_hDbgModStrCache;
+extern DECLHIDDEN(RTDBGMODVTDBG const)  g_rtDbgModVtDbgNm;
 
 int rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg);