Changeset 752 in vbox

Timestamp:

Feb 7, 2007 3:35:59 PM (18 years ago)

Author:

vboxsync

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

18410

Message:

Fixed cleanup

File:

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

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

@@ -1860 +1860 @@
  * If we've reached the maxium number of frames, they will be flushed.
  */
-DECLINLINE(void) pcnetXmitCompleteFrame(PCNetState *pData)
-{
+DECLINLINE(int) pcnetXmitCompleteFrame(PCNetState *pData)
+{
+    HSEMEVENT hSem = pData->hSendEventSem;
+
     /* Don't hold the critical section while transmitting data. */
     /** @note also avoids deadlocks with NAT as it can call us right back. */
@@ -1870 +1872 @@
     STAM_PROFILE_ADV_STOP(&pData->StatTransmitSend, a);
 
-    int rc = PDMCritSectEnter(&pData->CritSect, VERR_PERMISSION_DENIED);
-    AssertReleaseRC(rc);
+    return PDMCritSectEnter(&pData->CritSect, VERR_PERMISSION_DENIED);
 }
 
@@ -1967 +1968 @@
  * Try to transmit frames
  */
-static void pcnetAsyncTransmit(PCNetState *pData)
+static int pcnetAsyncTransmit(PCNetState *pData)
 {
 #ifdef VBOX_WITH_STATISTICS
@@ -2023 +2024 @@
                     pcnetXmitLoopbackFrame(pData);
                 else
-                    pcnetXmitCompleteFrame(pData);
+                {
+                    int rc = pcnetXmitCompleteFrame(pData);
+                    if (VBOX_FAILURE(rc))
+                        return rc; /* can happen during termination */
+                }
             }
             else
@@ -2100 +2105 @@
                          pData->SendFrame.cb, iStart, CSR_XMTRC(pData)));
                     if (pcnetIsLinkUp(pData) && !fDropFrame)
-                        pcnetXmitCompleteFrame(pData);
+                    {
+                        int rc = pcnetXmitCompleteFrame(pData);
+                        if (VBOX_FAILURE(rc))
+                            return rc; /* can happen during termination */
+                    }
                     else if (CSR_LOOP(pData) && !fDropFrame)
                         pcnetXmitLoopbackFrame(pData);
@@ -2155 +2164 @@
     pcnetUpdateIrq(pData);
     STAM_PROFILE_ADV_STOP(&pData->StatTransmit, a);
+
+    return VINF_SUCCESS;
 }
 
@@ -2164 +2175 @@
     PCNetState *pData = (PCNetState *)pvUser;
     RTSEMEVENT hEvent = pData->hSendEventSem;
-
-    while(1)
-    {
-        int rc = RTSemEventWait(hEvent, RT_INDEFINITE_WAIT);
+    int        rc     = VINF_SUCCESS;
+
+    while(rc == VINF_SUCCESS)
+    {
+        rc = RTSemEventWait(hEvent, RT_INDEFINITE_WAIT);
         if (VBOX_FAILURE(rc))
             break;
@@ -2174 +2186 @@
         AssertReleaseRC(rc);
 
-        pcnetAsyncTransmit(pData);
-
+        rc = pcnetAsyncTransmit(pData);
         PDMCritSectLeave(&pData->CritSect);
     }
@@ -3892 +3903 @@
 {
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
-#ifdef PCNET_ASYNC_SEND
-    if (pData->pSendQueue)
-        RTReqDestroyQueue(pData->pSendQueue);
-#endif
+
+    int rc = PDMCritSectEnter(&pData->CritSect, VERR_ACCESS_DENIED);
+    AssertReleaseRC(rc);
+
+    RTSemEventDestroy(pData->hSendEventSem);
+    pData->hSendEventSem = 0;
+    PDMCritSectLeave(&pData->CritSect);
+
     PDMR3CritSectDelete(&pData->CritSect);
     return VINF_SUCCESS;