Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile tweaks

Browse Source 
Threads work now under wxGTK and glibc 2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-26 20:09:03 +00:00
parent 2a040d3f07
commit f3855ef064
15 changed files with 838 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -3,6 +3,8 @@
SHELL=/bin/sh
DIRS=src
#if DIRS are defind make only executes in these diretories
all::
@if test "x$(DIRS)" = x; then \

702
configure vendored
View File

File diff suppressed because it is too large Load Diff

13
configure.in
View File

@@ -61,6 +61,8 @@ main ()
exit(1);
}
if (gtk_minor_version > 0) return FALSE;
return !((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
@@ -266,6 +268,9 @@ SEARCH_INCLUDE="\
/usr/XFree86/include/X11 \
\
/usr/include \
/usr/include/gtk \
/usr/include/gdk \
/usr/include/glib \
/usr/local/include \
/usr/unsupported/include \
/usr/athena/include \
@@ -1022,7 +1027,7 @@ if test "$wxUSE_GTK" = 1; then
AM_PATH_GTK(1.0.4, [
GUI_TK_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS"
], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?))
TOOLKIT=GTK
TOOLKIT_DEF=__WXGTK__
WX_LINK=-lwx_gtk_1_0
@@ -1450,10 +1455,8 @@ if test "$wxUSE_THREADS" = "1"; then
THREADS_LINK="-lpthread"
])
])
AC_CHECK_LIB(pthreads, pthread_setcanceltype, [
UNIX_THREAD="gtk/threadpsx.cpp"
THREADS_LINK="-lpthreads"
])
dnl -lposix4 seems to be required on Solaris
AC_CHECK_LIB(posix4, printf, [
THREADS_LINK="$THREADS_LINK -lposix4"

2
include/wx/gtk/frame.h
View File

@@ -62,6 +62,8 @@ public:
virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int const width, int const height );
virtual void SetSize( int x, int y, int width, int height,

2
include/wx/gtk1/frame.h
View File

@@ -62,6 +62,8 @@ public:
virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
virtual void SetClientSize( int const width, int const height );
virtual void SetSize( int x, int y, int width, int height,

2
include/wx/thread.h
View File

@@ -132,8 +132,6 @@ public:
// Called when thread exits.
virtual void OnExit();
// Returns the wxThread object which corresponds to the ID.
static wxThread *GetThreadFromID(unsigned long id);
protected:
// In case, the DIFFER flag is true, enables another thread to kill this one.
void TestDestroy();

27
samples/thread/test.cpp
View File

@@ -35,8 +35,6 @@ class MyApp: public wxApp
bool OnInit(void);
};
wxMutex text_mutex;
WX_DEFINE_ARRAY(wxThread *,wxArrayThread);
// Define a new frame type
@@ -51,6 +49,7 @@ class MyFrame: public wxFrame
void OnStartThread(wxCommandEvent& event);
void OnStopThread(wxCommandEvent& event);
void OnPauseThread(wxCommandEvent& event);
void OnSize(wxSizeEvent &event);
bool OnClose(void) { return TRUE; }
public:
@@ -85,9 +84,9 @@ void *MyThread::Entry()
while (1) {
TestDestroy();
text_mutex.Lock();
wxMutexGuiEnter();
m_frame->m_txtctrl->WriteText(text);
text_mutex.Unlock();
wxMutexGuiLeave();
wxSleep(1);
}
@@ -108,6 +107,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(TEST_START_THREAD, MyFrame::OnStartThread)
EVT_MENU(TEST_STOP_THREAD, MyFrame::OnStopThread)
EVT_MENU(TEST_PAUSE_THREAD, MyFrame::OnPauseThread)
EVT_SIZE(MyFrame::OnSize)
END_EVENT_TABLE()
// Create a new application object
@@ -135,9 +135,12 @@ bool MyApp::OnInit(void)
frame->SetMenuBar(menu_bar);
// Make a panel with a message
wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
wxPanel *panel = new wxPanel( frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL );
(void)new wxStaticText( panel, -1, "Log window", wxPoint(10,10) );
frame->m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10, 10), wxSize(390, 190),
frame->m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10,30), wxSize(390, 190),
wxTE_MULTILINE);
// Show the frame
@@ -174,7 +177,17 @@ void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )
}
void MyFrame::OnPauseThread(wxCommandEvent& WXUNUSED(event) )
{}
{
}
void MyFrame::OnSize(wxSizeEvent& event )
{
wxFrame::OnSize(event);
wxSize size( GetClientSize() );
m_txtctrl->SetSize( 10, 30, size.x-20, size.y-40 );
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
{

3
src/Makefile.in
View File

@@ -39,7 +39,8 @@ include @MAKEINCLUDE@
STATIC_LIBRARY=lib$(LIB_TARGET).a
SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
# @GTK_JOYSTICK@
LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c

4
src/common/socket.cpp
View File

@@ -474,7 +474,7 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
if (m_fd < 0)
return FALSE;
if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
if (getpeername(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
return FALSE;
addr_man.Disassemble(&my_addr, len_addr);
@@ -489,7 +489,7 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
if (m_fd < 0)
return FALSE;
if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
if (getsockname(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
return FALSE;
addr_man.Disassemble(&my_addr, len_addr);

12
src/gtk/app.cpp
View File

@@ -22,6 +22,7 @@
#include "wx/resource.h"
#include "wx/module.h"
#include "wx/image.h"
#include "wx/thread.h"
#include "unistd.h"
@@ -137,7 +138,9 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
usleep( 10000 );
wxMutexGuiLeave();
usleep(10000);
wxMutexGuiEnter();
return TRUE;
}
@@ -213,8 +216,8 @@ bool wxApp::SendIdleEvents(void)
wxNode* node = wxTopLevelWindows.First();
while (node)
{
wxWindow* win = (wxWindow*) node->Data();
if (SendIdleEvents(win))
wxWindow* win = (wxWindow*) node->Data();
if (SendIdleEvents(win))
needMore = TRUE;
node = node->Next();
}
@@ -478,6 +481,3 @@ int wxEntry( int argc, char *argv[] )
//-----------------------------------------------------------------------------

39
src/gtk/threadgui.inc
View File

@@ -35,16 +35,22 @@ static void
ThreadExitProc(gpointer WXUNUSED(client), gint fid,
GdkInputCondition WXUNUSED(cond))
{
wxThread* ptr;
wxThread* ptr;
// printf( "thread exit proc.\n" );
if (fid != p_thrd_pipe[0])
return;
if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr)) {
//fprintf(stderr, "calling OnExit %p\n", ptr);
ptr->OnExit();
} else {
//fprintf(stderr, "this should never happen\n");
}
if (fid != p_thrd_pipe[0])
return;
if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr))
{
// printf( "calling OnExit %p\n", ptr);
ptr->OnExit();
}
else
{
// printf( "this should never happen\n" );
}
}
// Global initialization
@@ -63,20 +69,6 @@ static void wxThreadGuiExit()
close(p_thrd_pipe[1]);
}
#ifdef NO_DEFINE_GDK_1_1
void wxMutexGuiEnter()
{
gdk_mutex_enter();
}
void wxMutexGuiLeave()
{
gdk_mutex_leave();
}
#else
void wxMutexGuiEnter()
{
wxMainMutex->Lock();
@@ -87,4 +79,3 @@ void wxMutexGuiLeave()
wxMainMutex->Unlock();
}
#endif

375
src/gtk/threadpsx.cpp
View File

@@ -5,9 +5,12 @@
// Modified by:
// Created: 04/22/98
// RCS-ID: $Id$
// Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
// Copyright: (c) Wolfram Gloger (1996, 1997)
// Guilhem Lavaux (1998)
// Robert Roebling (1999)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "thread.h"
#endif
@@ -21,7 +24,8 @@
#include "wx/utils.h"
#include "wx/log.h"
enum thread_state {
enum thread_state
{
STATE_IDLE = 0,
STATE_RUNNING,
STATE_PAUSING,
@@ -30,131 +34,137 @@ enum thread_state {
STATE_EXITED
};
/////////////////////////////////////////////////////////////////////////////
// Static variables
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// global data
//--------------------------------------------------------------------
static pthread_t p_mainid;
static wxMutex p_list_mutex;
static wxList p_threads_list;
wxMutex *wxMainMutex; // controls access to all GUI functions
/////////////////////////////////////////////////////////////////////////////
// GUI thread manager
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// common GUI thread code
//--------------------------------------------------------------------
#include "threadgui.inc"
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Mutex)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxMutex (Posix implementation)
//--------------------------------------------------------------------
class wxMutexInternal {
class wxMutexInternal
{
public:
pthread_mutex_t p_mutex;
};
wxMutex::wxMutex()
{
p_internal = new wxMutexInternal;
pthread_mutex_init(&(p_internal->p_mutex), NULL);
m_locked = 0;
p_internal = new wxMutexInternal;
pthread_mutex_init(&(p_internal->p_mutex), NULL);
m_locked = 0;
}
wxMutex::~wxMutex()
{
if (m_locked > 0)
wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
if (m_locked > 0)
wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
}
wxMutexError wxMutex::Lock()
{
int err;
int err;
err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK)
return MUTEX_DEAD_LOCK;
m_locked++;
return MUTEX_NO_ERROR;
err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK)
return MUTEX_DEAD_LOCK;
m_locked++;
return MUTEX_NO_ERROR;
}
wxMutexError wxMutex::TryLock()
{
int err;
int err;
if (m_locked)
return MUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err) {
case EBUSY: return MUTEX_BUSY;
}
m_locked++;
return MUTEX_NO_ERROR;
if (m_locked)
return MUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err)
{
case EBUSY: return MUTEX_BUSY;
}
m_locked++;
return MUTEX_NO_ERROR;
}
wxMutexError wxMutex::Unlock()
{
if (m_locked > 0)
m_locked--;
else
return MUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex));
return MUTEX_NO_ERROR;
if (m_locked > 0)
m_locked--;
else
return MUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex));
return MUTEX_NO_ERROR;
}
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Condition)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxCondition (Posix implementation)
//--------------------------------------------------------------------
class wxConditionInternal {
class wxConditionInternal
{
public:
pthread_cond_t p_condition;
};
wxCondition::wxCondition()
{
p_internal = new wxConditionInternal;
pthread_cond_init(&(p_internal->p_condition), NULL);
p_internal = new wxConditionInternal;
pthread_cond_init(&(p_internal->p_condition), NULL);
}
wxCondition::~wxCondition()
{
pthread_cond_destroy(&(p_internal->p_condition));
delete p_internal;
pthread_cond_destroy(&(p_internal->p_condition));
delete p_internal;
}
void wxCondition::Wait(wxMutex& mutex)
{
pthread_cond_wait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex));
pthread_cond_wait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex));
}
bool wxCondition::Wait(wxMutex& mutex, unsigned long sec, unsigned long nsec)
{
struct timespec tspec;
struct timespec tspec;
tspec.tv_sec = time(NULL)+sec;
tspec.tv_nsec = nsec;
return (pthread_cond_timedwait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex), &tspec) != ETIMEDOUT);
tspec.tv_sec = time(NULL)+sec;
tspec.tv_nsec = nsec;
return (pthread_cond_timedwait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex), &tspec) != ETIMEDOUT);
}
void wxCondition::Signal()
{
pthread_cond_signal(&(p_internal->p_condition));
pthread_cond_signal(&(p_internal->p_condition));
}
void wxCondition::Broadcast()
{
pthread_cond_broadcast(&(p_internal->p_condition));
pthread_cond_broadcast(&(p_internal->p_condition));
}
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Thread)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxThread (Posix implementation)
//--------------------------------------------------------------------
class wxThreadInternal {
class wxThreadInternal
{
public:
wxThreadInternal() { state = STATE_IDLE; }
~wxThreadInternal() {}
@@ -163,234 +173,227 @@ public:
int state;
int prio;
int defer_destroy;
int id;
};
void *wxThreadInternal::PthreadStart(void *ptr)
{
wxThread *thread = (wxThread *)ptr;
wxThread *thread = (wxThread *)ptr;
// Add the current thread to the list
p_list_mutex.Lock();
thread->p_internal->id = p_threads_list.Number();
p_threads_list.Append((wxObject *)thread);
p_list_mutex.Unlock();
// Call the main entry
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
void* status = thread->Entry();
// Call the main entry
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
void* status = thread->Entry();
thread->Exit(status);
thread->Exit(status);
return NULL;
return NULL;
}
wxThreadError wxThread::Create()
{
pthread_attr_t a;
int min_prio, max_prio, p;
struct sched_param sp;
pthread_attr_t a;
int min_prio, max_prio, p;
struct sched_param sp;
if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING;
if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING;
// Change thread priority
pthread_attr_init(&a);
pthread_attr_getschedpolicy(&a, &p);
// Change thread priority
pthread_attr_init(&a);
pthread_attr_getschedpolicy(&a, &p);
min_prio = sched_get_priority_min(p);
max_prio = sched_get_priority_max(p);
min_prio = sched_get_priority_min(p);
max_prio = sched_get_priority_max(p);
pthread_attr_getschedparam(&a, &sp);
sp.sched_priority = min_prio +
pthread_attr_getschedparam(&a, &sp);
sp.sched_priority = min_prio +
(p_internal->prio*(max_prio-min_prio))/100;
pthread_attr_setschedparam(&a, &sp);
pthread_attr_setschedparam(&a, &sp);
// this is the point of no return
p_internal->state = STATE_RUNNING;
if (pthread_create(&p_internal->thread_id, &a,
wxThreadInternal::PthreadStart, (void *)this) != 0) {
p_internal->state = STATE_IDLE;
// this is the point of no return
p_internal->state = STATE_RUNNING;
if (pthread_create(&p_internal->thread_id, &a,
wxThreadInternal::PthreadStart, (void *)this) != 0)
{
p_internal->state = STATE_IDLE;
pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE;
}
pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE;
}
pthread_attr_destroy(&a);
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
void wxThread::SetPriority(int prio)
{
if (p_internal->state == STATE_RUNNING)
return;
if (p_internal->state == STATE_RUNNING)
return;
if (prio > 100)
prio = 100;
if (prio < 0)
prio = 0;
p_internal->prio = prio;
if (prio > 100) prio = 100;
if (prio < 0) prio = 0;
p_internal->prio = prio;
}
int wxThread::GetPriority() const
{
return p_internal->prio;
return p_internal->prio;
}
void wxThread::DeferDestroy(bool on)
{
if (on)
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
else
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
if (on)
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
else
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
}
wxThreadError wxThread::Destroy()
{
int res = 0;
int res = 0;
if (p_internal->state == STATE_RUNNING) {
res = pthread_cancel(p_internal->thread_id);
if (res == 0)
p_internal->state = STATE_CANCELED;
}
if (p_internal->state == STATE_RUNNING)
{
res = pthread_cancel(p_internal->thread_id);
if (res == 0)
p_internal->state = STATE_CANCELED;
}
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
wxThreadError wxThread::Pause()
{
if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING;
if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING;
if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR;
if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR;
p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR;
p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR;
}
wxThreadError wxThread::Resume()
{
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING;
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING;
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
void *wxThread::Join()
{
void* status = 0;
void* status = 0;
if (p_internal->state != STATE_IDLE) {
bool do_unlock = wxThread::IsMain();
if (p_internal->state != STATE_IDLE)
{
bool do_unlock = wxThread::IsMain();
while (p_internal->state == STATE_RUNNING)
wxYield();
while (p_internal->state == STATE_RUNNING)
wxYield();
if (do_unlock)
wxMainMutex->Unlock();
pthread_join(p_internal->thread_id, &status);
if (do_unlock)
wxMainMutex->Lock();
if (do_unlock) wxMainMutex->Unlock();
pthread_join(p_internal->thread_id, &status);
if (do_unlock) wxMainMutex->Lock();
p_list_mutex.Lock();
delete p_threads_list.Nth(p_internal->id);
p_list_mutex.Unlock();
p_internal->state = STATE_IDLE;
}
return status;
p_internal->state = STATE_IDLE;
}
return status;
}
unsigned long wxThread::GetID() const
{
return p_internal->id;
}
wxThread *wxThread::GetThreadFromID(unsigned long id)
{
wxNode *node = p_threads_list.Nth(id);
if (!node)
return NULL;
return (wxThread *)node->Data();
return p_internal->thread_id;
}
void wxThread::Exit(void *status)
{
wxThread* ptr = this;
wxThread* ptr = this;
THREAD_SEND_EXIT_MSG(ptr);
p_internal->state = STATE_EXITED;
pthread_exit(status);
THREAD_SEND_EXIT_MSG(ptr);
p_internal->state = STATE_EXITED;
pthread_exit(status);
}
void wxThread::TestDestroy()
{
if (p_internal->state == STATE_PAUSING) {
p_internal->state = STATE_PAUSED;
while (p_internal->state == STATE_PAUSED) {
pthread_testcancel();
usleep(1);
if (p_internal->state == STATE_PAUSING)
{
p_internal->state = STATE_PAUSED;
while (p_internal->state == STATE_PAUSED)
{
pthread_testcancel();
usleep(1);
}
}
}
pthread_testcancel();
pthread_testcancel();
}
bool wxThread::IsMain()
{
return (bool)pthread_equal(pthread_self(), p_mainid);
return (bool)pthread_equal(pthread_self(), p_mainid);
}
bool wxThread::IsRunning() const
{
return (p_internal->state == STATE_RUNNING);
return (p_internal->state == STATE_RUNNING);
}
bool wxThread::IsAlive() const
{
return (p_internal->state == STATE_RUNNING) ||
(p_internal->state == STATE_PAUSING) ||
(p_internal->state == STATE_PAUSED);
return (p_internal->state == STATE_RUNNING) ||
(p_internal->state == STATE_PAUSING) ||
(p_internal->state == STATE_PAUSED);
}
wxThread::wxThread()
{
p_internal = new wxThreadInternal();
p_internal = new wxThreadInternal();
}
wxThread::~wxThread()
{
Destroy();
Join();
delete p_internal;
Destroy();
Join();
delete p_internal;
}
// The default callback just joins the thread and throws away the result.
void wxThread::OnExit()
{
Join();
Join();
}
// Automatic initialization
class wxThreadModule : public wxModule {
//--------------------------------------------------------------------
// wxThreadModule
//--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
DECLARE_DYNAMIC_CLASS(wxThreadModule)
public:
virtual bool OnInit() {
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
// p_threads_list = wxList(wxKEY_INTEGER);
wxMainMutex->Lock();
virtual bool OnInit()
{
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
wxMainMutex->Lock();
return TRUE;
}
return TRUE;
}
virtual void OnExit() {
wxMainMutex->Unlock();
wxThreadGuiExit();
delete wxMainMutex;
virtual void OnExit()
{
wxMainMutex->Unlock();
wxThreadGuiExit();
delete wxMainMutex;
}
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)

12
src/gtk1/app.cpp
View File

@@ -22,6 +22,7 @@
#include "wx/resource.h"
#include "wx/module.h"
#include "wx/image.h"
#include "wx/thread.h"
#include "unistd.h"
@@ -137,7 +138,9 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
usleep( 10000 );
wxMutexGuiLeave();
usleep(10000);
wxMutexGuiEnter();
return TRUE;
}
@@ -213,8 +216,8 @@ bool wxApp::SendIdleEvents(void)
wxNode* node = wxTopLevelWindows.First();
while (node)
{
wxWindow* win = (wxWindow*) node->Data();
if (SendIdleEvents(win))
wxWindow* win = (wxWindow*) node->Data();
if (SendIdleEvents(win))
needMore = TRUE;
node = node->Next();
}
@@ -478,6 +481,3 @@ int wxEntry( int argc, char *argv[] )
//-----------------------------------------------------------------------------

39
src/gtk1/threadgui.inc
View File

@@ -35,16 +35,22 @@ static void
ThreadExitProc(gpointer WXUNUSED(client), gint fid,
GdkInputCondition WXUNUSED(cond))
{
wxThread* ptr;
wxThread* ptr;
// printf( "thread exit proc.\n" );
if (fid != p_thrd_pipe[0])
return;
if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr)) {
//fprintf(stderr, "calling OnExit %p\n", ptr);
ptr->OnExit();
} else {
//fprintf(stderr, "this should never happen\n");
}
if (fid != p_thrd_pipe[0])
return;
if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr))
{
// printf( "calling OnExit %p\n", ptr);
ptr->OnExit();
}
else
{
// printf( "this should never happen\n" );
}
}
// Global initialization
@@ -63,20 +69,6 @@ static void wxThreadGuiExit()
close(p_thrd_pipe[1]);
}
#ifdef NO_DEFINE_GDK_1_1
void wxMutexGuiEnter()
{
gdk_mutex_enter();
}
void wxMutexGuiLeave()
{
gdk_mutex_leave();
}
#else
void wxMutexGuiEnter()
{
wxMainMutex->Lock();
@@ -87,4 +79,3 @@ void wxMutexGuiLeave()
wxMainMutex->Unlock();
}
#endif

375
src/gtk1/threadpsx.cpp
View File

@@ -5,9 +5,12 @@
// Modified by:
// Created: 04/22/98
// RCS-ID: $Id$
// Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
// Copyright: (c) Wolfram Gloger (1996, 1997)
// Guilhem Lavaux (1998)
// Robert Roebling (1999)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "thread.h"
#endif
@@ -21,7 +24,8 @@
#include "wx/utils.h"
#include "wx/log.h"
enum thread_state {
enum thread_state
{
STATE_IDLE = 0,
STATE_RUNNING,
STATE_PAUSING,
@@ -30,131 +34,137 @@ enum thread_state {
STATE_EXITED
};
/////////////////////////////////////////////////////////////////////////////
// Static variables
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// global data
//--------------------------------------------------------------------
static pthread_t p_mainid;
static wxMutex p_list_mutex;
static wxList p_threads_list;
wxMutex *wxMainMutex; // controls access to all GUI functions
/////////////////////////////////////////////////////////////////////////////
// GUI thread manager
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// common GUI thread code
//--------------------------------------------------------------------
#include "threadgui.inc"
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Mutex)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxMutex (Posix implementation)
//--------------------------------------------------------------------
class wxMutexInternal {
class wxMutexInternal
{
public:
pthread_mutex_t p_mutex;
};
wxMutex::wxMutex()
{
p_internal = new wxMutexInternal;
pthread_mutex_init(&(p_internal->p_mutex), NULL);
m_locked = 0;
p_internal = new wxMutexInternal;
pthread_mutex_init(&(p_internal->p_mutex), NULL);
m_locked = 0;
}
wxMutex::~wxMutex()
{
if (m_locked > 0)
wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
if (m_locked > 0)
wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
}
wxMutexError wxMutex::Lock()
{
int err;
int err;
err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK)
return MUTEX_DEAD_LOCK;
m_locked++;
return MUTEX_NO_ERROR;
err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK)
return MUTEX_DEAD_LOCK;
m_locked++;
return MUTEX_NO_ERROR;
}
wxMutexError wxMutex::TryLock()
{
int err;
int err;
if (m_locked)
return MUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err) {
case EBUSY: return MUTEX_BUSY;
}
m_locked++;
return MUTEX_NO_ERROR;
if (m_locked)
return MUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err)
{
case EBUSY: return MUTEX_BUSY;
}
m_locked++;
return MUTEX_NO_ERROR;
}
wxMutexError wxMutex::Unlock()
{
if (m_locked > 0)
m_locked--;
else
return MUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex));
return MUTEX_NO_ERROR;
if (m_locked > 0)
m_locked--;
else
return MUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex));
return MUTEX_NO_ERROR;
}
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Condition)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxCondition (Posix implementation)
//--------------------------------------------------------------------
class wxConditionInternal {
class wxConditionInternal
{
public:
pthread_cond_t p_condition;
};
wxCondition::wxCondition()
{
p_internal = new wxConditionInternal;
pthread_cond_init(&(p_internal->p_condition), NULL);
p_internal = new wxConditionInternal;
pthread_cond_init(&(p_internal->p_condition), NULL);
}
wxCondition::~wxCondition()
{
pthread_cond_destroy(&(p_internal->p_condition));
delete p_internal;
pthread_cond_destroy(&(p_internal->p_condition));
delete p_internal;
}
void wxCondition::Wait(wxMutex& mutex)
{
pthread_cond_wait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex));
pthread_cond_wait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex));
}
bool wxCondition::Wait(wxMutex& mutex, unsigned long sec, unsigned long nsec)
{
struct timespec tspec;
struct timespec tspec;
tspec.tv_sec = time(NULL)+sec;
tspec.tv_nsec = nsec;
return (pthread_cond_timedwait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex), &tspec) != ETIMEDOUT);
tspec.tv_sec = time(NULL)+sec;
tspec.tv_nsec = nsec;
return (pthread_cond_timedwait(&(p_internal->p_condition), &(mutex.p_internal->p_mutex), &tspec) != ETIMEDOUT);
}
void wxCondition::Signal()
{
pthread_cond_signal(&(p_internal->p_condition));
pthread_cond_signal(&(p_internal->p_condition));
}
void wxCondition::Broadcast()
{
pthread_cond_broadcast(&(p_internal->p_condition));
pthread_cond_broadcast(&(p_internal->p_condition));
}
/////////////////////////////////////////////////////////////////////////////
// wxThread: Posix Thread implementation (Thread)
/////////////////////////////////////////////////////////////////////////////
//--------------------------------------------------------------------
// wxThread (Posix implementation)
//--------------------------------------------------------------------
class wxThreadInternal {
class wxThreadInternal
{
public:
wxThreadInternal() { state = STATE_IDLE; }
~wxThreadInternal() {}
@@ -163,234 +173,227 @@ public:
int state;
int prio;
int defer_destroy;
int id;
};
void *wxThreadInternal::PthreadStart(void *ptr)
{
wxThread *thread = (wxThread *)ptr;
wxThread *thread = (wxThread *)ptr;
// Add the current thread to the list
p_list_mutex.Lock();
thread->p_internal->id = p_threads_list.Number();
p_threads_list.Append((wxObject *)thread);
p_list_mutex.Unlock();
// Call the main entry
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
void* status = thread->Entry();
// Call the main entry
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
void* status = thread->Entry();
thread->Exit(status);
thread->Exit(status);
return NULL;
return NULL;
}
wxThreadError wxThread::Create()
{
pthread_attr_t a;
int min_prio, max_prio, p;
struct sched_param sp;
pthread_attr_t a;
int min_prio, max_prio, p;
struct sched_param sp;
if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING;
if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING;
// Change thread priority
pthread_attr_init(&a);
pthread_attr_getschedpolicy(&a, &p);
// Change thread priority
pthread_attr_init(&a);
pthread_attr_getschedpolicy(&a, &p);
min_prio = sched_get_priority_min(p);
max_prio = sched_get_priority_max(p);
min_prio = sched_get_priority_min(p);
max_prio = sched_get_priority_max(p);
pthread_attr_getschedparam(&a, &sp);
sp.sched_priority = min_prio +
pthread_attr_getschedparam(&a, &sp);
sp.sched_priority = min_prio +
(p_internal->prio*(max_prio-min_prio))/100;
pthread_attr_setschedparam(&a, &sp);
pthread_attr_setschedparam(&a, &sp);
// this is the point of no return
p_internal->state = STATE_RUNNING;
if (pthread_create(&p_internal->thread_id, &a,
wxThreadInternal::PthreadStart, (void *)this) != 0) {
p_internal->state = STATE_IDLE;
// this is the point of no return
p_internal->state = STATE_RUNNING;
if (pthread_create(&p_internal->thread_id, &a,
wxThreadInternal::PthreadStart, (void *)this) != 0)
{
p_internal->state = STATE_IDLE;
pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE;
}
pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE;
}
pthread_attr_destroy(&a);
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
void wxThread::SetPriority(int prio)
{
if (p_internal->state == STATE_RUNNING)
return;
if (p_internal->state == STATE_RUNNING)
return;
if (prio > 100)
prio = 100;
if (prio < 0)
prio = 0;
p_internal->prio = prio;
if (prio > 100) prio = 100;
if (prio < 0) prio = 0;
p_internal->prio = prio;
}
int wxThread::GetPriority() const
{
return p_internal->prio;
return p_internal->prio;
}
void wxThread::DeferDestroy(bool on)
{
if (on)
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
else
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
if (on)
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
else
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
}
wxThreadError wxThread::Destroy()
{
int res = 0;
int res = 0;
if (p_internal->state == STATE_RUNNING) {
res = pthread_cancel(p_internal->thread_id);
if (res == 0)
p_internal->state = STATE_CANCELED;
}
if (p_internal->state == STATE_RUNNING)
{
res = pthread_cancel(p_internal->thread_id);
if (res == 0)
p_internal->state = STATE_CANCELED;
}
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
wxThreadError wxThread::Pause()
{
if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING;
if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING;
if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR;
if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR;
p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR;
p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR;
}
wxThreadError wxThread::Resume()
{
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING;
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING;
return THREAD_NO_ERROR;
return THREAD_NO_ERROR;
}
void *wxThread::Join()
{
void* status = 0;
void* status = 0;
if (p_internal->state != STATE_IDLE) {
bool do_unlock = wxThread::IsMain();
if (p_internal->state != STATE_IDLE)
{
bool do_unlock = wxThread::IsMain();
while (p_internal->state == STATE_RUNNING)
wxYield();
while (p_internal->state == STATE_RUNNING)
wxYield();
if (do_unlock)
wxMainMutex->Unlock();
pthread_join(p_internal->thread_id, &status);
if (do_unlock)
wxMainMutex->Lock();
if (do_unlock) wxMainMutex->Unlock();
pthread_join(p_internal->thread_id, &status);
if (do_unlock) wxMainMutex->Lock();
p_list_mutex.Lock();
delete p_threads_list.Nth(p_internal->id);
p_list_mutex.Unlock();
p_internal->state = STATE_IDLE;
}
return status;
p_internal->state = STATE_IDLE;
}
return status;
}
unsigned long wxThread::GetID() const
{
return p_internal->id;
}
wxThread *wxThread::GetThreadFromID(unsigned long id)
{
wxNode *node = p_threads_list.Nth(id);
if (!node)
return NULL;
return (wxThread *)node->Data();
return p_internal->thread_id;
}
void wxThread::Exit(void *status)
{
wxThread* ptr = this;
wxThread* ptr = this;
THREAD_SEND_EXIT_MSG(ptr);
p_internal->state = STATE_EXITED;
pthread_exit(status);
THREAD_SEND_EXIT_MSG(ptr);
p_internal->state = STATE_EXITED;
pthread_exit(status);
}
void wxThread::TestDestroy()
{
if (p_internal->state == STATE_PAUSING) {
p_internal->state = STATE_PAUSED;
while (p_internal->state == STATE_PAUSED) {
pthread_testcancel();
usleep(1);
if (p_internal->state == STATE_PAUSING)
{
p_internal->state = STATE_PAUSED;
while (p_internal->state == STATE_PAUSED)
{
pthread_testcancel();
usleep(1);
}
}
}
pthread_testcancel();
pthread_testcancel();
}
bool wxThread::IsMain()
{
return (bool)pthread_equal(pthread_self(), p_mainid);
return (bool)pthread_equal(pthread_self(), p_mainid);
}
bool wxThread::IsRunning() const
{
return (p_internal->state == STATE_RUNNING);
return (p_internal->state == STATE_RUNNING);
}
bool wxThread::IsAlive() const
{
return (p_internal->state == STATE_RUNNING) ||
(p_internal->state == STATE_PAUSING) ||
(p_internal->state == STATE_PAUSED);
return (p_internal->state == STATE_RUNNING) ||
(p_internal->state == STATE_PAUSING) ||
(p_internal->state == STATE_PAUSED);
}
wxThread::wxThread()
{
p_internal = new wxThreadInternal();
p_internal = new wxThreadInternal();
}
wxThread::~wxThread()
{
Destroy();
Join();
delete p_internal;
Destroy();
Join();
delete p_internal;
}
// The default callback just joins the thread and throws away the result.
void wxThread::OnExit()
{
Join();
Join();
}
// Automatic initialization
class wxThreadModule : public wxModule {
//--------------------------------------------------------------------
// wxThreadModule
//--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
DECLARE_DYNAMIC_CLASS(wxThreadModule)
public:
virtual bool OnInit() {
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
// p_threads_list = wxList(wxKEY_INTEGER);
wxMainMutex->Lock();
virtual bool OnInit()
{
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
wxMainMutex->Lock();
return TRUE;
}
return TRUE;
}
virtual void OnExit() {
wxMainMutex->Unlock();
wxThreadGuiExit();
delete wxMainMutex;
virtual void OnExit()
{
wxMainMutex->Unlock();
wxThreadGuiExit();
delete wxMainMutex;
}
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)