AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

attempt to fix Delete/Pause deadlock

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-03-22 12:49:05 +00:00
parent 29545b1dc6
commit 862cc6f9cd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/unix/threadpsx.cpp
View File

@ -257,7 +257,7 @@ private:
// this (mutex, cond) pair is used to synchronize the main thread and this // this (mutex, cond) pair is used to synchronize the main thread and this
// thread in several situations: // thread in several situations:
// 1. The thread function blocks until condition is signaled by Run() when // 1. The thread function blocks until condition is signaled by Run() when
// it's initially created - this allows create thread in "suspended" // it's initially created - this allows thread creation in "suspended"
// state // state
// 2. The Delete() function blocks until the condition is signaled when the // 2. The Delete() function blocks until the condition is signaled when the
// thread exits. // thread exits.
@ -279,9 +279,10 @@ void *wxThreadInternal::PthreadStart(void *ptr)
wxThread *thread = (wxThread *)ptr; wxThread *thread = (wxThread *)ptr;
wxThreadInternal *pthread = thread->p_internal; wxThreadInternal *pthread = thread->p_internal;
if ( pthread_setspecific(gs_keySelf, thread) != 0 ) int rc = pthread_setspecific(gs_keySelf, thread);
if ( rc != 0 )
{ {
wxLogError(_("Can not start thread: error writing TLS.")); wxLogSysError(rc, _("Can not start thread: error writing TLS."));
return (void *)-1; return (void *)-1;
} }
@ -387,6 +388,12 @@ void wxThreadInternal::Pause()
wxCHECK_RET( m_state == STATE_PAUSED, wxCHECK_RET( m_state == STATE_PAUSED,
"thread must first be paused with wxThread::Pause()." ); "thread must first be paused with wxThread::Pause()." );
// don't pause the thread which is being terminated - this would lead to
// deadlock if the thread is paused after Delete() had called Resume() but
// before it had time to call Cancel()
if ( m_cancelled )
return;
// wait until the condition is signaled from Resume() // wait until the condition is signaled from Resume()
m_condSuspend.Wait(m_mutexSuspend); m_condSuspend.Wait(m_mutexSuspend);
} }