fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index a133ba9fa0d117dc7d662d414a69b81e98428856..db3063e48e359dee1f9c9eb18863ded1c15cc211 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -67,17 +67,6 @@
     #define THR_ID(thr) ((long)(thr)->GetId())
 #endif
 
-#ifdef __WXMAC__
-
-    // implement wxCriticalSection using mutexes
-wxCriticalSection::wxCriticalSection( wxCriticalSectionType critSecType )
-       : m_mutex( critSecType == wxCRITSEC_DEFAULT ? wxMUTEX_RECURSIVE : wxMUTEX_DEFAULT )  { }
-wxCriticalSection::~wxCriticalSection() { }
-
-void wxCriticalSection::Enter() { (void)m_mutex.Lock(); }
-void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); }
-
-#endif
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -139,11 +128,11 @@ static pthread_key_t gs_keySelf;
 static size_t gs_nThreadsBeingDeleted = 0;
 
 // a mutex to protect gs_nThreadsBeingDeleted
-static wxMutex *gs_mutexDeleteThread = (wxMutex *)NULL;
+static wxMutex *gs_mutexDeleteThread = NULL;
 
 // and a condition variable which will be signaled when all
 // gs_nThreadsBeingDeleted will have been deleted
-static wxCondition *gs_condAllDeleted = (wxCondition *)NULL;
+static wxCondition *gs_condAllDeleted = NULL;
 
 // this mutex must be acquired before any call to a GUI function
 // (it's not inside #if wxUSE_GUI because this file is compiled as part
@@ -189,6 +178,8 @@ private:
 private:
     pthread_mutex_t m_mutex;
     bool m_isOk;
+    wxMutexType m_type;
+    unsigned long m_owningThread;
 
     // wxConditionInternal uses our m_mutex
     friend class wxConditionInternal;
@@ -203,6 +194,9 @@ extern "C" int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType)
 {
+    m_type = mutexType;
+    m_owningThread = 0;
+
     int err;
     switch ( mutexType )
     {
@@ -263,6 +257,12 @@ wxMutexInternal::~wxMutexInternal()
 
 wxMutexError wxMutexInternal::Lock()
 {
+    if ((m_type == wxMUTEX_DEFAULT) && (m_owningThread != 0))
+    {
+        if (m_owningThread == wxThread::GetCurrentId())
+           return wxMUTEX_DEAD_LOCK;
+    }
+
     return HandleLockResult(pthread_mutex_lock(&m_mutex));
 }
 
@@ -318,6 +318,8 @@ wxMutexError wxMutexInternal::Lock(unsigned long ms)
 
 wxMutexError wxMutexInternal::HandleLockResult(int err)
 {
+    // wxPrintf( "err %d\n", err );
+
     switch ( err )
     {
         case EDEADLK:
@@ -334,6 +336,8 @@ wxMutexError wxMutexInternal::HandleLockResult(int err)
             return wxMUTEX_TIMEOUT;
 
         case 0:
+            if (m_type == wxMUTEX_DEFAULT)
+                m_owningThread = wxThread::GetCurrentId();
             return wxMUTEX_NO_ERROR;
 
         default:
@@ -359,6 +363,8 @@ wxMutexError wxMutexInternal::TryLock()
             break;
 
         case 0:
+            if (m_type == wxMUTEX_DEFAULT)
+                m_owningThread = wxThread::GetCurrentId();
             return wxMUTEX_NO_ERROR;
 
         default:
@@ -370,6 +376,8 @@ wxMutexError wxMutexInternal::TryLock()
 
 wxMutexError wxMutexInternal::Unlock()
 {
+    m_owningThread = 0;
+
     int err = pthread_mutex_unlock(&m_mutex);
     switch ( err )
     {
@@ -581,14 +589,14 @@ wxSemaError wxSemaphoreInternal::Wait()
     while ( m_count == 0 )
     {
         wxLogTrace(TRACE_SEMA,
-                   _T("Thread %ld waiting for semaphore to become signalled"),
+                   _T("Thread %p waiting for semaphore to become signalled"),
                    wxThread::GetCurrentId());
 
         if ( m_cond.Wait() != wxCOND_NO_ERROR )
             return wxSEMA_MISC_ERROR;
 
         wxLogTrace(TRACE_SEMA,
-                   _T("Thread %ld finished waiting for semaphore, count = %lu"),
+                   _T("Thread %p finished waiting for semaphore, count = %lu"),
                    wxThread::GetCurrentId(), (unsigned long)m_count);
     }
 
@@ -655,7 +663,7 @@ wxSemaError wxSemaphoreInternal::Post()
     m_count++;
 
     wxLogTrace(TRACE_SEMA,
-               _T("Thread %ld about to signal semaphore, count = %lu"),
+               _T("Thread %p about to signal semaphore, count = %lu"),
                wxThread::GetCurrentId(), (unsigned long)m_count);
 
     return m_cond.Signal() == wxCOND_NO_ERROR ? wxSEMA_NO_ERROR
@@ -721,8 +729,8 @@ public:
             _T("EXITED"),
         };
 
-        wxLogTrace(TRACE_THREADS, _T("Thread %ld: %s => %s."),
-                   (long)GetId(), stateNames[m_state], stateNames[state]);
+        wxLogTrace(TRACE_THREADS, _T("Thread %p: %s => %s."),
+                   GetId(), stateNames[m_state], stateNames[state]);
 #endif // __WXDEBUG__
 
         m_state = state;
@@ -798,7 +806,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
 {
     wxThreadInternal *pthread = thread->m_internal;
 
-    wxLogTrace(TRACE_THREADS, _T("Thread %ld started."), THR_ID(pthread));
+    wxLogTrace(TRACE_THREADS, _T("Thread %p started."), THR_ID(pthread));
 
     // associate the thread pointer with the newly created thread so that
     // wxThread::This() will work
@@ -836,7 +844,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
     {
         // call the main entry
         wxLogTrace(TRACE_THREADS,
-                   _T("Thread %ld about to enter its Entry()."),
+                   _T("Thread %p about to enter its Entry()."),
                    THR_ID(pthread));
 
         wxTRY
@@ -844,7 +852,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
             pthread->m_exitcode = thread->Entry();
 
             wxLogTrace(TRACE_THREADS,
-                       _T("Thread %ld Entry() returned %lu."),
+                       _T("Thread %p Entry() returned %lu."),
                        THR_ID(pthread), wxPtrToUInt(pthread->m_exitcode));
         }
         wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
@@ -967,7 +975,7 @@ void wxThreadInternal::Wait()
         wxMutexGuiLeave();
 
     wxLogTrace(TRACE_THREADS,
-               _T("Starting to wait for thread %ld to exit."),
+               _T("Starting to wait for thread %p to exit."),
                THR_ID(this));
 
     // to avoid memory leaks we should call pthread_join(), but it must only be
@@ -1007,7 +1015,7 @@ void wxThreadInternal::Pause()
                  wxT("thread must first be paused with wxThread::Pause().") );
 
    wxLogTrace(TRACE_THREADS,
-              _T("Thread %ld goes to sleep."), THR_ID(this));
+              _T("Thread %p goes to sleep."), THR_ID(this));
 
     // wait until the semaphore is Post()ed from Resume()
     m_semSuspend.Wait();
@@ -1023,7 +1031,7 @@ void wxThreadInternal::Resume()
     if ( IsReallyPaused() )
     {
        wxLogTrace(TRACE_THREADS,
-                  _T("Waking up thread %ld"), THR_ID(this));
+                  _T("Waking up thread %p"), THR_ID(this));
 
         // wake up Pause()
         m_semSuspend.Post();
@@ -1034,7 +1042,7 @@ void wxThreadInternal::Resume()
     else
     {
         wxLogTrace(TRACE_THREADS,
-                   _T("Thread %ld is not yet really paused"), THR_ID(this));
+                   _T("Thread %p is not yet really paused"), THR_ID(this));
     }
 
     SetState(STATE_RUNNING);
@@ -1397,7 +1405,7 @@ wxThreadError wxThread::Resume()
     switch ( state )
     {
         case STATE_PAUSED:
-            wxLogTrace(TRACE_THREADS, _T("Thread %ld suspended, resuming."),
+            wxLogTrace(TRACE_THREADS, _T("Thread %p suspended, resuming."),
                        GetId());
 
             m_internal->Resume();
@@ -1405,7 +1413,7 @@ wxThreadError wxThread::Resume()
             return wxTHREAD_NO_ERROR;
 
         case STATE_EXITED:
-            wxLogTrace(TRACE_THREADS, _T("Thread %ld exited, won't resume."),
+            wxLogTrace(TRACE_THREADS, _T("Thread %p exited, won't resume."),
                        GetId());
             return wxTHREAD_NO_ERROR;
 
@@ -1789,14 +1797,14 @@ static void DeleteThread(wxThread *This)
     // or wxThreadModule::OnExit() would deadlock
     wxMutexLocker locker( *gs_mutexDeleteThread );
 
-    wxLogTrace(TRACE_THREADS, _T("Thread %ld auto deletes."), This->GetId());
+    wxLogTrace(TRACE_THREADS, _T("Thread %p auto deletes."), This->GetId());
 
     delete This;
 
     wxCHECK_RET( gs_nThreadsBeingDeleted > 0,
                  _T("no threads scheduled for deletion, yet we delete one?") );
 
-    wxLogTrace(TRACE_THREADS, _T("%lu scheduled for deletion threads left."),
+    wxLogTrace(TRACE_THREADS, _T("%lu threads remain scheduled for deletion."),
                (unsigned long)gs_nThreadsBeingDeleted - 1);
 
     if ( !--gs_nThreadsBeingDeleted )