Trace module initialization and cleanup.

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index e8aad25e50984bf824c220d0aef919c7c5b08037..86c408883416898b0d5d4d448ce2576870e8b481 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -21,10 +21,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "thread.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -44,7 +40,7 @@
 #include <pthread.h>
 #include <errno.h>
 #include <time.h>
 #include <pthread.h>
 #include <errno.h>
 #include <time.h>

-#if HAVE_SCHED_H
+#ifdef HAVE_SCHED_H

     #include <sched.h>
 #endif
 
     #include <sched.h>
 #endif
 


@@ -100,7 +96,7 @@ static void DeleteThread(wxThread *This);
 // ----------------------------------------------------------------------------
 
 // an (non owning) array of pointers to threads
 // ----------------------------------------------------------------------------
 
 // an (non owning) array of pointers to threads

-WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
+WX_DEFINE_ARRAY_PTR(wxThread *, wxArrayThread);

 
 // an entry for a thread we can wait for
 
 
 // an entry for a thread we can wait for
 


@@ -591,10 +587,10 @@ wxSemaError wxSemaphoreInternal::Post()
 extern "C"
 {
 
 extern "C"
 {
 

-#if HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifdef wxHAVE_PTHREAD_CLEANUP

     // thread exit function
     void wxPthreadCleanup(void *ptr);
     // thread exit function
     void wxPthreadCleanup(void *ptr);

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

 
 void *wxPthreadStart(void *ptr);
 
 
 void *wxPthreadStart(void *ptr);
 


@@ -671,10 +667,10 @@ public:
         m_isDetached = TRUE;
     }
 
         m_isDetached = TRUE;
     }
 

-#if HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifdef wxHAVE_PTHREAD_CLEANUP

     // this is used by wxPthreadCleanup() only
     static void Cleanup(wxThread *thread);
     // this is used by wxPthreadCleanup() only
     static void Cleanup(wxThread *thread);

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

 
 private:
     pthread_t     m_threadId;   // id of the thread
 
 private:
     pthread_t     m_threadId;   // id of the thread


@@ -735,11 +731,11 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
     // block!
     bool dontRunAtAll;
 
     // block!
     bool dontRunAtAll;
 

-#if HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifdef wxHAVE_PTHREAD_CLEANUP

     // install the cleanup handler which will be called if the thread is
     // cancelled
     pthread_cleanup_push(wxPthreadCleanup, thread);
     // install the cleanup handler which will be called if the thread is
     // cancelled
     pthread_cleanup_push(wxPthreadCleanup, thread);

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

 
     // wait for the semaphore to be posted from Run()
     pthread->m_semRun.Wait();
 
     // wait for the semaphore to be posted from Run()
     pthread->m_semRun.Wait();


@@ -779,10 +775,10 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
     // NB: at least under Linux, pthread_cleanup_push/pop are macros and pop
     //     contains the matching '}' for the '{' in push, so they must be used
     //     in the same block!
     // NB: at least under Linux, pthread_cleanup_push/pop are macros and pop
     //     contains the matching '}' for the '{' in push, so they must be used
     //     in the same block!

-#if HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifdef wxHAVE_PTHREAD_CLEANUP

     // remove the cleanup handler without executing it
     pthread_cleanup_pop(FALSE);
     // remove the cleanup handler without executing it
     pthread_cleanup_pop(FALSE);

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

 
     if ( dontRunAtAll )
     {
 
     if ( dontRunAtAll )
     {


@@ -802,7 +798,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
     }
 }
 
     }
 }
 

-#if HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifdef wxHAVE_PTHREAD_CLEANUP

 
 // this handler is called when the thread is cancelled
 extern "C" void wxPthreadCleanup(void *ptr)
 
 // this handler is called when the thread is cancelled
 extern "C" void wxPthreadCleanup(void *ptr)


@@ -825,7 +821,7 @@ void wxThreadInternal::Cleanup(wxThread *thread)
     thread->Exit(EXITCODE_CANCELLED);
 }
 
     thread->Exit(EXITCODE_CANCELLED);
 }
 

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

 
 // ----------------------------------------------------------------------------
 // wxThreadInternal
 
 // ----------------------------------------------------------------------------
 // wxThreadInternal


@@ -1435,14 +1431,14 @@ wxThreadError wxThread::Kill()
             {
                 // if we use cleanup function, this will be done from
                 // wxPthreadCleanup()
             {
                 // if we use cleanup function, this will be done from
                 // wxPthreadCleanup()

-#if !HAVE_THREAD_CLEANUP_FUNCTIONS
+#ifndef wxHAVE_PTHREAD_CLEANUP

                 ScheduleThreadForDeletion();
 
                 // don't call OnExit() here, it can only be called in the
                 // threads context and we're in the context of another thread
 
                 DeleteThread(this);
                 ScheduleThreadForDeletion();
 
                 // don't call OnExit() here, it can only be called in the
                 // threads context and we're in the context of another thread
 
                 DeleteThread(this);

-#endif // HAVE_THREAD_CLEANUP_FUNCTIONS
+#endif // wxHAVE_PTHREAD_CLEANUP

             }
             else
             {
             }
             else
             {