Changeset 32132 in vbox

Timestamp:

Aug 31, 2010 11:57:44 AM (14 years ago)

Author:

vboxsync

Message:

iSCSI: Handle all events, not only the first one we encounter

File:

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

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

@@ -2309 +2309 @@
         /* Send as much as we can. */
         rc = pImage->pInterfaceNetCallbacks->pfnSgWriteNB(pImage->Socket, &pImage->pIScsiPDUTxCur->SgBuf, &cbSent);
+        LogFlow(("SgWriteNB returned rc=%Rrc cbSent=%zu\n", rc, cbSent));
         if (RT_SUCCESS(rc))
         {
@@ -2338 +2339 @@
         pImage->fPollEvents &= ~VD_INTERFACETCPNET_EVT_WRITE;
 
+    LogFlowFunc(("rc=%Rrc pIScsiPDUTxCur=%#p\n", rc, pImage->pIScsiPDUTxCur));
     return rc;
 }
@@ -3280 +3282 @@
             msWait = RT_INDEFINITE_WAIT;
 
+        LogFlow(("Waiting for events fPollEvents=%#x\n", pImage->fPollEvents));
         rc = iscsiIoThreadWait(pImage, msWait, pImage->fPollEvents, &fEvents);
         if (rc == VERR_INTERRUPTED)
@@ -3334 +3337 @@
                     LogRel(("iSCSI: Handling incoming request failed %Rrc\n", rc));
             }
-            else if (fEvents & VD_INTERFACETCPNET_EVT_WRITE)
+
+            if (fEvents & VD_INTERFACETCPNET_EVT_WRITE)
             {
                 LogFlow(("The socket is writable\n"));
@@ -3341 +3345 @@
                     LogRel(("iSCSI: Sending PDU failed %Rrc\n", rc));
             }
-            else if (fEvents & VD_INTERFACETCPNET_EVT_ERROR)
+
+            if (fEvents & VD_INTERFACETCPNET_EVT_ERROR)
             {
                 LogFlow(("An error ocurred\n"));
                 iscsiReattach(pImage);
             }
-            else
-                LogRel(("iSCSI: Received unexpected event %#x\n", fEvents));
         }
         else