diff options
Diffstat (limited to 'pr/src/pthreads/ptthread.c')
| -rw-r--r-- | pr/src/pthreads/ptthread.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pr/src/pthreads/ptthread.c b/pr/src/pthreads/ptthread.c index 8e81c202..23189c53 100644 --- a/pr/src/pthreads/ptthread.c +++ b/pr/src/pthreads/ptthread.c @@ -158,16 +158,6 @@ static void *_pt_root(void *arg) /* unhook the thread from the runtime */ PR_Lock(pt_book.ml); - if (thred->state & PT_THREAD_SYSTEM) - pt_book.system -= 1; - else if (--pt_book.user == pt_book.this_many) - PR_NotifyAllCondVar(pt_book.cv); - thred->prev->next = thred->next; - if (NULL == thred->next) - pt_book.last = thred->prev; - else - thred->next->prev = thred->prev; - /* * At this moment, PR_CreateThread() may not have set thred->id yet. * It is safe for a detached thread to free thred only after @@ -178,6 +168,16 @@ static void *_pt_root(void *arg) while (!thred->okToDelete) PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT); } + + if (thred->state & PT_THREAD_SYSTEM) + pt_book.system -= 1; + else if (--pt_book.user == pt_book.this_many) + PR_NotifyAllCondVar(pt_book.cv); + thred->prev->next = thred->next; + if (NULL == thred->next) + pt_book.last = thred->prev; + else + thred->next->prev = thred->prev; PR_Unlock(pt_book.ml); /* @@ -224,7 +224,6 @@ static PRThread* pt_AttachThread(void) PR_ASSERT(0 == rv); thred->state = PT_THREAD_GLOBAL | PT_THREAD_FOREIGN; - thred->io_tq_index = -1; PR_Lock(pt_book.ml); /* then put it into the list */ @@ -363,8 +362,6 @@ static PRThread* _PR_CreateThread( thred->stack->stackSize = stackSize; thred->stack->thr = thred; - thred->io_tq_index = -1; - #ifdef PT_NO_SIGTIMEDWAIT pthread_mutex_init(&thred->suspendResumeMutex,NULL); pthread_cond_init(&thred->suspendResumeCV,NULL); @@ -740,8 +737,6 @@ static void _pt_thread_death(void *arg) PR_Free(thred->privateData); if (NULL != thred->errorString) PR_Free(thred->errorString); - if (NULL != thred->io_cv) - PR_DestroyCondVar(thred->io_cv); PR_Free(thred->stack); #if defined(DEBUG) memset(thred, 0xaf, sizeof(PRThread)); @@ -807,8 +802,6 @@ void _PR_InitThreads( thred->stack->thr = thred; _PR_InitializeStack(thred->stack); - thred->io_tq_index = -1; - /* * Create a key for our use to store a backpointer in the pthread * to our PRThread object. This object gets deleted when the thread |