X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fae05df5a988883e9c6683ccded766dfb7b84b1b..1987af7e9f5685198b0c19e2326eebf7e56b7834:/src/unix/threadpsx.cpp diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index a6f79d8db1..8fc3c664e1 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -101,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; } @@ -108,7 +109,7 @@ wxMutex::wxMutex() wxMutex::~wxMutex() { if (m_locked > 0) - wxLogDebug(_T("Freeing a locked mutex (%d locks)"), m_locked); + wxLogDebug(wxT("Freeing a locked mutex (%d locks)"), m_locked); pthread_mutex_destroy( &(p_internal->p_mutex) ); delete p_internal; @@ -119,7 +120,7 @@ wxMutexError wxMutex::Lock() int err = pthread_mutex_lock( &(p_internal->p_mutex) ); if (err == EDEADLK) { - wxLogDebug(_T("Locking this mutex would lead to deadlock!")); + wxLogDebug(wxT("Locking this mutex would lead to deadlock!")); return wxMUTEX_DEAD_LOCK; } @@ -155,7 +156,7 @@ wxMutexError wxMutex::Unlock() } else { - wxLogDebug(_T("Unlocking not locked mutex.")); + wxLogDebug(wxT("Unlocking not locked mutex.")); return wxMUTEX_UNLOCKED; } @@ -319,7 +320,7 @@ void *wxThreadInternal::PthreadStart(void *ptr) // terminate the thread thread->Exit(status); - wxFAIL_MSG(_T("wxThread::Exit() can't return.")); + wxFAIL_MSG(wxT("wxThread::Exit() can't return.")); return NULL; } @@ -350,6 +351,8 @@ wxThreadInternal::wxThreadInternal() { m_state = STATE_NEW; m_cancelled = FALSE; + m_prio = WXTHREAD_DEFAULT_PRIORITY; + m_threadId = 0; // this mutex is locked during almost all thread lifetime - it will only be // unlocked in the very end @@ -388,7 +391,7 @@ wxThreadInternal::~wxThreadInternal() 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 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 - @@ -407,7 +410,7 @@ wxThreadError wxThreadInternal::Run() void wxThreadInternal::Wait() { - wxCHECK_RET( WasCancelled(), _T("thread should have been cancelled first") ); + wxCHECK_RET( WasCancelled(), wxT("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 @@ -451,7 +454,7 @@ 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 @@ -466,7 +469,7 @@ void wxThreadInternal::Pause() 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); @@ -535,6 +538,17 @@ wxThreadError wxThread::Create() wxLogError(_("Cannot get priority range for scheduling policy %d."), prio); } + else if ( max_prio == min_prio ) + { + if ( p_internal->GetPriority() != 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; @@ -566,6 +580,9 @@ wxThreadError wxThread::Create() wxThreadError wxThread::Run() { + wxCHECK_MSG( p_internal->GetId(), wxTHREAD_MISC_ERROR, + wxT("must call wxThread::Create() first") ); + return p_internal->Run(); } @@ -577,7 +594,7 @@ 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); @@ -606,7 +623,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")); } } @@ -632,7 +649,7 @@ wxThreadError wxThread::Pause() if ( p_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; } @@ -656,7 +673,7 @@ wxThreadError wxThread::Resume() } else { - wxLogDebug(_T("Attempt to resume a thread which is not paused.")); + wxLogDebug(wxT("Attempt to resume a thread which is not paused.")); return wxTHREAD_MISC_ERROR; } @@ -696,6 +713,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; } @@ -717,6 +736,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; } @@ -762,13 +783,17 @@ 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.")); + if ( p_internal->GetState() != STATE_EXITED && + p_internal->GetState() != STATE_NEW ) + { + wxLogDebug(wxT("The thread is being destroyed although 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); } @@ -844,16 +869,18 @@ bool wxThreadModule::OnInit() 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") ); // 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("Some threads were not terminated by the application.")); 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(); } // destroy GUI mutex