Changeset 97084 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Oct 11, 2022 6:51:17 AM (2 years ago)

Author:

vboxsync

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

154035

Message:

NetworkServices/IntNetSwitch: Some fixes and cleanups, bugref:10297

Location:

trunk/src/VBox/NetworkServices/IntNetSwitch

Files:

• IntNetSwitchInternal.h (modified) (2 diffs)
• SrvIntNetWrapper.cpp (modified) (1 diff)
• main.cpp (modified) (17 diffs)

trunk/src/VBox/NetworkServices/IntNetSwitch/IntNetSwitchInternal.h

@@ -36 +36 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define IN_INTNET_TESTCASE
+#define IN_INTNET_R3
+
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
@@ -46 +49 @@
 #define PSUPDRVSESSION  MYPSUPDRVSESSION
 
+#include <VBox/intnet.h>
 #include <VBox/sup.h>
 

trunk/src/VBox/NetworkServices/IntNetSwitch/SrvIntNetWrapper.cpp

@@ -33 +33 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define IN_INTNET_TESTCASE
-#define IN_INTNET_R3
-
 #include "IntNetSwitchInternal.h"
 
-
-#include <VBox/types.h>
-#include <VBox/intnet.h>
 #include <iprt/asm.h>
 #include <iprt/mp.h>

trunk/src/VBox/NetworkServices/IntNetSwitch/main.cpp

@@ -37 +37 @@
 #include "IntNetSwitchInternal.h"
 
-#include <VBox/intnet.h>
 #include <VBox/err.h>
 #include <VBox/vmm/vmm.h>
 #include <iprt/asm.h>
+#include <iprt/critsect.h>
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
@@ -55 +55 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-
 
 /**
@@ -98 +97 @@
     /** Number of references to this service. */
     uint32_t volatile               cRefs;
-    /** Mutex to serialize the initialization, usage counting and objects. */
-    RTSEMFASTMUTEX                  hMtx;
+    /** Critical section to serialize the initialization, usage counting and objects. */
+    RTCRITSECT                      CritSect;
     /** List of registered objects. Protected by the spinlock. */
     PSUPDRVOBJ volatile             pObjs;
@@ -113 +112 @@
 {
     PSUPDRVDEVEXT                   pDevExt;
-    /** List of generic usage records. (protected by SUPDRVDEVEXT::hMtx) */
+    /** List of generic usage records. (protected by SUPDRVDEVEXT::CritSect) */
     PSUPDRVUSAGE volatile           pUsage;
     /** The XPC connection handle for this session. */
@@ -158 +157 @@
 
     PSUPDRVDEVEXT pDevExt = pSession->pDevExt;
-    RTSemFastMutexRequest(pDevExt->hMtx);
+    RTCritSectEnter(&pDevExt->CritSect);
 
     /* The object. */
@@ -170 +169 @@
     pSession->pUsage    = pUsage;
 
-    RTSemFastMutexRelease(pDevExt->hMtx);
+    RTCritSectLeave(&pDevExt->CritSect);
     return pObj;
 }
@@ -184 +183 @@
     RT_NOREF(fNoBlocking);
 
-    RTSemFastMutexRequest(pDevExt->hMtx);
+    RTCritSectEnter(&pDevExt->CritSect);
 
     /*
@@ -220 +219 @@
     }
 
-    RTSemFastMutexRelease(pDevExt->hMtx);
+    RTCritSectLeave(&pDevExt->CritSect);
     return rc;
 }
@@ -242 +241 @@
      * Acquire the spinlock and look for the usage record.
      */
-    RTSemFastMutexRequest(pDevExt->hMtx);
+    RTCritSectEnter(&pDevExt->CritSect);
 
     for (pUsagePrev = NULL, pUsage = pSession->pUsage;
@@ -296 +295 @@
     }
 
-    RTSemFastMutexRelease(pDevExt->hMtx);
+    RTCritSectLeave(&pDevExt->CritSect);
 
     /*
@@ -380 +379 @@
     {
         PSUPDRVUSAGE  pUsage;
-        RTSemFastMutexRequest(pDevExt->hMtx);
+        RTCritSectEnter(&pDevExt->CritSect);
 
         while ((pUsage = pSession->pUsage) != NULL)
@@ -409 +408 @@
                 }
 
+                RTCritSectLeave(&pDevExt->CritSect);
+
                 if (pObj->pfnDestructor)
                     pObj->pfnDestructor(pObj, pObj->pvUser1, pObj->pvUser2);
                 RTMemFree(pObj);
+
+                RTCritSectEnter(&pDevExt->CritSect);
             }
 
@@ -418 +421 @@
         }
 
-        RTSemFastMutexRelease(pDevExt->hMtx);
+        RTCritSectLeave(&pDevExt->CritSect);
         AssertMsg(!pSession->pUsage, ("Some buster reregistered an object during desturction!\n"));
     }
@@ -448 +451 @@
             break;
 
-        INTNETIFWAITREQ WaitReq;
-        WaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-        WaitReq.Hdr.cbReq    = sizeof(WaitReq);
-        WaitReq.pSession     = NULL;
-        WaitReq.hIf          = pSession->hIfWait;
-        WaitReq.cMillies     = 30000; /* 30s - don't wait forever, timeout now and then. */
-        int rc = IntNetR0IfWaitReq(pSession, &WaitReq);
+        int rc = IntNetR0IfWait(pSession->hIfWait, pSession, 30000); /* 30s - don't wait forever, timeout now and then. */
         if (RT_SUCCESS(rc))
         {
@@ -464 +461 @@
                  && rc != VERR_INTERRUPTED)
         {
-            LogFlow(("drvR3IntNetRecvRun: returns %Rrc\n", rc));
+            LogFlow(("intnetR3RecvThread: returns %Rrc\n", rc));
             return rc;
         }
@@ -635 +632 @@
                 {
                     /* Last one cleans up the global data. */
-                    RTSemFastMutexDestroy(pDevExt->hMtx);
-                    pDevExt->hMtx = NIL_RTSEMFASTMUTEX;
+                    RTCritSectDelete(&pDevExt->CritSect);
                 }
             }
@@ -680 +676 @@
 
         g_DevExt.pObjs = NULL;
-        rc = RTSemFastMutexCreate(&g_DevExt.hMtx);
+        rc = RTCritSectInit(&g_DevExt.CritSect);
         if (RT_SUCCESS(rc))
             xpc_main(xpcConnHandler); /* Never returns. */