Changeset 102213 in vbox for trunk/src/libs

Timestamp:

Nov 21, 2023 2:29:32 PM (16 months ago)

Author:

vboxsync

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

160338

Message:

libs/xpcom: As PR_Interrupt() is not existing anymore it issafe to drop the PRThread::waiting member and remove ode setting it, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (1 diff)
• src/pthreads/ptsynch.c (modified) (4 diffs)

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

@@ -258 +258 @@
     pthread_t id;                   /* pthread identifier for the thread */
     PRBool okToDelete;              /* ok to delete the PRThread struct? */
-    PRCondVar *waiting;             /* where the thread is waiting | NULL */
     void *sp;                       /* recorded sp for garbage collection */
     PRThread *next, *prev;          /* simple linked list of all threads */

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

@@ -322 +322 @@
 {
     PRIntn rv;
-    PRThread *thred = PR_GetCurrentThread();
 
     Assert(cvar != NULL);
@@ -330 +329 @@
     /* and it better be by us */
     Assert(pthread_equal(cvar->lock->owner, pthread_self()));
-
-    if (_PT_THREAD_INTERRUPTED(thred)) goto aborted;
-
-    /*
-     * The thread waiting is used for PR_Interrupt
-     */
-    thred->waiting = cvar;  /* this is where we're waiting */
 
     /*
@@ -365 +357 @@
 
     Assert(0 == cvar->lock->notified.length);
-    thred->waiting = NULL;  /* and now we're not */
-    if (_PT_THREAD_INTERRUPTED(thred)) goto aborted;
     if (rv != 0)
     {
@@ -372 +362 @@
     }
     return PR_SUCCESS;
-
-aborted:
-    thred->state &= ~PT_THREAD_ABORTED;
-    return PR_FAILURE;
 }  /* PR_WaitCondVar */