/////////////////////////////////////////////////////////////////////////////
-// Name: thread.cpp
-// Purpose: wxThread Implementation. For Unix ports, see e.g. src/gtk
-// Author: Original from Wolfram Gloger/Guilhem Lavaux
-// Modified by: David Webster
+// Name: src/os2/thread.cpp
+// Purpose: wxThread Implementation
+// Author: Original from Wolfram Gloger/Guilhem Lavaux/David Webster
+// Modified by: Stefan Neis
// Created: 04/22/98
// RCS-ID: $Id$
-// Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
+// Copyright: (c) Stefan Neis (2003)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "thread.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#if wxUSE_THREADS
-#include <stdio.h>
+#include "wx/thread.h"
-#include "wx/module.h"
-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/module.h"
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/thread.h"
+
+#include <stdio.h>
#define INCL_DOSSEMAPHORES
#define INCL_DOSPROCESS
+#define INCL_DOSMISC
#define INCL_ERRORS
#include <os2.h>
#ifndef __EMX__
};
// ----------------------------------------------------------------------------
-// static variables
+// this module's globals
// ----------------------------------------------------------------------------
// id of the main thread - the one which can call GUI functions without first
// calling wxMutexGuiEnter()
-static ULONG s_ulIdMainThread = 0;
+wxThreadIdType wxThread::ms_idMainThread = 0;
wxMutex* p_wxMainMutex;
// OS2 substitute for Tls pointer the current parent thread object
-wxThread* m_pThread; // pointer to the wxWindows thread object
+wxThread* m_pThread; // pointer to the wxWidgets thread object
-// if it's FALSE, some secondary thread is holding the GUI lock
-static bool gs_bGuiOwnedByMainThread = TRUE;
+// if it's false, some secondary thread is holding the GUI lock
+static bool gs_bGuiOwnedByMainThread = true;
// critical section which controls access to all GUI functions: any secondary
// thread (i.e. except the main one) must enter this crit section before doing
static size_t gs_nWaitingForGui = 0;
// are we waiting for a thread termination?
-static bool gs_bWaitingForThread = FALSE;
+static bool gs_bWaitingForThread = false;
// ============================================================================
-// OS/2 implementation of thread classes
+// OS/2 implementation of thread and related classes
// ============================================================================
// ----------------------------------------------------------------------------
class wxMutexInternal
{
public:
+ wxMutexInternal(wxMutexType mutexType);
+ ~wxMutexInternal();
+
+ bool IsOk() const { return m_vMutex != NULL; }
+
+ wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); }
+ wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); }
+ wxMutexError TryLock();
+ wxMutexError Unlock();
+
+private:
+ wxMutexError LockTimeout(ULONG ulMilliseconds);
HMTX m_vMutex;
};
-wxMutex::wxMutex(
- wxMutexType eMutexType
-)
+// all mutexes are "pseudo-"recursive under OS2 so we don't use mutexType
+// (Calls to DosRequestMutexSem and DosReleaseMutexSem can be nested, but
+// the request count for a semaphore cannot exceed 65535. If an attempt is
+// made to exceed this number, ERROR_TOO_MANY_SEM_REQUESTS is returned.)
+wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(eMutexType))
{
- APIRET ulrc;
-
- m_internal = new wxMutexInternal;
- ulrc = ::DosCreateMutexSem(NULL, &m_internal->m_vMutex, 0L, FALSE);
+ APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
if (ulrc != 0)
{
- wxLogSysError(_("Can not create mutex."));
+ wxLogSysError(_("Cannot create mutex."));
+ m_vMutex = NULL;
+ }
+}
+
+wxMutexInternal::~wxMutexInternal()
+{
+ if (m_vMutex)
+ {
+ if (::DosCloseMutexSem(m_vMutex))
+ {
+ wxLogLastError(wxT("DosCloseMutexSem(mutex)"));
+ }
}
}
-wxMutex::~wxMutex()
+wxMutexError wxMutexInternal::TryLock()
{
- ::DosCloseMutexSem(m_internal->m_vMutex);
- m_internal->m_vMutex = NULL;
+ const wxMutexError rc = LockTimeout( SEM_IMMEDIATE_RETURN );
+
+ // we have a special return code for timeout in this case
+ return rc == wxMUTEX_TIMEOUT ? wxMUTEX_BUSY : rc;
}
-wxMutexError wxMutex::Lock()
+wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
{
APIRET ulrc;
- ulrc = ::DosRequestMutexSem(m_internal->m_vMutex, SEM_INDEFINITE_WAIT);
+ ulrc = ::DosRequestMutexSem(m_vMutex, ulMilliseconds);
switch (ulrc)
{
+ case ERROR_TIMEOUT:
+ return wxMUTEX_TIMEOUT;
case ERROR_TOO_MANY_SEM_REQUESTS:
return wxMUTEX_BUSY;
wxLogSysError(_("Couldn't acquire a mutex lock"));
return wxMUTEX_MISC_ERROR;
- case ERROR_TIMEOUT:
default:
wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
- }
- return wxMUTEX_NO_ERROR;
-}
-
-wxMutexError wxMutex::TryLock()
-{
- ULONG ulrc;
-
- ulrc = ::DosRequestMutexSem(m_internal->m_vMutex, SEM_IMMEDIATE_RETURN /*0L*/);
- if (ulrc == ERROR_TIMEOUT || ulrc == ERROR_TOO_MANY_SEM_REQUESTS)
- return wxMUTEX_BUSY;
-
+ return wxMUTEX_MISC_ERROR;
+ }
return wxMUTEX_NO_ERROR;
}
-wxMutexError wxMutex::Unlock()
+wxMutexError wxMutexInternal::Unlock()
{
APIRET ulrc;
- ulrc = ::DosReleaseMutexSem(m_internal->m_vMutex);
+ ulrc = ::DosReleaseMutexSem(m_vMutex);
if (ulrc != 0)
{
wxLogSysError(_("Couldn't release a mutex"));
return wxMUTEX_NO_ERROR;
}
-// ----------------------------------------------------------------------------
-// wxCondition implementation
-// ----------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// wxSemaphore
+// --------------------------------------------------------------------------
-class wxConditionInternal
+// a trivial wrapper around OS2 event semaphore
+class wxSemaphoreInternal
{
public:
- inline wxConditionInternal (wxMutex& rMutex) : m_vMutex(rMutex)
- {
- ::DosCreateEventSem(NULL, &m_vEvent, DC_SEM_SHARED, FALSE);
- if (!m_vEvent)
- {
- wxLogSysError(_("Can not create event semaphore."));
- }
- m_nWaiters = 0;
- }
-
- inline APIRET Wait(
- unsigned long ulTimeout
- )
- {
- APIRET ulrc;
+ wxSemaphoreInternal(int initialcount, int maxcount);
+ ~wxSemaphoreInternal();
- m_nWaiters++;
- ulrc = ::DosWaitEventSem(m_vEvent, ulTimeout);
- m_nWaiters--;
- return (ulrc);
- }
+ bool IsOk() const { return m_vEvent != NULL; }
- inline ~wxConditionInternal ()
- {
- APIRET ulrc;
+ wxSemaError Wait() { return WaitTimeout(SEM_INDEFINITE_WAIT); }
+ wxSemaError TryWait() { return WaitTimeout(SEM_IMMEDIATE_RETURN); }
+ wxSemaError WaitTimeout(unsigned long milliseconds);
- if (m_vEvent)
- {
- ulrc = ::DosCloseEventSem(m_vEvent);
- if (!ulrc)
- {
- wxLogLastError("DosCloseEventSem(m_vEvent)");
- }
- }
- }
+ wxSemaError Post();
- HEV m_vEvent;
- int m_nWaiters;
- wxMutex& m_vMutex;
+private:
+ HEV m_vEvent;
+ HMTX m_vMutex;
+ int m_count;
+ int m_maxcount;
};
-wxCondition::wxCondition(wxMutex& rMutex)
-{
- APIRET ulrc;
- ULONG ulCount;
-
- m_internal = new wxConditionInternal(rMutex);
- ulrc = ::DosCreateEventSem(NULL, &m_internal->m_vEvent, 0L, FALSE);
- if (ulrc != 0)
- {
- wxLogSysError(_("Can not create event object."));
- }
- m_internal->m_nWaiters = 0;
- // ?? just for good measure?
- ::DosResetEventSem(m_internal->m_vEvent, &ulCount);
-}
-
-wxCondition::~wxCondition()
+wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
{
- ::DosCloseEventSem(m_internal->m_vEvent);
- delete m_internal;
- m_internal = NULL;
-}
-
-wxCondError wxCondition::Wait()
-{
- APIRET rc = m_internal->Wait(SEM_INDEFINITE_WAIT);
-
- switch(rc)
+ APIRET ulrc;
+ if ( maxcount == 0 )
{
- case NO_ERROR:
- return wxCOND_NO_ERROR;
- case ERROR_INVALID_HANDLE:
- return wxCOND_INVALID;
- case ERROR_TIMEOUT:
- return wxCOND_TIMEOUT;
- default:
- return wxCOND_MISC_ERROR;
+ // make it practically infinite
+ maxcount = INT_MAX;
}
-}
-
-wxCondError wxCondition::WaitTimeout(
- unsigned long lMilliSec
-)
-{
- APIRET rc = m_internal->Wait(lMilliSec);
- switch(rc)
+ m_count = initialcount;
+ m_maxcount = maxcount;
+ ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
+ if (ulrc != 0)
{
- case NO_ERROR:
- return wxCOND_NO_ERROR;
- case ERROR_INVALID_HANDLE:
- return wxCOND_INVALID;
- case ERROR_TIMEOUT:
- return wxCOND_TIMEOUT;
- default:
- return wxCOND_MISC_ERROR;
+ wxLogLastError(wxT("DosCreateMutexSem()"));
+ m_vMutex = NULL;
+ m_vEvent = NULL;
+ return;
}
-}
-
-wxCondError wxCondition::Signal()
-{
- APIRET rc = ::DosPostEventSem(m_internal->m_vEvent);
-
- switch(rc)
+ ulrc = ::DosCreateEventSem(NULL, &m_vEvent, 0L, FALSE);
+ if ( ulrc != 0)
{
- case NO_ERROR:
- return wxCOND_NO_ERROR;
- case ERROR_INVALID_HANDLE:
- return wxCOND_INVALID;
- default:
- return wxCOND_MISC_ERROR;
+ wxLogLastError(wxT("DosCreateEventSem()"));
+ ::DosCloseMutexSem(m_vMutex);
+ m_vMutex = NULL;
+ m_vEvent = NULL;
}
+ if (initialcount)
+ ::DosPostEventSem(m_vEvent);
}
-wxCondError wxCondition::Broadcast()
+wxSemaphoreInternal::~wxSemaphoreInternal()
{
- int i;
- APIRET rc = NO_ERROR;
-
- for (i = 0; i < m_internal->m_nWaiters; i++)
+ if ( m_vEvent )
{
- if ((rc = ::DosPostEventSem(m_internal->m_vEvent)) != NO_ERROR)
+ if ( ::DosCloseEventSem(m_vEvent) )
{
- wxLogSysError(_("Couldn't change the state of event object."));
- break;
+ wxLogLastError(wxT("DosCloseEventSem(semaphore)"));
}
- }
-
- switch(rc)
- {
- case NO_ERROR:
- return wxCOND_NO_ERROR;
- case ERROR_INVALID_HANDLE:
- return wxCOND_INVALID;
- default:
- return wxCOND_MISC_ERROR;
+ if ( ::DosCloseMutexSem(m_vMutex) )
+ {
+ wxLogLastError(wxT("DosCloseMutexSem(semaphore)"));
+ }
+ else
+ m_vEvent = NULL;
}
}
-// ----------------------------------------------------------------------------
-// wxCriticalSection implementation
-// ----------------------------------------------------------------------------
-
-wxCriticalSection::wxCriticalSection()
+wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long ulMilliseconds)
{
+ APIRET ulrc;
+ do {
+ ulrc = ::DosWaitEventSem(m_vEvent, ulMilliseconds );
+ switch ( ulrc )
+ {
+ case NO_ERROR:
+ break;
+
+ case ERROR_TIMEOUT:
+ if (ulMilliseconds == SEM_IMMEDIATE_RETURN)
+ return wxSEMA_BUSY;
+ else
+ return wxSEMA_TIMEOUT;
+
+ default:
+ wxLogLastError(wxT("DosWaitEventSem(semaphore)"));
+ return wxSEMA_MISC_ERROR;
+ }
+ ulrc = :: DosRequestMutexSem(m_vMutex, ulMilliseconds);
+ switch ( ulrc )
+ {
+ case NO_ERROR:
+ // ok
+ break;
+
+ case ERROR_TIMEOUT:
+ case ERROR_TOO_MANY_SEM_REQUESTS:
+ if (ulMilliseconds == SEM_IMMEDIATE_RETURN)
+ return wxSEMA_BUSY;
+ else
+ return wxSEMA_TIMEOUT;
+
+ default:
+ wxFAIL_MSG(wxT("DosRequestMutexSem(mutex)"));
+ return wxSEMA_MISC_ERROR;
+ }
+ bool OK = false;
+ if (m_count > 0)
+ {
+ m_count--;
+ OK = true;
+ }
+ else
+ {
+ ULONG ulPostCount;
+ ::DosResetEventSem(m_vEvent, &ulPostCount);
+ }
+ ::DosReleaseMutexSem(m_vMutex);
+ if (OK)
+ return wxSEMA_NO_ERROR;
+ } while (ulMilliseconds == SEM_INDEFINITE_WAIT);
+
+ if (ulMilliseconds == SEM_IMMEDIATE_RETURN)
+ return wxSEMA_BUSY;
+ return wxSEMA_TIMEOUT;
}
-wxCriticalSection::~wxCriticalSection()
+wxSemaError wxSemaphoreInternal::Post()
{
-}
+ APIRET ulrc;
+ ulrc = ::DosRequestMutexSem(m_vMutex, SEM_INDEFINITE_WAIT);
+ if (ulrc != NO_ERROR)
+ return wxSEMA_MISC_ERROR;
+ bool OK = false;
+ if (m_count < m_maxcount)
+ {
+ m_count++;
+ ulrc = ::DosPostEventSem(m_vEvent);
+ OK = true;
+ }
+ ::DosReleaseMutexSem(m_vMutex);
+ if (!OK)
+ return wxSEMA_OVERFLOW;
+ if ( ulrc != NO_ERROR && ulrc != ERROR_ALREADY_POSTED )
+ {
+ wxLogLastError(wxT("DosPostEventSem(semaphore)"));
-void wxCriticalSection::Enter()
-{
- ::DosEnterCritSec();
-}
+ return wxSEMA_MISC_ERROR;
+ }
-void wxCriticalSection::Leave()
-{
- ::DosExitCritSec();
+ return wxSEMA_NO_ERROR;
}
// ----------------------------------------------------------------------------
{
m_hThread = 0;
m_eState = STATE_NEW;
- m_nPriority = 0;
+ m_nPriority = WXTHREAD_DEFAULT_PRIORITY;
}
~wxThreadInternal()
{
- Free();
- }
-
- void Free()
- {
- if (m_hThread)
- {
- ::DosExit(0,0);
- m_hThread = 0;
- }
+ m_hThread = 0;
}
// create a new (suspended) thread (for the given thread object)
TID GetId() const { return m_hThread; }
// thread function
- static DWORD OS2ThreadStart(wxThread *thread);
+ static void OS2ThreadStart(void* pParam);
private:
// Threads in OS/2 have only an ID, so m_hThread is both it's handle and ID
// PM also has no real Tls mechanism to index pointers by so we'll just
- // keep track of the wxWindows parent object here.
+ // keep track of the wxWidgets parent object here.
TID m_hThread; // handle and ID of the thread
wxThreadState m_eState; // state, see wxThreadState enum
unsigned int m_nPriority; // thread priority in "wx" units
};
-ULONG wxThreadInternal::OS2ThreadStart(
- wxThread* pThread
-)
+void wxThreadInternal::OS2ThreadStart( void * pParam )
{
- m_pThread = pThread;
+ DWORD dwRet;
+ bool bWasCancelled;
- DWORD dwRet = (DWORD)pThread->Entry();
+ wxThread *pThread = (wxThread *)pParam;
- // enter m_critsect before changing the thread state
+ // first of all, wait for the thread to be started.
pThread->m_critsect.Enter();
+ pThread->m_critsect.Leave();
+ // Now check whether we hadn't been cancelled already and don't
+ // start the user code at all in this case.
+ if ( pThread->m_internal->GetState() == STATE_EXITED )
+ {
+ dwRet = (DWORD)-1;
+ bWasCancelled = true;
+ }
+ else // do run thread
+ {
+ wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ unsigned long ulHab;
+ if (traits)
+ traits->InitializeGui(ulHab);
+ dwRet = (DWORD)pThread->Entry();
+ if (traits)
+ traits->TerminateGui(ulHab);
- bool bWasCancelled = pThread->m_internal->GetState() == STATE_CANCELED;
+ // enter m_critsect before changing the thread state
+ pThread->m_critsect.Enter();
- pThread->m_internal->SetState(STATE_EXITED);
- pThread->m_critsect.Leave();
+ bWasCancelled = pThread->m_internal->GetState() == STATE_CANCELED;
+ pThread->m_internal->SetState(STATE_EXITED);
+ pThread->m_critsect.Leave();
+ }
pThread->OnExit();
// if the thread was cancelled (from Delete()), then it the handle is still
delete pThread;
}
//else: the joinable threads handle will be closed when Wait() is done
- return dwRet;
+ return;
}
void wxThreadInternal::SetPriority(
unsigned int nPriority
)
{
- // translate wxWindows priority to the PM one
- ULONG ulOS2_Priority;
+ // translate wxWidgets priority to the PM one
+ ULONG ulOS2_PriorityClass;
+ ULONG ulOS2_SubPriority;
ULONG ulrc;
m_nPriority = nPriority;
-
- if (m_nPriority <= 20)
- ulOS2_Priority = PRTYC_NOCHANGE;
- else if (m_nPriority <= 40)
- ulOS2_Priority = PRTYC_IDLETIME;
- else if (m_nPriority <= 60)
- ulOS2_Priority = PRTYC_REGULAR;
- else if (m_nPriority <= 80)
- ulOS2_Priority = PRTYC_TIMECRITICAL;
+ if (m_nPriority <= 25)
+ ulOS2_PriorityClass = PRTYC_IDLETIME;
+ else if (m_nPriority <= 50)
+ ulOS2_PriorityClass = PRTYC_REGULAR;
+ else if (m_nPriority <= 75)
+ ulOS2_PriorityClass = PRTYC_TIMECRITICAL;
else if (m_nPriority <= 100)
- ulOS2_Priority = PRTYC_FOREGROUNDSERVER;
+ ulOS2_PriorityClass = PRTYC_FOREGROUNDSERVER;
else
{
wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
- ulOS2_Priority = PRTYC_REGULAR;
+ ulOS2_PriorityClass = PRTYC_REGULAR;
}
+ ulOS2_SubPriority = (ULONG) (((m_nPriority - 1) % 25 + 1) * 31.0 / 25);
ulrc = ::DosSetPriority( PRTYS_THREAD
- ,ulOS2_Priority
- ,0
+ ,ulOS2_PriorityClass
+ ,ulOS2_SubPriority
,(ULONG)m_hThread
);
if (ulrc != 0)
}
}
-bool wxThreadInternal::Create(
- wxThread* pThread
-, unsigned int uStackSize
-)
+bool wxThreadInternal::Create( wxThread* pThread,
+ unsigned int uStackSize)
{
- APIRET ulrc;
+ int tid;
- ulrc = ::DosCreateThread( &m_hThread
- ,(PFNTHREAD)wxThreadInternal::OS2ThreadStart
- ,(ULONG)pThread
- ,CREATE_SUSPENDED | STACK_SPARSE
- ,(ULONG)uStackSize
- );
- if(ulrc != 0)
+ if (!uStackSize)
+ uStackSize = 131072;
+
+ pThread->m_critsect.Enter();
+ tid = _beginthread(wxThreadInternal::OS2ThreadStart,
+ NULL, uStackSize, pThread);
+ if(tid == -1)
{
wxLogSysError(_("Can't create thread"));
- return FALSE;
+ return false;
}
+ m_hThread = tid;
if (m_nPriority != WXTHREAD_DEFAULT_PRIORITY)
{
SetPriority(m_nPriority);
}
- return(TRUE);
+
+ return true;
}
bool wxThreadInternal::Suspend()
{
- ULONG ulrc = ::DosSuspendThread(m_hThread);
+ ULONG ulrc = ::DosSuspendThread(m_hThread);
if (ulrc != 0)
{
- wxLogSysError(_("Can not suspend thread %lu"), m_hThread);
- return FALSE;
+ wxLogSysError(_("Cannot suspend thread %lu"), m_hThread);
+ return false;
}
m_eState = STATE_PAUSED;
- return TRUE;
+
+ return true;
}
bool wxThreadInternal::Resume()
{
- ULONG ulrc = ::DosResumeThread(m_hThread);
+ ULONG ulrc = ::DosResumeThread(m_hThread);
if (ulrc != 0)
{
- wxLogSysError(_("Can not suspend thread %lu"), m_hThread);
- return FALSE;
+ wxLogSysError(_("Cannot resume thread %lu"), m_hThread);
+ return false;
}
- m_eState = STATE_PAUSED;
- return TRUE;
+
+ // don't change the state from STATE_EXITED because it's special and means
+ // we are going to terminate without running any user code - if we did it,
+ // the codei n Delete() wouldn't work
+ if ( m_eState != STATE_EXITED )
+ {
+ m_eState = STATE_RUNNING;
+ }
+
+ return true;
}
// static functions
return pThread;
}
-bool wxThread::IsMain()
-{
- PTIB ptib;
- PPIB ppib;
-
- ::DosGetInfoBlocks(&ptib, &ppib);
-
- if (ptib->tib_ptib2->tib2_ultid == s_ulIdMainThread)
- return TRUE;
- return FALSE;
-}
-
#ifdef Yield
#undef Yield
#endif
::DosSleep(0);
}
-void wxThread::Sleep(
- unsigned long ulMilliseconds
-)
+int wxThread::GetCPUCount()
+{
+ ULONG CPUCount;
+ APIRET ulrc;
+ ulrc = ::DosQuerySysInfo(26, 26, (void *)&CPUCount, sizeof(ULONG));
+ // QSV_NUMPROCESSORS(26) is typically not defined in header files
+
+ if (ulrc != 0)
+ CPUCount = 1;
+
+ return CPUCount;
+}
+
+wxThreadIdType wxThread::GetCurrentId()
+{
+ PTIB ptib;
+ PPIB ppib;
+
+ ::DosGetInfoBlocks(&ptib, &ppib);
+ return (wxThreadIdType) ptib->tib_ptib2->tib2_ultid;
+}
+
+bool wxThread::SetConcurrency(size_t level)
{
- ::DosSleep(ulMilliseconds);
+ wxASSERT_MSG( IsMain(), wxT("should only be called from the main thread") );
+
+ // ok only for the default one
+ if ( level == 0 )
+ return 0;
+
+ // Don't know how to realize this on OS/2.
+ return level == 1;
}
// ctor and dtor
unsigned int uStackSize
)
{
+ wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+
if ( !m_internal->Create(this, uStackSize) )
return wxTHREAD_NO_RESOURCE;
wxThreadError wxThread::Resume()
{
+ if (m_internal->GetState() == STATE_NEW)
+ {
+ m_internal->SetState(STATE_RUNNING);
+ m_critsect.Leave();
+ return wxTHREAD_NO_ERROR;
+ }
+
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
return m_internal->Resume() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;
// stopping thread
// ---------------
-wxThread::ExitCode wxThread::Wait()
+wxThread::ExitCode wxThread::Wait(wxThreadWait waitMode)
{
// although under Windows we can wait for any thread, it's an error to
// wait for a detached one in wxWin API
wxCHECK_MSG( !IsDetached(), (ExitCode)-1,
- _T("can't wait for detached thread") );
+ wxT("can't wait for detached thread") );
ExitCode rc = (ExitCode)-1;
- (void)Delete(&rc);
- m_internal->Free();
+ (void)Delete(&rc, waitMode);
return(rc);
}
-wxThreadError wxThread::Delete(ExitCode *pRc)
+wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode))
{
ExitCode rc = 0;
// Delete() is always safe to call, so consider all possible states
- if (IsPaused())
+
+ // we might need to resume the thread, but we might also not need to cancel
+ // it if it doesn't run yet
+ bool shouldResume = false,
+ shouldCancel = true,
+ isRunning = false;
+
+ // check if the thread already started to run
+ {
+ wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+
+ if ( m_internal->GetState() == STATE_NEW )
+ {
+ // WinThreadStart() will see it and terminate immediately, no need
+ // to cancel the thread - but we still need to resume it to let it
+ // run
+ m_internal->SetState(STATE_EXITED);
+
+ Resume(); // it knows about STATE_EXITED special case
+
+ shouldCancel = false;
+ isRunning = true;
+
+ // shouldResume is correctly set to false here
+ }
+ else
+ {
+ shouldResume = IsPaused();
+ }
+ }
+
+ // resume the thread if it is paused
+ if ( shouldResume )
Resume();
- TID hThread = m_internal->GetHandle();
+ TID hThread = m_internal->GetHandle();
- if (IsRunning())
+ if ( isRunning || IsRunning())
{
if (IsMain())
{
// set flag for wxIsWaitingForThread()
- gs_bWaitingForThread = TRUE;
-
-#if wxUSE_GUI
- wxBeginBusyCursor();
-#endif // wxUSE_GUI
+ gs_bWaitingForThread = true;
}
// ask the thread to terminate
+ if ( shouldCancel )
{
wxCriticalSectionLocker lock(m_critsect);
+
m_internal->Cancel();
}
-#if wxUSE_GUI
- // need a way to finish GUI processing before killing the thread
- // until then we just exit
-
- if ((gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread())
+#if 0
+ // we can't just wait for the thread to terminate because it might be
+ // calling some GUI functions and so it will never terminate before we
+ // process the Windows messages that result from these functions
+ DWORD result = 0; // suppress warnings from broken compilers
+ do
{
- wxMutexGuiLeave();
- }
-#else // !wxUSE_GUI
+ if ( IsMain() )
+ {
+ // give the thread we're waiting for chance to do the GUI call
+ // it might be in
+ if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
+ {
+ wxMutexGuiLeave();
+ }
+ }
- // can't wait for yourself to end under OS/2 so just quit
+ result = ::DosWaitThread(&hThread, DCWW_NOWAIT);
+ // FIXME: We ought to have a message processing loop here!!
+ switch ( result )
+ {
+ case ERROR_INTERRUPT:
+ case ERROR_THREAD_NOT_TERMINATED:
+ break;
+ case ERROR_INVALID_THREADID:
+ case NO_ERROR:
+ // thread we're waiting for just terminated
+ // or even does not exist any more.
+ result = NO_ERROR;
+ break;
+ default:
+ wxFAIL_MSG(wxT("unexpected result of DosWaitThread"));
+ }
+ if ( IsMain() )
+ {
+ // event processing - needed if we are the main thread
+ // to give other threads a chance to do remaining GUI
+ // processing and terminate cleanly.
+ wxTheApp->HandleSockets();
+ if (wxTheApp->Pending())
+ if ( !wxTheApp->DoMessage() )
+ {
+ // WM_QUIT received: kill the thread
+ Kill();
+
+ return wxTHREAD_KILLED;
+ }
+ else
+ wxUsleep(10);
+ }
+ else
+ wxUsleep(10);
+ } while ( result != NO_ERROR );
+#else // !wxUSE_GUI
+ // simply wait for the thread to terminate
+ //
+ // OTOH, even console apps create windows (in wxExecute, for WinSock
+ // &c), so may be use MsgWaitForMultipleObject() too here?
+ if ( ::DosWaitThread(&hThread, DCWW_WAIT) != NO_ERROR )
+ {
+ wxFAIL_MSG(wxT("unexpected result of DosWaitThread"));
+ }
#endif // wxUSE_GUI/!wxUSE_GUI
if ( IsMain() )
{
- gs_bWaitingForThread = FALSE;
-
-#if wxUSE_GUI
- wxEndBusyCursor();
-#endif // wxUSE_GUI
+ gs_bWaitingForThread = false;
}
}
- ::DosExit(0, 0);
- // probably won't get this far, but
- if (IsDetached())
+#if 0
+ // although the thread might be already in the EXITED state it might not
+ // have terminated yet and so we are not sure that it has actually
+ // terminated if the "if" above hadn't been taken
+ do
+ {
+ if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
+ {
+ wxLogLastError(wxT("GetExitCodeThread"));
+
+ rc = (ExitCode)-1;
+ }
+ } while ( (DWORD)rc == STILL_ACTIVE );
+#endif
+
+ if ( IsDetached() )
{
+ // if the thread exits normally, this is done in WinThreadStart, but in
+ // this case it would have been too early because
+ // MsgWaitForMultipleObject() would fail if the thread handle was
+ // closed while we were waiting on it, so we must do it here
delete this;
}
return wxTHREAD_NOT_RUNNING;
::DosKillThread(m_internal->GetHandle());
- m_internal->Free();
if (IsDetached())
{
delete this;
return wxTHREAD_NO_ERROR;
}
-void wxThread::Exit(
- ExitCode pStatus
-)
+void wxThread::Exit(ExitCode WXUNUSED(pStatus))
{
- m_internal->Free();
delete this;
- ::DosExit(EXIT_THREAD, ULONG(pStatus));
+ _endthread();
wxFAIL_MSG(wxT("Couldn't return from DosExit()!"));
}
gs_pCritsectGui = new wxCriticalSection();
gs_pCritsectGui->Enter();
- PTIB ptib;
- PPIB ppib;
-
- ::DosGetInfoBlocks(&ptib, &ppib);
+ wxThread::ms_idMainThread = wxThread::GetCurrentId();
- s_ulIdMainThread = ptib->tib_ptib2->tib2_ultid;
- return TRUE;
+ return true;
}
void wxThreadModule::OnExit()
// Helper functions
// ----------------------------------------------------------------------------
-// Does nothing under OS/2 [for now]
+// wake up the main thread if it's in ::GetMessage()
void WXDLLEXPORT wxWakeUpMainThread()
{
+#if 0
+ if ( !::WinPostQueueMsg(wxTheApp->m_hMq, WM_NULL, 0, 0) )
+ {
+ // should never happen
+ wxLogLastError(wxT("WinPostMessage(WM_NULL)"));
+ }
+#endif
+}
+
+void wxMutexGuiEnterImpl()
+{
+ // this would dead lock everything...
+ wxASSERT_MSG( !wxThread::IsMain(),
+ wxT("main thread doesn't want to block in wxMutexGuiEnter()!") );
+
+ // the order in which we enter the critical sections here is crucial!!
+
+ // set the flag telling to the main thread that we want to do some GUI
+ {
+ wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
+
+ gs_nWaitingForGui++;
+ }
+
+ wxWakeUpMainThread();
+
+ // now we may block here because the main thread will soon let us in
+ // (during the next iteration of OnIdle())
+ gs_pCritsectGui->Enter();
}
-void WXDLLEXPORT wxMutexGuiLeave()
+void wxMutexGuiLeaveImpl()
{
wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
if ( wxThread::IsMain() )
{
- gs_bGuiOwnedByMainThread = FALSE;
+ gs_bGuiOwnedByMainThread = false;
}
else
{
{
gs_pCritsectGui->Enter();
- gs_bGuiOwnedByMainThread = TRUE;
+ gs_bGuiOwnedByMainThread = true;
}
//else: already have it, nothing to do
}
return gs_bWaitingForThread;
}
+// ----------------------------------------------------------------------------
+// include common implementation code
+// ----------------------------------------------------------------------------
+
+#include "wx/thrimpl.cpp"
+
#endif
// wxUSE_THREADS
projects / wxWidgets.git / blobdiff