added an explicit accessor to query the default key value

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

diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp
index c68fd396deb9fa7ebe3aecfb38752c63d93f5d37..69a6e85003c47e78e9195d7f54e42f3a3f433ccd 100644 (file)
--- a/src/mac/thread.cpp
+++ b/src/mac/thread.cpp
@@ -35,7 +35,10 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <Threads.h>
+#endif
+#include "wx/mac/uma.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -67,13 +70,15 @@ static bool gs_waitingForThread = FALSE ;
 class wxMacStCritical
 {
 public :
-    wxMacStCritical() 
+    wxMacStCritical()
     {
-        ThreadBeginCritical() ;
+        if ( UMASystemIsInitialized() )
+            ThreadBeginCritical() ;
     }
     ~wxMacStCritical()
     {
-        ThreadEndCritical() ;
+        if ( UMASystemIsInitialized() )
+            ThreadEndCritical() ;
     }
 };
 
@@ -89,7 +94,7 @@ public:
         m_owner = kNoThreadID ;
     }
 
-    ~wxMutexInternal() 
+    ~wxMutexInternal()
     {
     }
 
@@ -118,19 +123,21 @@ wxMutex::~wxMutex()
 wxMutexError wxMutex::Lock()
 {
     wxMacStCritical critical ;
-    
-    OSErr err ;
-    ThreadID current = kNoThreadID;
-    err = ::MacGetCurrentThread(&current);
-    // if we are not the owner, add this thread to the list of waiting threads, stop this thread
-    // and invoke the scheduler to continue executing the owner's thread
-    while ( m_internal->m_owner != kNoThreadID && m_internal->m_owner != current) 
-    {
-        m_internal->m_waiters.Add(current);
-        err = ::SetThreadStateEndCritical(kCurrentThreadID, kStoppedThreadState, m_internal->m_owner);
-        err = ::ThreadBeginCritical();
+    if ( UMASystemIsInitialized() )
+    {
+        OSErr err ;
+        ThreadID current = kNoThreadID;
+        err = ::MacGetCurrentThread(&current);
+        // if we are not the owner, add this thread to the list of waiting threads, stop this thread
+        // and invoke the scheduler to continue executing the owner's thread
+        while ( m_internal->m_owner != kNoThreadID && m_internal->m_owner != current)
+        {
+            m_internal->m_waiters.Add(current);
+            err = ::SetThreadStateEndCritical(kCurrentThreadID, kStoppedThreadState, m_internal->m_owner);
+            err = ::ThreadBeginCritical();
+        }
+        m_internal->m_owner = current;
     }
-    m_internal->m_owner = current;
     m_locked++;
 
     return wxMUTEX_NO_ERROR;
@@ -139,15 +146,17 @@ wxMutexError wxMutex::Lock()
 wxMutexError wxMutex::TryLock()
 {
     wxMacStCritical critical ;
-    
-    OSErr err ;
-    ThreadID current = kNoThreadID;
-    ::MacGetCurrentThread(&current);
-    // if we are not the owner, give an error back
-    if ( m_internal->m_owner != kNoThreadID && m_internal->m_owner != current ) 
-        return wxMUTEX_BUSY;
-        
-    m_internal->m_owner = current;
+    if ( UMASystemIsInitialized() )
+    {
+        OSErr err ;
+        ThreadID current = kNoThreadID;
+        ::MacGetCurrentThread(&current);
+        // if we are not the owner, give an error back
+        if ( m_internal->m_owner != kNoThreadID && m_internal->m_owner != current )
+            return wxMUTEX_BUSY;
+
+        m_internal->m_owner = current;
+    }
     m_locked++;
 
    return wxMUTEX_NO_ERROR;
@@ -155,32 +164,39 @@ wxMutexError wxMutex::TryLock()
 
 wxMutexError wxMutex::Unlock()
 {
-    OSErr err;
-    err = ::ThreadBeginCritical();
-    
-    if (m_locked > 0)
-        m_locked--;
+    if ( UMASystemIsInitialized() )
+    {
+        OSErr err;
+        err = ::ThreadBeginCritical();
+
+        if (m_locked > 0)
+            m_locked--;
 
-    // this mutex is not owned by anybody anmore
-    m_internal->m_owner = kNoThreadID;
+        // this mutex is not owned by anybody anmore
+        m_internal->m_owner = kNoThreadID;
 
-    // now pass on to the first waiting thread
-    ThreadID firstWaiting = kNoThreadID;
-    bool found = false;
-    while (!m_internal->m_waiters.IsEmpty() && !found) 
+        // now pass on to the first waiting thread
+        ThreadID firstWaiting = kNoThreadID;
+        bool found = false;
+        while (!m_internal->m_waiters.IsEmpty() && !found)
+        {
+            firstWaiting = m_internal->m_waiters[0];
+            err = ::SetThreadState(firstWaiting, kReadyThreadState, kNoThreadID);
+            // in case this was not successful (dead thread), we just loop on and reset the id
+            found = (err != threadNotFoundErr);
+            if ( !found )
+                firstWaiting = kNoThreadID ;
+            m_internal->m_waiters.RemoveAt(0) ;
+        }
+        // now we have a valid firstWaiting thread, which has been scheduled to run next, just end the
+        // critical section and invoke the scheduler
+        err = ::SetThreadStateEndCritical(kCurrentThreadID, kReadyThreadState, firstWaiting);
+    }
+    else
     {
-        firstWaiting = m_internal->m_waiters[0];
-        err = ::SetThreadState(firstWaiting, kReadyThreadState, kNoThreadID);
-        // in case this was not successful (dead thread), we just loop on and reset the id
-        found = (err != threadNotFoundErr);    
-        if ( !found )
-            firstWaiting = kNoThreadID ;
-        m_internal->m_waiters.RemoveAt(0) ;
+        if (m_locked > 0)
+            m_locked--;
     }
-    // now we have a valid firstWaiting thread, which has been scheduled to run next, just end the
-    // critical section and invoke the scheduler
-    err = ::SetThreadStateEndCritical(kCurrentThreadID, kReadyThreadState, firstWaiting);
-
     return wxMUTEX_NO_ERROR;
 }
 
@@ -323,7 +339,7 @@ public:
     // thread priority
     void SetPriority(unsigned int priority);
     unsigned int GetPriority() const { return m_priority; }
-    
+
     void SetResult( void *res ) { m_result = res ; }
     void *GetResult() { return m_result ; }
 
@@ -409,7 +425,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 bool wxThreadInternal::Suspend()
 {
     OSErr err ;
-    
+
     ::ThreadBeginCritical();
 
     if ( m_state != STATE_RUNNING )
@@ -434,18 +450,18 @@ bool wxThreadInternal::Resume()
 
     wxASSERT( err == noErr ) ;
     wxASSERT( current != m_tid ) ;
-        
+
     ::ThreadBeginCritical();
     if ( m_state != STATE_PAUSED && m_state != STATE_NEW )
     {
         ::ThreadEndCritical() ;
         wxLogSysError(_("Can not resume thread %x"), m_tid);
         return FALSE;
-        
+
     }
     err = ::SetThreadStateEndCritical(m_tid, kReadyThreadState, kNoThreadID);
     wxASSERT( err == noErr ) ;
-    
+
     m_state = STATE_RUNNING;
     ::ThreadEndCritical() ;
     ::YieldToAnyThread() ;
@@ -457,12 +473,12 @@ bool wxThreadInternal::Resume()
 wxThread *wxThread::This()
 {
     wxMacStCritical critical ;
-    
+
     ThreadID current ;
     OSErr err ;
-    
+
     err = MacGetCurrentThread( &current ) ;
-    
+
     for ( int i = 0 ; i < s_threads.Count() ; ++i )
     {
         if ( ( (wxThread*) s_threads[i] )->GetId() == current )
@@ -477,7 +493,7 @@ bool wxThread::IsMain()
 {
     ThreadID current ;
     OSErr err ;
-    
+
     err = MacGetCurrentThread( &current ) ;
     return current == gs_idMainThread;
 }
@@ -494,7 +510,7 @@ void wxThread::Yield()
 void wxThread::Sleep(unsigned long milliseconds)
 {
         clock_t start = clock() ;
-        do 
+        do
         {
             YieldToAnyThread() ;
         } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
@@ -506,6 +522,13 @@ int wxThread::GetCPUCount()
     return 1;
 }
 
+unsigned long wxThread::GetCurrentId()
+{
+    ThreadID current ;
+    MacGetCurrentThread( &current ) ;
+    return (unsigned long)current;
+}
+
 bool wxThread::SetConcurrency(size_t level)
 {
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
@@ -521,7 +544,7 @@ bool wxThread::SetConcurrency(size_t level)
         // processor system it doesn't make much sense anyhow
         return level == 1;
     }
-    
+
     return TRUE ;
 }
 
@@ -732,7 +755,7 @@ void wxThread::Exit(ExitCode status)
 
     m_internal->SetResult( status ) ;
 
-/*    
+/*
 #if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
     _endthreadex((unsigned)status);
 #else // !VC++
@@ -848,7 +871,7 @@ bool WXDLLEXPORT wxGuiOwnedByMainThread()
     return false ;
 }
 
-// wake up the main thread 
+// wake up the main thread
 void WXDLLEXPORT wxWakeUpMainThread()
 {
     wxMacWakeUp() ;