Changeset 28438 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 17, 2010 9:58:52 PM (15 years ago)

Author:

vboxsync

Message:

renamed a semaphore to make it easier to work with... but got distracted so got no work done.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (31 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -359 +359 @@
      *        another mutex for creation / destruction serilization. */
 #endif
-    RTSEMFASTMUTEX          FastMutex;
+    RTSEMFASTMUTEX          FastMutex2;
 #ifdef WITH_NEW_STUFF
     /** Wait for an interface to stop being busy so it can be removed or have its
@@ -2020 +2020 @@
         ||  intnetR0TrunkIfRetain(pThis))
     {
-        rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+        rc = RTSemFastMutexRelease(pNetwork->FastMutex2);
         AssertRC(rc);
         if (RT_SUCCESS(rc))
@@ -2042 +2042 @@
             }
 
-            int rc2 = RTSemFastMutexRequest(pNetwork->FastMutex);
+            int rc2 = RTSemFastMutexRequest(pNetwork->FastMutex2);
             AssertRC(rc2);
         }
@@ -2636 +2636 @@
      */
     PINTNETNETWORK pNetwork = pIf->pNetwork;
-    int rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+    int rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
     if (RT_FAILURE(rc))
     {
@@ -2645 +2645 @@
     if (pTrunkIf)
     {
-        RTSemFastMutexRelease(pIf->pNetwork->FastMutex);
+        RTSemFastMutexRelease(pIf->pNetwork->FastMutex2);
 
         if (!intnetR0TrunkIfOutLock(pTrunkIf))
@@ -2654 +2654 @@
         }
 
-        rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+        rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
         if (RT_FAILURE(rc))
         {
@@ -2711 +2711 @@
      * Release the semaphore(s) and release references.
      */
-    rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+    rc = RTSemFastMutexRelease(pNetwork->FastMutex2);
     if (pTrunkIf)
     {
@@ -2767 +2767 @@
      * allocating the buffer.
      */
-    int rc = RTSemFastMutexRequest(pIf->pNetwork->FastMutex);
+    int rc = RTSemFastMutexRequest(pIf->pNetwork->FastMutex2);
     if (RT_SUCCESS(rc))
     {
         *ppRing3Buf = pIf->pIntBufR3;
-        rc = RTSemFastMutexRelease(pIf->pNetwork->FastMutex);
+        rc = RTSemFastMutexRelease(pIf->pNetwork->FastMutex2);
     }
 
@@ -2823 +2823 @@
      * ASSUMES that the handle isn't closed while we're here.
      */
-    int rc = RTSemFastMutexRequest(pIf->pNetwork->FastMutex);
+    int rc = RTSemFastMutexRequest(pIf->pNetwork->FastMutex2);
     if (RT_SUCCESS(rc))
     {
         *ppRing0Buf = pIf->pIntBuf;
 
-        rc = RTSemFastMutexRelease(pIf->pNetwork->FastMutex);
+        rc = RTSemFastMutexRelease(pIf->pNetwork->FastMutex2);
     }
     intnetR0IfRelease(pIf, pSession);
@@ -2907 +2907 @@
     if (pNetwork)
     {
-        rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+        rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
         if (RT_SUCCESS(rc))
         {
@@ -2917 +2917 @@
             }
 
-            rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+            rc = RTSemFastMutexRelease(pNetwork->FastMutex2);
         }
     }
@@ -2976 +2976 @@
     if (pNetwork)
     {
-        rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+        rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
         if (RT_SUCCESS(rc))
         {
@@ -2987 +2987 @@
             }
 
-            rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+            rc = RTSemFastMutexRelease(pNetwork->FastMutex2);
         }
     }
@@ -3040 +3040 @@
         return VERR_SEM_DESTROYED;
 
-    int rc = RTSemFastMutexRequest(pNetwork->FastMutex); AssertRC(rc);
+    int rc = RTSemFastMutexRequest(pNetwork->FastMutex2); AssertRC(rc);
     if (RT_SUCCESS(rc))
     {
@@ -3064 +3064 @@
                  * the network semaphore so we don't create any deadlocks.
                  */
-                int rc2 = RTSemFastMutexRelease(pNetwork->FastMutex); AssertRC(rc2);
+                int rc2 = RTSemFastMutexRelease(pNetwork->FastMutex2); AssertRC(rc2);
                 fNetworkLocked = false;
 
@@ -3073 +3073 @@
 
         if (fNetworkLocked)
-            RTSemFastMutexRelease(pNetwork->FastMutex);
+            RTSemFastMutexRelease(pNetwork->FastMutex2);
     }
     if (pTrunkIf)
@@ -3418 +3418 @@
     {
         SUPR0MemFree(pIf->pSession, (RTHCUINTPTR)pIf->pIntBufDefault);
-        pIf->pIntBufDefault = NULL;
-        pIf->pIntBufDefaultR3 = 0;
-        pIf->pIntBuf = NULL;
-        pIf->pIntBufR3 = 0;
+        pIf->pIntBufDefault     = NULL;
+        pIf->pIntBufDefaultR3   = 0;
+        pIf->pIntBuf            = NULL;
+        pIf->pIntBufR3          = 0;
     }
 
@@ -3521 +3521 @@
              * Link the interface to the network.
              */
-            rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+            rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
             if (RT_SUCCESS(rc))
             {
                 pIf->pNext = pNetwork->pIFs;
                 pNetwork->pIFs = pIf;
-                RTSemFastMutexRelease(pNetwork->FastMutex);
+                RTSemFastMutexRelease(pNetwork->FastMutex2);
 
                 /*
@@ -3548 +3548 @@
                 }
 
-                RTSemFastMutexDestroy(pNetwork->FastMutex);
-                pNetwork->FastMutex = NIL_RTSEMFASTMUTEX;
+                RTSemFastMutexDestroy(pNetwork->FastMutex2);
+                pNetwork->FastMutex2 = NIL_RTSEMFASTMUTEX;
             }
 
@@ -3604 +3604 @@
     /* assert some sanity */
     AssertPtrReturn(pNetwork, INTNETSWDECISION_TRUNK);
-    AssertReturn(pNetwork->FastMutex != NIL_RTSEMFASTMUTEX, INTNETSWDECISION_TRUNK);
+    AssertReturn(pNetwork->FastMutex2 != NIL_RTSEMFASTMUTEX, INTNETSWDECISION_TRUNK);
     AssertPtr(pvSrc);
     AssertPtr(cbSrc >= 6);
@@ -3623 +3623 @@
     /* assert some sanity */
     AssertPtrReturn(pNetwork, false);
-    AssertReturn(pNetwork->FastMutex != NIL_RTSEMFASTMUTEX, false);
+    AssertReturn(pNetwork->FastMutex2 != NIL_RTSEMFASTMUTEX, false);
     AssertPtr(pSG);
     Assert(fSrc);
@@ -3630 +3630 @@
      * Lock the network and send the frame to it.
      */
-    int rc = RTSemFastMutexRequest(pNetwork->FastMutex);
+    int rc = RTSemFastMutexRequest(pNetwork->FastMutex2);
     AssertRCReturn(rc, false);
 
@@ -3639 +3639 @@
         fRc = false; /* don't drop it */
 
-    rc = RTSemFastMutexRelease(pNetwork->FastMutex);
+    rc = RTSemFastMutexRelease(pNetwork->FastMutex2);
     AssertRC(rc);
 
@@ -3654 +3654 @@
     /* assert some sanity */
     AssertPtrReturnVoid(pNetwork);
-    AssertReturnVoid(pNetwork->FastMutex != NIL_RTSEMFASTMUTEX);
+    AssertReturnVoid(pNetwork->FastMutex2 != NIL_RTSEMFASTMUTEX);
     AssertPtr(pSG);
     Assert(pSG->cUsers > 0 && pSG->cUsers < 256);
@@ -3671 +3671 @@
     /* assert some sanity */
     AssertPtrReturnVoid(pNetwork);
-    AssertReturnVoid(pNetwork->FastMutex != NIL_RTSEMFASTMUTEX);
+    AssertReturnVoid(pNetwork->FastMutex2 != NIL_RTSEMFASTMUTEX);
     AssertPtr(pSG);
     Assert(pSG->cUsers > 0);
@@ -4018 +4018 @@
      * deal with this by simply orphaning the interfaces.
      */
-    RTSemFastMutexRequest(pNetwork->FastMutex);
+    RTSemFastMutexRequest(pNetwork->FastMutex2);
 
     PINTNETIF pCur = pNetwork->pIFs;
@@ -4033 +4033 @@
     pNetwork->pTrunkIF = NULL;
 
-    RTSemFastMutexRelease(pNetwork->FastMutex);
+    RTSemFastMutexRelease(pNetwork->FastMutex2);
 
     /*
@@ -4045 +4045 @@
      * Free resources.
      */
-    RTSemFastMutexDestroy(pNetwork->FastMutex);
-    pNetwork->FastMutex = NIL_RTSEMFASTMUTEX;
+    RTSemFastMutexDestroy(pNetwork->FastMutex2);
+    pNetwork->FastMutex2 = NIL_RTSEMFASTMUTEX;
     RTMemFree(pNetwork);
 
@@ -4187 +4187 @@
     if (!pNew)
         return VERR_NO_MEMORY;
-    int rc = RTSemFastMutexCreate(&pNew->FastMutex);
+    int rc = RTSemFastMutexCreate(&pNew->FastMutex2);
     if (RT_SUCCESS(rc))
     {
@@ -4249 +4249 @@
         rc = VERR_NO_MEMORY;
 
-        RTSemFastMutexDestroy(pNew->FastMutex);
-        pNew->FastMutex = NIL_RTSEMFASTMUTEX;
+        RTSemFastMutexDestroy(pNew->FastMutex2);
+        pNew->FastMutex2 = NIL_RTSEMFASTMUTEX;
     }
     RTMemFree(pNew);