Changeset 46246 in vbox

Timestamp:

May 23, 2013 7:15:44 PM (12 years ago)

Author:

vboxsync

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

85975

Message:

Runtime/AioMgr: Bug fixes

Location:

trunk

Files:

• include/iprt/aiomgr.h (modified) (3 diffs)
• src/VBox/Runtime/common/misc/aiomgr.cpp (modified) (8 diffs)

trunk/include/iprt/aiomgr.h ¶

@@ -81 +81 @@
  * @param   phAioMgrFile      Where to store the newly created async I/O manager
  *                            handle on success.
+ * @param   pvUser            Opaque user data for this file handle.
  *
  * @note This function increases the reference count of the given async I/O manager
@@ -86 +87 @@
  */
 RTDECL(int) RTAioMgrFileCreate(RTAIOMGR hAioMgr, RTFILE hFile, PFNRTAIOMGRREQCOMPLETE pfnReqComplete,
-                               PRTAIOMGRFILE phAioMgrFile);
+                               void *pvUser, PRTAIOMGRFILE phAioMgrFile);
 
 /**
@@ -103 +104 @@
  */
 RTDECL(uint32_t) RTAioMgrFileRelease(RTAIOMGRFILE hAioMgrFile);
+
+/**
+ * Return opaque user data passed on creation.
+ *
+ * @returns Opaque user data or NULL if the handle is invalid.
+ * @param   hAioMgrFile       The file handle.
+ */
+RTDECL(void *) RTAioMgrFileGetUser(RTAIOMGRFILE hAioMgrFile);
 
 /**

trunk/src/VBox/Runtime/common/misc/aiomgr.cpp ¶

@@ -123 +123 @@
     /** Flags. */
     uint32_t                      fFlags;
+    /** Opaque user data passed on creation. */
+    void                         *pvUser;
     /** File handle. */
     RTFILE                        hFile;
@@ -476 +478 @@
 
         pReqsHead = (PRTAIOMGRREQ)pReqsHead->WorkItem.pNext;
-        pReqsHead->WorkItem.pNext = NULL;
+        pReqCur->WorkItem.pNext = NULL;
         RTListAppend(&pFile->AioMgr.ListWaitingReqs, &pReqCur->NodeWaitingList);
     }
@@ -1003 +1005 @@
     pThis->hMemCacheReqs = NIL_RTMEMCACHE;
     pThis->u32Magic      = ~RTAIOMGR_MAGIC;
+    RTCritSectDelete(&pThis->CritSectBlockingEvent);
+    RTSemEventDestroy(pThis->hEventSemBlock);
     RTMemFree(pThis);
 }
@@ -1025 +1029 @@
 {
     pThis->u32Magic = ~RTAIOMGRFILE_MAGIC;
+    rtAioMgrCloseFile(pThis->pAioMgr, pThis);
     RTAioMgrRelease(pThis->pAioMgr);
     RTMemFree(pThis);
@@ -1122 +1127 @@
         pThis->u32Magic = RTAIOMGR_MAGIC;
         pThis->cRefs    = 1;
+        pThis->enmBlockingEvent = RTAIOMGREVENT_NO_EVENT;
         RTListInit(&pThis->ListFiles);
-        rc = RTMemCacheCreate(&pThis->hMemCacheReqs, sizeof(RTAIOMGRREQ),
-                              0, UINT32_MAX, rtAioMgrReqCtor, rtAioMgrReqDtor, NULL, 0);
+        rc = RTCritSectInit(&pThis->CritSectBlockingEvent);
         if (RT_SUCCESS(rc))
         {
-            rc = RTFileAioCtxCreate(&pThis->hAioCtx, cReqsMax == UINT32_MAX
-                                                     ? RTFILEAIO_UNLIMITED_REQS
-                                                     : cReqsMax,
-                                    RTFILEAIOCTX_FLAGS_WAIT_WITHOUT_PENDING_REQUESTS);
+            rc = RTSemEventCreate(&pThis->hEventSemBlock);
             if (RT_SUCCESS(rc))
             {
-                rc = RTThreadCreateF(&pThis->hThread, rtAioMgrWorker, pThis, 0, RTTHREADTYPE_IO,
-                                     RTTHREADFLAGS_WAITABLE, "AioMgr-%p", pThis);
+                rc = RTMemCacheCreate(&pThis->hMemCacheReqs, sizeof(RTAIOMGRREQ),
+                                      0, UINT32_MAX, rtAioMgrReqCtor, rtAioMgrReqDtor, NULL, 0);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = RTFileAioCtxCreate(&pThis->hAioCtx, cReqsMax == UINT32_MAX
+                                                             ? RTFILEAIO_UNLIMITED_REQS
+                                                             : cReqsMax,
+                                            RTFILEAIOCTX_FLAGS_WAIT_WITHOUT_PENDING_REQUESTS);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = RTThreadCreateF(&pThis->hThread, rtAioMgrWorker, pThis, 0, RTTHREADTYPE_IO,
+                                             RTTHREADFLAGS_WAITABLE, "AioMgr-%u", cReqsMax);
+                        if (RT_FAILURE(rc))
+                        {
+                            rc = RTFileAioCtxDestroy(pThis->hAioCtx);
+                            AssertRC(rc);
+                        }
+                    }
+
+                    if (RT_FAILURE(rc))
+                        RTMemCacheDestroy(pThis->hMemCacheReqs);
+                }
+
                 if (RT_FAILURE(rc))
-                {
-                    rc = RTFileAioCtxDestroy(pThis->hAioCtx);
-                    AssertRC(rc);
-                }
+                    RTSemEventDestroy(pThis->hEventSemBlock);
             }
 
             if (RT_FAILURE(rc))
-                RTMemCacheDestroy(pThis->hMemCacheReqs);
+                RTCritSectDelete(&pThis->CritSectBlockingEvent);
         }
 
@@ -1186 +1206 @@
 
 RTDECL(int) RTAioMgrFileCreate(RTAIOMGR hAioMgr, RTFILE hFile, PFNRTAIOMGRREQCOMPLETE pfnReqComplete,
-                               PRTAIOMGRFILE phAioMgrFile)
+                               void *pvUser, PRTAIOMGRFILE phAioMgrFile)
 {
     int rc = VINF_SUCCESS;
@@ -1203 +1223 @@
         pThis->hFile    = hFile;
         pThis->pAioMgr  = hAioMgr;
+        pThis->pvUser   = pvUser;
         pThis->pfnReqCompleted = pfnReqComplete;
         RTQueueAtomicInit(&pThis->QueueReqs);
+        RTListInit(&pThis->AioMgr.ListWaitingReqs);
         RTAioMgrRetain(hAioMgr);
         rc = RTFileAioCtxAssociateWithFile(pThis->pAioMgr->hAioCtx, hFile);
         if (RT_FAILURE(rc))
             rtAioMgrFileDestroy(pThis);
+        else
+            rtAioMgrAddFile(pThis->pAioMgr, pThis);
     }
     else
@@ -1246 +1270 @@
 }
 
+RTDECL(void *) RTAioMgrFileGetUser(RTAIOMGRFILE hAioMgrFile)
+{
+    PRTAIOMGRFILEINT pThis = hAioMgrFile;
+
+    AssertPtrReturn(pThis, NULL);
+    return pThis->pvUser;
+}
+
 RTDECL(int) RTAioMgrFileRead(RTAIOMGRFILE hAioMgrFile, RTFOFF off,
                              PRTSGBUF pSgBuf, size_t cbRead, void *pvUser)