Changeset 101981 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Nov 8, 2023 2:07:52 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert plevent.{c,h} to IPRT critical sections and event semaphores, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/threads

Files:

• plevent.c (modified) (8 diffs)
• plevent.h (modified) (2 diffs)

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

@@ -52 +52 @@
 #include "private/pprthred.h"
 
+#include <iprt/errcore.h>
+
 static PRLogModuleInfo *event_lm = NULL;
 
@@ -256 +258 @@
         int i, entryCount;
 
-        event->lock = PR_NewLock();
-        if (!event->lock) {
+        int vrc = RTCritSectInit(&event->lock);
+        if (RT_FAILURE(vrc)) {
           return NULL;
         }
-        event->condVar = PR_NewCondVar(event->lock);
-        if(!event->condVar) {
-          PR_DestroyLock(event->lock);
-          event->lock = NULL;
+
+        vrc = RTSemEventCreate(&event->condVar);
+        if(RT_FAILURE(vrc))
+        {
+          RTCritSectDelete(&event->lock);
           return NULL;
         }
 
-        PR_Lock(event->lock);
+        RTCritSectEnter(&event->lock);
 
         entryCount = PR_GetMonitorEntryCount(self->monitor);
@@ -288 +291 @@
         while (!event->handled) {
             /* wait for event to be handled or destroyed */
-            PR_WaitCondVar(event->condVar, PR_INTERVAL_NO_TIMEOUT);
+            RTCritSectLeave(&event->lock);
+            RTSemEventWait(event->condVar, RT_INDEFINITE_WAIT);
+            RTCritSectEnter(&event->lock);
         }
 
@@ -298 +303 @@
         result = event->synchronousResult;
         event->synchronousResult = NULL;
-        PR_Unlock(event->lock);
+        RTCritSectLeave(&event->lock);
     }
 
@@ -386 +391 @@
 
         if (event->synchronousResult == (void*)PR_TRUE) {
-            PR_Lock(event->lock);
+            RTCritSectEnter(&event->lock);
             event->synchronousResult = NULL;
             event->handled = PR_TRUE;
-            PR_NotifyCondVar(event->condVar);
-            PR_Unlock(event->lock);
+            RTSemEventSignal(event->condVar);
+            RTCritSectLeave(&event->lock);
         }
         else {
@@ -528 +533 @@
     self->synchronousResult = NULL;
     self->handled = PR_FALSE;
-    self->lock = NULL;
-    self->condVar = NULL;
+    self->condVar = NIL_RTSEMEVENT;
 #if defined(XP_UNIX) && !defined(XP_MACOSX)
     self->id = 0;
@@ -553 +557 @@
     result = self->handler(self);
     if (NULL != self->synchronousResult) {
-        PR_Lock(self->lock);
+        RTCritSectEnter(&self->lock);
         self->synchronousResult = result;
         self->handled = PR_TRUE;
-        PR_NotifyCondVar(self->condVar);
-        PR_Unlock(self->lock);
+        RTSemEventSignal(self->condVar);
+        RTCritSectLeave(&self->lock);
     }
     else {
@@ -575 +579 @@
     PR_ASSERT(PR_CLIST_IS_EMPTY(&self->link));
 
-    if(self->condVar)
-      PR_DestroyCondVar(self->condVar);
-    if(self->lock)
-      PR_DestroyLock(self->lock);
+    if(self->condVar != NIL_RTSEMEVENT)
+      RTSemEventDestroy(self->condVar);
+    if(RTCritSectIsInitialized(&self->lock))
+      RTCritSectDelete(&self->lock);
 
     self->destructor(self);

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

@@ -188 +188 @@
 #include "prclist.h"
 #include "prthread.h"
-#include "prlock.h"
 #include "prcvar.h"
 #include "prmon.h"
+
+#include <iprt/critsect.h>
+#include <iprt/semaphore.h>
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -526 +528 @@
     void*                               owner;
     void*                               synchronousResult;
-    PRLock*             lock;
-    PRCondVar*          condVar;
+    RTCRITSECT          lock;
+    RTSEMEVENT          condVar;
     PRBool              handled;
 #ifdef XP_UNIX