Changeset 22108 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 9, 2009 12:42:45 AM (16 years ago)

Author:

vboxsync

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

50859

Message:

DBGC: plug-ins in the works.

Location:

trunk/src/VBox/VMM

Files:

• DBGFAddrSpace.cpp (modified) (1 diff)
• DBGFOS.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/DBGFAddrSpace.cpp

@@ -589 +589 @@
             psz++;
 
-        /* Fine the end of this element. */
+        /* Find the end of this element. */
         const char *pszNext;
         const char *pszEnd = strchr(psz, ';');

trunk/src/VBox/VMM/DBGFOS.cpp

@@ -30 +30 @@
 #include <VBox/vm.h>
 #include <VBox/err.h>
-
 #include <VBox/log.h>
+
+#include <iprt/assert.h>
 #include <iprt/thread.h>
-#include <iprt/assert.h>
-
+#include <iprt/param.h>
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#define DBGF_OS_READ_LOCK(pVM)      do { } while (0)
+#define DBGF_OS_READ_UNLOCK(pVM)    do { } while (0)
+
+#define DBGF_OS_WRITE_LOCK(pVM)     do { } while (0)
+#define DBGF_OS_WRITE_UNLOCK(pVM)   do { } while (0)
+
+
+/**
+ * Internal cleanup routine called by DBGFR3Term().
+ *
+ * @param   pVM     Pointer to the shared VM structure.
+ */
+void dbgfR3OSTerm(PVM pVM)
+{
+    /*
+     * Terminate the current one.
+     */
+    if (pVM->dbgf.s.pCurOS)
+    {
+        pVM->dbgf.s.pCurOS->pReg->pfnTerm(pVM, pVM->dbgf.s.pCurOS->abData);
+        pVM->dbgf.s.pCurOS = NULL;
+    }
+
+    /*
+     * Destroy all the instances.
+     */
+    while (pVM->dbgf.s.pOSHead)
+    {
+        PDBGFOS pOS = pVM->dbgf.s.pOSHead;
+        pVM->dbgf.s.pOSHead = pOS->pNext;
+        if (pOS->pReg->pfnDestruct)
+            pOS->pReg->pfnDestruct(pVM, pOS->abData);
+        MMR3HeapFree(pOS);
+    }
+}
 
 
@@ -47 +87 @@
 {
     /* more validations. */
+    DBGF_OS_READ_LOCK(pVM);
     PDBGFOS pOS;
     for (pOS = pVM->dbgf.s.pOSHead; pOS; pOS = pOS->pNext)
         if (!strcmp(pOS->pReg->szName, pReg->szName))
         {
+            DBGF_OS_READ_UNLOCK(pVM);
             Log(("dbgfR3OSRegister: %s -> VERR_ALREADY_LOADED\n", pReg->szName));
             return VERR_ALREADY_LOADED;
@@ -65 +107 @@
     if (RT_SUCCESS(rc))
     {
+        DBGF_OS_WRITE_LOCK(pVM);
         pOS->pNext = pVM->dbgf.s.pOSHead;
         pVM->dbgf.s.pOSHead = pOS;
+        DBGF_OS_WRITE_UNLOCK(pVM);
     }
     else
@@ -95 +139 @@
      * Validate intput.
      */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+
     AssertPtrReturn(pReg, VERR_INVALID_POINTER);
     AssertReturn(pReg->u32Magic == DBGFOSREG_MAGIC, VERR_INVALID_MAGIC);
@@ -115 +161 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSRegister, 2, pVM, pReg);
+    int rc = VMR3ReqCallU(pVM->pUVM, 0, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSRegister, 2, pVM, pReg);
     if (RT_SUCCESS(rc))
         rc = pReq->iStatus;
@@ -125 +171 @@
 
 /**
- * Internal cleanup routine called by DBGFR3Term().
- *
+ * EMT worker function for DBGFR3OSDeregister.
+ *
+ * @returns VBox status code.
  * @param   pVM     Pointer to the shared VM structure.
- */
-void dbgfR3OSTerm(PVM pVM)
-{
-    /*
-     * Terminate the current one.
-     */
-    if (pVM->dbgf.s.pCurOS)
-    {
-        pVM->dbgf.s.pCurOS->pReg->pfnTerm(pVM, pVM->dbgf.s.pCurOS->abData);
-        pVM->dbgf.s.pCurOS = NULL;
-    }
-
-    /*
-     * Destroy all the instances.
-     */
-    while (pVM->dbgf.s.pOSHead)
-    {
-        PDBGFOS pOS = pVM->dbgf.s.pOSHead;
-        pVM->dbgf.s.pOSHead = pOS->pNext;
-        if (pOS->pReg->pfnDestruct)
-            pOS->pReg->pfnDestruct(pVM, pOS->abData);
-        MMR3HeapFree(pOS);
-    }
+ * @param   pReg    The registration structure.
+ */
+static DECLCALLBACK(int) dbgfR3OSDeregister(PVM pVM, PDBGFOSREG pReg)
+{
+    /*
+     * Unlink it.
+     */
+    bool    fWasCurOS = false;
+    PDBGFOS pOSPrev   = NULL;
+    PDBGFOS pOS;
+    DBGF_OS_WRITE_LOCK(pVM);
+    for (pOS = pVM->dbgf.s.pOSHead; pOS; pOSPrev = pOS, pOS = pOS->pNext)
+        if (pOS->pReg == pReg)
+        {
+            if (pOSPrev)
+                pOSPrev->pNext = pOS->pNext;
+            else
+                pVM->dbgf.s.pOSHead = pOS->pNext;
+            if (pVM->dbgf.s.pCurOS == pOS)
+            {
+                pVM->dbgf.s.pCurOS = NULL;
+                fWasCurOS = true;
+            }
+            break;
+        }
+    DBGF_OS_WRITE_UNLOCK(pVM);
+    if (!pOS)
+    {
+        Log(("DBGFR3OSDeregister: %s -> VERR_NOT_FOUND\n", pReg->szName));
+        return VERR_NOT_FOUND;
+    }
+
+    /*
+     * Terminate it if it was the current OS, then invoke the
+     * destructor and clean up.
+     */
+    if (fWasCurOS)
+        pOS->pReg->pfnTerm(pVM, pOS->abData);
+    if (pOS->pReg->pfnDestruct)
+        pOS->pReg->pfnDestruct(pVM, pOS->abData);
+    MMR3HeapFree(pOS);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Deregisters a guest OS digger previously registered by DBGFR3OSRegister.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM     Pointer to the shared VM structure.
+ * @param   pReg    The registration structure.
+ * @thread  Any.
+ */
+VMMR3DECL(int)  DBGFR3OSDeregister(PVM pVM, PCDBGFOSREG pReg)
+{
+    /*
+     * Validate input.
+     */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertPtrReturn(pReg, VERR_INVALID_POINTER);
+    AssertReturn(pReg->u32Magic == DBGFOSREG_MAGIC, VERR_INVALID_MAGIC);
+    AssertReturn(pReg->u32EndMagic == DBGFOSREG_MAGIC, VERR_INVALID_MAGIC);
+    AssertReturn(memchr(&pReg->szName[0], '\0', sizeof(pReg->szName)), VERR_INVALID_NAME);
+
+    DBGF_OS_READ_LOCK(pVM);
+    PDBGFOS pOS;
+    for (pOS = pVM->dbgf.s.pOSHead; pOS; pOS = pOS->pNext)
+        if (pOS->pReg == pReg)
+            break;
+    DBGF_OS_READ_LOCK(pVM);
+
+    if (!pOS)
+    {
+        Log(("DBGFR3OSDeregister: %s -> VERR_NOT_FOUND\n", pReg->szName));
+        return VERR_NOT_FOUND;
+    }
+
+    /*
+     * Pass it on to the EMT.
+     */
+    PVMREQ pReq;
+    int rc = VMR3ReqCallU(pVM->pUVM, 0, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSDeregister, 2, pVM, pReg);
+    if (RT_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+
+    return rc;
 }
 
@@ -223 +336 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSDetect, 3, pVM, pszName, cchName);
+    int rc = VMR3ReqCallU(pVM->pUVM, 0, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSDetect, 3, pVM, pszName, cchName);
     if (RT_SUCCESS(rc))
         rc = pReq->iStatus;
@@ -307 +420 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSQueryNameAndVersion,
+    int rc = VMR3ReqCallU(pVM->pUVM, 0, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSQueryNameAndVersion,
                           5, pVM, pszName, cchName, pszVersion, cchVersion);
     if (RT_SUCCESS(rc))