Changeset 6941 in vbox for trunk/src/VBox/Devices/Network/DrvTAP.cpp

Timestamp:

Feb 14, 2008 12:16:17 PM (17 years ago)

Author:

vboxsync

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

28106

Message:

Removed ASYNCSTATE. Set EventOutOfSpace to NIL after destruction.

File:

• trunk/src/VBox/Devices/Network/DrvTAP.cpp (modified) (5 diffs)

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

@@ -81 +81 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef enum ASYNCSTATE
-{
-    //ASYNCSTATE_SUSPENDED = 1,
-    ASYNCSTATE_RUNNING,
-    ASYNCSTATE_TERMINATE
-} ASYNCSTATE;
-
 /**
  * Block driver instance data.
@@ -429 +422 @@
     }
 
+
     rc = RTSemEventDestroy(pData->EventOutOfSpace);
     AssertRC(rc);
+    pData->EventOutOfSpace = NIL_RTSEMEVENT;
 
     LogFlow(("drvTAPAsyncIoThread: returns %Vrc\n", VINF_SUCCESS));
@@ -449 +444 @@
     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
 
-    /* Ensure that it does not spin in the CanReceive loop */
+    /* Ensure that it does not spin in the CanReceive loop.
+       (May assert in IPRT if we're really unlucky.) */
     if (ASMAtomicXchgU32(&pData->fOutOfSpace, false))
         RTSemEventSignal(pData->EventOutOfSpace);
@@ -548 +544 @@
     szMacAddress[sizeof(szMacAddress) - 1] =  0;
 
-    RTStrPrintf(szCommand, sizeof(szCommand), "%s %s %s", pData->pszSetupApplication, 
+    RTStrPrintf(szCommand, sizeof(szCommand), "%s %s %s", pData->pszSetupApplication,
             szMacAddress, pData->fStatic ? pData->pszDeviceName : "");
 #else
-    RTStrPrintf(szCommand, sizeof(szCommand), "%s %s", pData->pszSetupApplication, 
+    RTStrPrintf(szCommand, sizeof(szCommand), "%s %s", pData->pszSetupApplication,
             pData->fStatic ? pData->pszDeviceName : "");
 #endif
@@ -710 +706 @@
     else
         rc = PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
-                                         N_("Failed to obtain VNIC info")); 
+                                         N_("Failed to obtain VNIC info"));
     dlpi_close(pData->pDeviceHandle);
     return rc;