X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98781fa30e4a8cb7b244aba345a78a2a3c8f7f25..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/unix/threadpsx.cpp diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index 130ea38598..72be919335 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -2,13 +2,14 @@ // Name: threadpsx.cpp // Purpose: wxThread (Posix) Implementation // Author: Original from Wolfram Gloger/Guilhem Lavaux -// Modified by: +// Modified by: K. S. Sreeram (2002): POSIXified wxCondition, added wxSemaphore // Created: 04/22/98 // RCS-ID: $Id$ // Copyright: (c) Wolfram Gloger (1996, 1997) // Guilhem Lavaux (1998) -// Vadim Zeitlin (1999) +// Vadim Zeitlin (1999-2002) // Robert Roebling (1999) +// K. S. Sreeram (2002) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,9 +25,7 @@ #pragma implementation "thread.h" #endif -// With simple makefiles, we must ignore the file body if not using -// threads. -#include "wx/setup.h" +#include "wx/defs.h" #if wxUSE_THREADS @@ -36,17 +35,26 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/dynarray.h" +#include "wx/timer.h" #include #include #include #include #include - #if HAVE_SCHED_H #include #endif +#ifdef HAVE_THR_SETCONCURRENCY + #include +#endif + +// we use wxFFile under Linux in GetCPUCount() +#ifdef __LINUX__ + #include "wx/ffile.h" +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -60,6 +68,19 @@ enum wxThreadState STATE_EXITED // thread doesn't exist any more }; +// the exit value of a thread which has been cancelled +static const wxThread::ExitCode EXITCODE_CANCELLED = (wxThread::ExitCode)-1; + +// our trace mask +#define TRACE_THREADS _T("thread") + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +static void ScheduleThreadForDeletion(); +static void DeleteThread(wxThread *This); + // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- @@ -81,141 +102,591 @@ static pthread_t gs_tidMain; // the key for the pointer to the associated wxThread object static pthread_key_t gs_keySelf; -// this mutex must be acquired before any call to a GUI function -static wxMutex *gs_mutexGui; +// the number of threads which are being deleted - the program won't exit +// until there are any left +static size_t gs_nThreadsBeingDeleted = 0; + +// a mutex to protect gs_nThreadsBeingDeleted +static wxMutex *gs_mutexDeleteThread = (wxMutex *)NULL; + +// and a condition variable which will be signaled when all +// gs_nThreadsBeingDeleted will have been deleted +static wxCondition *gs_condAllDeleted = (wxCondition *)NULL; + +#if wxUSE_GUI + // this mutex must be acquired before any call to a GUI function + static wxMutex *gs_mutexGui; +#endif // wxUSE_GUI // ============================================================================ -// implementation +// wxMutex implementation // ============================================================================ -//-------------------------------------------------------------------- -// wxMutex (Posix implementation) -//-------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxMutexInternal +// ---------------------------------------------------------------------------- class wxMutexInternal { public: - pthread_mutex_t p_mutex; + wxMutexInternal(); + ~wxMutexInternal(); + + wxMutexError Lock(); + wxMutexError TryLock(); + wxMutexError Unlock(); + +private: + pthread_mutex_t m_mutex; + + friend class wxConditionInternal; }; +wxMutexInternal::wxMutexInternal() +{ + // support recursive locks like Win32, i.e. a thread can lock a mutex which + // it had itself already locked + // + // but initialization of recursive mutexes is non portable , so try + // several methods +#ifdef HAVE_PTHREAD_MUTEXATTR_T + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + + pthread_mutex_init(&m_mutex, &attr); +#elif defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER) + // we can use this only as initializer so we have to assign it first to a + // temp var - assigning directly to m_mutex wouldn't even compile + pthread_mutex_t mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + m_mutex = mutex; +#else // no recursive mutexes + pthread_mutex_init(&m_mutex, NULL); + + // used by TryLock() below + #define NO_RECURSIVE_MUTEXES +#endif // HAVE_PTHREAD_MUTEXATTR_T/... +} + +wxMutexInternal::~wxMutexInternal() +{ + pthread_mutex_destroy(&m_mutex); +} + +wxMutexError wxMutexInternal::Lock() +{ + int err = pthread_mutex_lock(&m_mutex); + switch ( err ) + { + case EDEADLK: + wxLogDebug(wxT("Locking this mutex would lead to deadlock!")); + return wxMUTEX_DEAD_LOCK; + + default: + wxFAIL_MSG( _T("unexpected pthread_mutex_lock() return") ); + // fall through + + case EINVAL: + wxLogDebug(_T("Failed to lock the mutex.")); + return wxMUTEX_MISC_ERROR; + + case 0: + return wxMUTEX_NO_ERROR; + } +} + +wxMutexError wxMutexInternal::TryLock() +{ + int err = pthread_mutex_trylock(&m_mutex); + switch ( err ) + { + case EBUSY: + return wxMUTEX_BUSY; + + default: + wxFAIL_MSG( _T("unexpected pthread_mutex_trylock() return") ); + // fall through + + case EINVAL: + wxLogDebug(_T("Failed to try to lock the mutex.")); + return wxMUTEX_MISC_ERROR; + + case 0: + return wxMUTEX_NO_ERROR; + } +} + +wxMutexError wxMutexInternal::Unlock() +{ + int err = pthread_mutex_unlock(&m_mutex); + switch ( err ) + { + case EPERM: + // we don't own the mutex + return wxMUTEX_UNLOCKED; + + default: + wxFAIL_MSG( _T("unexpected pthread_mutex_unlock() return") ); + // fall through + + case EINVAL: + wxLogDebug(_T("Failed to unlock the mutex.")); + return wxMUTEX_MISC_ERROR; + + case 0: + return wxMUTEX_NO_ERROR; + } +} + +// ---------------------------------------------------------------------------- +// wxMutex +// ---------------------------------------------------------------------------- + +// TODO: this is completely generic, move it to common code? + wxMutex::wxMutex() { - p_internal = new wxMutexInternal; - - pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL ); + m_internal = new wxMutexInternal; + m_locked = 0; } wxMutex::~wxMutex() { - if (m_locked > 0) - wxLogDebug(_T("Freeing a locked mutex (%d locks)"), m_locked); + if ( m_locked > 0 ) + wxLogDebug(wxT("Freeing a locked mutex (%d locks)"), m_locked); - pthread_mutex_destroy( &(p_internal->p_mutex) ); - delete p_internal; + delete m_internal; } wxMutexError wxMutex::Lock() { - int err = pthread_mutex_lock( &(p_internal->p_mutex) ); - if (err == EDEADLK) - { - wxLogDebug(_T("Locking this mutex would lead to deadlock!")); + wxMutexError err = m_internal->Lock(); - return wxMUTEX_DEAD_LOCK; + if ( !err ) + { + m_locked++; } - m_locked++; - - return wxMUTEX_NO_ERROR; + return err; } wxMutexError wxMutex::TryLock() { - if (m_locked) + if ( m_locked ) { - return wxMUTEX_BUSY; +#ifdef NO_RECURSIVE_MUTEXES + return wxMUTEX_DEAD_LOCK; +#else // have recursive mutexes on this platform + // we will succeed in locking it when we have it already locked + return wxMUTEX_NO_ERROR; +#endif // recursive/non-recursive mutexes } - int err = pthread_mutex_trylock( &(p_internal->p_mutex) ); - switch (err) + wxMutexError err = m_internal->TryLock(); + if ( !err ) { - case EBUSY: return wxMUTEX_BUSY; + m_locked++; } - m_locked++; - - return wxMUTEX_NO_ERROR; + return err; } wxMutexError wxMutex::Unlock() { - if (m_locked > 0) + if ( m_locked > 0 ) { m_locked--; } else { - wxLogDebug(_T("Unlocking not locked mutex.")); + wxLogDebug(wxT("Unlocking not locked mutex.")); return wxMUTEX_UNLOCKED; } - pthread_mutex_unlock( &(p_internal->p_mutex) ); - - return wxMUTEX_NO_ERROR; + return m_internal->Unlock(); } -//-------------------------------------------------------------------- -// wxCondition (Posix implementation) -//-------------------------------------------------------------------- +// =========================================================================== +// wxCondition implementation +// =========================================================================== + +// --------------------------------------------------------------------------- +// wxConditionInternal +// --------------------------------------------------------------------------- class wxConditionInternal { public: - pthread_cond_t p_condition; + wxConditionInternal(wxMutex& mutex); + ~wxConditionInternal(); + + void Wait(); + + bool Wait( const timespec *ts ); + + void Signal(); + + void Broadcast(); + +private: + // get the POSIX mutex associated with us + pthread_mutex_t *GetMutex() const { return &m_mutex.m_internal->m_mutex; } + + wxMutex& m_mutex; + pthread_cond_t m_cond; }; -wxCondition::wxCondition() +wxConditionInternal::wxConditionInternal(wxMutex& mutex) + : m_mutex(mutex) { - p_internal = new wxConditionInternal; - pthread_cond_init( &(p_internal->p_condition), (const pthread_condattr_t *) NULL ); + if ( pthread_cond_init( &m_cond, NULL ) != 0 ) + { + wxLogDebug(_T("pthread_cond_init() failed")); + } } -wxCondition::~wxCondition() +wxConditionInternal::~wxConditionInternal() +{ + if ( pthread_cond_destroy( &m_cond ) != 0 ) + { + wxLogDebug(_T("pthread_cond_destroy() failed")); + } +} + +void wxConditionInternal::Wait() { - pthread_cond_destroy( &(p_internal->p_condition) ); + if ( pthread_cond_wait( &m_cond, GetMutex() ) != 0 ) + { + wxLogDebug(_T("pthread_cond_wait() failed")); + } +} + +bool wxConditionInternal::Wait( const timespec *ts ) +{ + int result = pthread_cond_timedwait( &m_cond, GetMutex(), ts ); + if ( result == ETIMEDOUT ) + return FALSE; + + if ( result != 0 ) + { + wxLogDebug(_T("pthread_cond_timedwait() failed")); + } + + return TRUE; +} + +void wxConditionInternal::Signal() +{ + int result = pthread_cond_signal( &m_cond ); + if ( result != 0 ) +{ + wxFAIL_MSG( _T("pthread_cond_signal() failed") ); + } +} - delete p_internal; +void wxConditionInternal::Broadcast() +{ + int result = pthread_cond_broadcast( &m_cond ); + if ( result != 0 ) +{ + wxFAIL_MSG( _T("pthread_cond_broadcast() failed") ); + } } -void wxCondition::Wait(wxMutex& mutex) + +// --------------------------------------------------------------------------- +// wxCondition +// --------------------------------------------------------------------------- + +wxCondition::wxCondition(wxMutex& mutex) { - pthread_cond_wait( &(p_internal->p_condition), &(mutex.p_internal->p_mutex) ); + m_internal = new wxConditionInternal( mutex ); } -bool wxCondition::Wait(wxMutex& mutex, unsigned long sec, unsigned long nsec) +wxCondition::~wxCondition() { - struct timespec tspec; + delete m_internal; +} - tspec.tv_sec = time(0L)+sec; - tspec.tv_nsec = nsec; - return (pthread_cond_timedwait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex), &tspec) != ETIMEDOUT); +void wxCondition::Wait() +{ + m_internal->Wait(); +} + +bool wxCondition::Wait( unsigned long timeout_millis ) +{ + wxLongLong curtime = wxGetLocalTimeMillis(); + curtime += timeout_millis; + wxLongLong temp = curtime / 1000; + int sec = temp.GetLo(); + temp = temp * 1000; + temp = curtime - temp; + int millis = temp.GetLo(); + + timespec tspec; + + tspec.tv_sec = sec; + tspec.tv_nsec = millis * 1000L * 1000L; + + return m_internal->Wait(&tspec); } void wxCondition::Signal() { - pthread_cond_signal( &(p_internal->p_condition) ); + m_internal->Signal(); } void wxCondition::Broadcast() { - pthread_cond_broadcast( &(p_internal->p_condition) ); + m_internal->Broadcast(); } -//-------------------------------------------------------------------- -// wxThread (Posix implementation) -//-------------------------------------------------------------------- +// =========================================================================== +// wxSemaphore implementation +// =========================================================================== + +// --------------------------------------------------------------------------- +// wxSemaphoreInternal +// --------------------------------------------------------------------------- + +class wxSemaphoreInternal +{ +public: + wxSemaphoreInternal( int initialcount, int maxcount ); + + void Wait(); + bool TryWait(); + + bool Wait( unsigned long timeout_millis ); + + void Post(); + +private: + wxMutex m_mutex; + wxCondition m_cond; + + int count, + maxcount; +}; + +wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount ) + : m_cond(m_mutex) +{ + + if ( (initialcount < 0) || ((maxcount > 0) && (initialcount > maxcount)) ) + { + wxFAIL_MSG( _T("wxSemaphore: invalid initial count") ); + } + + maxcount = maxcount; + count = initialcount; +} + +void wxSemaphoreInternal::Wait() +{ + wxMutexLocker locker(m_mutex); + + while ( count <= 0 ) + { + m_cond.Wait(); + } + + count--; +} + +bool wxSemaphoreInternal::TryWait() +{ + wxMutexLocker locker(m_mutex); + + if ( count <= 0 ) + return FALSE; + + count--; + + return TRUE; +} + +bool wxSemaphoreInternal::Wait( unsigned long timeout_millis ) +{ + wxMutexLocker locker(m_mutex); + + wxLongLong startTime = wxGetLocalTimeMillis(); + + while ( count <= 0 ) + { + wxLongLong elapsed = wxGetLocalTimeMillis() - startTime; + long remainingTime = (long)timeout_millis - (long)elapsed.GetLo(); + if ( remainingTime <= 0 ) + return FALSE; + + bool result = m_cond.Wait( remainingTime ); + if ( !result ) + return FALSE; + } + + count--; + + return TRUE; +} + +void wxSemaphoreInternal::Post() +{ + wxMutexLocker locker(m_mutex); + + if ( maxcount > 0 && count == maxcount ) + { + wxFAIL_MSG( _T("wxSemaphore::Post() overflow") ); + } + + count++; + + m_cond.Signal(); +} + +// -------------------------------------------------------------------------- +// wxSemaphore +// -------------------------------------------------------------------------- + +wxSemaphore::wxSemaphore( int initialcount, int maxcount ) +{ + m_internal = new wxSemaphoreInternal( initialcount, maxcount ); +} + +wxSemaphore::~wxSemaphore() +{ + delete m_internal; +} + +void wxSemaphore::Wait() +{ + m_internal->Wait(); +} + +bool wxSemaphore::TryWait() +{ + return m_internal->TryWait(); +} + +bool wxSemaphore::Wait( unsigned long timeout_millis ) +{ + return m_internal->Wait( timeout_millis ); +} + +void wxSemaphore::Post() +{ + m_internal->Post(); +} + +// This class is used by wxThreadInternal to support Delete() on +// a detached thread +class wxRefCountedCondition +{ +public: + // start with a initial reference count of 1 + wxRefCountedCondition() + { + m_refCount = 1; + m_signaled = FALSE; + + m_mutex = new wxMutex(); + m_cond = new wxCondition( *m_mutex ); + } + + // increment the reference count + void AddRef() + { + wxMutexLocker locker( *m_mutex ); + + m_refCount++; + } + + // decrement the reference count if reference count is zero then delete the + // object + void DeleteRef() + { + bool shouldDelete = FALSE; + + m_mutex->Lock(); + + if ( --m_refCount == 0 ) + { + shouldDelete = TRUE; + } + + m_mutex->Unlock(); + + if ( shouldDelete ) + { + delete this; + } + } + + + // sets the object to signaled this signal will be a persistent signal all + // further Wait()s on the object will return without blocking + void SetSignaled() + { + wxMutexLocker locker( *m_mutex ); + + m_signaled = TRUE; + + m_cond->Broadcast(); + } + + // wait till the object is signaled if the object was already signaled then + // return immediately + void Wait() + { + wxMutexLocker locker( *m_mutex ); + + if ( !m_signaled ) + { + m_cond->Wait(); + } + } + +private: + int m_refCount; + + wxMutex *m_mutex; + wxCondition *m_cond; + + bool m_signaled; + + // Cannot delete this object directly, call DeleteRef() instead + ~wxRefCountedCondition() + { + delete m_cond; + delete m_mutex; + } + + // suppress gcc warning about the class having private dtor and not having + // friend (so what??) + friend class wxDummyFriend; +}; + +// =========================================================================== +// wxThread implementation +// =========================================================================== + +// the thread callback functions must have the C linkage +extern "C" +{ + +#if HAVE_THREAD_CLEANUP_FUNCTIONS + // thread exit function + void wxPthreadCleanup(void *ptr); +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS + +void *wxPthreadStart(void *ptr); + +} // extern "C" + +// ---------------------------------------------------------------------------- +// wxThreadInternal +// ---------------------------------------------------------------------------- class wxThreadInternal { @@ -224,12 +695,7 @@ public: ~wxThreadInternal(); // thread entry function - static void *PthreadStart(void *ptr); - -#if HAVE_THREAD_CLEANUP_FUNCTIONS - // thread exit function - static void PthreadCleanup(void *ptr); -#endif + static void *PthreadStart(wxThread *thread); // thread actions // start the thread @@ -238,6 +704,8 @@ public: void Wait(); // wake up threads waiting for our termination void SignalExit(); + // wake up threads waiting for our start + void SignalRun() { m_semRun.Post(); } // go to sleep until Resume() is called void Pause(); // resume the thread @@ -256,43 +724,82 @@ public: // "cancelled" flag void SetCancelFlag() { m_cancelled = TRUE; } bool WasCancelled() const { return m_cancelled; } + // exit code + void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; } + wxThread::ExitCode GetExitCode() const { return m_exitcode; } + + // the pause flag + void SetReallyPaused(bool paused) { m_isPaused = paused; } + bool IsReallyPaused() const { return m_isPaused; } + + // tell the thread that it is a detached one + void Detach() + { + m_shouldBeJoined = m_shouldBroadcast = FALSE; + m_isDetached = TRUE; + } + // but even detached threads need to notifyus about their termination + // sometimes - tell the thread that it should do it + void Notify() { m_shouldBroadcast = TRUE; } + +#if HAVE_THREAD_CLEANUP_FUNCTIONS + // this is used by wxPthreadCleanup() only + static void Cleanup(wxThread *thread); +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS private: pthread_t m_threadId; // id of the thread wxThreadState m_state; // see wxThreadState enum int m_prio; // in wxWindows units: from 0 to 100 - // set when the thread should terminate + // this flag is set when the thread should terminate bool m_cancelled; - // this (mutex, cond) pair is used to synchronize the main thread and this - // thread in several situations: - // 1. The thread function blocks until condition is signaled by Run() when - // it's initially created - this allows thread creation in "suspended" - // state - // 2. The Delete() function blocks until the condition is signaled when the - // thread exits. - // 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; + // this flag is set when the thread is blocking on m_semSuspend + bool m_isPaused; - // another (mutex, cond) pair for Pause()/Resume() usage - // - // VZ: it's possible that we might reuse the mutex and condition from above - // for this too, but as I'm not at all sure that it won't create subtle - // problems with race conditions between, say, Pause() and Delete() I - // prefer this may be a bit less efficient but much safer solution - wxMutex m_mutexSuspend; - wxCondition m_condSuspend; + // the thread exit code - only used for joinable (!detached) threads and + // is only valid after the thread termination + wxThread::ExitCode m_exitcode; + + // many threads may call Wait(), but only one of them should call + // pthread_join(), so we have to keep track of this + wxCriticalSection m_csJoinFlag; + bool m_shouldBeJoined; + bool m_shouldBroadcast; + bool m_isDetached; + + // this semaphore is posted by Run() and the threads Entry() is not + // called before it is done + wxSemaphore m_semRun; + + // this one is signaled when the thread should resume after having been + // Pause()d + wxSemaphore m_semSuspend; + + // finally this one is signalled when the thread exits + // we are using a reference counted condition to support + // Delete() for a detached thread + wxRefCountedCondition *m_condEnd; }; -void *wxThreadInternal::PthreadStart(void *ptr) +// ---------------------------------------------------------------------------- +// thread startup and exit functions +// ---------------------------------------------------------------------------- + +void *wxPthreadStart(void *ptr) { - wxThread *thread = (wxThread *)ptr; - wxThreadInternal *pthread = thread->p_internal; - void *status; + return wxThreadInternal::PthreadStart((wxThread *)ptr); +} + +void *wxThreadInternal::PthreadStart(wxThread *thread) +{ + wxThreadInternal *pthread = thread->m_internal; + + wxLogTrace(TRACE_THREADS, _T("Thread %ld started."), pthread->GetId()); + // associate the thread pointer with the newly created thread so that + // wxThread::This() will work int rc = pthread_setspecific(gs_keySelf, thread); if ( rc != 0 ) { @@ -300,131 +807,190 @@ void *wxThreadInternal::PthreadStart(void *ptr) return (void *)-1; } + + // have to declare this before pthread_cleanup_push() which defines a + // block! + bool dontRunAtAll; + #if HAVE_THREAD_CLEANUP_FUNCTIONS - // Install the cleanup handler. - pthread_cleanup_push(wxThreadInternal::PthreadCleanup, ptr); -#endif + // install the cleanup handler which will be called if the thread is + // cancelled + pthread_cleanup_push(wxPthreadCleanup, thread); +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS + + // wait for the semaphore to be posted from Run() + pthread->m_semRun.Wait(); - // 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() + // test whether we should run the run at all - may be it was deleted + // before it started to Run()? + { + wxCriticalSectionLocker lock(thread->m_critsect); + + dontRunAtAll = pthread->GetState() == STATE_NEW && + pthread->WasCancelled(); + } - // call the main entry - status = thread->Entry(); + if ( !dontRunAtAll ) + { + // call the main entry + pthread->m_exitcode = thread->Entry(); + wxLogTrace(TRACE_THREADS, _T("Thread %ld left its Entry()."), + pthread->GetId()); + + { + wxCriticalSectionLocker lock(thread->m_critsect); + + wxLogTrace(TRACE_THREADS, _T("Thread %ld changes state to EXITED."), + pthread->GetId()); + + // change the state of the thread to "exited" so that + // wxPthreadCleanup handler won't do anything from now (if it's + // called before we do pthread_cleanup_pop below) + pthread->SetState(STATE_EXITED); + } + } + + // NB: at least under Linux, pthread_cleanup_push/pop are macros and pop + // contains the matching '}' for the '{' in push, so they must be used + // in the same block! #if HAVE_THREAD_CLEANUP_FUNCTIONS + // remove the cleanup handler without executing it pthread_cleanup_pop(FALSE); -#endif +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS + + if ( dontRunAtAll ) + { + delete thread; - // terminate the thread - thread->Exit(status); + return EXITCODE_CANCELLED; + } + else + { + // terminate the thread + thread->Exit(pthread->m_exitcode); - wxFAIL_MSG(_T("wxThread::Exit() can't return.")); + wxFAIL_MSG(wxT("wxThread::Exit() can't return.")); - return NULL; + return NULL; + } } #if HAVE_THREAD_CLEANUP_FUNCTIONS -// Only called when the thread is explicitely killed. -void wxThreadInternal::PthreadCleanup(void *ptr) +// this handler is called when the thread is cancelled +extern "C" void wxPthreadCleanup(void *ptr) { - wxThread *thread = (wxThread *) ptr; + wxThreadInternal::Cleanup((wxThread *)ptr); +} - // The thread is already considered as finished. - if (thread->p_internal->GetState() == STATE_EXITED) - return; +void wxThreadInternal::Cleanup(wxThread *thread) +{ + { + wxCriticalSectionLocker lock(thread->m_critsect); + if ( thread->m_internal->GetState() == STATE_EXITED ) + { + // thread is already considered as finished. + return; + } + } - // first call user-level clean up code - thread->OnExit(); + // exit the thread gracefully + thread->Exit(EXITCODE_CANCELLED); +} - // 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); +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS - thread->p_internal->SignalExit(); -} -#endif +// ---------------------------------------------------------------------------- +// wxThreadInternal +// ---------------------------------------------------------------------------- wxThreadInternal::wxThreadInternal() { m_state = STATE_NEW; m_cancelled = FALSE; + m_prio = WXTHREAD_DEFAULT_PRIORITY; + m_threadId = 0; + m_exitcode = 0; - // 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(); + // set to TRUE only when the thread starts waiting on m_semSuspend + m_isPaused = FALSE; - // this mutex is used in Pause()/Resume() and is also locked all the time - // unless the thread is paused - m_mutexSuspend.Lock(); + // defaults for joinable threads + m_shouldBeJoined = TRUE; + m_shouldBroadcast = TRUE; + m_isDetached = FALSE; + + m_condEnd = new wxRefCountedCondition(); } wxThreadInternal::~wxThreadInternal() { - // GL: moved to SignalExit - // m_mutexSuspend.Unlock(); - - // 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(); + m_condEnd->DeleteRef(); } wxThreadError wxThreadInternal::Run() { wxCHECK_MSG( GetState() == STATE_NEW, wxTHREAD_RUNNING, - _T("thread may only be started once after successful Create()") ); + wxT("thread may only be started once after Create()") ); - // the mutex was locked on Create(), so we will be able to lock it again - // only when the thread really starts executing and enters the wait - - // otherwise we might signal the condition before anybody is waiting for it - wxMutexLocker lock(m_mutex); - m_cond.Signal(); + SignalRun(); - m_state = STATE_RUNNING; + SetState(STATE_RUNNING); return wxTHREAD_NO_ERROR; - - // now the mutex is unlocked back - but just to allow Wait() function to - // terminate by relocking it, so the net result is that the worker thread - // starts executing and the mutex is still locked } void wxThreadInternal::Wait() { - wxCHECK_RET( WasCancelled(), _T("thread should have been cancelled first") ); - // if the thread we're waiting for is waiting for the GUI mutex, we will // deadlock so make sure we release it temporarily if ( wxThread::IsMain() ) wxMutexGuiLeave(); - // entering Wait() releases the mutex thus allowing SignalExit() to acquire - // it and to signal us its termination - m_cond.Wait(m_end_mutex); + bool isDetached = m_isDetached; + wxThreadIdType id = (wxThreadIdType) GetId(); + + wxLogTrace(TRACE_THREADS, + _T("Starting to wait for thread %ld to exit."), id); + + // wait until the thread terminates (we're blocking in _another_ thread, + // of course) + + // a reference counting condition is used to handle the + // case where a detached thread deletes itself + // before m_condEnd->Wait() returns + // in this case the deletion of the condition object is deferred until + // all Wait()ing threads have finished calling DeleteRef() + m_condEnd->AddRef(); + m_condEnd->Wait(); + m_condEnd->DeleteRef(); - // 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_end_mutex.Unlock(); + wxLogTrace(TRACE_THREADS, _T("Finished waiting for thread %ld."), id); + + // we can't use any member variables any more if the thread is detached + // because it could be already deleted + if ( !isDetached ) + { + // to avoid memory leaks we should call pthread_join(), but it must + // only be done once + wxCriticalSectionLocker lock(m_csJoinFlag); + + if ( m_shouldBeJoined ) + { + // FIXME shouldn't we set cancellation type to DISABLED here? If + // we're cancelled inside pthread_join(), things will almost + // certainly break - but if we disable the cancellation, we + // might deadlock + if ( pthread_join((pthread_t)id, &m_exitcode) != 0 ) + { + wxLogError(_("Failed to join a thread, potential memory leak " + "detected - please restart the program")); + } - // After that, we wait for the real end of the other thread. - pthread_join(GetId(), NULL); + m_shouldBeJoined = FALSE; + } + } // reacquire GUI mutex if ( wxThread::IsMain() ) @@ -433,18 +999,18 @@ void wxThreadInternal::Wait() void wxThreadInternal::SignalExit() { - // GL: Unlock mutexSuspend here. - m_mutexSuspend.Unlock(); + wxLogTrace(TRACE_THREADS, _T("Thread %ld about to exit."), GetId()); - // 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_end_mutex.Lock(); + SetState(STATE_EXITED); - // wake up all the threads waiting for our termination - m_cond.Broadcast(); + // wake up all the threads waiting for our termination - if there are any + if ( m_shouldBroadcast ) + { + wxLogTrace(TRACE_THREADS, _T("Thread %ld signals end condition."), + GetId()); - // after this call mutex will be finally unlocked - m_end_mutex.Unlock(); + m_condEnd->SetSignaled(); + } } void wxThreadInternal::Pause() @@ -452,32 +1018,42 @@ void wxThreadInternal::Pause() // the state is set from the thread which pauses us first, this function // is called later so the state should have been already set wxCHECK_RET( m_state == STATE_PAUSED, - _T("thread must first be paused with wxThread::Pause().") ); + wxT("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 Wait() - if ( WasCancelled() ) - return; + wxLogTrace(TRACE_THREADS, _T("Thread %ld goes to sleep."), GetId()); - // wait until the condition is signaled from Resume() - m_condSuspend.Wait(m_mutexSuspend); + // wait until the semaphore is Post()ed from Resume() + m_semSuspend.Wait(); } void wxThreadInternal::Resume() { wxCHECK_RET( m_state == STATE_PAUSED, - _T("can't resume thread which is not suspended.") ); + wxT("can't resume thread which is not suspended.") ); - // we will be able to lock this mutex only when Pause() starts waiting - wxMutexLocker lock(m_mutexSuspend); - m_condSuspend.Signal(); + // the thread might be not actually paused yet - if there were no call to + // TestDestroy() since the last call to Pause() for example + if ( IsReallyPaused() ) + { + wxLogTrace(TRACE_THREADS, _T("Waking up thread %ld"), GetId()); + + // wake up Pause() + m_semSuspend.Post(); + + // reset the flag + SetReallyPaused(FALSE); + } + else + { + wxLogTrace(TRACE_THREADS, _T("Thread %ld is not yet really paused"), + GetId()); + } SetState(STATE_RUNNING); } // ----------------------------------------------------------------------------- -// static functions +// wxThread static functions // ----------------------------------------------------------------------------- wxThread *wxThread::This() @@ -492,7 +1068,9 @@ bool wxThread::IsMain() void wxThread::Yield() { +#ifdef HAVE_SCHED_YIELD sched_yield(); +#endif } void wxThread::Sleep(unsigned long milliseconds) @@ -500,65 +1078,197 @@ void wxThread::Sleep(unsigned long milliseconds) wxUsleep(milliseconds); } +int wxThread::GetCPUCount() +{ +#if defined(__LINUX__) && wxUSE_FFILE + // read from proc (can't use wxTextFile here because it's a special file: + // it has 0 size but still can be read from) + wxLogNull nolog; + + wxFFile file(_T("/proc/cpuinfo")); + if ( file.IsOpened() ) + { + // slurp the whole file + wxString s; + if ( file.ReadAll(&s) ) + { + // (ab)use Replace() to find the number of "processor" strings + size_t count = s.Replace(_T("processor"), _T("")); + if ( count > 0 ) + { + return count; + } + + wxLogDebug(_T("failed to parse /proc/cpuinfo")); + } + else + { + wxLogDebug(_T("failed to read /proc/cpuinfo")); + } + } +#elif defined(_SC_NPROCESSORS_ONLN) + // this works for Solaris + int rc = sysconf(_SC_NPROCESSORS_ONLN); + if ( rc != -1 ) + { + return rc; + } +#endif // different ways to get number of CPUs + + // unknown + return -1; +} + +#ifdef __VMS + // VMS is a 64 bit system and threads have 64 bit pointers. + // ??? also needed for other systems???? +unsigned long long wxThread::GetCurrentId() +{ + return (unsigned long long)pthread_self(); +#else +unsigned long wxThread::GetCurrentId() +{ + return (unsigned long)pthread_self(); +#endif +} + +bool wxThread::SetConcurrency(size_t level) +{ +#ifdef HAVE_THR_SETCONCURRENCY + int rc = thr_setconcurrency(level); + if ( rc != 0 ) + { + wxLogSysError(rc, _T("thr_setconcurrency() failed")); + } + + return rc == 0; +#else // !HAVE_THR_SETCONCURRENCY + // ok only for the default value + return level == 0; +#endif // HAVE_THR_SETCONCURRENCY/!HAVE_THR_SETCONCURRENCY +} + // ----------------------------------------------------------------------------- // creating thread // ----------------------------------------------------------------------------- -wxThread::wxThread() +wxThread::wxThread(wxThreadKind kind) { // add this thread to the global list of all threads gs_allThreads.Add(this); - p_internal = new wxThreadInternal(); + m_internal = new wxThreadInternal(); + + m_isDetached = kind == wxTHREAD_DETACHED; } -wxThreadError wxThread::Create() +wxThreadError wxThread::Create(unsigned int WXUNUSED(stackSize)) { - if (p_internal->GetState() != STATE_NEW) + if ( m_internal->GetState() != STATE_NEW ) + { + // don't recreate thread return wxTHREAD_RUNNING; + } // set up the thread attribute: right now, we only set thread priority pthread_attr_t attr; pthread_attr_init(&attr); #ifdef HAVE_THREAD_PRIORITY_FUNCTIONS - int prio; - if ( pthread_attr_getschedpolicy(&attr, &prio) != 0 ) + int policy; + if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 ) { wxLogError(_("Cannot retrieve thread scheduling policy.")); } - int min_prio = sched_get_priority_min(prio), - max_prio = sched_get_priority_max(prio); +#ifdef __VMS__ + /* the pthread.h contains too many spaces. This is a work-around */ +# undef sched_get_priority_max +#undef sched_get_priority_min +#define sched_get_priority_max(_pol_) \ + (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX) +#define sched_get_priority_min(_pol_) \ + (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN) +#endif + + int max_prio = sched_get_priority_max(policy), + min_prio = sched_get_priority_min(policy), + prio = m_internal->GetPriority(); if ( min_prio == -1 || max_prio == -1 ) { wxLogError(_("Cannot get priority range for scheduling policy %d."), - prio); + policy); + } + else if ( max_prio == min_prio ) + { + if ( prio != WXTHREAD_DEFAULT_PRIORITY ) + { + // notify the programmer that this doesn't work here + wxLogWarning(_("Thread priority setting is ignored.")); + } + //else: we have default priority, so don't complain + + // anyhow, don't do anything because priority is just ignored } else { struct sched_param sp; - pthread_attr_getschedparam(&attr, &sp); - sp.sched_priority = min_prio + - (p_internal->GetPriority()*(max_prio-min_prio))/100; - pthread_attr_setschedparam(&attr, &sp); + if ( pthread_attr_getschedparam(&attr, &sp) != 0 ) + { + wxFAIL_MSG(_T("pthread_attr_getschedparam() failed")); + } + + sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100; + + if ( pthread_attr_setschedparam(&attr, &sp) != 0 ) + { + wxFAIL_MSG(_T("pthread_attr_setschedparam(priority) failed")); + } } #endif // HAVE_THREAD_PRIORITY_FUNCTIONS #ifdef HAVE_PTHREAD_ATTR_SETSCOPE // this will make the threads created by this process really concurrent - pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); + if ( pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) != 0 ) + { + wxFAIL_MSG(_T("pthread_attr_setscope(PTHREAD_SCOPE_SYSTEM) failed")); + } #endif // HAVE_PTHREAD_ATTR_SETSCOPE + // VZ: assume that this one is always available (it's rather fundamental), + // if this function is ever missing we should try to use + // pthread_detach() instead (after thread creation) + if ( m_isDetached ) + { + if ( pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0 ) + { + wxFAIL_MSG(_T("pthread_attr_setdetachstate(DETACHED) failed")); + } + + // never try to join detached threads + m_internal->Detach(); + } + //else: threads are created joinable by default, it's ok + // create the new OS thread object - int rc = pthread_create(p_internal->GetIdPtr(), &attr, - wxThreadInternal::PthreadStart, (void *)this); - pthread_attr_destroy(&attr); + int rc = pthread_create + ( + m_internal->GetIdPtr(), + &attr, + wxPthreadStart, + (void *)this + ); + + if ( pthread_attr_destroy(&attr) != 0 ) + { + wxFAIL_MSG(_T("pthread_attr_destroy() failed")); + } if ( rc != 0 ) { - p_internal->SetState(STATE_EXITED); + m_internal->SetState(STATE_EXITED); + return wxTHREAD_NO_RESOURCE; } @@ -567,7 +1277,12 @@ wxThreadError wxThread::Create() wxThreadError wxThread::Run() { - return p_internal->Run(); + wxCriticalSectionLocker lock(m_critsect); + + wxCHECK_MSG( m_internal->GetId(), wxTHREAD_MISC_ERROR, + wxT("must call wxThread::Create() first") ); + + return m_internal->Run(); } // ----------------------------------------------------------------------------- @@ -578,15 +1293,15 @@ void wxThread::SetPriority(unsigned int prio) { wxCHECK_RET( ((int)WXTHREAD_MIN_PRIORITY <= (int)prio) && ((int)prio <= (int)WXTHREAD_MAX_PRIORITY), - _T("invalid thread priority") ); + wxT("invalid thread priority") ); wxCriticalSectionLocker lock(m_critsect); - switch ( p_internal->GetState() ) + switch ( m_internal->GetState() ) { case STATE_NEW: // thread not yet started, priority will be set when it is - p_internal->SetPriority(prio); + m_internal->SetPriority(prio); break; case STATE_RUNNING: @@ -596,7 +1311,7 @@ void wxThread::SetPriority(unsigned int prio) struct sched_param sparam; sparam.sched_priority = prio; - if ( pthread_setschedparam(p_internal->GetId(), + if ( pthread_setschedparam(m_internal->GetId(), SCHED_OTHER, &sparam) != 0 ) { wxLogError(_("Failed to set thread priority %d."), prio); @@ -607,7 +1322,7 @@ void wxThread::SetPriority(unsigned int prio) case STATE_EXITED: default: - wxFAIL_MSG(_T("impossible to set thread priority in this state")); + wxFAIL_MSG(wxT("impossible to set thread priority in this state")); } } @@ -615,12 +1330,12 @@ unsigned int wxThread::GetPriority() const { wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - return p_internal->GetPriority(); + return m_internal->GetPriority(); } -unsigned long wxThread::GetID() const +wxThreadIdType wxThread::GetId() const { - return (unsigned long)p_internal->GetId(); + return (wxThreadIdType) m_internal->GetId(); } // ----------------------------------------------------------------------------- @@ -629,37 +1344,56 @@ unsigned long wxThread::GetID() const wxThreadError wxThread::Pause() { + wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR, + _T("a thread can't pause itself") ); + wxCriticalSectionLocker lock(m_critsect); - if ( p_internal->GetState() != STATE_RUNNING ) + if ( m_internal->GetState() != STATE_RUNNING ) { - wxLogDebug(_T("Can't pause thread which is not running.")); + wxLogDebug(wxT("Can't pause thread which is not running.")); return wxTHREAD_NOT_RUNNING; } - p_internal->SetState(STATE_PAUSED); + wxLogTrace(TRACE_THREADS, _T("Asking thread %ld to pause."), + GetId()); + + // just set a flag, the thread will be really paused only during the next + // call to TestDestroy() + m_internal->SetState(STATE_PAUSED); return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Resume() { + wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR, + _T("a thread can't resume itself") ); + wxCriticalSectionLocker lock(m_critsect); - if ( p_internal->GetState() == STATE_PAUSED ) - { - m_critsect.Leave(); - p_internal->Resume(); - m_critsect.Enter(); + wxThreadState state = m_internal->GetState(); - return wxTHREAD_NO_ERROR; - } - else + switch ( state ) { - wxLogDebug(_T("Attempt to resume a thread which is not paused.")); + case STATE_PAUSED: + wxLogTrace(TRACE_THREADS, _T("Thread %ld suspended, resuming."), + GetId()); - return wxTHREAD_MISC_ERROR; + m_internal->Resume(); + + return wxTHREAD_NO_ERROR; + + case STATE_EXITED: + wxLogTrace(TRACE_THREADS, _T("Thread %ld exited, won't resume."), + GetId()); + return wxTHREAD_NO_ERROR; + + default: + wxLogDebug(_T("Attempt to resume a thread which is not paused.")); + + return wxTHREAD_MISC_ERROR; } } @@ -667,115 +1401,234 @@ wxThreadError wxThread::Resume() // exiting thread // ----------------------------------------------------------------------------- -wxThread::ExitCode wxThread::Delete() +wxThread::ExitCode wxThread::Wait() +{ + wxCHECK_MSG( This() != this, (ExitCode)-1, + _T("a thread can't wait for itself") ); + + wxCHECK_MSG( !m_isDetached, (ExitCode)-1, + _T("can't wait for detached thread") ); + + m_internal->Wait(); + + return m_internal->GetExitCode(); +} + +wxThreadError wxThread::Delete(ExitCode *rc) { - if (IsPaused()) - Resume(); + wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR, + _T("a thread can't delete itself") ); m_critsect.Enter(); - wxThreadState state = p_internal->GetState(); + wxThreadState state = m_internal->GetState(); // ask the thread to stop - p_internal->SetCancelFlag(); + m_internal->SetCancelFlag(); + + if ( m_isDetached ) + { + // detached threads won't broadcast about their termination by default + // because usually nobody waits for them - but here we do, so ask the + // thread to notify us + m_internal->Notify(); + } m_critsect.Leave(); switch ( state ) { case STATE_NEW: + // we need to wake up the thread so that PthreadStart() will + // terminate - right now it's blocking on m_semRun + m_internal->SignalRun(); + + // fall through + case STATE_EXITED: // nothing to do break; case STATE_PAUSED: - // resume the thread first - Resume(); + // resume the thread first (don't call our Resume() because this + // would dead lock when it tries to enter m_critsect) + m_internal->Resume(); // fall through default: // wait until the thread stops - p_internal->Wait(); + m_internal->Wait(); + + if ( rc ) + { + wxASSERT_MSG( !m_isDetached, + _T("no return code for detached threads") ); + + // if it's a joinable thread, it's not deleted yet + *rc = m_internal->GetExitCode(); + } } - //GL: As we must auto-destroy, the destruction must happen here. - delete this; - return NULL; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Kill() { - switch ( p_internal->GetState() ) + wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR, + _T("a thread can't kill itself") ); + + switch ( m_internal->GetState() ) { case STATE_NEW: case STATE_EXITED: return wxTHREAD_NOT_RUNNING; + case STATE_PAUSED: + // resume the thread first + Resume(); + + // fall through + default: -#ifdef HAVE_PTHREAD_CANCEL - if ( pthread_cancel(p_internal->GetId()) != 0 ) +#ifdef HAVE_PTHREAD_CANCEL + if ( pthread_cancel(m_internal->GetId()) != 0 ) #endif { wxLogError(_("Failed to terminate a thread.")); return wxTHREAD_MISC_ERROR; } - //GL: As we must auto-destroy, the destruction must happen here (2). - delete this; + + if ( m_isDetached ) + { + // if we use cleanup function, this will be done from + // wxPthreadCleanup() +#if !HAVE_THREAD_CLEANUP_FUNCTIONS + ScheduleThreadForDeletion(); + + // don't call OnExit() here, it can only be called in the + // threads context and we're in the context of another thread + + DeleteThread(this); +#endif // HAVE_THREAD_CLEANUP_FUNCTIONS + } + else + { + m_internal->SetExitCode(EXITCODE_CANCELLED); + } return wxTHREAD_NO_ERROR; } } -void wxThread::Exit(void *status) +void wxThread::Exit(ExitCode status) { - // first call user-level clean up code + wxASSERT_MSG( This() == this, + _T("wxThread::Exit() can only be called in the " + "context of the same thread") ); + + // from the moment we call OnExit(), the main program may terminate at any + // moment, so mark this thread as being already in process of being + // deleted or wxThreadModule::OnExit() will try to delete it again + ScheduleThreadForDeletion(); + + // don't enter m_critsect before calling OnExit() because the user code + // might deadlock if, for example, it signals a condition in OnExit() (a + // common case) while the main thread calls any of functions entering + // m_critsect on us (almost all of them do) OnExit(); + // now do enter it because SignalExit() will change our state + m_critsect.Enter(); + // next wake up the threads waiting for us (OTOH, this function won't return // until someone waited for us!) - p_internal->SignalExit(); + m_internal->SignalExit(); - p_internal->SetState(STATE_EXITED); + // leave the critical section before entering the dtor which tries to + // enter it + m_critsect.Leave(); + + // delete C++ thread object if this is a detached thread - user is + // responsible for doing this for joinable ones + if ( m_isDetached ) + { + // FIXME I'm feeling bad about it - what if another thread function is + // called (in another thread context) now? It will try to access + // half destroyed object which will probably result in something + // very bad - but we can't protect this by a crit section unless + // we make it a global object, but this would mean that we can + // only call one thread function at a time :-( + DeleteThread(this); + } - // delete both C++ thread object and terminate the OS thread object - // GL: This is very ugly and buggy ... -// delete this; + // terminate the thread (pthread_exit() never returns) pthread_exit(status); + + wxFAIL_MSG(_T("pthread_exit() failed")); } // also test whether we were paused bool wxThread::TestDestroy() { - wxCriticalSectionLocker lock(m_critsect); + wxASSERT_MSG( This() == this, + _T("wxThread::TestDestroy() can only be called in the " + "context of the same thread") ); + + m_critsect.Enter(); - if ( p_internal->GetState() == STATE_PAUSED ) + if ( m_internal->GetState() == STATE_PAUSED ) { - // leave the crit section or the other threads will stop too if they try - // to call any of (seemingly harmless) IsXXX() functions while we sleep - m_critsect.Leave(); + m_internal->SetReallyPaused(TRUE); - p_internal->Pause(); + // leave the crit section or the other threads will stop too if they + // try to call any of (seemingly harmless) IsXXX() functions while we + // sleep + m_critsect.Leave(); - // enter it back before it's finally left in lock object dtor - m_critsect.Enter(); + m_internal->Pause(); + } + else + { + // thread wasn't requested to pause, nothing to do + m_critsect.Leave(); } - return p_internal->WasCancelled(); + return m_internal->WasCancelled(); } wxThread::~wxThread() { +#ifdef __WXDEBUG__ 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.")); + + // check that the thread either exited or couldn't be created + if ( m_internal->GetState() != STATE_EXITED && + m_internal->GetState() != STATE_NEW ) + { + wxLogDebug(_T("The thread %ld is being destroyed although it is still " + "running! The application may crash."), GetId()); + } m_critsect.Leave(); +#endif // __WXDEBUG__ + + delete m_internal; - delete p_internal; // remove this thread from the global array gs_allThreads.Remove(this); + + // detached thread will decrement this counter in DeleteThread(), but it + // is not called for the joinable threads, so do it here + if ( !m_isDetached ) + { + wxMutexLocker lock( *gs_mutexDeleteThread ); + + gs_nThreadsBeingDeleted--; + + wxLogTrace(TRACE_THREADS, _T("%u scheduled for deletion threads left."), + gs_nThreadsBeingDeleted - 1); + } } // ----------------------------------------------------------------------------- @@ -786,14 +1639,14 @@ bool wxThread::IsRunning() const { wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - return p_internal->GetState() == STATE_RUNNING; + return m_internal->GetState() == STATE_RUNNING; } bool wxThread::IsAlive() const { wxCriticalSectionLocker lock((wxCriticalSection&)m_critsect); - switch ( p_internal->GetState() ) + switch ( m_internal->GetState() ) { case STATE_RUNNING: case STATE_PAUSED: @@ -808,7 +1661,7 @@ bool wxThread::IsPaused() const { wxCriticalSectionLocker lock((wxCriticalSection&)m_critsect); - return (p_internal->GetState() == STATE_PAUSED); + return (m_internal->GetState() == STATE_PAUSED); } //-------------------------------------------------------------------- @@ -838,50 +1691,121 @@ bool wxThreadModule::OnInit() return FALSE; } - gs_mutexGui = new wxMutex(); - gs_tidMain = pthread_self(); +#if wxUSE_GUI + gs_mutexGui = new wxMutex(); + gs_mutexGui->Lock(); +#endif // wxUSE_GUI + + gs_mutexDeleteThread = new wxMutex(); + gs_condAllDeleted = new wxCondition( *gs_mutexDeleteThread ); return TRUE; } void wxThreadModule::OnExit() { - wxASSERT_MSG( wxThread::IsMain(), _T("only main thread can be here") ); + wxASSERT_MSG( wxThread::IsMain(), wxT("only main thread can be here") ); + + // are there any threads left which are being deleted right now? + size_t nThreadsBeingDeleted; + + { + wxMutexLocker lock( *gs_mutexDeleteThread ); + nThreadsBeingDeleted = gs_nThreadsBeingDeleted; + + if ( nThreadsBeingDeleted > 0 ) +{ + wxLogTrace(TRACE_THREADS, _T("Waiting for %u threads to disappear"), + nThreadsBeingDeleted); + + // have to wait until all of them disappear + gs_condAllDeleted->Wait(); + } + } // terminate any threads left size_t count = gs_allThreads.GetCount(); if ( count != 0u ) - wxLogDebug(_T("Some threads were not terminated by the application.")); + { + wxLogDebug(wxT("%u threads were not terminated by the application."), + count); + } for ( size_t n = 0u; n < count; n++ ) { - gs_allThreads[n]->Delete(); + // Delete calls the destructor which removes the current entry. We + // should only delete the first one each time. + gs_allThreads[0]->Delete(); } +#if wxUSE_GUI // destroy GUI mutex gs_mutexGui->Unlock(); delete gs_mutexGui; +#endif // wxUSE_GUI // and free TLD slot (void)pthread_key_delete(gs_keySelf); + + delete gs_condAllDeleted; + delete gs_mutexDeleteThread; } // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- +static void ScheduleThreadForDeletion() +{ + wxMutexLocker lock( *gs_mutexDeleteThread ); + + gs_nThreadsBeingDeleted++; + + wxLogTrace(TRACE_THREADS, _T("%u thread%s waiting to be deleted"), + gs_nThreadsBeingDeleted, + gs_nThreadsBeingDeleted == 1 ? "" : "s"); +} + +static void DeleteThread(wxThread *This) +{ + // gs_mutexDeleteThread should be unlocked before signalling the condition + // or wxThreadModule::OnExit() would deadlock + wxMutexLocker locker( *gs_mutexDeleteThread ); + + wxLogTrace(TRACE_THREADS, _T("Thread %ld auto deletes."), This->GetId()); + + delete This; + + wxCHECK_RET( gs_nThreadsBeingDeleted > 0, + _T("no threads scheduled for deletion, yet we delete " + "one?") ); + + wxLogTrace(TRACE_THREADS, _T("%u scheduled for deletion threads left."), + gs_nThreadsBeingDeleted - 1); + + if ( !--gs_nThreadsBeingDeleted ) + { + // no more threads left, signal it + gs_condAllDeleted->Signal(); + } +} + void wxMutexGuiEnter() { - gs_mutexGui->Lock(); +#if wxUSE_GUI + gs_mutexGui->Lock(); +#endif // wxUSE_GUI } void wxMutexGuiLeave() { - gs_mutexGui->Unlock(); +#if wxUSE_GUI + gs_mutexGui->Unlock(); +#endif // wxUSE_GUI } #endif