Changeset 101991 in vbox for trunk/src

Timestamp:

Nov 8, 2023 5:34:06 PM (18 months ago)

Author:

vboxsync

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

160088

Message:

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

File:

• trunk/src/libs/xpcom18a4/xpcom/threads/nsThread.cpp (modified) (8 diffs)

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

@@ -38 +38 @@
 #include "nsThread.h"
 #include "prmem.h"
-#include "prlog.h"
 #include "nsAutoLock.h"
 
 #include <iprt/assert.h>
+#include <VBox/log.h>
 
 RTTLS nsThread::kIThreadSelfIndex = NIL_RTTLS;
 static nsIThread *gMainThread = 0;
 
-#if defined(PR_LOGGING)
-//
-// Log module for nsIThread logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsIThread:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-// gSocketLog is defined in nsSocketTransport.cpp
-//
-PRLogModuleInfo* nsIThreadLog = nsnull;
-
-#endif /* PR_LOGGING */
-
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -69 +51 @@
     : mThread(nsnull), mDead(PR_FALSE), mStartLock(nsnull)
 {
-#if defined(PR_LOGGING)
-    //
-    // Initialize the global PRLogModule for nsIThread logging 
-    // if necessary...
-    //
-    if (nsIThreadLog == nsnull) {
-        nsIThreadLog = PR_NewLogModule("nsIThread");
-    }
-#endif /* PR_LOGGING */
-
     // enforce matching of constants to enums in prthread.h
     NS_ASSERTION(int(nsIThread::PRIORITY_LOW)     == int(PR_PRIORITY_LOW) &&
@@ -96 +68 @@
         PR_DestroyLock(mStartLock);
 
-    PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-           ("nsIThread %p destroyed\n", this));
+    Log(("nsIThread %p destroyed\n", this));
 
     // This code used to free the nsIThreadLog loginfo stuff
@@ -116 +87 @@
     NS_ASSERTION(rv == NS_OK, "failed to set thread self");
 
-    PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-           ("nsIThread %p start run %p\n", self, self->mRunnable.get()));
+    Log(("nsIThread %p start run %p\n", self, self->mRunnable.get()));
     rv = self->mRunnable->Run();
     NS_ASSERTION(NS_SUCCEEDED(rv), "runnable failed");
 
-#ifdef DEBUG
+#ifdef LOG_ENABLED
     // Because a thread can die after gMainThread dies and takes nsIThreadLog with it,
     // we need to check for it being null so that we don't crash on shutdown.
-    if (nsIThreadLog) {
-      PRThreadState state;
-      rv = self->GetState(&state);
-      PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-             ("nsIThread %p end run %p\n", self, self->mRunnable.get()));
-    }
+    PRThreadState state;
+    rv = self->GetState(&state);
+    Log(("nsIThread %p end run %p\n", self, self->mRunnable.get()));
 #endif
 
@@ -149 +116 @@
     self->mDead = PR_TRUE;
 
-#if defined(PR_LOGGING)
-    if (nsIThreadLog) {
-      PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-             ("nsIThread %p exited\n", self));
-    }
-#endif
+    Log(("nsIThread %p exited\n", self));
     NS_RELEASE(self);
 }
@@ -176 +138 @@
     // thread-local storage) before they let us join with the thread
 
-    PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-           ("nsIThread %p start join\n", this));
+    Log(("nsIThread %p start join\n", this));
     if (!mThread)
         return NS_ERROR_NOT_INITIALIZED;
@@ -183 +144 @@
     // XXX can't use NS_RELEASE here because the macro wants to set
     // this to null (bad c++)
-    PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-           ("nsIThread %p end join\n", this));
+    Log(("nsIThread %p end join\n", this));
     if (status == PR_SUCCESS) {
         NS_RELEASE_THIS();   // most likely the final release of this thread 
@@ -279 +239 @@
                               priority, scope, state, stackSize);
     PR_Unlock(mStartLock);
-    PR_LOG(nsIThreadLog, PR_LOG_DEBUG,
-           ("nsIThread %p created\n", this));
+    Log(("nsIThread %p created\n", this));
 
     if (mThread == nsnull)