wxFileIn/OutputStream fix

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 707eb0928f5533c79d695ff924684ab0da9de98b..edd373cdc467c86356acf5a00ba3c8628b69f153 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -47,10 +47,6 @@
     #include <sched.h>
 #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
@@ -277,7 +271,7 @@ private:
     //     state
     //  2. The Delete() function blocks until the condition is signaled when the
     //     thread exits.
-    wxMutex     m_mutex;
+    wxMutex     m_mutex, m_end_mutex;
     wxCondition m_cond;
 
     // another (mutex, cond) pair for Pause()/Resume() usage
@@ -305,20 +299,19 @@ void *wxThreadInternal::PthreadStart(void *ptr)
     }
 #if HAVE_THREAD_CLEANUP_FUNCTIONS
     // Install the cleanup handler.
-    pthread_cleanup_push(wxThreadInternal::PthreadCleanup, ptr);
+//    pthread_cleanup_push(wxThreadInternal::PthreadCleanup, ptr);
 #endif
 
     // 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
     status = thread->Entry();
 
 #if HAVE_THREAD_CLEANUP_FUNCTIONS
-    pthread_cleanup_pop(FALSE);
+//    pthread_cleanup_pop(FALSE);
 #endif
 
     // terminate the thread
@@ -359,6 +352,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 +370,9 @@ wxThreadInternal::~wxThreadInternal()
 
     // note that m_mutex will be unlocked by the thread which waits for our
     // termination
+
+    // m_end_mutex can be unlocked here.
+    m_end_mutex.Unlock();
 }
 
 wxThreadError wxThreadInternal::Run()
@@ -403,15 +404,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 +422,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()
@@ -661,11 +660,12 @@ wxThread::ExitCode wxThread::Delete()
 {
     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:
@@ -713,20 +713,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);
 }
 
@@ -816,15 +812,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 +835,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 +850,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