儲存庫 vbox 的更動 18534

時間撮記:

2009-3-30 下午12:03:12 (16 年 以前)

作者:

vboxsync

訊息:

PDMDevHlp: Added deadlock detection to the Phys APIs (disabled unless you're me).

檔案:

• trunk/src/VBox/VMM/PDMDevHlp.cpp (修改) (10 筆差異)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -42 +42 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def PDM_DEVHLP_DEADLOCK_DETECTION
+ * Define this to enable the deadlock detection when accessing physical memory.
+ */
+#if defined(DEBUG_bird) || defined(DOXYGEN_RUNNING)
+# define PDM_DEVHLP_DEADLOCK_DETECTION
+#endif
 
 
@@ -2028 +2039 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbRead));
 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
+    {
+        char szNames[128];
+        uint32_t cLocks = PDMR3CritSectCountOwned(pVM, szNames, sizeof(szNames));
+        AssertMsg(cLocks == 0, ("cLocks=%u %s\n", cLocks, szNames));
+    }
+#endif
+
     int rc;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     if (VM_IS_EMT(pVM))
         rc = PGMPhysRead(pVM, GCPhys, pvBuf, cbRead);
@@ -2036 +2056 @@
 #else
     PGMPhysRead(pVM, GCPhys, pvBuf, cbRead);
-    rc = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
 #endif
     Log(("pdmR3DevHlp_PhysRead: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2051 +2071 @@
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhys, pvBuf, cbWrite));
 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
+    {
+        char szNames[128];
+        uint32_t cLocks = PDMR3CritSectCountOwned(pVM, szNames, sizeof(szNames));
+        AssertMsg(cLocks == 0, ("cLocks=%u %s\n", cLocks, szNames));
+    }
+#endif
+
     int rc;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     if (VM_IS_EMT(pVM))
         rc = PGMPhysWrite(pVM, GCPhys, pvBuf, cbWrite);
@@ -2059 +2088 @@
 #else
     PGMPhysWrite(pVM, GCPhys, pvBuf, cbWrite);
-    rc = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
 #endif
     Log(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: returns %Rrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2075 +2104 @@
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
+    {
+        char szNames[128];
+        uint32_t cLocks = PDMR3CritSectCountOwned(pVM, szNames, sizeof(szNames));
+        AssertMsg(cLocks == 0, ("cLocks=%u %s\n", cLocks, szNames));
+    }
+#endif
+#endif
+
     int rc = PGMR3PhysGCPhys2CCPtrExternal(pVM, GCPhys, ppv, pLock);
 
@@ -2091 +2131 @@
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    if (!VM_IS_EMT(pVM)) /** @todo not true for SMP. oh joy! */
+    {
+        char szNames[128];
+        uint32_t cLocks = PDMR3CritSectCountOwned(pVM, szNames, sizeof(szNames));
+        AssertMsg(cLocks == 0, ("cLocks=%u %s\n", cLocks, szNames));
+    }
+#endif
+#endif
+
     int rc = PGMR3PhysGCPhys2CCPtrReadOnlyExternal(pVM, GCPhys, ppv, pLock);
 
@@ -2123 +2174 @@
     if (!VM_IS_EMT(pVM))
         return VERR_ACCESS_DENIED;
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    /** @todo SMP. */
+#endif
 
     int rc = PGMPhysSimpleReadGCPtr(pVM, pvDst, GCVirtSrc, cb);
@@ -2143 +2197 @@
     if (!VM_IS_EMT(pVM))
         return VERR_ACCESS_DENIED;
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    /** @todo SMP. */
+#endif
 
     int rc = PGMPhysSimpleWriteGCPtr(pVM, GCVirtDst, pvSrc, cb);
@@ -2163 +2220 @@
     if (!VM_IS_EMT(pVM))
         return VERR_ACCESS_DENIED;
+#if defined(VBOX_STRICT) && defined(PDM_DEVHLP_DEADLOCK_DETECTION)
+    /** @todo SMP. */
+#endif
 
     int rc = PGMPhysGCPtr2GCPhys(pVM, GCPtr, pGCPhys);