Changeset 101993 in vbox

Timestamp:

Nov 8, 2023 5:44:34 PM (15 months ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/libs/xpcom18a4/xpcom/threads/nsEventQueue.cpp (modified) (13 diffs)

trunk/src/libs/xpcom18a4/xpcom/threads/nsEventQueue.cpp

@@ -46 +46 @@
 #include "nsString.h"
 
-#include "prlog.h"
-
 #ifdef NS_DEBUG
 #include "prprf.h"
 #endif
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-/* found these logs useful in conjunction with netlibStreamEvent logging
-   from netwerk. */
-PRLogModuleInfo* gEventQueueLog = 0;
-PRUint32 gEventQueueLogCount = 0;
-PRUint32 gEventQueueLogPPCount = 0;
-static int gEventQueueLogPPLevel = 0;
-static PLEventQueue *gEventQueueLogQueue = 0;
-static PRThread *gEventQueueLogThread = 0;
-#endif
+#include <VBox/log.h>
 
 // in a real system, these would be members in a header class...
@@ -113 +102 @@
   */
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: Created [queue=%lx]",(long)mEventQueue));
-  ++gEventQueueLogCount;
-#endif
+  Log(("EventQueue: Created [queue=%lx]\n",(long)mEventQueue));
 
   mYoungerQueue = nsnull;
@@ -129 +114 @@
   Unlink();
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: Destroyed [queue=%lx]",(long)mEventQueue));
-  ++gEventQueueLogCount;
-#endif
+  Log(("EventQueue: Destroyed [queue=%lx]\n",(long)mEventQueue));
 
   if (mEventQueue) {
@@ -207 +188 @@
   mAcceptingEvents = PR_FALSE;
   CheckForDeactivation();
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: StopAccepting [queue=%lx, accept=%d, could=%d]",
-         (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-  ++gEventQueueLogCount;
-#endif
+
+  Log(("EventQueue: StopAccepting [queue=%lx, accept=%d, could=%d]\n",
+       (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
   return NS_OK;
 }
@@ -246 +224 @@
 {
   if (!mAcceptingEvents) {
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-    PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-           ("EventQueue: Punt posted event [queue=%lx, accept=%d, could=%d]",
+
+    Log(("EventQueue: Punt posted event [queue=%lx, accept=%d, could=%d]\n",
          (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-  ++gEventQueueLogCount;
-#endif
+
     nsresult rv = NS_ERROR_FAILURE;
     NS_ASSERTION(mElderQueue, "event dropped because event chain is dead");
@@ -261 +237 @@
     return rv;
   }
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: Posting event [queue=%lx]", (long)mEventQueue));
-  ++gEventQueueLogCount;
-#endif
+
+  Log(("EventQueue: Posting event [queue=%lx]\n", (long)mEventQueue));
   return PL_PostEvent(mEventQueue, aEvent) == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE;
 }
@@ -273 +246 @@
 {
   if (!mAcceptingEvents) {
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-    PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-           ("EventQueue: Punt posted synchronous event [queue=%lx, accept=%d, could=%d]",
+    Log(("EventQueue: Punt posted synchronous event [queue=%lx, accept=%d, could=%d]\n",
          (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-  ++gEventQueueLogCount;
-#endif
+
     nsresult rv = NS_ERROR_NO_INTERFACE;
     NS_ASSERTION(mElderQueue, "event dropped because event chain is dead");
@@ -290 +260 @@
   }
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: Posting synchronous event [queue=%lx]", (long)mEventQueue));
-  ++gEventQueueLogCount;
-#endif
+  Log(("EventQueue: Posting synchronous event [queue=%lx]\n", (long)mEventQueue));
   void* result = PL_PostSynchronousEvent(mEventQueue, aEvent);
   if (aResult)
@@ -377 +343 @@
   if (!correctThread)
     return NS_ERROR_FAILURE;
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  ++gEventQueueLogPPLevel;
-  if ((gEventQueueLogQueue != mEventQueue || gEventQueueLogThread != PR_GetCurrentThread() ||
-       gEventQueueLogCount != gEventQueueLogPPCount) && gEventQueueLogPPLevel == 1) {
-    PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-           ("EventQueue: Process pending [queue=%lx, accept=%d, could=%d]",
-           (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-    gEventQueueLogPPCount = ++gEventQueueLogCount;
-    gEventQueueLogQueue = mEventQueue;
-    gEventQueueLogThread = PR_GetCurrentThread();
-  }
-#endif
+
+  Log(("EventQueue: Process pending [queue=%lx, accept=%d, could=%d]\n",
+       (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
   PL_ProcessPendingEvents(mEventQueue);
 
@@ -403 +360 @@
       elder->ProcessPendingEvents();
   }
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  --gEventQueueLogPPLevel;
-#endif
+
   return NS_OK;
 }
@@ -446 +401 @@
     return NS_ERROR_FAILURE;
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: handle event [queue=%lx, accept=%d, could=%d]",
-         (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-  ++gEventQueueLogCount;
-#endif
+  Log(("EventQueue: handle event [queue=%lx, accept=%d, could=%d]\n",
+       (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
+
   PL_HandleEvent(aEvent);
   return NS_OK;
@@ -464 +416 @@
       return NS_ERROR_FAILURE;
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: wait for event [queue=%lx, accept=%d, could=%d]",
+    Log(("EventQueue: wait for event [queue=%lx, accept=%d, could=%d]\n",
          (long)mEventQueue,(int)mAcceptingEvents,(int)mCouldHaveEvents));
-  ++gEventQueueLogCount;
-#endif
+
     *aResult = PL_WaitForEvent(mEventQueue);
     CheckForDeactivation();
@@ -547 +496 @@
                                 old = mElderQueue;
 
-#if defined(PR_LOGGING) && defined(DEBUG_danm)
-  PR_LOG(gEventQueueLog, PR_LOG_DEBUG,
-         ("EventQueue: unlink [queue=%lx, younger=%lx, elder=%lx]",
-         (long)mEventQueue,(long)mYoungerQueue, (long)mElderQueue.get()));
-  ++gEventQueueLogCount;
-#endif
+  Log(("EventQueue: unlink [queue=%lx, younger=%lx, elder=%lx]\n",
+       (long)mEventQueue,(long)mYoungerQueue, (long)mElderQueue.get()));
 
   // this is probably OK, but shouldn't happen by design, so tell me if it does