Changeset 101990 in vbox for trunk/src/libs

Timestamp:

Nov 8, 2023 5:30:18 PM (15 months ago)

Author:

vboxsync

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

160087

Message:

libs/xpcom: Convert plevent.c from PR_LOG to IPRT's logging infrastructure, bugref:10545

File:

• trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c (modified) (21 diffs)

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

@@ -52 +52 @@
 #include "private/pprthred.h"
 
+#include <iprt/assert.h>
 #include <iprt/errcore.h>
-
-static PRLogModuleInfo *event_lm = NULL;
+#include <VBox/log.h>
 
 /*******************************************************************************
@@ -118 +118 @@
     PRMonitor* mon = NULL;
 
-    if (event_lm == NULL)
-        event_lm = PR_NewLogModule("event");
-
     self = PR_NEWZAP(PLEventQueue);
     if (self == NULL) return NULL;
@@ -248 +245 @@
         return NULL;
 
-    PR_ASSERT(event != NULL);
+    Assert(event != NULL);
 
     if (PR_GetCurrentThread() == self->handlerThread) {
@@ -384 +381 @@
 _pl_DestroyEventForOwner(PLEvent* event, void* owner, PLEventQueue* queue)
 {
-    PR_ASSERT(PR_GetMonitorEntryCount(queue->monitor) > 0);
+    Assert(PR_GetMonitorEntryCount(queue->monitor) > 0);
     if (event->owner == owner) {
-        PR_LOG(event_lm, PR_LOG_DEBUG,
-               ("$$$ \tdestroying event %0x for owner %0x", event, owner));
+        Log(("$$$ \tdestroying event %0x for owner %0x", event, owner));
         PL_DequeueEvent(event, queue);
 
@@ -402 +398 @@
     }
     else {
-        PR_LOG(event_lm, PR_LOG_DEBUG,
-               ("$$$ \tskipping event %0x for owner %0x", event, owner));
+        Log(("$$$ \tskipping event %0x for owner %0x", event, owner));
     }
 }
@@ -413 +408 @@
         return;
 
-    PR_LOG(event_lm, PR_LOG_DEBUG,
-         ("$$$ revoking events for owner %0x", owner));
+    Log(("$$$ revoking events for owner %0x", owner));
 
     /*
@@ -421 +415 @@
     */
     PR_EnterMonitor(self->monitor);
-    PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ owner %0x, entered monitor", owner));
+    Log(("$$$ owner %0x, entered monitor", owner));
 
     /*
@@ -434 +428 @@
             PLEvent* event = PR_EVENT_PTR(qp);
             qp = qp->next;
-            PR_ASSERT(event->owner != owner);
+            Assert(event->owner != owner);
         }
     }
@@ -441 +435 @@
     PR_ExitMonitor(self->monitor);
 
-    PR_LOG(event_lm, PR_LOG_DEBUG,
-           ("$$$ revoking events for owner %0x", owner));
+    Log(("$$$ revoking events for owner %0x", owner));
 }
 
@@ -493 +486 @@
             break;
 
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ processing event"));
+        Log(("$$$ processing event"));
         PL_HandleEvent(event);
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ done processing event"));
+        Log(("$$$ done processing event"));
     }
 
@@ -553 +546 @@
 
     /* This event better not be on an event queue anymore. */
-    PR_ASSERT(PR_CLIST_IS_EMPTY(&self->link));
+    Assert(PR_CLIST_IS_EMPTY(&self->link));
 
     result = self->handler(self);
@@ -577 +570 @@
 
     /* This event better not be on an event queue anymore. */
-    PR_ASSERT(PR_CLIST_IS_EMPTY(&self->link));
+    Assert(PR_CLIST_IS_EMPTY(&self->link));
 
     if(self->condVar != NIL_RTSEMEVENT)
@@ -597 +590 @@
        been processed and destroyed or not. */
 
-    PR_ASSERT(queue->handlerThread == PR_GetCurrentThread());
+    Assert(queue->handlerThread == PR_GetCurrentThread());
 
     PR_EnterMonitor(queue->monitor);
 
-    PR_ASSERT(!PR_CLIST_IS_EMPTY(&self->link));
+    Assert(!PR_CLIST_IS_EMPTY(&self->link));
 
 #if 0
@@ -645 +638 @@
     while ((event = PL_GetEvent(self)) == NULL) {
         PRStatus err;
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ waiting for event"));
+        Log(("$$$ waiting for event"));
         err = PR_Wait(mon, PR_INTERVAL_NO_TIMEOUT);
         if ((err == PR_FAILURE)
@@ -668 +661 @@
         }
 
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ processing event"));
+        Log(("$$$ processing event"));
         PL_HandleEvent(event);
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ done processing event"));
+        Log(("$$$ done processing event"));
     }
 }
@@ -760 +753 @@
 # endif
 
-    PR_LOG(event_lm, PR_LOG_DEBUG,
-           ("_pl_NativeNotify: self=%p",
-            self));
+    Log(("_pl_NativeNotify: self=%p", self));
     count = write(self->eventPipe[1], buf, 1);
     if (count == 1)
@@ -789 +780 @@
     PRInt32 count;
     unsigned char c;
-    PR_LOG(event_lm, PR_LOG_DEBUG,
-            ("_pl_AcknowledgeNativeNotify: self=%p",
-             self));
+    Log(("_pl_AcknowledgeNativeNotify: self=%p", self));
     /* consume the byte NativeNotify put in our pipe: */
     count = read(self->eventPipe[0], &c, 1);
@@ -865 +854 @@
     /* make a run loop source */
     eventQueue->mRunLoopSource = CFRunLoopSourceCreate(kCFAllocatorDefault, 0 /* order */, &sourceContext);
-    PR_ASSERT(eventQueue->mRunLoopSource);
+    Assert(eventQueue->mRunLoopSource);
 
     eventQueue->mMainRunLoop = CFRunLoopGetCurrent();
@@ -913 +902 @@
      */
     fullCount = _pl_GetEventCount(aSelf);
-    PR_LOG(event_lm, PR_LOG_DEBUG,
-           ("$$$ fullCount is %d id is %ld\n", fullCount, aID));
+    Log(("$$$ fullCount is %d id is %ld\n", fullCount, aID));
 
     if (fullCount == 0) {
@@ -930 +918 @@
         if (event == NULL)
             break;
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ processing event %ld\n",
-                                        event->id));
+        Log(("$$$ processing event %ld\n", event->id));
         if (event->id >= aID) {
-            PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ skipping event and breaking"));
+            Log(("$$$ skipping event and breaking"));
             break;
         }
@@ -939 +926 @@
         event = PL_GetEvent(aSelf);
         PL_HandleEvent(event);
-        PR_LOG(event_lm, PR_LOG_DEBUG, ("$$$ done processing event"));
+        Log(("$$$ done processing event"));
         count++;
     }