Changeset 102241 in vbox for trunk/src/libs/xpcom18a4/nsprpub

Timestamp:

Nov 22, 2023 10:31:33 AM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove the generic intialization routine from nsprpub now that there is only some lock init done and move it the lock code, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (2 diffs)
• src/misc/prinit.c (deleted)
• src/pthreads/ptsynch.c (modified) (3 diffs)

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

@@ -94 +94 @@
 };
 
-extern void _PR_InitLocks(void);
-
 struct PRCondVar {
     PRLock *lock;               /* associated lock that protects the condition */
@@ -114 +112 @@
 /************************************************************************/
 
-extern PRBool _pr_initialized;
-extern void _PR_ImplicitInitialization(void);
-
 PR_END_EXTERN_C
 

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

@@ -108 +108 @@
 static pthread_condattr_t _pt_cvar_attr;
 
+static PRBool _pr_initialized = PR_FALSE;
+
 static void PR_DestroyCondVar(PRCondVar *cvar);
 
@@ -116 +118 @@
 /**************************************************************/
 
-void _PR_InitLocks(void)
-{
+static void _PR_InitLocks(void)
+{
+    _pr_initialized = PR_TRUE;
+
     int rv;
     rv = _PT_PTHREAD_MUTEXATTR_INIT(&_pt_mattr); 
@@ -395 +399 @@
     PRCondVar *cvar;
 
-    if (!_pr_initialized) _PR_ImplicitInitialization();
+    if (!_pr_initialized) _PR_InitLocks();
 
     cvar = PR_NEWZAP(PRCondVar);