projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expand . into cwd
[wxWidgets.git]
/
src
/
gtk1
/
threadsgi.cpp
diff --git
a/src/gtk1/threadsgi.cpp
b/src/gtk1/threadsgi.cpp
index ea652677e1af0f8af54a7321b386de08697bb42a..217f67d7d96d2f7abe40076e1ea24ae509b9fc6d 100644
(file)
--- a/
src/gtk1/threadsgi.cpp
+++ b/
src/gtk1/threadsgi.cpp
@@
-18,8
+18,16
@@
#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"
+#include "wx/log.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,
@@
-31,7
+39,7
@@
enum thread_state {
/////////////////////////////////////////////////////////////////////////////
static int p_mainid;
/////////////////////////////////////////////////////////////////////////////
static int p_mainid;
-wxMutex wxMainMutex;
+wxMutex
*
wxMainMutex;
#include "threadgui.inc"
#include "threadgui.inc"
@@
-54,8
+62,7
@@
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;
}
@@
-63,24
+70,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
wx
MUTEX_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
wx
MUTEX_BUSY;
m_locked++;
m_locked++;
- return MUTEX_NO_ERROR;
+ return
wx
MUTEX_NO_ERROR;
}
wxMutexError wxMutex::Unlock()
{
if (m_locked == 0)
}
wxMutexError wxMutex::Unlock()
{
if (m_locked == 0)
- return MUTEX_UNLOCKED;
+ return
wx
MUTEX_UNLOCKED;
release_lock(&(p_internal->p_mutex));
m_locked--;
release_lock(&(p_internal->p_mutex));
m_locked--;
- return MUTEX_NO_ERROR;
+ return
wx
MUTEX_NO_ERROR;
}
// GL: Don't know how it works on SGI. Wolfram ?
}
// GL: Don't know how it works on SGI. Wolfram ?
@@
-129,19
+136,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
wx
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 THREAD_NO_RESOURCE;
+ return
wx
THREAD_NO_RESOURCE;
}
}
- return THREAD_NO_ERROR;
+ return
wx
THREAD_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()
@@
-151,10
+170,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;
@@
-185,11
+204,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();
@@
-209,19
+238,32
@@
void wxThread::OnExit()
}
// Global initialization
}
// Global initialization
-class wxThreadModule : public wxModule {
- DECLARE_DYNAMIC_CLASS(wxThreadModule)
+
+class wxThreadModule : public wxModule
+{
public:
public:
- virtual bool OnInit() {
+ virtual bool OnInit();
+ virtual void OnExit();
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxThreadModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+
+bool wxThreadModule::OnInit()
+{
+ wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = (int)getpid();
wxThreadGuiInit();
p_mainid = (int)getpid();
- wxMainMutex.Lock();
- }
+ wxMainMutex->Lock();
+ return TRUE;
+}
- virtual void OnExit() {
- wxMainMutex.Unlock();
+void wxThreadModule::OnExit()
+{
+ wxMainMutex->Unlock();
wxThreadGuiExit();
wxThreadGuiExit();
- }
-}
;
+ delete wxMainMutex;
+}
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)