Changeset 102232 in vbox for trunk/src

Timestamp:

Nov 22, 2023 9:44:51 AM (17 months ago)

Author:

vboxsync

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

160357

Message:

libs/xpcom: Remove public PR_Lock and PR_CondVar APIs as they are not used anywhere outside of NSPR, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/nspr.h (modified) (1 diff)
• nsprpub/pr/include/prcvar.h (deleted)
• nsprpub/pr/include/private/primpl.h (modified) (1 diff)
• nsprpub/pr/include/prlock.h (deleted)
• nsprpub/pr/src/pthreads/ptsynch.c (modified) (6 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -167 +167 @@
         nsprpub/pr/include/prbit.h \
         nsprpub/pr/include/prclist.h \
-        nsprpub/pr/include/prcvar.h \
         nsprpub/pr/include/prinrval.h \
-        nsprpub/pr/include/prlock.h \
         nsprpub/pr/include/prlong.h \
         nsprpub/pr/include/prmem.h \

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

@@ -41 +41 @@
 #include "prbit.h"
 #include "prclist.h"
-#include "prcvar.h"
 #include "prinrval.h"
-#include "prlock.h"
 #include "prlong.h"
 #include "prmem.h"

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

@@ -57 +57 @@
 typedef struct _MDLock _MDLock;
 typedef struct _MDCVar _MDCVar;
+
+typedef struct PRLock    PRLock;
+typedef struct PRCondVar PRCondVar;
 
 /*

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c

@@ -51 +51 @@
 #include <iprt/assert.h>
 
-#ifdef VBOX
-/* From the removed obsolete/prsem.h */
-typedef struct PRSemaphore PRSemaphore;
-#endif
-
 static pthread_mutexattr_t _pt_mattr;
 static pthread_condattr_t _pt_cvar_attr;
+
+static void PR_DestroyCondVar(PRCondVar *cvar);
 
 /**************************************************************/
@@ -139 +136 @@
 }  /* pt_PostNotifies */
 
-PR_IMPLEMENT(PRLock*) PR_NewLock(void)
-{
-    PRIntn rv;
-    PRLock *lock;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    lock = PR_NEWZAP(PRLock);
-    if (lock != NULL)
-    {
-        rv = _PT_PTHREAD_MUTEX_INIT(lock->mutex, _pt_mattr); 
-        Assert(0 == rv);
-    }
-    return lock;
-}  /* PR_NewLock */
-
-PR_IMPLEMENT(void) PR_DestroyLock(PRLock *lock)
-{
-    PRIntn rv;
-    Assert(NULL != lock);
-    Assert(PR_FALSE == lock->locked);
-    Assert(0 == lock->notified.length);
-    Assert(NULL == lock->notified.link);
-    rv = pthread_mutex_destroy(&lock->mutex);
-    Assert(0 == rv);
-#if defined(DEBUG)
-    memset(lock, 0xaf, sizeof(PRLock));
-#endif
-    PR_DELETE(lock);
-}  /* PR_DestroyLock */
-
-PR_IMPLEMENT(void) PR_Lock(PRLock *lock)
+static void PR_Lock(PRLock *lock)
 {
     PRIntn rv;
@@ -183 +149 @@
 }  /* PR_Lock */
 
-PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock *lock)
+static PRStatus PR_Unlock(PRLock *lock)
 {
     PRIntn rv;
@@ -296 +262 @@
 }  /* pt_PostNotifyToCvar */
 
-PR_IMPLEMENT(PRCondVar*) PR_NewCondVar(PRLock *lock)
-{
-    PRCondVar *cv = PR_NEW(PRCondVar);
-    Assert(lock != NULL);
-    if (cv != NULL)
-    {
-        int rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-        Assert(0 == rv);
-        cv->lock = lock;
-        cv->notify_pending = 0;
-    }
-    return cv;
-}  /* PR_NewCondVar */
-
-PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
+static void PR_DestroyCondVar(PRCondVar *cvar)
 {
     if (0 > ASMAtomicDecS32(&cvar->notify_pending))
@@ -364 +316 @@
 }  /* PR_WaitCondVar */
 
-PR_IMPLEMENT(PRStatus) PR_NotifyCondVar(PRCondVar *cvar)
+static PRStatus PR_NotifyCondVar(PRCondVar *cvar)
 {
     Assert(cvar != NULL);   
@@ -371 +323 @@
 }  /* PR_NotifyCondVar */
 
-PR_IMPLEMENT(PRStatus) PR_NotifyAllCondVar(PRCondVar *cvar)
+static PRStatus PR_NotifyAllCondVar(PRCondVar *cvar)
 {
     Assert(cvar != NULL);