#include <sched.h>
#endif
+#ifdef __WXGTK12__
+#include "gtk/gtk.h"
+#endif
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// 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
// thread entry function
static void *PthreadStart(void *ptr);
+#if HAVE_THREAD_CLEANUP_FUNCTIONS
+ // thread exit function
+ static void PthreadCleanup(void *ptr);
+#endif
+
// thread actions
// start the thread
wxThreadError Run();
// 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
{
wxThread *thread = (wxThread *)ptr;
wxThreadInternal *pthread = thread->p_internal;
+ void *status;
int rc = pthread_setspecific(gs_keySelf, thread);
if ( rc != 0 )
return (void *)-1;
}
+#if HAVE_THREAD_CLEANUP_FUNCTIONS
+ // Install the cleanup handler.
+// 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
- void* status = thread->Entry();
+ status = thread->Entry();
+
+#if HAVE_THREAD_CLEANUP_FUNCTIONS
+// pthread_cleanup_pop(FALSE);
+#endif
// terminate the thread
thread->Exit(status);
return NULL;
}
+#if HAVE_THREAD_CLEANUP_FUNCTIONS
+// Only called when the thread is explicitely killed.
+
+void wxThreadInternal::PthreadCleanup(void *ptr)
+{
+ wxThread *thread = (wxThread *) ptr;
+
+ // The thread is already considered as finished.
+ if (thread->p_internal->GetState() == STATE_EXITED)
+ return;
+
+ // first call user-level clean up code
+ thread->OnExit();
+
+ // next wake up the threads waiting for us (OTOH, this function won't retur
+ // until someone waited for us!)
+ thread->p_internal->SetState(STATE_EXITED);
+
+ thread->p_internal->SignalExit();
+}
+#endif
+
wxThreadInternal::wxThreadInternal()
{
m_state = STATE_NEW;
// 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
wxThreadInternal::~wxThreadInternal()
{
- m_mutexSuspend.Unlock();
+ // GL: moved to SignalExit
+ // m_mutexSuspend.Unlock();
// 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()
// entering Wait() releases the mutex thus allowing SignalExit() to acquire
// it and to signal us its termination
- m_cond.Wait(m_mutex);
+ 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() )
void wxThreadInternal::SignalExit()
{
+ // 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();
+ 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();
+ m_end_mutex.Unlock();
}
void wxThreadInternal::Pause()
wxThreadError wxThread::Create()
{
- // Maybe we could think about recreate the thread once it has exited.
- if (p_internal->GetState() != STATE_NEW &&
- p_internal->GetState() != STATE_EXITED)
+ if (p_internal->GetState() != STATE_NEW)
return wxTHREAD_RUNNING;
// set up the thread attribute: right now, we only set thread priority
if ( p_internal->GetState() == STATE_PAUSED )
{
+ m_critsect.Leave();
p_internal->Resume();
+ m_critsect.Enter();
return wxTHREAD_NO_ERROR;
}
{
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:
}
}
+bool wxThread::IsPaused() const
+{
+ wxCriticalSectionLocker lock((wxCriticalSection&)m_critsect);
+
+ return (p_internal->GetState() == STATE_PAUSED);
+}
+
//--------------------------------------------------------------------
// wxThreadModule
//--------------------------------------------------------------------
return FALSE;
}
+#ifndef __WXGTK12__
gs_mutexGui = new wxMutex();
-
- //wxThreadGuiInit();
+#endif
gs_tidMain = pthread_self();
+
+#ifndef __WXGTK12__
gs_mutexGui->Lock();
+#endif
return TRUE;
}
gs_allThreads[n]->Delete();
}
+#ifndef __WXGTK12__
// destroy GUI mutex
gs_mutexGui->Unlock();
- //wxThreadGuiExit();
-
delete gs_mutexGui;
+#endif
// and free TLD slot
(void)pthread_key_delete(gs_keySelf);
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
projects / wxWidgets.git / blobdiff