wxMutex::~wxMutex()
{
if (m_locked > 0)
- wxLogDebug("Freeing a locked mutex (%d locks)", m_locked);
+ wxLogDebug(_T("Freeing a locked mutex (%d locks)"), m_locked);
pthread_mutex_destroy( &(p_internal->p_mutex) );
delete p_internal;
int err = pthread_mutex_lock( &(p_internal->p_mutex) );
if (err == EDEADLK)
{
- wxLogDebug("Locking this mutex would lead to deadlock!");
+ wxLogDebug(_T("Locking this mutex would lead to deadlock!"));
return wxMUTEX_DEAD_LOCK;
}
}
else
{
- wxLogDebug("Unlocking not locked mutex.");
+ wxLogDebug(_T("Unlocking not locked mutex."));
return wxMUTEX_UNLOCKED;
}
// 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;
+ // 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
{
wxThread *thread = (wxThread *)ptr;
wxThreadInternal *pthread = thread->p_internal;
+ void *status;
int rc = pthread_setspecific(gs_keySelf, thread);
if ( rc != 0 )
{
- wxLogSysError(rc, _("Can not start thread: error writing TLS."));
+ wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
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);
- wxFAIL_MSG("wxThread::Exit() can't return.");
+ wxFAIL_MSG(_T("wxThread::Exit() can't return."));
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
+
+ // 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()
{
wxCHECK_MSG( GetState() == STATE_NEW, wxTHREAD_RUNNING,
- "thread may only be started once after successful Create()" );
+ _T("thread may only be started once after successful 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 -
void wxThreadInternal::Wait()
{
- wxCHECK_RET( WasCancelled(), "thread should have been cancelled first" );
+ 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
// 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()
// 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,
- "thread must first be paused with wxThread::Pause()." );
+ _T("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
void wxThreadInternal::Resume()
{
wxCHECK_RET( m_state == STATE_PAUSED,
- "can't resume thread which is not suspended." );
+ _T("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);
int prio;
if ( pthread_attr_getschedpolicy(&attr, &prio) != 0 )
{
- wxLogError(_("Can not retrieve thread scheduling policy."));
+ wxLogError(_("Cannot retrieve thread scheduling policy."));
}
int min_prio = sched_get_priority_min(prio),
if ( min_prio == -1 || max_prio == -1 )
{
- wxLogError(_("Can not get priority range for scheduling policy %d."),
+ wxLogError(_("Cannot get priority range for scheduling policy %d."),
prio);
}
else
}
#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);
+#endif // HAVE_PTHREAD_ATTR_SETSCOPE
+
// create the new OS thread object
int rc = pthread_create(p_internal->GetIdPtr(), &attr,
wxThreadInternal::PthreadStart, (void *)this);
{
wxCHECK_RET( ((int)WXTHREAD_MIN_PRIORITY <= (int)prio) &&
((int)prio <= (int)WXTHREAD_MAX_PRIORITY),
- "invalid thread priority" );
+ _T("invalid thread priority") );
wxCriticalSectionLocker lock(m_critsect);
case STATE_EXITED:
default:
- wxFAIL_MSG("impossible to set thread priority in this state");
+ wxFAIL_MSG(_T("impossible to set thread priority in this state"));
}
}
if ( p_internal->GetState() != STATE_RUNNING )
{
- wxLogDebug("Can't pause thread which is not running.");
+ wxLogDebug(_T("Can't pause thread which is not running."));
return wxTHREAD_NOT_RUNNING;
}
if ( p_internal->GetState() == STATE_PAUSED )
{
+ m_critsect.Leave();
p_internal->Resume();
+ m_critsect.Enter();
return wxTHREAD_NO_ERROR;
}
else
{
- wxLogDebug("Attempt to resume a thread which is not paused.");
+ wxLogDebug(_T("Attempt to resume a thread which is not paused."));
return wxTHREAD_MISC_ERROR;
}
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:
p_internal->SetState(STATE_EXITED);
// delete both C++ thread object and terminate the OS thread object
- delete this;
+ // GL: This is very ugly and buggy ...
+// delete this;
pthread_exit(status);
}
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);
}
}
}
+bool wxThread::IsPaused() const
+{
+ wxCriticalSectionLocker lock((wxCriticalSection&)m_critsect);
+
+ return (p_internal->GetState() == STATE_PAUSED);
+}
+
//--------------------------------------------------------------------
// wxThreadModule
//--------------------------------------------------------------------
bool wxThreadModule::OnInit()
{
- if ( pthread_key_create(&gs_keySelf, NULL /* dtor function */) != 0 )
+ int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
+ if ( rc != 0 )
{
- wxLogError(_("Thread module initialization failed: "
- "failed to create pthread key."));
+ wxLogSysError(rc, _("Thread module initialization failed: "
+ "failed to create thread key"));
return FALSE;
}
gs_mutexGui = new wxMutex();
- //wxThreadGuiInit();
-
gs_tidMain = pthread_self();
+
gs_mutexGui->Lock();
return TRUE;
void wxThreadModule::OnExit()
{
- wxASSERT_MSG( wxThread::IsMain(), "only main thread can be here" );
+ wxASSERT_MSG( wxThread::IsMain(), _T("only main thread can be here") );
// terminate any threads left
size_t count = gs_allThreads.GetCount();
if ( count != 0u )
- wxLogDebug("Some threads were not terminated by the application.");
+ wxLogDebug(_T("Some threads were not terminated by the application."));
for ( size_t n = 0u; n < count; n++ )
{
// destroy GUI mutex
gs_mutexGui->Unlock();
- //wxThreadGuiExit();
-
delete gs_mutexGui;
// and free TLD slot
projects / wxWidgets.git / blobdiff