Changeset 39503 in vbox

Timestamp:

Dec 1, 2011 9:36:44 PM (13 years ago)

Author:

vboxsync

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

75174

Message:

RTReq: Bugfix and some more refactoring.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/req.h (modified) (4 diffs)
• src/VBox/Runtime/common/misc/req.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/misc/reqqueue.cpp (modified) (3 diffs)

trunk/include/iprt/mangling.h

@@ -1016 +1016 @@
 # define RTRandU64                                      RT_MANGLER(RTRandU64)
 # define RTRandU64Ex                                    RT_MANGLER(RTRandU64Ex)
-# define RTReqQueueAlloc                                     RT_MANGLER(RTReqQueueAlloc)
-# define RTReqQueueCall                                      RT_MANGLER(RTReqQueueCall)
-# define RTReqQueueCallEx                                    RT_MANGLER(RTReqQueueCallEx)
-# define RTReqQueueCallV                                     RT_MANGLER(RTReqQueueCallV)
-# define RTReqQueueCallVoid                                  RT_MANGLER(RTReqQueueCallVoid)
+# define RTReqQueueAlloc                                RT_MANGLER(RTReqQueueAlloc)
+# define RTReqQueueCall                                 RT_MANGLER(RTReqQueueCall)
+# define RTReqQueueCallEx                               RT_MANGLER(RTReqQueueCallEx)
+# define RTReqQueueCallV                                RT_MANGLER(RTReqQueueCallV)
+# define RTReqQueueCallVoid                             RT_MANGLER(RTReqQueueCallVoid)
 # define RTReqQueueCreate                               RT_MANGLER(RTReqQueueCreate)
 # define RTReqQueueDestroy                              RT_MANGLER(RTReqQueueDestroy)
 # define RTReqFree                                      RT_MANGLER(RTReqFree)
-# define RTReqQueueIsBusy                                    RT_MANGLER(RTReqQueueIsBusy)
-# define RTReqQueueProcess                                   RT_MANGLER(RTReqQueueProcess)
-# define RTReqSubmit                                     RT_MANGLER(RTReqSubmit)
+# define RTReqQueueIsBusy                               RT_MANGLER(RTReqQueueIsBusy)
+# define RTReqQueueProcess                              RT_MANGLER(RTReqQueueProcess)
+# define RTReqSubmit                                    RT_MANGLER(RTReqSubmit)
 # define RTReqWait                                      RT_MANGLER(RTReqWait)
+# define RTReqGetStatus                                 RT_MANGLER(RTReqGetStatus)
 # define RTS3BucketsDestroy                             RT_MANGLER(RTS3BucketsDestroy)
 # define RTS3Create                                     RT_MANGLER(RTS3Create)

trunk/include/iprt/req.h

@@ -107 +107 @@
  * This is used to request an action in the queue handler thread.
  */
+#if defined(IN_RT) || defined(IN_RT_R3) || defined(IN_RT_R0) || defined(IN_RT_RC)
 typedef struct RTREQ
 {
@@ -116 +117 @@
     volatile bool           fPoolOrQueue;
     /** IPRT status code for the completed request. */
-    volatile int32_t        iStatus;
+    volatile int32_t        iStatusX;
     /** Request state. */
     volatile RTREQSTATE     enmState;
@@ -155 +156 @@
     } u;
 } RTREQ;
+#else
+typedef struct RTREQ RTREQ;
+#endif
 /** Pointer to an RT request packet. */
 typedef RTREQ *PRTREQ;
@@ -375 +379 @@
 RTDECL(int) RTReqWait(PRTREQ pReq, RTMSINTERVAL cMillies);
 
+/**
+ * Get the status of the request.
+ *
+ * @returns Status code in the IPRT tradition.
+ *
+ * @param   pReq            The request.
+ */
+RTDECL(int) RTReqGetStatus(PRTREQ pReq);
 
 #endif /* IN_RING3 */

trunk/src/VBox/Runtime/common/misc/req.cpp

@@ -78 +78 @@
      */
     pReq->enmState = RTREQSTATE_FREE;
-    pReq->iStatus  = VERR_RT_REQUEST_STATUS_FREED;
+    pReq->iStatusX = VERR_RT_REQUEST_STATUS_FREED;
     pReq->enmType  = RTREQTYPE_INVALID;
 
@@ -211 +211 @@
 }
 RT_EXPORT_SYMBOL(RTReqWait);
+
+
+RTDECL(int) RTReqGetStatus(PRTREQ pReq)
+{
+    AssertPtrReturn(pReq, VERR_INVALID_POINTER);
+    AssertReturn(pReq->u32Magic == RTREQ_MAGIC, VERR_INVALID_POINTER);
+    return pReq->iStatusX;
+}
+RT_EXPORT_SYMBOL(RTReqGetStatus);
+
 
 
@@ -331 +341 @@
      * Complete the request.
      */
-    pReq->iStatus  = rcReq;
+    pReq->iStatusX = rcReq;
     pReq->enmState = RTREQSTATE_COMPLETED;
     if (pReq->fFlags & RTREQFLAGS_NO_WAIT)

trunk/src/VBox/Runtime/common/misc/reqqueue.cpp

@@ -82 +82 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pQueue->apReqFree); i++)
     {
-        PRTREQ pReq = (PRTREQ)ASMAtomicXchgPtr(&pQueue->apReqFree[i], NULL);
+        PRTREQ pReq = (PRTREQ)ASMAtomicXchgPtr((void **)&pQueue->apReqFree[i], NULL);
         while (pReq)
         {
@@ -419 +419 @@
             Assert(pReq->uOwner.hQueue == pQueue);
             ASMAtomicWriteNullPtr(&pReq->pNext);
-            pReq->iStatus  = VERR_RT_REQUEST_STATUS_STILL_PENDING;
+            pReq->iStatusX = VERR_RT_REQUEST_STATUS_STILL_PENDING;
             pReq->enmState = RTREQSTATE_ALLOCATED;
             pReq->fFlags   = RTREQFLAGS_IPRT_STATUS;
@@ -454 +454 @@
     pReq->fEventSemClear= true;
     pReq->fPoolOrQueue  = false;
-    pReq->iStatus       = VERR_RT_REQUEST_STATUS_STILL_PENDING;
+    pReq->iStatusX      = VERR_RT_REQUEST_STATUS_STILL_PENDING;
     pReq->enmState      = RTREQSTATE_ALLOCATED;
     pReq->pNext         = NULL;