Changeset 10697 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 16, 2008 12:32:59 PM (17 years ago)

Author:

vboxsync

Message:

Do *NOT* invoke the logger when inside a spinlock because it may block and kernels like xnu gets very upset about such things (panics).

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -1497 +1497 @@
     pUsage->pObj        = pObj;
     pUsage->pNext       = pSession->pUsage;
-    Log2(("SUPR0ObjRegister: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+    /* Log2(("SUPR0ObjRegister: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext)); */
     pSession->pUsage    = pUsage;
 
@@ -1542 +1542 @@
     if (RT_UNLIKELY(pObj->u32Magic != SUPDRVOBJ_MAGIC))
     {
-        AssertMsg(pObj->u32Magic == SUPDRVOBJ_MAGIC + 1, ("pvObj=%p magic=%#x\n", pvObj, pObj->u32Magic));
-
         RTSpinlockRelease(pDevExt->Spinlock, &SpinlockTmp);
+
+        AssertMsgFailed(("pvObj=%p magic=%#x\n", pvObj, pObj->u32Magic));
         return VERR_WRONG_ORDER;
     }
@@ -1574 +1574 @@
     for (pUsage = pSession->pUsage; pUsage; pUsage = pUsage->pNext)
     {
-        Log(("SUPR0AddRef: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+        /*Log(("SUPR0AddRef: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));*/
         if (pUsage->pObj == pObj)
             break;
@@ -1587 +1587 @@
         pUsagePre->pNext    = pSession->pUsage;
         pSession->pUsage    = pUsagePre;
-        Log(("SUPR0AddRef: pUsagePre=%p:{.pObj=%p, .pNext=%p}\n", pUsagePre, pUsagePre->pObj, pUsagePre->pNext));
+        /*Log(("SUPR0AddRef: pUsagePre=%p:{.pObj=%p, .pNext=%p}\n", pUsagePre, pUsagePre->pObj, pUsagePre->pNext));*/
 
         pUsagePre = NULL;
@@ -1642 +1642 @@
          pUsagePrev = pUsage, pUsage = pUsage->pNext)
     {
-        Log2(("SUPR0ObjRelease: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+        /*Log2(("SUPR0ObjRelease: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));*/
         if (pUsage->pObj == pObj)
         {