Changeset 9594 in vbox for trunk/src/VBox

Timestamp:

Jun 11, 2008 9:45:26 AM (17 years ago)

Author:

vboxsync

Message:

If IntNet is used as a service (for lwIP) then taking it down on suspend/poweroff is way too early. The service and the users of it come later in the notification order and thus have no chance of doing proper connection shutdown. This fixes the 10 seconds suspend/poweroff delay when using iSCSI over IntNet.

File:

• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (8 diffs)

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

@@ -85 +85 @@
      * When the link is down all incoming packets will be dropped. */
     bool volatile           fLinkDown;
-    /** Set if data transmission should start immediately. */
-    bool                    fActivateEarly;
+    /** Set if data transmission should start immediately and deactivate
+     * as late as possible. */
+    bool                    fActivateEarlyDeactivateLate;
 
 #ifdef VBOX_WITH_STATISTICS
@@ -533 +534 @@
     LogFlow(("drvIntNetPowerOff\n"));
     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
+    if (!pThis->fActivateEarlyDeactivateLate)
+        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
 }
 
@@ -546 +548 @@
     LogFlow(("drvIntNetPowerResume\n"));
     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
-    RTSemEventSignal(pThis->EventSuspended);
+    if (!pThis->fActivateEarlyDeactivateLate)
+    {
+        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
+        RTSemEventSignal(pThis->EventSuspended);
+    }
 }
 
@@ -560 +565 @@
     LogFlow(("drvIntNetPowerSuspend\n"));
     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
+    if (!pThis->fActivateEarlyDeactivateLate)
+        ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
 }
 
@@ -573 +579 @@
     LogFlow(("drvIntNetPowerOn\n"));
     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
-    if (!pThis->fActivateEarly)
+    if (!pThis->fActivateEarlyDeactivateLate)
     {
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
@@ -658 +664 @@
     pThis->EventSuspended               = NIL_RTSEMEVENT;
     pThis->enmState                     = ASYNCSTATE_SUSPENDED;
-    pThis->fActivateEarly               = false;
+    pThis->fActivateEarlyDeactivateLate = false;
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvIntNetQueryInterface;
@@ -732 +738 @@
                                 N_("Configuration error: Failed to get the \"RestrictAccess\" value"));
 
-    rc = CFGMR3QueryBool(pCfgHandle, "IsService", &pThis->fActivateEarly);
+    rc = CFGMR3QueryBool(pCfgHandle, "IsService", &pThis->fActivateEarlyDeactivateLate);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        pThis->fActivateEarly = false;
+        pThis->fActivateEarlyDeactivateLate = false;
     else if (VBOX_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -809 +815 @@
      * Activate data transmission as early as possible
      */
-    if (pThis->fActivateEarly)
+    if (pThis->fActivateEarlyDeactivateLate)
     {
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);