Committing in .

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

diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp
index 26e1b0517df9fc6a460dcb5e6717bfa075941615..88f837d669ea70fc2a57655955941fac9e6b2095 100644 (file)
--- a/src/mac/thread.cpp
+++ b/src/mac/thread.cpp
@@ -35,6 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
+#include <Threads.h>
 #include "wx/mac/uma.h"
 #endif
 
@@ -67,7 +68,7 @@ static bool gs_waitingForThread = FALSE ;
 class wxMacStCritical
 {
 public :
-    wxMacStCritical() 
+    wxMacStCritical()
     {
         if ( UMASystemIsInitialized() )
             ThreadBeginCritical() ;
@@ -91,7 +92,7 @@ public:
         m_owner = kNoThreadID ;
     }
 
-    ~wxMutexInternal() 
+    ~wxMutexInternal()
     {
     }
 
@@ -127,7 +128,7 @@ wxMutexError wxMutex::Lock()
         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) 
+        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);
@@ -144,14 +145,14 @@ wxMutexError wxMutex::TryLock()
 {
     wxMacStCritical critical ;
     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 ) 
+        if ( m_internal->m_owner != kNoThreadID && m_internal->m_owner != current )
             return wxMUTEX_BUSY;
-            
+
         m_internal->m_owner = current;
     }
     m_locked++;
@@ -162,10 +163,10 @@ wxMutexError wxMutex::TryLock()
 wxMutexError wxMutex::Unlock()
 {
     if ( UMASystemIsInitialized() )
-    {    
+    {
         OSErr err;
         err = ::ThreadBeginCritical();
-        
+
         if (m_locked > 0)
             m_locked--;
 
@@ -175,12 +176,12 @@ wxMutexError wxMutex::Unlock()
         // now pass on to the first waiting thread
         ThreadID firstWaiting = kNoThreadID;
         bool found = false;
-        while (!m_internal->m_waiters.IsEmpty() && !found) 
+        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);    
+            found = (err != threadNotFoundErr);
             if ( !found )
                 firstWaiting = kNoThreadID ;
             m_internal->m_waiters.RemoveAt(0) ;
@@ -204,7 +205,7 @@ wxMutexError wxMutex::Unlock()
 class wxConditionInternal
 {
 public:
-    wxConditionInternal()
+    wxConditionInternal(wxMutex& mutex) : m_mutex(mutex)
     {
         m_excessSignals = 0 ;
     }
@@ -246,11 +247,12 @@ public:
 
     wxArrayLong m_waiters ;
     wxInt32     m_excessSignals ;
+    wxMutex&    m_mutex;
 };
 
-wxCondition::wxCondition()
+wxCondition::wxCondition(wxMutex& mutex)
 {
-    m_internal = new wxConditionInternal;
+    m_internal = new wxConditionInternal(mutex);
 }
 
 wxCondition::~wxCondition()
@@ -263,10 +265,9 @@ void wxCondition::Wait()
     (void)m_internal->Wait(0xFFFFFFFFL);
 }
 
-bool wxCondition::Wait(unsigned long sec,
-                       unsigned long nsec)
+bool wxCondition::Wait(unsigned long timeout_millis)
 {
-    return m_internal->Wait(sec*1000 + nsec/1000000);
+    return m_internal->Wait(timeout_millis);
 }
 
 void wxCondition::Signal()
@@ -336,7 +337,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 ; }
 
@@ -422,7 +423,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 bool wxThreadInternal::Suspend()
 {
     OSErr err ;
-    
+
     ::ThreadBeginCritical();
 
     if ( m_state != STATE_RUNNING )
@@ -447,18 +448,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() ;
@@ -470,12 +471,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 )
@@ -490,7 +491,7 @@ bool wxThread::IsMain()
 {
     ThreadID current ;
     OSErr err ;
-    
+
     err = MacGetCurrentThread( &current ) ;
     return current == gs_idMainThread;
 }
@@ -507,7 +508,7 @@ void wxThread::Yield()
 void wxThread::Sleep(unsigned long milliseconds)
 {
         clock_t start = clock() ;
-        do 
+        do
         {
             YieldToAnyThread() ;
         } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
@@ -519,6 +520,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") );
@@ -534,7 +542,7 @@ bool wxThread::SetConcurrency(size_t level)
         // processor system it doesn't make much sense anyhow
         return level == 1;
     }
-    
+
     return TRUE ;
 }
 
@@ -745,7 +753,7 @@ void wxThread::Exit(ExitCode status)
 
     m_internal->SetResult( status ) ;
 
-/*    
+/*
 #if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
     _endthreadex((unsigned)status);
 #else // !VC++
@@ -861,7 +869,7 @@ bool WXDLLEXPORT wxGuiOwnedByMainThread()
     return false ;
 }
 
-// wake up the main thread 
+// wake up the main thread
 void WXDLLEXPORT wxWakeUpMainThread()
 {
     wxMacWakeUp() ;