Changeset 25125 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 1, 2009 12:28:55 PM (15 years ago)

Author:

vboxsync

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

55503

Message:

NAT: backed out r55479.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (9 diffs)

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

@@ -170 +170 @@
     /** event to wakeup the guest receive thread */
     RTSEMEVENT              EventRecv;
-    RTCRITSECT              csEventRecv;
     /** event to wakeup the guest urgent receive thread */
     RTSEMEVENT              EventUrgRecv;
-    RTCRITSECT              csEventUrgRecv;
     /** Receive Req queue (deliver packets to the guest) */
     PRTREQQUEUE             pRecvReqQueue;
@@ -233 +231 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    int rc;
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
@@ -240 +237 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        rc = RTCritSectEnter(&pThis->csEventRecv);
-        AssertRC(rc);
         RTReqProcess(pThis->pRecvReqQueue, 0);
-        rc = RTCritSectLeave(&pThis->csEventRecv);
-        AssertRC(rc);
         if (ASMAtomicReadU32(&pThis->cPkt) == 0) 
-        {
             RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
-        }
     }
     return VINF_SUCCESS;
@@ -260 +251 @@
     if (ASMAtomicReadU32(&pThis->cPkt) > 0) 
     {
-        rc = RTCritSectEnter(&pThis->csEventRecv);
-        AssertRC(rc);
         rc = RTSemEventSignal(pThis->EventRecv);
-        AssertRC(rc);
-        rc = RTCritSectLeave(&pThis->csEventRecv);
     }
 
@@ -280 +267 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        int rc;
-        rc = RTCritSectEnter(&pThis->csEventUrgRecv);
-        AssertRC(rc);
         RTReqProcess(pThis->pUrgRecvReqQueue, 0);
-        rc = RTCritSectLeave(&pThis->csEventUrgRecv);
-        AssertRC(rc);
         if (ASMAtomicReadU32(&pThis->cUrgPkt) == 0) 
         {
-            rc = RTSemEventWait(pThis->EventUrgRecv, RT_INDEFINITE_WAIT);
+            int rc = RTSemEventWait(pThis->EventUrgRecv, RT_INDEFINITE_WAIT);
             AssertRC(rc);
         }
@@ -299 +281 @@
     if (ASMAtomicReadU32(&pThis->cUrgPkt) > 0) 
     {
-        int rc;
-        rc = RTCritSectEnter(&pThis->csEventUrgRecv);
-        AssertRC(rc);
-        rc = RTSemEventSignal(pThis->EventUrgRecv);
-        AssertRC(rc);
-        rc = RTCritSectLeave(&pThis->csEventUrgRecv);
+        int rc = RTSemEventSignal(pThis->EventUrgRecv);
         AssertRC(rc);
     }
@@ -349 +326 @@
     while(ASMAtomicReadU32(&pThis->cUrgPkt) != 0)
     {
-        rc = RTCritSectLeave(&pThis->csEventRecv);
-        AssertRC(rc);
         rc = RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
         if (   RT_FAILURE(rc) 
@@ -356 +331 @@
                  || rc == VERR_INTERRUPTED))
             goto done_unlocked; 
-        rc = RTCritSectEnter(&pThis->csEventRecv);
-        AssertRC(rc);
     }
 
@@ -1171 +1144 @@
             rc = RTSemEventCreate(&pThis->EventRecv);
             rc = RTSemEventCreate(&pThis->EventUrgRecv);
-            rc = RTCritSectInit(&pThis->csEventRecv);
-            rc = RTCritSectInit(&pThis->csEventUrgRecv);
             rc = RTCritSectInit(&pThis->csDevAccess);
             rc = PDMDrvHlpTMTimerCreate(pThis->pDrvIns, TMCLOCK_REAL/*enmClock*/, drvNATSlowTimer,