Changeset 46185 in vbox

Timestamp:

May 21, 2013 6:28:49 AM (12 years ago)

Author:

vboxsync

Message:

Runtime: Rename RTWorkQueue to RTQueueAtomic

Location:

trunk

Files:

• include/iprt/queueatomic.h (moved) (moved from trunk/include/iprt/workqueue.h ) (6 diffs)
• src/VBox/Runtime/common/misc/aiomgr.cpp (modified) (4 diffs)

trunk/include/iprt/queueatomic.h

@@ -1 +1 @@
 /** @file
- * IPRT - Generic Work Queue with concurrent access.
+ * IPRT - Generic Work Queue with concurrent atomic access.
  */
 
@@ -24 +24 @@
  */
 
-#ifndef ___iprt_workqueue_h
-#define ___iprt_workqueue_h
+#ifndef ___iprt_queueatomic_h
+#define ___iprt_queueatomic_h
 
 #include <iprt/types.h>
 #include <iprt/asm.h>
 
-/** @defgroup grp_rt_list    RTWorkQueue - Generic Work Queue
+/** @defgroup grp_rt_list    RTQueueAtomic - Generic Work Queue
  * @ingroup grp_rt
  *
@@ -42 +42 @@
  * A work item
  */
-typedef struct RTWORKITEM
+typedef struct RTQUEUEATOMICITEM
 {
     /** Pointer to the next work item in the list. */
-    struct RTWORKITEM * volatile pNext;
-} RTWORKITEM;
+    struct RTQUEUEATOMICITEM * volatile pNext;
+} RTQUEUEATOMICITEM;
 /** Pointer to a work item. */
-typedef RTWORKITEM *PRTWORKITEM;
+typedef RTQUEUEATOMICITEM *PRTQUEUEATOMICITEM;
 /** Pointer to a work item pointer. */
-typedef PRTWORKITEM *PPRTWORKITEM;
+typedef PRTQUEUEATOMICITEM *PPRTQUEUEATOMICITEM;
 
 /**
  * Work queue.
  */
-typedef struct RTWORKQUEUE
+typedef struct RTQUEUEATOMIC
 {
     /* Head of the work queue. */
-    volatile PRTWORKITEM        pHead;
-} RTWORKQUEUE;
+    volatile PRTQUEUEATOMICITEM        pHead;
+} RTQUEUEATOMIC;
 /** Pointer to a work queue. */
-typedef RTWORKQUEUE *PRTWORKQUEUE;
+typedef RTQUEUEATOMIC *PRTQUEUEATOMIC;
 
 /**
@@ -68 +68 @@
  * @param   pWorkQueue          Pointer to an unitialised work queue.
  */
-DECLINLINE(void) RTWorkQueueInit(PRTWORKQUEUE pWorkQueue)
+DECLINLINE(void) RTQueueAtomicInit(PRTQUEUEATOMIC pWorkQueue)
 {
     ASMAtomicWriteNullPtr(&pWorkQueue->pHead);
@@ -79 +79 @@
  * @param   pItem               The item to insert.
  */
-DECLINLINE(void) RTWorkQueueInsert(PRTWORKQUEUE pWorkQueue, PRTWORKITEM pItem)
+DECLINLINE(void) RTQueueAtomicInsert(PRTQUEUEATOMIC pWorkQueue, PRTQUEUEATOMICITEM pItem)
 {
-    PRTWORKITEM pNext = ASMAtomicUoReadPtrT(&pWorkQueue->pHead, PRTWORKITEM);
-    PRTWORKITEM pHeadOld;
+    PRTQUEUEATOMICITEM pNext = ASMAtomicUoReadPtrT(&pWorkQueue->pHead, PRTQUEUEATOMICITEM);
+    PRTQUEUEATOMICITEM pHeadOld;
     pItem->pNext = pNext;
     while (!ASMAtomicCmpXchgExPtr(&pWorkQueue->pHead, pItem, pNext, &pHeadOld))
@@ -99 +99 @@
  * @param   pWorkQueue          The work queue.
  */
-DECLINLINE(PRTWORKITEM) RTWorkQueueRemoveAll(PRTWORKQUEUE pWorkQueue)
+DECLINLINE(PRTQUEUEATOMICITEM) RTQueueAtomicRemoveAll(PRTQUEUEATOMIC pWorkQueue)
 {
-    PRTWORKITEM pHead = ASMAtomicXchgPtrT(&pWorkQueue->pHead, NULL, PRTWORKITEM);
+    PRTQUEUEATOMICITEM pHead = ASMAtomicXchgPtrT(&pWorkQueue->pHead, NULL, PRTQUEUEATOMICITEM);
 
     /* Reverse it. */
-    PRTWORKITEM pCur = pHead;
+    PRTQUEUEATOMICITEM pCur = pHead;
     pHead = NULL;
     while (pCur)
     {
-        PRTWORKITEM pInsert = pCur;
+        PRTQUEUEATOMICITEM pInsert = pCur;
         pCur = pCur->pNext;
         pInsert->pNext = pHead;

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

@@ -36 +36 @@
 #include <iprt/thread.h>
 #include <iprt/assert.h>
-#include <iprt/workqueue.h>
+#include <iprt/critsect.h>
+#include <iprt/semaphore.h>
+#include <iprt/queueatomic.h>
 
 #include "internal/magics.h"
@@ -89 +91 @@
     /** Size of the array. */
     unsigned                      cReqEntries;
-#if 0
     /** Critical section protecting the blocking event handling. */
     RTCRITSECT                    CritSectBlockingEvent;
@@ -109 +110 @@
         volatile PRTAIOMGRFILEINT pFileClose;
     } BlockingEventData;
-#endif
 } RTAIOMGRINT;
 /** Pointer to an internal async I/O manager instance. */
@@ -128 +128 @@
     PRTAIOMGRINT                  pAioMgr;
     /** Work queue for new requests. */
-    RTWORKQUEUE                   WorkQueueReqs;
+    RTQUEUEATOMIC                 QueueReqs;
     /** Data for exclusive use by the assigned async I/O manager. */
     struct