Rework IE virtual file system support to use new syntax. Remove now unused code for...

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

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 10945b3900324398e99ca6e460f08017a486c4d5..6ba3e7255c9a49daf61c5f698a2eb7e7321fcf5b 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        threadsgi.cpp
+// Name:        src/gtk1/threadsgi.cpp

 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:
 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:


@@ -8,8 +8,16 @@
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
-#pragma implementation "thread.h"
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/thread.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -19,7 +27,11 @@
 #include <sys/wait.h>
 #include <sys/prctl.h>
 
 #include <sys/wait.h>
 #include <sys/prctl.h>
 

-enum thread_state {
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+enum thread_state
+{

   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,
   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,


@@ -30,10 +42,8 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/thread.h"
-

 static int p_mainid;
 static int p_mainid;

-wxMutex wxMainMutex;
+wxMutex *wxMainMutex;

 
 #include "threadgui.inc"
 
 
 #include "threadgui.inc"
 


@@ -56,8 +66,9 @@ wxMutex::wxMutex()
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)

-    wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n",
-               m_locked);
+  {
+    wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
+  }

   delete p_internal;
 }
 
   delete p_internal;
 }
 


@@ -65,24 +76,24 @@ wxMutexError wxMutex::Lock()
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)
 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)

-    return MUTEX_BUSY;
+    return wxMUTEX_BUSY;

   m_locked++;
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)

-    return MUTEX_UNLOCKED; 
+    return wxMUTEX_UNLOCKED;

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

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 // GL: Don't know how it works on SGI. Wolfram ?
 }
 
 // GL: Don't know how it works on SGI. Wolfram ?


@@ -131,19 +142,31 @@ void wxThread::Exit(void* status)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)

-    return THREAD_RUNNING;
+    return wxTHREAD_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 THREAD_NO_RESOURCE;
+    return wxTHREAD_NO_RESOURCE;

   }
   }

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 }
 

-void wxThread::Destroy()
+wxThreadError wxThread::Destroy()

 {
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 {
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;

+
+  return wxTHREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Pause()
+{
+  return wxTHREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Resume()
+{
+  return wxTHREAD_NO_ERROR;

 }
 
 void *wxThread::Join()
 }
 
 void *wxThread::Join()


@@ -153,10 +176,10 @@ void *wxThread::Join()
     int stat;
 
     if (do_unlock)
     int stat;
 
     if (do_unlock)

-      wxMainMutex.Unlock();
+      wxMainMutex->Unlock();

     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)
     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)

-      wxMainMutex.Lock();
+      wxMainMutex->Lock();

     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;
     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;


@@ -187,11 +210,21 @@ int wxThread::GetPriority() const
     return 0;
 }
 
     return 0;
 }
 

-bool wxThreadIsMain()
+bool wxThread::IsMain()

 {
   return (int)getpid() == main_id;
 }
 
 {
   return (int)getpid() == main_id;
 }
 

+bool wxThread::IsAlive() const
+{
+  return (p_internal->state == STATE_RUNNING);
+}
+
+bool wxThread::IsRunning() const
+{
+  return (p_internal->state == STATE_RUNNING);
+}
+

 wxThread::wxThread()
 {
   p_internal = new wxThreadPrivate();
 wxThread::wxThread()
 {
   p_internal = new wxThreadPrivate();


@@ -211,19 +244,31 @@ void wxThread::OnExit()
 }
 
 // Global initialization
 }
 
 // Global initialization

-class wxThreadModule : public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxThreadModule)
+
+class wxThreadModule : public wxModule
+{

 public:
 public:

-  virtual bool OnInit() {
-    wxThreadGuiInit();
-    p_mainid = (int)getpid();
-    wxMainMutex.Lock();
-  }
+    virtual bool OnInit();
+    virtual void OnExit();

 
 

-  virtual void OnExit() {
-    wxMainMutex.Unlock();
-    wxThreadGuiExit();
-  }
+private:
+    DECLARE_DYNAMIC_CLASS(wxThreadModule)

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)

+
+bool wxThreadModule::OnInit()
+{
+    wxMainMutex = new wxMutex();
+    wxThreadGuiInit();
+    p_mainid = (int)getpid();
+    wxMainMutex->Lock();
+    return true;
+}
+
+void wxThreadModule::OnExit()
+{
+    wxMainMutex->Unlock();
+    wxThreadGuiExit();
+    delete wxMainMutex;
+}