Changeset 39498 in vbox for trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

Timestamp:

Dec 1, 2011 7:59:21 PM (13 years ago)

Author:

vboxsync

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

75169

Message:

RTReq refactoring.

File:

• trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp (modified) (8 diffs)

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

@@ -63 +63 @@
     PPDMTHREAD              pAsyncIOThread;
     /** Queue for passing the requests to the thread. */
-    PRTREQQUEUE             pQueueRequests;
+    RTREQQUEUE              hQueueRequests;
 } DRVSCSIHOST, *PDRVSCSIHOST;
 
@@ -352 +352 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        rc = RTReqProcess(pThis->pQueueRequests, RT_INDEFINITE_WAIT);
+        rc = RTReqQueueProcess(pThis->hQueueRequests, RT_INDEFINITE_WAIT);
         AssertMsg(rc == VWRN_STATE_CHANGED, ("Left RTReqProcess and error code is not VWRN_STATE_CHANGED rc=%Rrc\n", rc));
     }
@@ -365 +365 @@
     PRTREQ pReq;
 
-    AssertMsgReturn(pThis->pQueueRequests, ("pQueueRequests is NULL\n"), VERR_INVALID_STATE);
-
-    rc = RTReqCall(pThis->pQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsihostAsyncIOLoopWakeupFunc, 0);
+    AssertReturn(pThis->hQueueRequests != NIL_RTREQQUEUE, VERR_INVALID_STATE);
+
+    rc = RTReqQueueCall(pThis->hQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsihostAsyncIOLoopWakeupFunc, 0);
     AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n"));
 
@@ -382 +382 @@
     PRTREQ pReq;
 
-    AssertMsgReturn(pThis->pQueueRequests, ("pQueueRequests is NULL\n"), VERR_INVALID_STATE);
-
-    rc = RTReqCallEx(pThis->pQueueRequests, &pReq, 0, RTREQFLAGS_NO_WAIT, (PFNRT)drvscsihostProcessRequestOne, 2, pThis, pSCSIRequest);
+    AssertReturn(pThis->hQueueRequests != NIL_RTREQQUEUE, VERR_INVALID_STATE);
+
+    rc = RTReqQueueCallEx(pThis->hQueueRequests, &pReq, 0, RTREQFLAGS_NO_WAIT, (PFNRT)drvscsihostProcessRequestOne, 2, pThis, pSCSIRequest);
     AssertMsgReturn(RT_SUCCESS(rc), ("Inserting request into queue failed rc=%Rrc\n", rc), rc);
 
@@ -429 +429 @@
     }
 
-    if (pThis->pQueueRequests)
-    {
-        int rc = RTReqDestroyQueue(pThis->pQueueRequests);
+    if (pThis->hQueueRequests != NIL_RTREQQUEUE)
+    {
+        int rc = RTReqQueueDestroy(pThis->hQueueRequests);
         AssertMsgRC(rc, ("Failed to destroy queue rc=%Rrc\n", rc));
+        pThis->hQueueRequests = NIL_RTREQQUEUE;
     }
 
@@ -447 +448 @@
     LogFlowFunc(("pDrvIns=%#p pCfg=%#p\n", pDrvIns, pCfg));
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+
+    /*
+     * Initialize the instance data first because of the destructor.
+     */
+    pDrvIns->IBase.pfnQueryInterface            = drvscsihostQueryInterface;
+    pThis->ISCSIConnector.pfnSCSIRequestSend    = drvscsihostRequestSend;
+    pThis->pDrvIns                              = pDrvIns;
+    pThis->hDeviceFile                          = NIL_RTFILE;
+    pThis->hQueueRequests                       = NIL_RTREQQUEUE;
 
     /*
@@ -455 +465 @@
                                 N_("Invalid configuration for host scsi access driver"));
 
-    /*
-     * Initialize interfaces.
-     */
-    pDrvIns->IBase.pfnQueryInterface                    = drvscsihostQueryInterface;
-    pThis->ISCSIConnector.pfnSCSIRequestSend            = drvscsihostRequestSend;
-    pThis->pDrvIns     = pDrvIns;
-    pThis->hDeviceFile = NIL_RTFILE;
 
     /* Query the SCSI port interface above. */
@@ -468 +471 @@
 
     /* Create request queue. */
-    int rc = RTReqCreateQueue(&pThis->pQueueRequests);
+    int rc = RTReqQueueCreate(&pThis->hQueueRequests);
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n"), rc);