Changeset 102459 in vbox

Timestamp:

Dec 5, 2023 8:12:45 AM (12 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert the sole user of prclist.h to IPRT's RTList* API and remove it, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/nspr.h (modified) (1 diff)
• nsprpub/pr/include/prclist.h (deleted)
• xpcom/threads/plevent.c (modified) (14 diffs)
• xpcom/threads/plevent.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -156 +156 @@
         nsprpub/lib/ds/plhash.h \
         nsprpub/pr/include/prbit.h \
-        nsprpub/pr/include/prclist.h \
         nsprpub/pr/include/prinrval.h \
         nsprpub/pr/include/prlong.h \

trunk/src/libs/xpcom18a4/nsprpub/pr/include/nspr.h

@@ -44 +44 @@
 
 #include "prbit.h"
-#include "prclist.h"
 #include "prinrval.h"
 #include "prlong.h"

trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c

@@ -70 +70 @@
 struct PLEventQueue {
     const char*         name;
-    PRCList             queue;
+    RTLISTANCHOR        queue;
     PRMonitor*          monitor;
     RTTHREAD            handlerThread;
@@ -129 +129 @@
     self->notified = PR_FALSE;
 
-    PR_INIT_CLIST(&self->queue);
+    RTListInit(&self->queue);
     if ( qtype == EventQueueIsNative ) {
         err = _pl_SetupNativeNotifier(self);
@@ -212 +212 @@
     /* insert event into thread's event queue: */
     if (event != NULL) {
-        PR_APPEND_LINK(&event->link, &self->queue);
+        RTListAppend(&self->queue, &event->link);
     }
 
@@ -319 +319 @@
     PR_EnterMonitor(self->monitor);
 
-    if (!PR_CLIST_IS_EMPTY(&self->queue)) {
+    if (!RTListIsEmpty(&self->queue)) {
         if ( self->type == EventQueueIsNative &&
              self->notified                   &&
@@ -332 +332 @@
 
         /* then grab the event and return it: */
-        event = PR_EVENT_PTR(self->queue.next);
-        PR_REMOVE_AND_INIT_LINK(&event->link);
+        event = RTListGetFirst(&self->queue, PLEvent, link);
+        RTListNodeRemove(&event->link);
+        RTListInit(&event->link);
     }
 
@@ -351 +352 @@
     PR_EnterMonitor(self->monitor);
 
-    if (!PR_CLIST_IS_EMPTY(&self->queue))
+    if (!RTListIsEmpty(&self->queue))
         result = PR_TRUE;
 
@@ -361 +362 @@
 PL_MapEvents(PLEventQueue* self, PLEventFunProc fun, void* data)
 {
-    PRCList* qp;
-
     if (self == NULL)
         return;
 
     PR_EnterMonitor(self->monitor);
-    qp = self->queue.next;
-    while (qp != &self->queue) {
-        PLEvent* event = PR_EVENT_PTR(qp);
-        qp = qp->next;
-        (*fun)(event, data, self);
+    PLEvent *pIt, *pItNext;
+    RTListForEachSafe(&self->queue, pIt, pItNext, PLEvent, link)
+    {
+        (*fun)(pIt, data, self);
     }
     PR_ExitMonitor(self->monitor);
@@ -422 +420 @@
 #ifdef DEBUG
     {
-        PRCList* qp = self->queue.next;
-        while (qp != &self->queue) {
-            PLEvent* event = PR_EVENT_PTR(qp);
-            qp = qp->next;
-            Assert(event->owner != owner);
+        PLEvent *pIt;
+        RTListForEach(&self->queue, pIt, PLEvent, link)
+        {
+            Assert(pIt->owner != owner);
         }
     }
@@ -439 +436 @@
 _pl_GetEventCount(PLEventQueue* self)
 {
-    PRCList* node;
     PRInt32  count = 0;
 
     PR_EnterMonitor(self->monitor);
-    node = PR_LIST_HEAD(&self->queue);
-    while (node != &self->queue) {
+    PLEvent *pIt;
+    RTListForEach(&self->queue, pIt, PLEvent, link)
+    {
         count++;
-        node = PR_NEXT_LINK(node);
     }
     PR_ExitMonitor(self->monitor);
@@ -518 +514 @@
              PLDestroyEventProc destructor)
 {
-    PR_INIT_CLIST(&self->link);
+    RTListInit(&self->link);
     self->handler = handler;
     self->destructor = destructor;
@@ -544 +540 @@
 
     /* This event better not be on an event queue anymore. */
-    Assert(PR_CLIST_IS_EMPTY(&self->link));
+    Assert(RTListIsEmpty(&self->link));
 
     result = self->handler(self);
@@ -568 +564 @@
 
     /* This event better not be on an event queue anymore. */
-    Assert(PR_CLIST_IS_EMPTY(&self->link));
+    Assert(RTListIsEmpty(&self->link));
 
     if(self->condVar != NIL_RTSEMEVENT)
@@ -592 +588 @@
     PR_EnterMonitor(queue->monitor);
 
-    Assert(!PR_CLIST_IS_EMPTY(&self->link));
+    Assert(!RTListIsEmpty(&self->link));
 
 #if 0
@@ -604 +600 @@
 #endif
 
-    PR_REMOVE_AND_INIT_LINK(&self->link);
+    RTListNodeRemove(&self->link);
+    RTListInit(&self->link);
 
     PR_ExitMonitor(queue->monitor);

trunk/src/libs/xpcom18a4/xpcom/threads/plevent.h

@@ -186 +186 @@
 
 #include "prtypes.h"
-#include "prclist.h"
 #include "prmon.h"
 
 #include <iprt/critsect.h>
+#include <iprt/list.h>
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
@@ -522 +522 @@
 
 struct PLEvent {
-    PRCList                             link;
+    RTLISTNODE                  link;
     PLHandleEventProc   handler;
     PLDestroyEventProc  destructor;