Back to previous call with -1 replacement.

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

diff --git a/src/mac/classic/thread.cpp b/src/mac/classic/thread.cpp
index 5e322a719d2eb0b8f820ce62b2499813e1a194cf..52f7603ee362b8465165de0ea45d145d0403c178 100644 (file)
--- a/src/mac/classic/thread.cpp
+++ b/src/mac/classic/thread.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        thread.cpp
+// Name:        src/mac/classic/thread.cpp

 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
 // Modified by: Stefan Csomor
 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
 // Modified by: Stefan Csomor


@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -27,11 +23,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"

+    #include "wx/module.h"

 #endif
 
 #if wxUSE_THREADS
 
 #endif
 
 #if wxUSE_THREADS
 

-#include "wx/module.h"

 #include "wx/thread.h"
 
 #ifdef __WXMAC__
 #include "wx/thread.h"
 
 #ifdef __WXMAC__


@@ -64,7 +60,7 @@ enum wxThreadState
 // ----------------------------------------------------------------------------
 
 static ThreadID gs_idMainThread = kNoThreadID ;
 // ----------------------------------------------------------------------------
 
 static ThreadID gs_idMainThread = kNoThreadID ;

-static bool gs_waitingForThread = FALSE ;
+static bool gs_waitingForThread = false ;

 size_t g_numberOfThreads = 0;
 
 // ============================================================================
 size_t g_numberOfThreads = 0;
 
 // ============================================================================


@@ -77,12 +73,18 @@ public :
     wxMacStCritical()
     {
         if ( UMASystemIsInitialized() )
     wxMacStCritical()
     {
         if ( UMASystemIsInitialized() )

-            ThreadBeginCritical() ;
+        {
+            OSErr err = ThreadBeginCritical() ;
+            wxASSERT( err == noErr ) ;
+        }

     }
     ~wxMacStCritical()
     {
         if ( UMASystemIsInitialized() )
     }
     ~wxMacStCritical()
     {
         if ( UMASystemIsInitialized() )

-            ThreadEndCritical() ;
+        {
+            OSErr err = ThreadEndCritical() ;
+            wxASSERT( err == noErr ) ;
+    }

     }
 };
 
     }
 };
 


@@ -133,6 +135,7 @@ wxMutexError wxMutexInternal::Lock()
             m_waiters.Add(current);
             err = ::SetThreadStateEndCritical(kCurrentThreadID, kStoppedThreadState, m_owner);
             err = ::ThreadBeginCritical();
             m_waiters.Add(current);
             err = ::SetThreadStateEndCritical(kCurrentThreadID, kStoppedThreadState, m_owner);
             err = ::ThreadBeginCritical();

+            wxASSERT( err == noErr ) ;

         }
         m_owner = current;
     }
         }
         m_owner = current;
     }


@@ -165,6 +168,7 @@ wxMutexError wxMutexInternal::Unlock()
     {
         OSErr err;
         err = ::ThreadBeginCritical();
     {
         OSErr err;
         err = ::ThreadBeginCritical();

+        wxASSERT( err == noErr ) ;

 
         if (m_locked > 0)
             m_locked--;
 
         if (m_locked > 0)
             m_locked--;


@@ -429,7 +433,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
     if ( err != noErr )
     {
         wxLogSysError(_("Can't create thread"));
     if ( err != noErr )
     {
         wxLogSysError(_("Can't create thread"));

-        return FALSE;
+        return false;

     }
 
     if ( m_priority != WXTHREAD_DEFAULT_PRIORITY )
     }
 
     if ( m_priority != WXTHREAD_DEFAULT_PRIORITY )


@@ -439,27 +443,29 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 
     m_state = STATE_NEW;
 
 
     m_state = STATE_NEW;
 

-    return TRUE;
+    return true;

 }
 
 bool wxThreadInternal::Suspend()
 {
     OSErr err ;
 
 }
 
 bool wxThreadInternal::Suspend()
 {
     OSErr err ;
 

-    ::ThreadBeginCritical();
+    err = ::ThreadBeginCritical();
+    wxASSERT( err == noErr ) ;

 
     if ( m_state != STATE_RUNNING )
     {
 
     if ( m_state != STATE_RUNNING )
     {

-        ::ThreadEndCritical() ;
+        err = ::ThreadEndCritical() ;
+        wxASSERT( err == noErr ) ;

         wxLogSysError(_("Can not suspend thread %x"), m_tid);
         wxLogSysError(_("Can not suspend thread %x"), m_tid);

-        return FALSE;
+        return false;

     }
 
     m_state = STATE_PAUSED;
 
     err = ::SetThreadStateEndCritical(m_tid, kStoppedThreadState, kNoThreadID);
 
     }
 
     m_state = STATE_PAUSED;
 
     err = ::SetThreadStateEndCritical(m_tid, kStoppedThreadState, kNoThreadID);
 

-    return TRUE;
+    return true;

 }
 
 bool wxThreadInternal::Resume()
 }
 
 bool wxThreadInternal::Resume()


@@ -471,21 +477,24 @@ bool wxThreadInternal::Resume()
     wxASSERT( err == noErr ) ;
     wxASSERT( current != m_tid ) ;
 
     wxASSERT( err == noErr ) ;
     wxASSERT( current != m_tid ) ;
 

-    ::ThreadBeginCritical();
+    err = ::ThreadBeginCritical();
+    wxASSERT( err == noErr ) ;
+

     if ( m_state != STATE_PAUSED && m_state != STATE_NEW )
     {
     if ( m_state != STATE_PAUSED && m_state != STATE_NEW )
     {

-        ::ThreadEndCritical() ;
+        err = ::ThreadEndCritical() ;
+        wxASSERT( err == noErr ) ;

         wxLogSysError(_("Can not resume thread %x"), m_tid);
         wxLogSysError(_("Can not resume thread %x"), m_tid);

-        return FALSE;
+        return false;

 
     }
     err = ::SetThreadStateEndCritical(m_tid, kReadyThreadState, kNoThreadID);
 
     }
     err = ::SetThreadStateEndCritical(m_tid, kReadyThreadState, kNoThreadID);

-    wxASSERT( err == noErr ) ;

 
     m_state = STATE_RUNNING;
 
     m_state = STATE_RUNNING;

-    ::ThreadEndCritical() ;
+    err = ::ThreadEndCritical() ;
+    wxASSERT( err == noErr ) ;

     ::YieldToAnyThread() ;
     ::YieldToAnyThread() ;

-    return TRUE;
+    return true;

 }
 
 // static functions
 }
 
 // static functions


@@ -536,7 +545,7 @@ void wxThread::Sleep(unsigned long milliseconds)
     double mssleep = milliseconds * 1000 ;
     double msstart, msnow ;
     msstart = (start.hi * 4294967296.0 + start.lo) ;
     double mssleep = milliseconds * 1000 ;
     double msstart, msnow ;
     msstart = (start.hi * 4294967296.0 + start.lo) ;

-    
+

     do
     {
         YieldToAnyThread();
     do
     {
         YieldToAnyThread();


@@ -574,7 +583,7 @@ bool wxThread::SetConcurrency(size_t level)
         return level == 1;
     }
 
         return level == 1;
     }
 

-    return TRUE ;
+    return true ;

 }
 
 // ctor and dtor
 }
 
 // ctor and dtor


@@ -679,7 +688,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
     // Delete() is always safe to call, so consider all possible states
 
     // has the thread started to run?
     // Delete() is always safe to call, so consider all possible states
 
     // has the thread started to run?

-    bool shouldResume = FALSE;
+    bool shouldResume = false;

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


@@ -689,7 +698,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
             // WinThreadStart() will see it and terminate immediately
             m_internal->SetState(STATE_EXITED);
 
             // WinThreadStart() will see it and terminate immediately
             m_internal->SetState(STATE_EXITED);
 

-            shouldResume = TRUE;
+            shouldResume = true;

         }
     }
 
         }
     }
 


@@ -703,7 +712,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         if ( IsMain() )
         {
             // set flag for wxIsWaitingForThread()
         if ( IsMain() )
         {
             // set flag for wxIsWaitingForThread()

-            gs_waitingForThread = TRUE;
+            gs_waitingForThread = true;

 
 #if wxUSE_GUI
             wxBeginBusyCursor();
 
 #if wxUSE_GUI
             wxBeginBusyCursor();


@@ -733,7 +742,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
 
         if ( IsMain() )
         {
 
         if ( IsMain() )
         {

-            gs_waitingForThread = FALSE;
+            gs_waitingForThread = false;

 
 #if wxUSE_GUI
             wxEndBusyCursor();
 
 #if wxUSE_GUI
             wxEndBusyCursor();


@@ -870,13 +879,13 @@ bool wxThreadModule::OnInit()
     if ( !hasThreadManager )
     {
         wxLogSysError( wxT("Thread Support is not available on this System") );
     if ( !hasThreadManager )
     {
         wxLogSysError( wxT("Thread Support is not available on this System") );

-        return FALSE ;
+        return false ;

     }
 
     // no error return for GetCurrentThreadId()
     MacGetCurrentThread( &gs_idMainThread ) ;
 
     }
 
     // no error return for GetCurrentThreadId()
     MacGetCurrentThread( &gs_idMainThread ) ;
 

-    return TRUE;
+    return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()