Changeset 32278 in vbox for trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

Timestamp:

Sep 7, 2010 11:35:31 AM (14 years ago)

Author:

vboxsync

Message:

iSCSI: Provide the correct hint to the select method

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -21 +21 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_VD_ISCSI
+#define LOG_ENABLED
 #include <VBox/VBoxHDD-Plugin.h>
 #define VBOX_VDICORE_VD /* Signal that the header is included from here. */
@@ -1745 +1746 @@
     uint32_t ExpDataSN = 0;
     bool final = false;
+
 
     LogFlowFunc(("entering, CmdSN=%d\n", pImage->CmdSN));
@@ -3297 +3299 @@
 
         if (pImage->cCmdsWaiting)
+        {
+            pImage->fPollEvents &= ~VD_INTERFACETCPNET_HINT_INTERRUPT;
             msWait = pImage->uReadTimeout;
+        }
         else
+        {
+            pImage->fPollEvents |= VD_INTERFACETCPNET_HINT_INTERRUPT;
             msWait = RT_INDEFINITE_WAIT;
+        }
 
         LogFlow(("Waiting for events fPollEvents=%#x\n", pImage->fPollEvents));
@@ -3331 +3339 @@
             }
         }
-        else if (rc == VERR_TIMEOUT)
+#if 0
+        else if ((rc == VERR_TIMEOUT) && pImage->cCmdsWaiting)
         {
             /*
@@ -3338 +3347 @@
              * We assume the connection is broken and try to reconnect.
              */
-            LogFlow(("Timed out while waiting for an asnwer from the target, reconnecting\n"));
+            LogFlow(("Timed out while waiting for an answer from the target, reconnecting\n"));
             iscsiReattach(pImage);
         }
-        else if (RT_SUCCESS(rc))
+#endif
+        else if (RT_SUCCESS(rc) || rc == VERR_TIMEOUT)
         {
             Assert(pImage->state == ISCSISTATE_NORMAL);