Changeset 101983 in vbox

Timestamp:

Nov 8, 2023 3:34:44 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Remove unused PR_Sleep, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr/src

Files:

• misc/prinit.c (modified) (2 diffs)
• pthreads/ptthread.c (modified) (3 diffs)

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

@@ -66 +66 @@
 PRFileDesc *_pr_stderr;
 
-PRLock *_pr_sleeplock;  /* used in PR_Sleep(), classic and pthreads */
-
 PRBool _pr_initialized = PR_FALSE;
 
@@ -104 +102 @@
     _PR_InitLocks();
     _PR_InitClock();
-
-    _pr_sleeplock = PR_NewLock();
-    PR_ASSERT(NULL != _pr_sleeplock);
 
     _PR_InitThreads(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);

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

@@ -63 +63 @@
 
 static PRIntn pt_schedpriv = 0;
-extern PRLock *_pr_sleeplock;
 
 static struct _PT_Bookeeping
@@ -508 +507 @@
 }  /* PR_Interrupt */
 
-PR_IMPLEMENT(PRStatus) PR_Sleep(PRIntervalTime ticks)
-{
-    PRStatus rv = PR_SUCCESS;
-
-    if (!_pr_initialized) _PR_ImplicitInitialization();
-
-    if (PR_INTERVAL_NO_WAIT == ticks)
-    {
-        _PT_PTHREAD_YIELD();
-    }
-    else
-    {
-        PRCondVar *cv;
-        PRIntervalTime timein;
-
-        timein = PR_IntervalNow();
-        cv = PR_NewCondVar(_pr_sleeplock);
-        PR_ASSERT(cv != NULL);
-        PR_Lock(_pr_sleeplock);
-        do
-        {
-            PRIntervalTime now = PR_IntervalNow();
-            PRIntervalTime delta = now - timein;
-            if (delta > ticks) break;
-            rv = PR_WaitCondVar(cv, ticks - delta);
-        } while (PR_SUCCESS == rv);
-        PR_Unlock(_pr_sleeplock);
-        PR_DestroyCondVar(cv);
-    }
-    return rv;
-}  /* PR_Sleep */
-
 static void _pt_thread_death(void *arg)
 {
@@ -673 +640 @@
         }
         _pt_thread_death(me);
-        PR_DestroyLock(_pr_sleeplock);
-        _pr_sleeplock = NULL;
+
         _pr_initialized = PR_FALSE;
         return PR_SUCCESS;