made pre-compiling the python files optional

[wxWidgets.git] / src / gtk1 / threadsgi.cpp

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 07d7cdabdeb2ecc4fd9af222a72b42db780caeda..6f602b3324e0e15e0ad1e528fdbc772eb93350a8 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -18,6 +18,9 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>

+#include "wx/thread.h"
+#include "wx/module.h"
+#include "wx/utils.h"

 
 enum thread_state {
   STATE_IDLE = 0,
 
 enum thread_state {
   STATE_IDLE = 0,


@@ -46,42 +49,52 @@ public:
 
 wxMutex::wxMutex()
 {
 
 wxMutex::wxMutex()
 {

+  m_locked = 0;

   p_internal = new wxMutexInternal;
   init_lock(&(p_internal->p_mutex));
 }
 
 wxMutex::~wxMutex()
 {
   p_internal = new wxMutexInternal;
   init_lock(&(p_internal->p_mutex));
 }
 
 wxMutex::~wxMutex()
 {

+  if (m_locked > 0)
+    wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n",
+               m_locked);
+  delete p_internal;

 }
 
 }
 

-wxMutex::MutexError wxMutex::Lock(void)
+wxMutexError wxMutex::Lock()

 {
   spin_lock(&(p_internal->p_mutex));
 {
   spin_lock(&(p_internal->p_mutex));

-  return NO_ERROR;
+  m_locked++;
+  return MUTEX_NO_ERROR;

 }
 
 }
 

-wxMutex::MutexError wxMutex::TryLock(void)
+wxMutexError wxMutex::TryLock()

 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)

-    return BUSY;
-  return NO_ERROR;
+    return MUTEX_BUSY;
+  m_locked++;
+  return MUTEX_NO_ERROR;

 }
 
 }
 

-wxMutex::MutexError wxMutex::Unlock(void)
+wxMutexError wxMutex::Unlock()

 {
 {

+  if (m_locked == 0)
+    return MUTEX_UNLOCKED; 

   release_lock(&(p_internal->p_mutex));
   release_lock(&(p_internal->p_mutex));

-  return NO_ERROR;
+  m_locked--;
+  return MUTEX_NO_ERROR;

 }
 
 }
 

-// GLH: Don't now how it works on SGI. Wolfram ?
+// GL: Don't know how it works on SGI. Wolfram ?

 
 

-wxCondition::wxCondition(void) {}
-wxCondition::~wxCondition(void) {}
+wxCondition::wxCondition() {}
+wxCondition::~wxCondition() {}

 int wxCondition::Wait(wxMutex& WXUNUSED(mutex)) { return 0;}
 int wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
                       unsigned long WXUNUSED(nsec)) { return 0; }
 int wxCondition::Wait(wxMutex& WXUNUSED(mutex)) { return 0;}
 int wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
                       unsigned long WXUNUSED(nsec)) { return 0; }

-int wxCondition::Signal(void) { return 0; }
-int wxCondition::Broadcast(void) { return 0; }
+int wxCondition::Signal() { return 0; }
+int wxCondition::Broadcast() { return 0; }

 
 class
 wxThreadPrivate {
 
 class
 wxThreadPrivate {


@@ -116,16 +129,16 @@ void wxThread::Exit(void* status)
   _exit(0);
 }
 
   _exit(0);
 }
 

-wxThread::ThreadError wxThread::Create()
+wxThreadError wxThread::Create()

 {
   if (p_internal->state != STATE_IDLE)
 {
   if (p_internal->state != STATE_IDLE)

-    return RUNNING;
+    return THREAD_RUNNING;

   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;
   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;

-    return NO_RESOURCE;
+    return THREAD_NO_RESOURCE;

   }
   }

-  return NO_ERROR;
+  return THREAD_NO_ERROR;

 }
 
 void wxThread::Destroy()
 }
 
 void wxThread::Destroy()


@@ -153,7 +166,7 @@ void *wxThread::Join()
   return 0;
 }
 
   return 0;
 }
 

-unsigned long wxThread::GetID()
+unsigned long wxThread::GetID() const

 {
   return (unsigned long)p_internal->thread_id;
 }
 {
   return (unsigned long)p_internal->thread_id;
 }


@@ -170,8 +183,9 @@ void wxThread::SetPriority(int prio)
 {
 }
 
 {
 }
 

-int wxThread::GetPriority(void)
+int wxThread::GetPriority() const

 {
 {

+    return 0;

 }
 
 bool wxThreadIsMain()
 }
 
 bool wxThreadIsMain()


@@ -201,13 +215,13 @@ void wxThread::OnExit()
 class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
 class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:

-  virtual bool OnInit(void) {
+  virtual bool OnInit() {

     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex.Lock();
   }
 
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex.Lock();
   }
 

-  virtual void OnExit(void) {
+  virtual void OnExit() {

     wxMainMutex.Unlock();
     wxThreadGuiExit();
   }
     wxMainMutex.Unlock();
     wxThreadGuiExit();
   }