Changeset 101905 in vbox

Timestamp:

Nov 6, 2023 9:08:40 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove unused code from nsprpub, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• nsprpub/pr/include/nspr.h (modified) (1 diff)
• nsprpub/pr/include/prcmon.h (deleted)
• nsprpub/pr/include/private/primpl.h (modified) (1 diff)
• nsprpub/pr/src/misc/prinit.c (modified) (1 diff)
• nsprpub/pr/src/threads/prcmon.c (deleted)
• xpcom/threads/nsAutoLock.cpp (modified) (3 diffs)
• xpcom/threads/nsAutoLock.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -170 +170 @@
         nsprpub/pr/include/prbit.h \
         nsprpub/pr/include/prclist.h \
-        nsprpub/pr/include/prcmon.h \
         nsprpub/pr/include/prcvar.h \
         nsprpub/pr/include/prdtoa.h \
@@ -500 +499 @@
         nsprpub/pr/src/misc/prlong.c \
         nsprpub/pr/src/misc/prtime.c \
-        nsprpub/pr/src/threads/prcmon.c \
         nsprpub/pr/src/threads/prtpd.c \
         nsprpub/lib/ds/plarena.c \

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

@@ -42 +42 @@
 #include "prbit.h"
 #include "prclist.h"
-#include "prcmon.h"
 #include "prcvar.h"
 #include "prdtoa.h"

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -511 +511 @@
 extern void _PR_InitMem(void);
 extern void _PR_InitEnv(void);
-extern void _PR_InitCMon(void);
 extern void _PR_InitIO(void);
 extern void _PR_InitLog(void);

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -161 +161 @@
     _PR_InitThreads(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
 
-    _PR_InitCMon();
     _PR_InitIO();
     _PR_InitLog();

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

@@ -163 +163 @@
         OrderTable = 0;
     }
-    PR_CSetOnMonitorRecycle(OnMonitorRecycle);
 }
 
@@ -172 +171 @@
 
     // Called at shutdown, so we don't need to lock.
-    PR_CSetOnMonitorRecycle(0);
     PR_DestroyLock(OrderTableLock);
     OrderTableLock = 0;
@@ -408 +406 @@
 }
 
-// XXX we don't worry about cached monitors being destroyed behind our back.
-// XXX current NSPR (mozilla/nsprpub/pr/src/threads/prcmon.c) never destroys
-// XXX a cached monitor! potential resource pig in conjunction with necko...
-
-void nsAutoCMonitor::Enter()
-{
-#ifdef DEBUG
-    nsAutoLockBase* stackTop =
-        (nsAutoLockBase*) PR_GetThreadPrivate(LockStackTPI);
-    NS_ASSERTION(stackTop == mDown, "non-LIFO nsAutoCMonitor::Enter");
-    mDown = stackTop;
-    (void) PR_SetThreadPrivate(LockStackTPI, this);
-#endif
-    PR_CEnterMonitor(mLockObject);
-    mLockCount += 1;
-}
-
-void nsAutoCMonitor::Exit()
-{
-#ifdef DEBUG
-    (void) PR_SetThreadPrivate(LockStackTPI, mDown);
-#endif
-    PRStatus status = PR_CExitMonitor(mLockObject);
-    NS_ASSERTION(status == PR_SUCCESS, "PR_CExitMonitor failed");
-    mLockCount -= 1;
-}

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

@@ -211 +211 @@
 };
 
-#include "prcmon.h"
+#include "prmon.h"
 #include "nsError.h"
 #include "nsDebug.h"
@@ -317 +317 @@
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// Once again, this time with a cache...
-// (Using this avoids the need to allocate a PRMonitor, which may be useful when
-// a large number of objects of the same class need associated monitors.)
-
-#include "prcmon.h"
-#include "nsError.h"
-
-class NS_COM nsAutoCMonitor : public nsAutoLockBase {
-public:
-    nsAutoCMonitor(void* lockObject)
-        : nsAutoLockBase(lockObject, eAutoCMonitor),
-          mLockObject(lockObject), mLockCount(0)
-    {
-        NS_ASSERTION(lockObject, "null lock object");
-        PR_CEnterMonitor(mLockObject);
-        mLockCount = 1;
-    }
-
-    ~nsAutoCMonitor() {
-        if (mLockCount) {
-#ifdef DEBUG
-            PRStatus status =
-#endif
-            PR_CExitMonitor(mLockObject);
-            NS_ASSERTION(status == PR_SUCCESS, "PR_CExitMonitor failed");
-        }
-    }
-
-    void Enter();
-    void Exit();
-
-    nsresult Wait(PRIntervalTime interval = PR_INTERVAL_NO_TIMEOUT) {
-        return PR_CWait(mLockObject, interval) == PR_SUCCESS
-            ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-    nsresult Notify() {
-        return PR_CNotify(mLockObject) == PR_SUCCESS
-            ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-    nsresult NotifyAll() {
-        return PR_CNotifyAll(mLockObject) == PR_SUCCESS
-            ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-private:
-    void*   mLockObject;
-    PRInt32 mLockCount;
-
-    // Not meant to be implemented. This makes it a compiler error to
-    // construct or assign an nsAutoLock object incorrectly.
-    nsAutoCMonitor(void);
-    nsAutoCMonitor(const nsAutoCMonitor& /*aMon*/);
-    nsAutoCMonitor& operator =(const nsAutoCMonitor& /*aMon*/);
-
-    // Not meant to be implemented. This makes it a compiler error to
-    // attempt to create an nsAutoLock object on the heap.
-    static void* operator new(size_t /*size*/) CPP_THROW_NEW;
-    static void operator delete(void* /*memory*/);
-};
-
 #endif // nsAutoLock_h__