/////////////////////////////////////////////////////////////////////////////
-// 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
// ----------------------------------------------------------------------------
#include <stdio.h>
+#include "wx/app.h"
#include "wx/module.h"
+#include "wx/intl.h"
+#include "wx/utils.h"
+#include "wx/log.h"
#include "wx/thread.h"
#define INCL_DOSSEMAPHORES
#define INCL_DOSPROCESS
+#define INCL_DOSMISC
#define INCL_ERRORS
#include <os2.h>
+#ifndef __EMX__
#include <bseerr.h>
-
+#endif
// the possible states of the thread ("=>" shows all possible transitions from
// this state)
enum wxThreadState
};
// ----------------------------------------------------------------------------
-// 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;
+static ULONG s_ulIdMainThread = 1;
wxMutex* p_wxMainMutex;
// OS2 substitute for Tls pointer the current parent thread object
wxThread* m_pThread; // pointer to the wxWindows thread object
// if it's FALSE, some secondary thread is holding the GUI lock
-static bool s_bGuiOwnedByMainThread = TRUE;
+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
// any GUI calls
-static wxCriticalSection *s_pCritsectGui = NULL;
+static wxCriticalSection *gs_pCritsectGui = NULL;
// critical section which protects s_nWaitingForGui variable
-static wxCriticalSection *s_pCritsectWaitingForGui = NULL;
+static wxCriticalSection *gs_pCritsectWaitingForGui = NULL;
// number of threads waiting for GUI in wxMutexGuiEnter()
-static size_t s_nWaitingForGui = 0;
+static size_t gs_nWaitingForGui = 0;
// are we waiting for a thread termination?
-static bool s_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 TryLock() { return LockTimeout(SEM_IMMEDIATE_RETURN); }
+ wxMutexError Unlock();
+
+private:
+ wxMutexError LockTimeout(ULONG ulMilliseconds);
HMTX m_vMutex;
};
-wxMutex::wxMutex()
+// 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;
- p_internal = new wxMutexInternal;
- ulrc = ::DosCreateMutexSem(NULL, &p_internal->m_vMutex, 0L, FALSE);
+ ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
if (ulrc != 0)
{
wxLogSysError(_("Can not create mutex."));
+ m_vMutex = NULL;
}
- m_locked = 0;
}
-wxMutex::~wxMutex()
+wxMutexInternal::~wxMutexInternal()
{
- if (m_locked > 0)
- wxLogDebug(wxT("Warning: freeing a locked mutex (%d locks)."), m_locked);
- ::DosCloseMutexSem(p_internal->m_vMutex);
- delete p_internal;
- p_internal = NULL;
+ if (m_vMutex)
+ {
+ if (::DosCloseMutexSem(m_vMutex))
+ wxLogLastError(_T("DosCloseMutexSem(mutex)"));
+ }
}
-wxMutexError wxMutex::Lock()
+wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
{
APIRET ulrc;
- ulrc = ::DosRequestMutexSem(p_internal->m_vMutex, SEM_INDEFINITE_WAIT);
+ ulrc = ::DosRequestMutexSem(m_vMutex, ulMilliseconds);
switch (ulrc)
{
+ case ERROR_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"));
- }
- m_locked++;
- return wxMUTEX_NO_ERROR;
-}
-
-wxMutexError wxMutex::TryLock()
-{
- ULONG ulrc;
-
- ulrc = ::DosRequestMutexSem(p_internal->m_vMutex, SEM_IMMEDIATE_RETURN /*0L*/);
- if (ulrc == ERROR_TIMEOUT || ulrc == ERROR_TOO_MANY_SEM_REQUESTS)
- return wxMUTEX_BUSY;
-
- m_locked++;
+ return wxMUTEX_MISC_ERROR;
+ }
return wxMUTEX_NO_ERROR;
}
-wxMutexError wxMutex::Unlock()
+wxMutexError wxMutexInternal::Unlock()
{
APIRET ulrc;
- if (m_locked > 0)
- m_locked--;
-
- ulrc = ::DosReleaseMutexSem(p_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:
- HEV m_vEvent;
- int m_nWaiters;
-};
+ wxSemaphoreInternal(int initialcount, int maxcount);
+ ~wxSemaphoreInternal();
-wxCondition::wxCondition()
-{
- APIRET ulrc;
- ULONG ulCount;
+ bool IsOk() const { return m_vEvent != NULL; }
- p_internal = new wxConditionInternal;
- ulrc = ::DosCreateEventSem(NULL, &p_internal->m_vEvent, 0L, FALSE);
- if (ulrc != 0)
- {
- wxLogSysError(_("Can not create event object."));
- }
- p_internal->m_nWaiters = 0;
- // ?? just for good measure?
- ::DosResetEventSem(p_internal->m_vEvent, &ulCount);
-}
+ wxSemaError Wait() { return WaitTimeout(SEM_INDEFINITE_WAIT); }
+ wxSemaError TryWait() { return WaitTimeout(SEM_IMMEDIATE_RETURN); }
+ wxSemaError WaitTimeout(unsigned long milliseconds);
-wxCondition::~wxCondition()
-{
- ::DosCloseEventSem(p_internal->m_vEvent);
- delete p_internal;
- p_internal = NULL;
-}
+ wxSemaError Post();
-void wxCondition::Wait(
- wxMutex& rMutex
-)
-{
- rMutex.Unlock();
- p_internal->m_nWaiters++;
- ::DosWaitEventSem(p_internal->m_vEvent, SEM_INDEFINITE_WAIT);
- p_internal->m_nWaiters--;
- rMutex.Lock();
-}
+private:
+ HEV m_vEvent;
+ HMTX m_vMutex;
+ int m_count;
+ int m_maxcount;
+};
-bool wxCondition::Wait(
- wxMutex& rMutex
-, unsigned long ulSec
-, unsigned long ulMillisec)
+wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
{
- APIRET ulrc;
-
- rMutex.Unlock();
- p_internal->m_nWaiters++;
- ulrc = ::DosWaitEventSem(p_internal->m_vEvent, ULONG((ulSec * 1000L) + ulMillisec));
- p_internal->m_nWaiters--;
- rMutex.Lock();
-
- return (ulrc != ERROR_TIMEOUT);
-}
+ APIRET ulrc;
+ if ( maxcount == 0 )
+ {
+ // make it practically infinite
+ maxcount = INT_MAX;
+ }
-void wxCondition::Signal()
-{
- ::DosPostEventSem(p_internal->m_vEvent);
+ m_count = initialcount;
+ m_maxcount = maxcount;
+ ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
+ if (ulrc != 0)
+ {
+ wxLogLastError(_T("DosCreateMutexSem()"));
+ m_vMutex = NULL;
+ m_vEvent = NULL;
+ return;
+ }
+ ulrc = ::DosCreateEventSem(NULL, &m_vEvent, 0L, FALSE);
+ if ( ulrc != 0)
+ {
+ wxLogLastError(_T("DosCreateEventSem()"));
+ ::DosCloseMutexSem(m_vMutex);
+ m_vMutex = NULL;
+ m_vEvent = NULL;
+ }
+ if (initialcount)
+ ::DosPostEventSem(m_vEvent);
}
-void wxCondition::Broadcast()
+wxSemaphoreInternal::~wxSemaphoreInternal()
{
- int i;
-
- for (i = 0; i < p_internal->m_nWaiters; i++)
+ if ( m_vEvent )
{
- if (::DosPostEventSem(p_internal->m_vEvent) != 0)
+ if ( ::DosCloseEventSem(m_vEvent) )
{
- wxLogSysError(_("Couldn't change the state of event object."));
+ wxLogLastError(_T("DosCloseEventSem(semaphore)"));
}
+ if ( ::DosCloseMutexSem(m_vMutex) )
+ {
+ wxLogLastError(_T("DosCloseMutexSem(semaphore)"));
+ }
+ else
+ m_vEvent = NULL;
}
}
-// ----------------------------------------------------------------------------
-// wxCriticalSection implementation
-// ----------------------------------------------------------------------------
-
-void wxCriticalSection::Enter()
+wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long ulMilliseconds)
{
- ::DosEnterCritSec();
+ 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(_T("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;
}
-void wxCriticalSection::Leave()
+wxSemaError wxSemaphoreInternal::Post()
{
- ::DosExitCritSec();
+ 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(_T("DosPostEventSem(semaphore)"));
+
+ return wxSEMA_MISC_ERROR;
+ }
+
+ return wxSEMA_NO_ERROR;
}
// ----------------------------------------------------------------------------
{
m_hThread = 0;
m_eState = STATE_NEW;
- m_nPriority = 0;
+ m_nPriority = WXTHREAD_DEFAULT_PRIORITY;
+ }
+
+ ~wxThreadInternal()
+ {
+ m_hThread = 0;
}
// create a new (suspended) thread (for the given thread object)
- bool Create(wxThread* pThread);
+ bool Create( wxThread* pThread
+ ,unsigned int uStackSize
+ );
// suspend/resume/terminate
bool Suspend();
inline wxThreadState GetState() const { return m_eState; }
// thread priority
- inline void SetPriority(unsigned int nPriority) { m_nPriority = nPriority; }
+ void SetPriority(unsigned int nPriority);
inline unsigned int GetPriority() const { return m_nPriority; }
// thread handle and id
TID GetId() const { return m_hThread; }
// thread function
- static DWORD OS2ThreadStart(wxThread *thread);
+ static DWORD OS2ThreadStart(ULONG ulParam);
private:
// Threads in OS/2 have only an ID, so m_hThread is both it's handle and ID
};
ULONG wxThreadInternal::OS2ThreadStart(
- wxThread* pThread
+ ULONG ulParam
)
{
- m_pThread = pThread;
+ DWORD dwRet;
+ bool bWasCancelled;
+
+ // first of all, check whether we hadn't been cancelled already and don't
+ // start the user code at all then
+ wxThread *pThread = (wxThread *)ulParam;
+ if ( pThread->m_internal->GetState() == STATE_EXITED )
+ {
+ dwRet = (DWORD)-1;
+ bWasCancelled = TRUE;
+ }
+ else // do run thread
+ {
+ dwRet = (DWORD)pThread->Entry();
+
+ // enter m_critsect before changing the thread state
+ pThread->m_critsect.Enter();
- DWORD dwRet = (DWORD)pThread->Entry();
+ bWasCancelled = pThread->m_internal->GetState() == STATE_CANCELED;
- pThread->p_internal->SetState(STATE_EXITED);
+ pThread->m_internal->SetState(STATE_EXITED);
+ pThread->m_critsect.Leave();
+ }
pThread->OnExit();
- delete pThread;
- m_pThread = NULL;
+ // if the thread was cancelled (from Delete()), then it the handle is still
+ // needed there
+ if (pThread->IsDetached() && !bWasCancelled)
+ {
+ // auto delete
+ delete pThread;
+ }
+ //else: the joinable threads handle will be closed when Wait() is done
return dwRet;
}
+void wxThreadInternal::SetPriority(
+ unsigned int nPriority
+)
+{
+ // translate wxWindows priority to the PM one
+ ULONG ulOS2_PriorityClass;
+ ULONG ulOS2_SubPriority;
+ ULONG ulrc;
+
+ m_nPriority = nPriority;
+ 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_PriorityClass = PRTYC_FOREGROUNDSERVER;
+ else
+ {
+ wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
+ ulOS2_PriorityClass = PRTYC_REGULAR;
+ }
+ ulOS2_SubPriority = (ULONG) (((m_nPriority - 1) % 25 + 1) * 31.0 / 25);
+ ulrc = ::DosSetPriority( PRTYS_THREAD
+ ,ulOS2_PriorityClass
+ ,ulOS2_SubPriority
+ ,(ULONG)m_hThread
+ );
+ if (ulrc != 0)
+ {
+ wxLogSysError(_("Can't set thread priority"));
+ }
+}
+
bool wxThreadInternal::Create(
wxThread* pThread
+, unsigned int uStackSize
)
{
APIRET ulrc;
,(PFNTHREAD)wxThreadInternal::OS2ThreadStart
,(ULONG)pThread
,CREATE_SUSPENDED | STACK_SPARSE
- ,8192L
+ ,(ULONG)uStackSize
);
if(ulrc != 0)
{
return FALSE;
}
-
- // translate wxWindows priority to the PM one
- ULONG ulOS2_Priority;
-
- 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;
- else if (m_nPriority <= 100)
- ulOS2_Priority = PRTYC_FOREGROUNDSERVER;
- else
- {
- wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
- ulOS2_Priority = PRTYC_REGULAR;
- }
- ulrc = ::DosSetPriority( PRTYS_THREAD
- ,ulOS2_Priority
- ,0
- ,(ULONG)m_hThread
- );
- if (ulrc != 0)
+ if (m_nPriority != WXTHREAD_DEFAULT_PRIORITY)
{
- wxLogSysError(_("Can't set thread priority"));
+ SetPriority(m_nPriority);
}
- return TRUE;
+
+ return(TRUE);
}
bool wxThreadInternal::Suspend()
wxLogSysError(_("Can not suspend thread %lu"), m_hThread);
return FALSE;
}
- m_eState = STATE_PAUSED;
+
+ // 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
// ----------------
+bool WXDLLEXPORT wxGuiOwnedByMainThread();
+
wxThread *wxThread::This()
{
wxThread* pThread = m_pThread;
::DosSleep(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;
+}
+
+unsigned long wxThread::GetCurrentId()
+{
+ PTIB ptib;
+ PPIB ppib;
+
+ ::DosGetInfoBlocks(&ptib, &ppib);
+ return (unsigned long) ptib->tib_ptib2->tib2_ultid;
+}
+
+bool wxThread::SetConcurrency(size_t level)
+{
+ wxASSERT_MSG( IsMain(), _T("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
+// -------------
+
+wxThread::wxThread(wxThreadKind kind)
+{
+ m_internal = new wxThreadInternal();
+
+ m_isDetached = kind == wxTHREAD_DETACHED;
+}
+
+wxThread::~wxThread()
+{
+ delete m_internal;
+}
+
// create/start thread
// -------------------
-wxThreadError wxThread::Create()
+wxThreadError wxThread::Create(
+ unsigned int uStackSize
+)
{
- if ( !p_internal->Create(this) )
+ wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+
+ if ( !m_internal->Create(this, uStackSize) )
return wxTHREAD_NO_RESOURCE;
return wxTHREAD_NO_ERROR;
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- if ( p_internal->GetState() != STATE_NEW )
+ if ( m_internal->GetState() != STATE_NEW )
{
// actually, it may be almost any state at all, not only STATE_RUNNING
return wxTHREAD_RUNNING;
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- return p_internal->Suspend() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;
+ return m_internal->Suspend() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;
}
wxThreadError wxThread::Resume()
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- return p_internal->Resume() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;
+ return m_internal->Resume() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;
}
// stopping thread
// ---------------
-wxThread::ExitCode wxThread::Delete()
+wxThread::ExitCode wxThread::Wait()
{
- ExitCode rc = 0;
- ULONG ulrc;
+ // 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") );
+ ExitCode rc = (ExitCode)-1;
+ (void)Delete(&rc);
+ return(rc);
+}
+
+wxThreadError wxThread::Delete(ExitCode *pRc)
+{
+ 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();
- if (IsRunning())
+ TID hThread = m_internal->GetHandle();
+
+ if ( isRunning || IsRunning())
{
if (IsMain())
{
// set flag for wxIsWaitingForThread()
- s_bWaitingForThread = TRUE;
- wxBeginBusyCursor();
- }
-
- TID hThread;
+ gs_bWaitingForThread = TRUE;
+ }
+ // ask the thread to terminate
+ if ( shouldCancel )
{
- wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+ wxCriticalSectionLocker lock(m_critsect);
- p_internal->Cancel();
- hThread = p_internal->GetHandle();
+ m_internal->Cancel();
}
+#if wxUSE_GUI
// 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
{
- ulrc = ::DosWaitThread( &hThread
- ,DCWW_NOWAIT
- );
- switch (ulrc)
+ if ( IsMain() )
{
- case ERROR_INTERRUPT:
- case ERROR_INVALID_THREADID:
+ // give the thread we're waiting for chance to do the GUI call
+ // it might be in
+ if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
+ {
+ wxMutexGuiLeave();
+ }
+ }
+
+ result = ::DosWaitThread(&hThread, DCWW_WAIT);
+ // FIXME: We ought to have a message processing loop here!!
+
+ switch ( result )
+ {
+ case ERROR_THREAD_NOT_TERMINATED:
+ case ERROR_INVALID_THREADID:
// error
wxLogSysError(_("Can not wait for thread termination"));
Kill();
- return (ExitCode)-1;
+ return wxTHREAD_KILLED;
- case 0:
+ case NO_ERROR:
// thread we're waiting for terminated
break;
- case ERROR_THREAD_NOT_TERMINATED:
- // new message arrived, process it
- if (!wxTheApp->DoMessage())
- {
- // WM_QUIT received: kill the thread
- Kill();
- return (ExitCode)-1;
- }
- if (IsMain())
- {
- // give the thread we're waiting for chance to exit
- // from the GUI call it might have been in
- if ((s_nWaitingForGui > 0) && wxGuiOwnedByMainThread())
- {
- wxMutexGuiLeave();
- }
- }
- break;
-
default:
- wxFAIL_MSG(wxT("unexpected result of DosWatiThread"));
+ wxFAIL_MSG(wxT("unexpected result of DosWaitThread"));
}
- } while (ulrc != 0);
+ } 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())
+ if ( IsMain() )
+ {
+ gs_bWaitingForThread = FALSE;
+ }
+ }
+
+#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) )
{
- s_bWaitingForThread = FALSE;
- wxEndBusyCursor();
+ wxLogLastError(wxT("GetExitCodeThread"));
+
+ rc = (ExitCode)-1;
}
+ } while ( (DWORD)rc == STILL_ACTIVE );
+#endif
- ::DosExit(EXIT_THREAD, ulrc);
+ 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;
}
- rc = (ExitCode)ulrc;
- return rc;
+
+ if ( pRc )
+ *pRc = rc;
+
+ return rc == (ExitCode)-1 ? wxTHREAD_MISC_ERROR : wxTHREAD_NO_ERROR;
}
wxThreadError wxThread::Kill()
if (!IsRunning())
return wxTHREAD_NOT_RUNNING;
- ::DosKillThread(p_internal->GetHandle());
- delete this;
+ ::DosKillThread(m_internal->GetHandle());
+ if (IsDetached())
+ {
+ delete this;
+ }
return wxTHREAD_NO_ERROR;
}
void wxThread::Exit(
- void* pStatus
+ ExitCode pStatus
)
{
delete this;
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- p_internal->SetPriority(nPrio);
+ m_internal->SetPriority(nPrio);
}
unsigned int wxThread::GetPriority() const
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- return p_internal->GetPriority();
+ return m_internal->GetPriority();
}
-unsigned long wxThread::GetID() const
+unsigned long wxThread::GetId() const
{
- wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+ wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
- return (unsigned long)p_internal->GetId();
+ return (unsigned long)m_internal->GetId();
}
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);
- return (p_internal->GetState() == STATE_RUNNING) ||
- (p_internal->GetState() == STATE_PAUSED);
+ return (m_internal->GetState() == STATE_RUNNING) ||
+ (m_internal->GetState() == STATE_PAUSED);
}
bool wxThread::IsPaused() const
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- return (p_internal->GetState() == STATE_PAUSED);
+ return (m_internal->GetState() == STATE_PAUSED);
}
bool wxThread::TestDestroy()
{
wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
- return p_internal->GetState() == STATE_CANCELED;
-}
-
-wxThread::wxThread()
-{
- p_internal = new wxThreadInternal();
-}
-
-wxThread::~wxThread()
-{
- delete p_internal;
+ return m_internal->GetState() == STATE_CANCELED;
}
// ----------------------------------------------------------------------------
bool wxThreadModule::OnInit()
{
- s_pCritsectWaitingForGui = new wxCriticalSection();
+ gs_pCritsectWaitingForGui = new wxCriticalSection();
- s_pCritsectGui = new wxCriticalSection();
- s_pCritsectGui->Enter();
+ gs_pCritsectGui = new wxCriticalSection();
+ gs_pCritsectGui->Enter();
PTIB ptib;
PPIB ppib;
void wxThreadModule::OnExit()
{
- if (s_pCritsectGui)
+ if (gs_pCritsectGui)
{
- s_pCritsectGui->Leave();
- delete s_pCritsectGui;
- s_pCritsectGui = NULL;
+ gs_pCritsectGui->Leave();
+#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
+ delete gs_pCritsectGui;
+#endif
+ gs_pCritsectGui = NULL;
}
- wxDELETE(s_pCritsectWaitingForGui);
+#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
+ wxDELETE(gs_pCritsectWaitingForGui);
+#endif
}
// ----------------------------------------------------------------------------
// 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 WXDLLEXPORT wxMutexGuiEnter()
+{
+ // 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()
{
- wxCriticalSectionLocker enter(*s_pCritsectWaitingForGui);
+ wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
if ( wxThread::IsMain() )
{
- s_bGuiOwnedByMainThread = FALSE;
+ gs_bGuiOwnedByMainThread = FALSE;
}
else
{
// decrement the number of waiters now
- wxASSERT_MSG( s_nWaitingForGui > 0,
+ wxASSERT_MSG(gs_nWaitingForGui > 0,
wxT("calling wxMutexGuiLeave() without entering it first?") );
- s_nWaitingForGui--;
+ gs_nWaitingForGui--;
wxWakeUpMainThread();
}
- s_pCritsectGui->Leave();
+ gs_pCritsectGui->Leave();
}
void WXDLLEXPORT wxMutexGuiLeaveOrEnter()
wxASSERT_MSG( wxThread::IsMain(),
wxT("only main thread may call wxMutexGuiLeaveOrEnter()!") );
- wxCriticalSectionLocker enter(*s_pCritsectWaitingForGui);
+ wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
- if ( s_nWaitingForGui == 0 )
+ if (gs_nWaitingForGui == 0)
{
// no threads are waiting for GUI - so we may acquire the lock without
// any danger (but only if we don't already have it)
if (!wxGuiOwnedByMainThread())
{
- s_pCritsectGui->Enter();
+ gs_pCritsectGui->Enter();
- s_bGuiOwnedByMainThread = TRUE;
+ gs_bGuiOwnedByMainThread = TRUE;
}
//else: already have it, nothing to do
}
bool WXDLLEXPORT wxGuiOwnedByMainThread()
{
- return s_bGuiOwnedByMainThread;
+ return gs_bGuiOwnedByMainThread;
}
+bool WXDLLEXPORT wxIsWaitingForThread()
+{
+ return gs_bWaitingForThread;
+}
+
+// ----------------------------------------------------------------------------
+// include common implementation code
+// ----------------------------------------------------------------------------
+
+#include "wx/thrimpl.cpp"
+
#endif
// wxUSE_THREADS
projects / wxWidgets.git / blobdiff