simplify code so it always returns the same object

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

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index bcdd9e1934bdddd3064ddf3b10972e435182f802..d1ee5dc364a051a7a0b29c2ab7698cd04d3da9e9 100644 (file)
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -57,7 +57,7 @@ enum wxThreadState
 
 // 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 = 1;
+wxThreadIdType                      wxThread::ms_idMainThread = 0;

 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


@@ -96,7 +96,8 @@ public:
     bool IsOk() const { return m_vMutex != NULL; }
 
     wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); }
     bool IsOk() const { return m_vMutex != NULL; }
 
     wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); }

-    wxMutexError TryLock() { return LockTimeout(SEM_IMMEDIATE_RETURN); }
+    wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); }
+    wxMutexError TryLock();

     wxMutexError Unlock();
 
 private:
     wxMutexError Unlock();
 
 private:


@@ -113,7 +114,7 @@ wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(eMutexType))
     APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {
     APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not create mutex."));
+        wxLogSysError(_("Cannot create mutex."));

         m_vMutex = NULL;
     }
 }
         m_vMutex = NULL;
     }
 }


@@ -123,10 +124,20 @@ wxMutexInternal::~wxMutexInternal()
     if (m_vMutex)
     {
         if (::DosCloseMutexSem(m_vMutex))
     if (m_vMutex)
     {
         if (::DosCloseMutexSem(m_vMutex))

-            wxLogLastError(_T("DosCloseMutexSem(mutex)"));
+        {
+            wxLogLastError(wxT("DosCloseMutexSem(mutex)"));
+        }

     }
 }
 
     }
 }
 

+wxMutexError wxMutexInternal::TryLock()
+{
+    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 wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
 {
     APIRET                          ulrc;
 wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
 {
     APIRET                          ulrc;


@@ -136,6 +147,7 @@ wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds)
     switch (ulrc)
     {
         case ERROR_TIMEOUT:
     switch (ulrc)
     {
         case ERROR_TIMEOUT:

+            return wxMUTEX_TIMEOUT;

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


@@ -209,7 +221,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
     ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {
     ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {

-        wxLogLastError(_T("DosCreateMutexSem()"));
+        wxLogLastError(wxT("DosCreateMutexSem()"));

         m_vMutex = NULL;
         m_vEvent = NULL;
         return;
         m_vMutex = NULL;
         m_vEvent = NULL;
         return;


@@ -217,7 +229,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
     ulrc = ::DosCreateEventSem(NULL, &m_vEvent, 0L, FALSE);
     if ( ulrc != 0)
     {
     ulrc = ::DosCreateEventSem(NULL, &m_vEvent, 0L, FALSE);
     if ( ulrc != 0)
     {

-        wxLogLastError(_T("DosCreateEventSem()"));
+        wxLogLastError(wxT("DosCreateEventSem()"));

         ::DosCloseMutexSem(m_vMutex);
         m_vMutex = NULL;
         m_vEvent = NULL;
         ::DosCloseMutexSem(m_vMutex);
         m_vMutex = NULL;
         m_vEvent = NULL;


@@ -232,11 +244,11 @@ wxSemaphoreInternal::~wxSemaphoreInternal()
     {
         if ( ::DosCloseEventSem(m_vEvent) )
         {
     {
         if ( ::DosCloseEventSem(m_vEvent) )
         {

-            wxLogLastError(_T("DosCloseEventSem(semaphore)"));
+            wxLogLastError(wxT("DosCloseEventSem(semaphore)"));

         }
         if ( ::DosCloseMutexSem(m_vMutex) )
         {
         }
         if ( ::DosCloseMutexSem(m_vMutex) )
         {

-            wxLogLastError(_T("DosCloseMutexSem(semaphore)"));
+            wxLogLastError(wxT("DosCloseMutexSem(semaphore)"));

         }
         else
             m_vEvent = NULL;
         }
         else
             m_vEvent = NULL;


@@ -260,7 +272,7 @@ wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long ulMilliseconds)
                     return wxSEMA_TIMEOUT;
 
             default:
                     return wxSEMA_TIMEOUT;
 
             default:

-                wxLogLastError(_T("DosWaitEventSem(semaphore)"));
+                wxLogLastError(wxT("DosWaitEventSem(semaphore)"));

                 return wxSEMA_MISC_ERROR;
         }
         ulrc = :: DosRequestMutexSem(m_vMutex, ulMilliseconds);
                 return wxSEMA_MISC_ERROR;
         }
         ulrc = :: DosRequestMutexSem(m_vMutex, ulMilliseconds);


@@ -320,7 +332,7 @@ wxSemaError wxSemaphoreInternal::Post()
         return wxSEMA_OVERFLOW;
     if ( ulrc != NO_ERROR && ulrc != ERROR_ALREADY_POSTED )
     {
         return wxSEMA_OVERFLOW;
     if ( ulrc != NO_ERROR && ulrc != ERROR_ALREADY_POSTED )
     {

-        wxLogLastError(_T("DosPostEventSem(semaphore)"));
+        wxLogLastError(wxT("DosPostEventSem(semaphore)"));

 
         return wxSEMA_MISC_ERROR;
     }
 
         return wxSEMA_MISC_ERROR;
     }


@@ -499,7 +511,7 @@ bool wxThreadInternal::Suspend()
 
     if (ulrc != 0)
     {
 
     if (ulrc != 0)
     {

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

         return false;
     }
     m_eState = STATE_PAUSED;
         return false;
     }
     m_eState = STATE_PAUSED;


@@ -513,7 +525,7 @@ bool wxThreadInternal::Resume()
 
     if (ulrc != 0)
     {
 
     if (ulrc != 0)
     {

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

         return false;
     }
 
         return false;
     }
 


@@ -537,19 +549,6 @@ wxThread *wxThread::This()
     return pThread;
 }
 
     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
 #ifdef Yield
     #undef Yield
 #endif


@@ -559,13 +558,6 @@ void wxThread::Yield()
     ::DosSleep(0);
 }
 
     ::DosSleep(0);
 }
 

-void wxThread::Sleep(
-  unsigned long                     ulMilliseconds
-)
-{
-    ::DosSleep(ulMilliseconds);
-}
-

 int wxThread::GetCPUCount()
 {
     ULONG CPUCount;
 int wxThread::GetCPUCount()
 {
     ULONG CPUCount;


@@ -579,18 +571,18 @@ int wxThread::GetCPUCount()
     return CPUCount;
 }
 
     return CPUCount;
 }
 

-unsigned long wxThread::GetCurrentId()
+wxThreadIdType wxThread::GetCurrentId()

 {
     PTIB                            ptib;
     PPIB                            ppib;
 
     ::DosGetInfoBlocks(&ptib, &ppib);
 {
     PTIB                            ptib;
     PPIB                            ppib;
 
     ::DosGetInfoBlocks(&ptib, &ppib);

-    return (unsigned long) ptib->tib_ptib2->tib2_ultid;
+    return (wxThreadIdType) ptib->tib_ptib2->tib2_ultid;

 }
 
 bool wxThread::SetConcurrency(size_t level)
 {
 }
 
 bool wxThread::SetConcurrency(size_t level)
 {

-    wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
+    wxASSERT_MSG( IsMain(), wxT("should only be called from the main thread") );

 
     // ok only for the default one
     if ( level == 0 )
 
     // ok only for the default one
     if ( level == 0 )


@@ -669,18 +661,18 @@ wxThreadError wxThread::Resume()
 // stopping thread
 // ---------------
 
 // 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,
 {
     // 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;
     ExitCode rc = (ExitCode)-1;

-    (void)Delete(&rc);
+    (void)Delete(&rc, waitMode);

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

-wxThreadError wxThread::Delete(ExitCode *pRc)
+wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode))

 {
     ExitCode rc = 0;
 
 {
     ExitCode rc = 0;
 


@@ -934,12 +926,8 @@ bool wxThreadModule::OnInit()
     gs_pCritsectGui = new wxCriticalSection();
     gs_pCritsectGui->Enter();
 
     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;
 }
 


@@ -975,7 +963,7 @@ void WXDLLEXPORT wxWakeUpMainThread()
 #endif
 }
 
 #endif
 }
 

-void WXDLLEXPORT wxMutexGuiEnter()
+void wxMutexGuiEnterImpl()

 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),
 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),


@@ -997,7 +985,7 @@ void WXDLLEXPORT wxMutexGuiEnter()
     gs_pCritsectGui->Enter();
 }
 
     gs_pCritsectGui->Enter();
 }
 

-void WXDLLEXPORT wxMutexGuiLeave()
+void wxMutexGuiLeaveImpl()

 {
     wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);
 
 {
     wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui);