Changeset 15841 in vbox

Timestamp:

Jan 7, 2009 4:40:02 PM (16 years ago)

Author:

vboxsync

Message:

SUPDrv,SUPLib: SUPR0ObjRelease returns VINF_OBJECT_DESTROYED if it destroyed the object. Made SUPLib require this version of the driver (joined the RTMp API change earlier today).

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.c (modified) (11 diffs)
• src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)

trunk/include/iprt/err.h

@@ -495 +495 @@
 /** A page count is ouf of range. */
 #define VERR_PAGE_COUNT_OUT_OF_RANGE        (-84)
+/** Generic object destroyed status. */
+#define VERR_OBJECT_DESTROYED               (-85)
+/** Generic object was destroyed by the call status. */
+#define VINF_OBJECT_DESTROYED               85
+/** Generic dangling objects status. */
+#define VERR_DANGLING_OBJECTS               (-86)
+/** Generic dangling objects status. */
+#define VWRN_DANGLING_OBJECTS               86
 /** @} */
 

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

@@ -1822 +1822 @@
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     AssertPtrReturn(pObj, VERR_INVALID_POINTER);
-    AssertMsgReturn(pObj->u32Magic == SUPDRVOBJ_MAGIC || pObj->u32Magic == SUPDRVOBJ_MAGIC + 1,
-                    ("Invalid pvObj=%p magic=%#x (expected %#x or %#x)\n", pvObj, pObj->u32Magic, SUPDRVOBJ_MAGIC, SUPDRVOBJ_MAGIC + 1),
+    AssertMsgReturn(pObj->u32Magic == SUPDRVOBJ_MAGIC || pObj->u32Magic == SUPDRVOBJ_MAGIC_DEAD,
+                    ("Invalid pvObj=%p magic=%#x (expected %#x or %#x)\n", pvObj, pObj->u32Magic, SUPDRVOBJ_MAGIC, SUPDRVOBJ_MAGIC_DEAD),
                     VERR_INVALID_PARAMETER);
 
@@ -1913 +1913 @@
  *
  * @returns IPRT status code.
+ * @retval  VINF_SUCCESS if not destroyed.
+ * @retval  VINF_OBJECT_DESTROYED if it's destroyed by this release call.
+ * @retval  VERR_INVALID_PARAMETER if the object isn't valid. Will assert in
+ *          string builds.
+ *
  * @param   pvObj           The identifier returned by SUPR0ObjRegister().
  * @param   pSession        The session which is referencing the object.
@@ -1921 +1926 @@
     PSUPDRVDEVEXT       pDevExt     = pSession->pDevExt;
     PSUPDRVOBJ          pObj        = (PSUPDRVOBJ)pvObj;
-    bool                fDestroy    = false;
+    int                 rc          = VERR_INVALID_PARAMETER;
     PSUPDRVUSAGE        pUsage;
     PSUPDRVUSAGE        pUsagePrev;
@@ -1945 +1950 @@
         if (pUsage->pObj == pObj)
         {
+            rc = VINF_SUCCESS;
             AssertMsg(pUsage->cUsage >= 1 && pObj->cUsage >= pUsage->cUsage, ("glob %d; sess %d\n", pObj->cUsage, pUsage->cUsage));
             if (pUsage->cUsage > 1)
@@ -1971 +1977 @@
                      * Object is to be destroyed, unlink it.
                      */
-                    pObj->u32Magic = SUPDRVOBJ_MAGIC + 1;
-                    fDestroy = true;
+                    pObj->u32Magic = SUPDRVOBJ_MAGIC_DEAD;
+                    rc = VINF_OBJECT_DESTROYED;
                     if (pDevExt->pObjs == pObj)
                         pDevExt->pObjs = pObj->pNext;
@@ -1997 +2003 @@
      * Call the destructor and free the object if required.
      */
-    if (fDestroy)
+    if (rc == VINF_OBJECT_DESTROYED)
     {
         Log(("SUPR0ObjRelease: destroying %p/%d (%p/%p) cpid=%RTproc pid=%RTproc dtor=%p\n",
@@ -2011 +2017 @@
 
     AssertMsg(pUsage, ("pvObj=%p\n", pvObj));
-    return pUsage ? VINF_SUCCESS : VERR_INVALID_PARAMETER;
+    return rc;
 }
 
@@ -3573 +3579 @@
                 if (RT_UNLIKELY((uintptr_t)pObj->pfnDestructor - (uintptr_t)pImage->pvImage < pImage->cbImage))
                 {
-                    rc = VERR_SHARING_VIOLATION; /** @todo VERR_DANGLING_OBJECTS */
+                    rc = VERR_DANGLING_OBJECTS;
                     break;
                 }
@@ -3583 +3589 @@
                 if (RT_UNLIKELY((uintptr_t)pGenUsage->pObj->pfnDestructor - (uintptr_t)pImage->pvImage < pImage->cbImage))
                 {
-                    rc = VERR_SHARING_VIOLATION; /** @todo VERR_DANGLING_OBJECTS */
+                    rc = VERR_DANGLING_OBJECTS;
                     break;
                 }
@@ -3610 +3616 @@
         }
         else
+        {
             Log(("supdrvIOCtl_LdrFree: Dangling objects in %p/%s!\n", pImage->pvImage, pImage->szName));
+            rc = VINF_SUCCESS; /** @todo BRANCH-2.1: remove this after branching. */
+        }
     }
     else
@@ -3622 +3631 @@
 
     RTSemFastMutexRelease(pDevExt->mtxLdr);
-    return VINF_SUCCESS;
+    return rc;
 }
 

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -448 +448 @@
 /** Magic number for SUPDRVOBJ::u32Magic. (Dame Agatha Mary Clarissa Christie). */
 #define SUPDRVOBJ_MAGIC             0x18900915
+/** Dead number magic for SUPDRVOBJ::u32Magic. */
+#define SUPDRVOBJ_MAGIC_DEAD        0x19760112
 
 /**

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -261 +261 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t MinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x000a0000
-                                  ? 0x000a0008
+                                  ? 0x000a0009
                                   :  SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = MinVersion;