Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a dead-lock when the thread finishes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-05-16 13:40:12 +00:00
parent e7a5464f56
commit 0dac2f38ef
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/unix/threadpsx.cpp
View File

@@ -277,7 +277,7 @@ private:
// 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.
wxMutex m_mutex; wxMutex m_mutex, m_end_mutex;
wxCondition m_cond; wxCondition m_cond;
// another (mutex, cond) pair for Pause()/Resume() usage // another (mutex, cond) pair for Pause()/Resume() usage
@@ -360,6 +360,8 @@ wxThreadInternal::wxThreadInternal()
// unlocked in the very end // unlocked in the very end
m_mutex.Lock(); m_mutex.Lock();
m_end_mutex.Lock();
// this mutex is used in Pause()/Resume() and is also locked all the time // this mutex is used in Pause()/Resume() and is also locked all the time
// unless the thread is paused // unless the thread is paused
m_mutexSuspend.Lock(); m_mutexSuspend.Lock();
@@ -372,6 +374,7 @@ wxThreadInternal::~wxThreadInternal()
// note that m_mutex will be unlocked by the thread which waits for our // note that m_mutex will be unlocked by the thread which waits for our
// termination // termination
m_end_mutex.Unlock();
} }
wxThreadError wxThreadInternal::Run() wxThreadError wxThreadInternal::Run()
@@ -406,12 +409,12 @@ void wxThreadInternal::Wait()
printf("Entering wait ...\n"); printf("Entering wait ...\n");
// entering Wait() releases the mutex thus allowing SignalExit() to acquire // entering Wait() releases the mutex thus allowing SignalExit() to acquire
// it and to signal us its termination // it and to signal us its termination
m_cond.Wait(m_mutex); m_cond.Wait(m_end_mutex);
printf("Exiting wait ...\n"); printf("Exiting wait ...\n");
// mutex is still in the locked state - relocked on exit from Wait(), so // mutex is still in the locked state - relocked on exit from Wait(), so
// unlock it - we don't need it any more, the thread has already terminated // unlock it - we don't need it any more, the thread has already terminated
m_mutex.Unlock(); m_end_mutex.Unlock();
// reacquire GUI mutex // reacquire GUI mutex
if ( wxThread::IsMain() ) if ( wxThread::IsMain() )
@@ -426,14 +429,14 @@ void wxThreadInternal::SignalExit()
// as mutex is currently locked, this will block until some other thread // as mutex is currently locked, this will block until some other thread
// (normally the same which created this one) unlocks it by entering Wait() // (normally the same which created this one) unlocks it by entering Wait()
m_mutex.Lock(); m_end_mutex.Lock();
printf("Mutex acquired\n"); printf("Mutex acquired\n");
// wake up all the threads waiting for our termination // wake up all the threads waiting for our termination
m_cond.Broadcast(); m_cond.Broadcast();
// after this call mutex will be finally unlocked // after this call mutex will be finally unlocked
m_mutex.Unlock(); m_end_mutex.Unlock();
printf("Mutex unacquired\n"); printf("Mutex unacquired\n");
} }