fixed bug #890430, parameter documented twice

[wxWidgets.git] / src / os2 / thread.cpp

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index c8cd9a796878066bd20083feca23de9afcce9612..c837f5c1a72630ddb39144901b8de0ff2025df3a 100644 (file)
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -1,14 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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$
 // Created:     04/22/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
+// Copyright:   (c) Stefan Neis (2003)
+//                         

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+    #pragma implementation "thread.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -20,6 +25,8 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+#include "wx/app.h"
+#include "wx/apptrait.h"

 #include "wx/module.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/intl.h"
 #include "wx/utils.h"


@@ -28,10 +35,12 @@
 
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSPROCESS
 
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSPROCESS

+#define INCL_DOSMISC

 #define INCL_ERRORS
 #include <os2.h>
 #define INCL_ERRORS
 #include <os2.h>

+#ifndef __EMX__

 #include <bseerr.h>
 #include <bseerr.h>

-
+#endif

 // the possible states of the thread ("=>" shows all possible transitions from
 // this state)
 enum wxThreadState
 // the possible states of the thread ("=>" shows all possible transitions from
 // this state)
 enum wxThreadState


@@ -44,12 +53,12 @@ enum wxThreadState
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// static variables
+// this module's globals

 // ----------------------------------------------------------------------------
 
 // id of the main thread - the one which can call GUI functions without first
 // calling wxMutexGuiEnter()
 // ----------------------------------------------------------------------------
 
 // 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
 wxMutex*                            p_wxMainMutex;
 
 // OS2 substitute for Tls pointer the current parent thread object


@@ -73,7 +82,7 @@ static size_t gs_nWaitingForGui = 0;
 static bool gs_bWaitingForThread = FALSE;
 
 // ============================================================================
 static bool gs_bWaitingForThread = FALSE;
 
 // ============================================================================

-// OS/2 implementation of thread classes
+// OS/2 implementation of thread and related classes

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------


@@ -82,38 +91,56 @@ static bool gs_bWaitingForThread = FALSE;
 class wxMutexInternal
 {
 public:
 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;
 };
 
     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;
 
 {
     APIRET                          ulrc;
 

-    m_internal = new wxMutexInternal;
-    ulrc = ::DosCreateMutexSem(NULL, &m_internal->m_vMutex, 0L, FALSE);
+    ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);

     if (ulrc != 0)
     {
         wxLogSysError(_("Can not create mutex."));
     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(m_internal->m_vMutex);
-    m_internal->m_vMutex = NULL;
+    if (m_vMutex)
+    {
+        if (::DosCloseMutexSem(m_vMutex))
+            wxLogLastError(_T("DosCloseMutexSem(mutex)"));
+    }

 }
 
 }
 

-wxMutexError wxMutex::Lock()
+wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)

 {
     APIRET                          ulrc;
 
 {
     APIRET                          ulrc;
 

-    ulrc = ::DosRequestMutexSem(m_internal->m_vMutex, SEM_INDEFINITE_WAIT);
+    ulrc = ::DosRequestMutexSem(m_vMutex, ulMilliseconds);

 
     switch (ulrc)
     {
 
     switch (ulrc)
     {

+        case ERROR_TIMEOUT:

         case ERROR_TOO_MANY_SEM_REQUESTS:
             return wxMUTEX_BUSY;
 
         case ERROR_TOO_MANY_SEM_REQUESTS:
             return wxMUTEX_BUSY;
 


@@ -127,34 +154,18 @@ wxMutexError wxMutex::Lock()
             wxLogSysError(_("Couldn't acquire a mutex lock"));
             return wxMUTEX_MISC_ERROR;
 
             wxLogSysError(_("Couldn't acquire a mutex lock"));
             return wxMUTEX_MISC_ERROR;
 

-        case ERROR_TIMEOUT:

         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));

-    }
-    m_locked++;
-    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;
-
-    m_locked++;
+            return wxMUTEX_MISC_ERROR;
+     }

     return wxMUTEX_NO_ERROR;
 }
 
     return wxMUTEX_NO_ERROR;
 }
 

-wxMutexError wxMutex::Unlock()
+wxMutexError wxMutexInternal::Unlock()

 {
     APIRET                          ulrc;
 
 {
     APIRET                          ulrc;
 

-    if (m_locked > 0)
-        m_locked--;
-
-    ulrc = ::DosReleaseMutexSem(m_internal->m_vMutex);
+    ulrc = ::DosReleaseMutexSem(m_vMutex);

     if (ulrc != 0)
     {
         wxLogSysError(_("Couldn't release a mutex"));
     if (ulrc != 0)
     {
         wxLogSysError(_("Couldn't release a mutex"));


@@ -163,126 +174,163 @@ wxMutexError wxMutex::Unlock()
     return wxMUTEX_NO_ERROR;
 }
 
     return wxMUTEX_NO_ERROR;
 }
 

-// ----------------------------------------------------------------------------
-// wxCondition implementation
-// ----------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// wxSemaphore
+// --------------------------------------------------------------------------

 
 

-class wxConditionInternal
+// a trivial wrapper around OS2 event semaphore
+class wxSemaphoreInternal

 {
 public:
 {
 public:

-    inline wxConditionInternal ()
-    {
-        ::DosCreateEventSem(NULL, &m_vEvent, DC_SEM_SHARED, FALSE);
-        if (!m_vEvent)
-        {
-            wxLogSysError(_("Can not create event semaphore."));
-        }
-        m_nWaiters = 0;
-    }
+    wxSemaphoreInternal(int initialcount, int maxcount);
+    ~wxSemaphoreInternal();

 
 

-    inline bool Wait(
-      unsigned long                 ulTimeout
-    )
-    {
-        APIRET                      ulrc;
+    bool IsOk() const { return m_vEvent != NULL; }

 
 

-        m_nWaiters++;
-        ulrc = ::DosWaitEventSem(m_vEvent, ulTimeout);
-        m_nWaiters--;
-        return (ulrc != ERROR_TIMEOUT);
-    }
+    wxSemaError Wait() { return WaitTimeout(SEM_INDEFINITE_WAIT); }
+    wxSemaError TryWait() { return WaitTimeout(SEM_IMMEDIATE_RETURN); }
+    wxSemaError WaitTimeout(unsigned long milliseconds);

 
 

-    inline ~wxConditionInternal ()
-    {
-        APIRET                      ulrc;
-
-        if (m_vEvent)
-        {
-            ulrc = ::DosCloseEventSem(m_vEvent);
-            if (!ulrc)
-            {
-                wxLogLastError("DosCloseEventSem(m_vEvent)");
-            }
-        }
-    }
+    wxSemaError Post();

 
 

-    HEV                             m_vEvent;
-    int                             m_nWaiters;
+private:
+    HEV m_vEvent;
+    HMTX m_vMutex;
+    int m_count;
+    int m_maxcount;

 };
 
 };
 

-wxCondition::wxCondition()
+wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)

 {
 {

-    APIRET                          ulrc;
-    ULONG                           ulCount;
+    APIRET ulrc;
+    if ( maxcount == 0 )
+    {
+        // make it practically infinite
+        maxcount = INT_MAX;
+    }

 
 

-    m_internal = new wxConditionInternal;
-    ulrc = ::DosCreateEventSem(NULL, &m_internal->m_vEvent, 0L, FALSE);
+    m_count = initialcount;
+    m_maxcount = maxcount;
+    ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);

     if (ulrc != 0)
     {
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not create event object."));
+        wxLogLastError(_T("DosCreateMutexSem()"));
+        m_vMutex = NULL;
+        m_vEvent = NULL;
+        return;

     }
     }

-    m_internal->m_nWaiters = 0;
-    // ?? just for good measure?
-    ::DosResetEventSem(m_internal->m_vEvent, &ulCount);
-}
-
-wxCondition::~wxCondition()
-{
-    ::DosCloseEventSem(m_internal->m_vEvent);
-    delete m_internal;
-    m_internal = NULL;
-}
-
-void wxCondition::Wait()
-{
-    (void)m_internal->Wait(SEM_INDEFINITE_WAIT);
-}
-
-bool wxCondition::Wait(
-  unsigned long                     lSec
-, unsigned long                     lNsec)
-{
-    return m_internal->Wait(lSec*1000 + lNsec/1000000);
-}
-
-void wxCondition::Signal()
-{
-    ::DosPostEventSem(m_internal->m_vEvent);
+    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 < m_internal->m_nWaiters; i++)
+    if ( m_vEvent )

     {
     {

-        if (::DosPostEventSem(m_internal->m_vEvent) != 0)
+        if ( ::DosCloseEventSem(m_vEvent) )
+        {
+            wxLogLastError(_T("DosCloseEventSem(semaphore)"));
+        }
+        if ( ::DosCloseMutexSem(m_vMutex) )

         {
         {

-            wxLogSysError(_("Couldn't change the state of event object."));
+            wxLogLastError(_T("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(_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;

 }
 
 }
 

-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(_T("DosPostEventSem(semaphore)"));

 
 

-void wxCriticalSection::Enter()
-{
-    ::DosEnterCritSec();
-}
+        return wxSEMA_MISC_ERROR;
+    }

 
 

-void wxCriticalSection::Leave()
-{
-    ::DosExitCritSec();
+    return wxSEMA_NO_ERROR;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -299,21 +347,12 @@ public:
     {
         m_hThread = 0;
         m_eState = STATE_NEW;
     {
         m_hThread = 0;
         m_eState = STATE_NEW;

-        m_nPriority = 0;
+        m_nPriority = WXTHREAD_DEFAULT_PRIORITY;

     }
 
     ~wxThreadInternal()
     {
     }
 
     ~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)
     }
 
     // create a new (suspended) thread (for the given thread object)


@@ -339,7 +378,7 @@ public:
     TID  GetId() const { return m_hThread; }
 
     // thread function
     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
 
 private:
     // Threads in OS/2 have only an ID, so m_hThread is both it's handle and ID


@@ -350,22 +389,43 @@ private:
     unsigned int                    m_nPriority;  // thread priority in "wx" units
 };
 
     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.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
     pThread->OnExit();
 
     // if the thread was cancelled (from Delete()), then it the handle is still


@@ -376,7 +436,7 @@ ULONG wxThreadInternal::OS2ThreadStart(
         delete pThread;
     }
     //else: the joinable threads handle will be closed when Wait() is done
         delete pThread;
     }
     //else: the joinable threads handle will be closed when Wait() is done

-    return dwRet;
+    return;

 }
 
 void wxThreadInternal::SetPriority(
 }
 
 void wxThreadInternal::SetPriority(


@@ -384,29 +444,28 @@ void wxThreadInternal::SetPriority(
 )
 {
     // translate wxWindows priority to the PM one
 )
 {
     // translate wxWindows priority to the PM one

-    ULONG                           ulOS2_Priority;
+    ULONG                           ulOS2_PriorityClass;
+    ULONG                           ulOS2_SubPriority;

     ULONG                           ulrc;
 
     m_nPriority = nPriority;
     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)
     else if (m_nPriority <= 100)

-        ulOS2_Priority = PRTYC_FOREGROUNDSERVER;
+        ulOS2_PriorityClass = PRTYC_FOREGROUNDSERVER;

     else
     {
         wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
     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
     ulrc = ::DosSetPriority( PRTYS_THREAD

-                            ,ulOS2_Priority
-                            ,0
+                            ,ulOS2_PriorityClass
+                            ,ulOS2_SubPriority

                             ,(ULONG)m_hThread
                            );
     if (ulrc != 0)
                             ,(ULONG)m_hThread
                            );
     if (ulrc != 0)


@@ -420,24 +479,25 @@ bool wxThreadInternal::Create(
 , unsigned int                      uStackSize
 )
 {
 , unsigned int                      uStackSize
 )
 {

-    APIRET                          ulrc;
-
-    ulrc = ::DosCreateThread( &m_hThread
-                             ,(PFNTHREAD)wxThreadInternal::OS2ThreadStart
-                             ,(ULONG)pThread
-                             ,CREATE_SUSPENDED | STACK_SPARSE
-                             ,(ULONG)uStackSize
-                            );
-    if(ulrc != 0)
+    int                          tid;
+    
+    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;
     }
     {
         wxLogSysError(_("Can't create thread"));
 
         return FALSE;
     }

+    m_hThread = tid;

     if (m_nPriority != WXTHREAD_DEFAULT_PRIORITY)
     {
         SetPriority(m_nPriority);
     }
     if (m_nPriority != WXTHREAD_DEFAULT_PRIORITY)
     {
         SetPriority(m_nPriority);
     }

+

     return(TRUE);
 }
 
     return(TRUE);
 }
 


@@ -460,10 +520,18 @@ bool wxThreadInternal::Resume()
 
     if (ulrc != 0)
     {
 
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not suspend thread %lu"), m_hThread);
+        wxLogSysError(_("Can not resume thread %lu"), m_hThread);

         return FALSE;
     }
         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;
 }
 
     return TRUE;
 }
 


@@ -504,6 +572,40 @@ void wxThread::Sleep(
     ::DosSleep(ulMilliseconds);
 }
 
     ::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
 // -------------
 
 // ctor and dtor
 // -------------
 


@@ -526,6 +628,8 @@ wxThreadError wxThread::Create(
   unsigned int                      uStackSize
 )
 {
   unsigned int                      uStackSize
 )
 {

+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
+

     if ( !m_internal->Create(this, uStackSize) )
         return wxTHREAD_NO_RESOURCE;
 
     if ( !m_internal->Create(this, uStackSize) )
         return wxTHREAD_NO_RESOURCE;
 


@@ -556,6 +660,13 @@ wxThreadError wxThread::Pause()
 
 wxThreadError wxThread::Resume()
 {
 
 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;
     wxCriticalSectionLocker         lock((wxCriticalSection &)m_critsect);
 
     return m_internal->Resume() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR;


@@ -572,7 +683,6 @@ wxThread::ExitCode wxThread::Wait()
                  _T("can't wait for detached thread") );
     ExitCode rc = (ExitCode)-1;
     (void)Delete(&rc);
                  _T("can't wait for detached thread") );
     ExitCode rc = (ExitCode)-1;
     (void)Delete(&rc);

-    m_internal->Free();

     return(rc);
 }
 
     return(rc);
 }
 


@@ -581,57 +691,151 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
     ExitCode rc = 0;
 
     // Delete() is always safe to call, so consider all possible states
     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();
 
         Resume();
 
     TID                             hThread = m_internal->GetHandle();
 

-    if (IsRunning())
+    if ( isRunning || IsRunning())

     {
         if (IsMain())
         {
             // set flag for wxIsWaitingForThread()
             gs_bWaitingForThread = TRUE;
     {
         if (IsMain())
         {
             // set flag for wxIsWaitingForThread()
             gs_bWaitingForThread = TRUE;

-
-#if wxUSE_GUI
-            wxBeginBusyCursor();
-#endif // wxUSE_GUI
-        }
+       }

 
         // ask the thread to terminate
 
         // ask the thread to terminate

+        if ( shouldCancel )

         {
             wxCriticalSectionLocker lock(m_critsect);
         {
             wxCriticalSectionLocker lock(m_critsect);

+

             m_internal->Cancel();
         }
 
 #if wxUSE_GUI
             m_internal->Cancel();
         }
 
 #if wxUSE_GUI

-        // need a way to finish GUI processing before killing the thread
-        // until then we just exit
+        // 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
+        {
+            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();
+                }
+            }

 
 

-        if ((gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread())
+            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 )

         {
         {

-            wxMutexGuiLeave();
+            wxFAIL_MSG(wxT("unexpected result of DosWaitThread"));

         }
         }

-#else // !wxUSE_GUI
-
-        // can't wait for yourself to end under OS/2 so just quit
-

 #endif // wxUSE_GUI/!wxUSE_GUI
 
         if ( IsMain() )
         {
             gs_bWaitingForThread = FALSE;
 #endif // wxUSE_GUI/!wxUSE_GUI
 
         if ( IsMain() )
         {
             gs_bWaitingForThread = FALSE;

-
-#if wxUSE_GUI
-            wxEndBusyCursor();
-#endif // wxUSE_GUI

         }
     }
 
         }
     }
 

-    ::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;
     }
 
         delete this;
     }
 


@@ -647,7 +851,6 @@ wxThreadError wxThread::Kill()
         return wxTHREAD_NOT_RUNNING;
 
     ::DosKillThread(m_internal->GetHandle());
         return wxTHREAD_NOT_RUNNING;
 
     ::DosKillThread(m_internal->GetHandle());

-    m_internal->Free();

     if (IsDetached())
     {
         delete this;
     if (IsDetached())
     {
         delete this;


@@ -659,9 +862,8 @@ void wxThread::Exit(
   ExitCode                          pStatus
 )
 {
   ExitCode                          pStatus
 )
 {

-    m_internal->Free();

     delete this;
     delete this;

-    ::DosExit(EXIT_THREAD, ULONG(pStatus));
+    _endthread();

     wxFAIL_MSG(wxT("Couldn't return from DosExit()!"));
 }
 
     wxFAIL_MSG(wxT("Couldn't return from DosExit()!"));
 }
 


@@ -769,9 +971,38 @@ void wxThreadModule::OnExit()
 // Helper functions
 // ----------------------------------------------------------------------------
 
 // Helper functions
 // ----------------------------------------------------------------------------
 

-// Does nothing under OS/2 [for now]
+// wake up the main thread if it's in ::GetMessage()

 void WXDLLEXPORT wxWakeUpMainThread()
 {
 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()
 }
 
 void WXDLLEXPORT wxMutexGuiLeave()


@@ -836,5 +1067,11 @@ bool WXDLLEXPORT wxIsWaitingForThread()
     return gs_bWaitingForThread;
 }
 
     return gs_bWaitingForThread;
 }
 

+// ----------------------------------------------------------------------------
+// include common implementation code
+// ----------------------------------------------------------------------------
+
+#include "wx/thrimpl.cpp"
+

 #endif
   // wxUSE_THREADS
 #endif
   // wxUSE_THREADS