Update to NSPR 4.10.4.

nspr/pr/src/threads/combined/prucv.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
 #include "primpl.h"
 #include "prinrval.h"
 #include "prtypes.h"
 
@@ skipping 428 matching lines @@
 ** Condition variables are synchronization objects that threads can use
 ** to wait for some condition to occur.
 **
 ** This may fail if memory is tight or if some operating system resource
 ** is low.
 */
 PR_IMPLEMENT(PRCondVar*) PR_NewCondVar(PRLock *lock)
 {
     PRCondVar *cvar;
 
-    PR_ASSERT(lock != NULL);
-
     cvar = PR_NEWZAP(PRCondVar);
     if (cvar) {
-#ifdef _PR_GLOBAL_THREADS_ONLY
-        if(_PR_MD_NEW_CV(&cvar->md)) {
-                PR_DELETE(cvar);
-                PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-                return NULL;
-        }
-#endif
-        if (_PR_MD_NEW_LOCK(&(cvar->ilock)) == PR_FAILURE) {
-                PR_DELETE(cvar);
-                PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
-                return NULL;
-        }
-    cvar->lock = lock;
-        PR_INIT_CLIST(&cvar->condQ);
-
+        if (_PR_InitCondVar(cvar, lock) != PR_SUCCESS) {
+            PR_DELETE(cvar);
+            return NULL;
+        }
     } else {
         PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
     return cvar;
 }
 
+PRStatus _PR_InitCondVar(PRCondVar *cvar, PRLock *lock)
+{
+    PR_ASSERT(lock != NULL);
+
+#ifdef _PR_GLOBAL_THREADS_ONLY
+    if(_PR_MD_NEW_CV(&cvar->md)) {
+        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
+        return PR_FAILURE;
+    }
+#endif
+    if (_PR_MD_NEW_LOCK(&(cvar->ilock)) != PR_SUCCESS) {
+        PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, 0);
+        return PR_FAILURE;
+    }
+    cvar->lock = lock;
+    PR_INIT_CLIST(&cvar->condQ);
+    return PR_SUCCESS;
+}
+
 /*
 ** Destroy a condition variable. There must be no thread
 ** waiting on the condvar. The caller is responsible for guaranteeing
 ** that the condvar is no longer in use.
 **
 */
 PR_IMPLEMENT(void) PR_DestroyCondVar(PRCondVar *cvar)
 {
+    _PR_FreeCondVar(cvar);
+    PR_DELETE(cvar);
+}
+
+void _PR_FreeCondVar(PRCondVar *cvar)
+{
     PR_ASSERT(cvar->condQ.next == &cvar->condQ);
 
 #ifdef _PR_GLOBAL_THREADS_ONLY
     _PR_MD_FREE_CV(&cvar->md);
 #endif
     _PR_MD_FREE_LOCK(&(cvar->ilock));
- 
-    PR_DELETE(cvar);
 }
 
 /*
 ** Wait for a notify on the condition variable. Sleep for "tiemout" amount
 ** of ticks (if "timeout" is zero then the sleep is indefinite). While
 ** the thread is waiting it unlocks lock. When the wait has
 ** finished the thread regains control of the condition variable after
 ** locking the associated lock.
 **
 ** The thread waiting on the condvar will be resumed when the condvar is
@@ skipping 136 matching lines @@
                 PR_LOG(_pr_cvar_lm, PR_LOG_MIN, ("PR_NotifyAll: cvar=%p", cvar));
                 _PR_NotifyThread(_PR_THREAD_CONDQ_PTR(q), me);
                 q = q->next;
     }
         _PR_MD_UNLOCK( &(cvar->ilock) );
     if (!_PR_IS_NATIVE_THREAD(me)) _PR_INTSON(is);
 
     return PR_SUCCESS;
 }  /* PRP_NakedBroadcast */