Bug 185687: added PR_CallOnceWithArg, a version of PR_CallOnce that allows

the callers to pass an argument to the call-once function.
Modified files: prinit.h nspr.def prinit.c

nsprpub/pr/include/prinit.h

@@ -220,11 +220,19 @@ typedef struct PRCallOnceType {
 
 typedef PRStatus (PR_CALLBACK *PRCallOnceFN)(void);
 
+typedef PRStatus (PR_CALLBACK *PRCallOnceWithArgFN)(void *arg);
+
 NSPR_API(PRStatus) PR_CallOnce(
     PRCallOnceType *once,
     PRCallOnceFN    func
 );
 
+NSPR_API(PRStatus) PR_CallOnceWithArg(
+    PRCallOnceType      *once,
+    PRCallOnceWithArgFN  func,
+    void                *arg
+);
+
 
 PR_END_EXTERN_C
 

nsprpub/pr/src/misc/prinit.c

@@ -819,6 +819,31 @@ PR_IMPLEMENT(PRStatus) PR_CallOnce(
     return once->status;
 }
 
+PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg(
+    PRCallOnceType      *once,
+    PRCallOnceWithArgFN  func,
+    void                *arg)
+{
+    if (!_pr_initialized) _PR_ImplicitInitialization();
+
+    if (!once->initialized) {
+	if (PR_AtomicSet(&once->inProgress, 1) == 0) {
+	    once->status = (*func)(arg);
+	    PR_Lock(mod_init.ml);
+	    once->initialized = 1;
+	    PR_NotifyAllCondVar(mod_init.cv);
+	    PR_Unlock(mod_init.ml);
+	} else {
+	    PR_Lock(mod_init.ml);
+	    while (!once->initialized) {
+		PR_WaitCondVar(mod_init.cv, PR_INTERVAL_NO_TIMEOUT);
+            }
+	    PR_Unlock(mod_init.ml);
+	}
+    }
+    return once->status;
+}
+
 PRBool _PR_Obsolete(const char *obsolete, const char *preferred)
 {
 #if defined(DEBUG)

nsprpub/pr/src/nspr.def

@@ -392,5 +392,6 @@ NSPR_4.1 {
 
 NSPR_4.3 {
 	global:
+		PR_CallOnceWithArg;
 		PR_GetLibraryFilePathname;
 } NSPR_4.1;