Changeset 62177 in vbox

Timestamp:

Jul 12, 2016 8:27:21 AM (8 years ago)

Author:

vboxsync

Message:

use RTHandleTable to maintain handles

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/SUPDrv.cpp (modified) (1 diff)
• VBoxUSB/VBoxUSBFilterMgr.cpp (modified) (15 diffs)

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

@@ -468 +468 @@
     /* VBoxUSB */
     (PFNRT)RTPathStripFilename,
+    (PFNRT)RTHandleTableAlloc,
 #if !defined(RT_OS_FREEBSD)
     (PFNRT)RTStrPurgeEncoding,

trunk/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp

@@ -23 +23 @@
 #include "VBoxUSBFilterMgr.h"
 
+#include <iprt/handletable.h>
 #include <iprt/mem.h>
 #ifdef VBOXUSBFILTERMGR_USB_SPINLOCK
@@ -77 +78 @@
 {
     /** The core filter. */
-    USBFILTER       Core;
+    USBFILTER             Core;
     /** The filter owner. */
-    VBOXUSBFILTER_CONTEXT       Owner;
+    VBOXUSBFILTER_CONTEXT Owner;
     /** The filter Id. */
-    uintptr_t       uId;
+    uint32_t              uHnd;
     /** Pointer to the next filter in the list. */
-    PVBOXUSBFILTER  pNext;
+    PVBOXUSBFILTER        pNext;
 } VBOXUSBFILTER;
 
@@ -113 +114 @@
  * @remark The first entry is empty (USBFILTERTYPE_INVALID). */
 static VBOXUSBFILTERLIST    g_aLists[USBFILTERTYPE_END];
+/** The handle table to match handles to the right filter. */
+static RTHANDLETABLE        g_hHndTableFilters = NIL_RTHANDLETABLE;
 
 
@@ -130 +133 @@
     if (RT_SUCCESS(rc))
     {
-        /* not really required, but anyway... */
-        for (unsigned i = USBFILTERTYPE_FIRST; i < RT_ELEMENTS(g_aLists); i++)
-            g_aLists[i].pHead = g_aLists[i].pTail = NULL;
+        uint32_t fFlags;
+#ifdef VBOXUSBFILTERMGR_USB_SPINLOCK
+        fFlags = RTHANDLETABLE_FLAGS_LOCKED_IRQ_SAFE;
+#else
+        fFlags = RTHANDLETABLE_FLAGS_LOCKED;
+#endif
+        rc = RTHandleTableCreateEx(&g_hHndTableFilters, fFlags, 1 /* uBase */, 32768 /* cMax */,
+                                   NULL, NULL);
+        if (RT_SUCCESS(rc))
+        {
+            /* not really required, but anyway... */
+            for (unsigned i = USBFILTERTYPE_FIRST; i < RT_ELEMENTS(g_aLists); i++)
+                g_aLists[i].pHead = g_aLists[i].pTail = NULL;
+        }
+        else
+        {
+#ifdef VBOXUSBFILTERMGR_USB_SPINLOCK
+            RTSpinlockDestroy(g_Spinlock);
+            g_Spinlock = NIL_RTSPINLOCK;
+#else
+            RTSemFastMutexDestroy(g_Mtx);
+            g_Mtx = NIL_RTSEMFASTMUTEX;
+#endif
+        }
     }
     return rc;
@@ -172 +196 @@
         {
             PVBOXUSBFILTER pNext = pCur->pNext;
+            RTHandleTableFree(g_hHndTableFilters, pCur->uHnd);
             vboxUSBFilterFree(pCur);
             pCur = pNext;
         }
     }
+
+    RTHandleTableDestroy(g_hHndTableFilters, NULL, NULL);
 }
 
@@ -210 +237 @@
     memcpy(&pNew->Core, pFilter, sizeof(pNew->Core));
     pNew->Owner = Owner;
-    pNew->uId   = (uintptr_t)pNew;
     pNew->pNext = NULL;
 
-    *puId = pNew->uId;
-
-    /*
-     * Insert it.
-     */
-    PVBOXUSBFILTERLIST pList = &g_aLists[pFilter->enmType];
-
-    VBOXUSBFILTERMGR_LOCK();
-
-    if (pList->pTail)
-        pList->pTail->pNext = pNew;
-    else
-        pList->pHead = pNew;
-    pList->pTail = pNew;
-
-    VBOXUSBFILTERMGR_UNLOCK();
-
-    return VINF_SUCCESS;
+    rc = RTHandleTableAlloc(g_hHndTableFilters, pNew, &pNew->uHnd);
+    if (RT_SUCCESS(rc))
+    {
+        *puId = pNew->uHnd;
+
+        /*
+         * Insert it.
+         */
+        PVBOXUSBFILTERLIST pList = &g_aLists[pFilter->enmType];
+
+        VBOXUSBFILTERMGR_LOCK();
+
+        if (pList->pTail)
+            pList->pTail->pNext = pNew;
+        else
+            pList->pHead = pNew;
+        pList->pTail = pNew;
+
+        VBOXUSBFILTERMGR_UNLOCK();
+    }
+
+    return rc;
 }
 
@@ -252 +282 @@
      * Validate input.
      */
-    if (!uId)
+    if (!uId || uId != (uint32_t)uId)
         return VERR_INVALID_PARAMETER;
     if (!Owner || Owner == VBOXUSBFILTER_CONTEXT_NIL)
@@ -260 +290 @@
      * Locate and unlink it.
      */
+    uint32_t uHnd = (uint32_t)uId;
     PVBOXUSBFILTER pCur = NULL;
 
@@ -270 +301 @@
         while (pCur)
         {
-            if (    pCur->uId == uId
+            if (    pCur->uHnd == uHnd
                 &&  pCur->Owner == Owner)
             {
@@ -295 +326 @@
     if (pCur)
     {
+        void *pv = RTHandleTableFree(g_hHndTableFilters, pCur->uHnd);
+        Assert(pv == pCur);
         vboxUSBFilterFree(pCur);
         return VINF_SUCCESS;
@@ -308 +341 @@
      * Validate input.
      */
-    if (!uId)
+    if (!uId || uId != (uint32_t)uId)
         return VBOXUSBFILTER_CONTEXT_NIL;
 
@@ -318 +351 @@
     VBOXUSBFILTERMGR_LOCK();
 
-    for (unsigned i = USBFILTERTYPE_FIRST; i < RT_ELEMENTS(g_aLists); i++)
-    {
-        for (PVBOXUSBFILTER pCur = g_aLists[i].pHead; pCur; pCur = pCur->pNext)
-        {
-            if (pCur->uId == uId)
-            {
-                Owner = pCur->Owner;
-                Assert(Owner != VBOXUSBFILTER_CONTEXT_NIL);
-                break;
-            }
-        }
-    }
+    PVBOXUSBFILTER pCur = (PVBOXUSBFILTER)RTHandleTableLookup(g_hHndTableFilters, (uint32_t)uId);
+    if (pCur)
+        Owner = pCur->Owner;
 
     Assert(Owner != VBOXUSBFILTER_CONTEXT_NIL);
@@ -392 +416 @@
     {
         PVBOXUSBFILTER pNext = pToFree->pNext;
+        void *pv = RTHandleTableFree(g_hHndTableFilters, pToFree->uHnd);
+        Assert(pv == pToFree);
         vboxUSBFilterFree(pToFree);
         pToFree = pNext;
@@ -448 +474 @@
                  */
                 if (puId)
-                    *puId = pCur->uId;
+                    *puId = pCur->uHnd;
                 VBOXUSBFILTER_CONTEXT Owner = pCur->Owner;
                 *pfFilter = !!(i != USBFILTERTYPE_IGNORE
@@ -476 +502 @@
                     if (fRemoveFltIfOneShot)
                     {
+                        void *pv = RTHandleTableFree(g_hHndTableFilters, pCur->uHnd);
+                        Assert(pv == pCur);
                         vboxUSBFilterFree(pCur);
                     }