X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5092b3add7a7c5d3d710bc18f9b80d10683d3f76..dc26b37a91938777fcd582bf06619fb1a9e04277:/src/unix/threadpsx.cpp?ds=sidebyside diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index 707eb0928f..130ea38598 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -47,10 +47,6 @@ #include #endif -#ifdef __WXGTK12__ -#include "gtk/gtk.h" -#endif - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -85,10 +81,8 @@ static pthread_t gs_tidMain; // the key for the pointer to the associated wxThread object static pthread_key_t gs_keySelf; -#ifndef __WXGTK12__ // this mutex must be acquired before any call to a GUI function static wxMutex *gs_mutexGui; -#endif // ============================================================================ // implementation @@ -107,6 +101,7 @@ public: wxMutex::wxMutex() { p_internal = new wxMutexInternal; + pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL ); m_locked = 0; } @@ -277,7 +272,9 @@ private: // state // 2. The Delete() function blocks until the condition is signaled when the // thread exits. - wxMutex m_mutex; + // GL: On Linux, this may fail because we can have a deadlock in either + // SignalExit() or Wait(): so we add m_end_mutex for the finalization. + wxMutex m_mutex, m_end_mutex; wxCondition m_cond; // another (mutex, cond) pair for Pause()/Resume() usage @@ -311,7 +308,6 @@ void *wxThreadInternal::PthreadStart(void *ptr) // wait for the condition to be signaled from Run() // mutex state: currently locked by the thread which created us pthread->m_cond.Wait(pthread->m_mutex); - // mutex state: locked again on exit of Wait() // call the main entry @@ -359,6 +355,11 @@ wxThreadInternal::wxThreadInternal() // this mutex is locked during almost all thread lifetime - it will only be // unlocked in the very end m_mutex.Lock(); + + // this mutex is used by wxThreadInternal::Wait() and by + // wxThreadInternal::SignalExit(). We don't use m_mutex because of a + // possible deadlock in either Wait() or SignalExit(). + m_end_mutex.Lock(); // this mutex is used in Pause()/Resume() and is also locked all the time // unless the thread is paused @@ -372,6 +373,17 @@ wxThreadInternal::~wxThreadInternal() // note that m_mutex will be unlocked by the thread which waits for our // termination + + // In the case, we didn't start the thread, all these mutex are locked: + // we must unlock them. + if (m_mutex.IsLocked()) + m_mutex.Unlock(); + + if (m_end_mutex.IsLocked()) + m_end_mutex.Unlock(); + + if (m_mutexSuspend.IsLocked()) + m_mutexSuspend.Unlock(); } wxThreadError wxThreadInternal::Run() @@ -403,15 +415,16 @@ void wxThreadInternal::Wait() if ( wxThread::IsMain() ) wxMutexGuiLeave(); - printf("Entering wait ...\n"); // entering Wait() releases the mutex thus allowing SignalExit() to acquire // it and to signal us its termination - m_cond.Wait(m_mutex); - printf("Exiting wait ...\n"); + m_cond.Wait(m_end_mutex); // 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 - m_mutex.Unlock(); + m_end_mutex.Unlock(); + + // After that, we wait for the real end of the other thread. + pthread_join(GetId(), NULL); // reacquire GUI mutex if ( wxThread::IsMain() ) @@ -420,21 +433,18 @@ void wxThreadInternal::Wait() void wxThreadInternal::SignalExit() { - printf("SignalExit\n"); // GL: Unlock mutexSuspend here. m_mutexSuspend.Unlock(); // as mutex is currently locked, this will block until some other thread // (normally the same which created this one) unlocks it by entering Wait() - m_mutex.Lock(); - printf("Mutex acquired\n"); + m_end_mutex.Lock(); // wake up all the threads waiting for our termination m_cond.Broadcast(); // after this call mutex will be finally unlocked - m_mutex.Unlock(); - printf("Mutex unacquired\n"); + m_end_mutex.Unlock(); } void wxThreadInternal::Pause() @@ -659,13 +669,17 @@ wxThreadError wxThread::Resume() wxThread::ExitCode wxThread::Delete() { + if (IsPaused()) + Resume(); + m_critsect.Enter(); wxThreadState state = p_internal->GetState(); - m_critsect.Leave(); // ask the thread to stop p_internal->SetCancelFlag(); + m_critsect.Leave(); + switch ( state ) { case STATE_NEW: @@ -683,6 +697,8 @@ wxThread::ExitCode wxThread::Delete() // wait until the thread stops p_internal->Wait(); } + //GL: As we must auto-destroy, the destruction must happen here. + delete this; return NULL; } @@ -704,6 +720,8 @@ wxThreadError wxThread::Kill() return wxTHREAD_MISC_ERROR; } + //GL: As we must auto-destroy, the destruction must happen here (2). + delete this; return wxTHREAD_NO_ERROR; } @@ -713,20 +731,16 @@ void wxThread::Exit(void *status) { // first call user-level clean up code OnExit(); - printf(" ... OnExit()\n"); // next wake up the threads waiting for us (OTOH, this function won't return // until someone waited for us!) p_internal->SignalExit(); - printf(" ... SignalExit()\n"); p_internal->SetState(STATE_EXITED); - printf(" ... SetState()\n"); // delete both C++ thread object and terminate the OS thread object // GL: This is very ugly and buggy ... // delete this; - printf(" ... Exit\n"); pthread_exit(status); } @@ -752,6 +766,14 @@ bool wxThread::TestDestroy() wxThread::~wxThread() { + m_critsect.Enter(); + if (p_internal->GetState() != STATE_EXITED && + p_internal->GetState() != STATE_NEW) + wxLogDebug(_T("The thread is being destroyed althought it is still running ! The application may crash.")); + + m_critsect.Leave(); + + delete p_internal; // remove this thread from the global array gs_allThreads.Remove(this); } @@ -816,15 +838,11 @@ bool wxThreadModule::OnInit() return FALSE; } -#ifndef __WXGTK12__ gs_mutexGui = new wxMutex(); -#endif gs_tidMain = pthread_self(); -#ifndef __WXGTK12__ gs_mutexGui->Lock(); -#endif return TRUE; } @@ -843,12 +861,10 @@ void wxThreadModule::OnExit() gs_allThreads[n]->Delete(); } -#ifndef __WXGTK12__ // destroy GUI mutex gs_mutexGui->Unlock(); delete gs_mutexGui; -#endif // and free TLD slot (void)pthread_key_delete(gs_keySelf); @@ -860,20 +876,12 @@ void wxThreadModule::OnExit() void wxMutexGuiEnter() { -#ifdef __WXGTK12__ - gdk_threads_enter(); -#else gs_mutexGui->Lock(); -#endif } void wxMutexGuiLeave() { -#ifdef __WXGTK12__ - gdk_threads_leave(); -#else gs_mutexGui->Unlock(); -#endif } #endif