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

1. Pause()/Resume() implemented for wxMSW

Browse Source 
2. crash on startup in the sample corrected


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-12-27 00:54:53 +00:00
parent f3855ef064
commit a6b0bd49c7
3 changed files with 247 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/wx/thread.h
View File

@@ -16,31 +16,40 @@
#pragma interface "thread.h" #pragma interface "thread.h"
#endif #endif
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/object.h" #include "wx/object.h"
#include "wx/setup.h" #include "wx/setup.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
typedef enum { typedef enum {
MUTEX_NO_ERROR=0, wxMUTEX_NO_ERROR = 0,
MUTEX_DEAD_LOCK, // Mutex has been already locked by THE CALLING thread wxMUTEX_DEAD_LOCK, // Mutex has been already locked by THE CALLING thread
MUTEX_BUSY, // Mutex has been already locked by ONE thread wxMUTEX_BUSY, // Mutex has been already locked by ONE thread
MUTEX_UNLOCKED wxMUTEX_UNLOCKED,
wxMUTEX_MISC_ERROR
} wxMutexError; } wxMutexError;
typedef enum { typedef enum {
THREAD_NO_ERROR=0, // No error wxTHREAD_NO_ERROR = 0, // No error
THREAD_NO_RESOURCE, // No resource left to create a new thread wxTHREAD_NO_RESOURCE, // No resource left to create a new thread
THREAD_RUNNING, // The thread is already running wxTHREAD_RUNNING, // The thread is already running
THREAD_NOT_RUNNING, // The thread isn't running wxTHREAD_NOT_RUNNING, // The thread isn't running
THREAD_MISC_ERROR // Some other error wxTHREAD_MISC_ERROR // Some other error
} wxThreadError; } wxThreadError;
// defines the interval of priority. // defines the interval of priority.
#define WXTHREAD_MIN_PRIORITY 0 #define WXTHREAD_MIN_PRIORITY 0
#define WXTHREAD_DEFAULT_PRIORITY 50 #define WXTHREAD_DEFAULT_PRIORITY 50
#define WXTHREAD_MAX_PRIORITY 100 #define WXTHREAD_MAX_PRIORITY 100
// --------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Mutex handler // Mutex handler
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMutexInternal; class WXDLLEXPORT wxMutexInternal;
class WXDLLEXPORT wxMutex { class WXDLLEXPORT wxMutex {
public: public:
@@ -57,6 +66,7 @@ public:
// Returns true if the mutex is locked. // Returns true if the mutex is locked.
bool IsLocked() const { return (m_locked > 0); } bool IsLocked() const { return (m_locked > 0); }
protected: protected:
friend class wxCondition; friend class wxCondition;
@@ -64,8 +74,9 @@ protected:
wxMutexInternal *p_internal; wxMutexInternal *p_internal;
}; };
// --------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Condition handler. // Condition handler.
// ----------------------------------------------------------------------------
class wxConditionInternal; class wxConditionInternal;
class WXDLLEXPORT wxCondition { class WXDLLEXPORT wxCondition {
public: public:
@@ -81,12 +92,14 @@ public:
void Signal(); void Signal();
// Broadcasts to all "Waiters". // Broadcasts to all "Waiters".
void Broadcast(); void Broadcast();
private: private:
wxConditionInternal *p_internal; wxConditionInternal *p_internal;
}; };
// --------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Thread management class // Thread management class
// ----------------------------------------------------------------------------
class wxThreadInternal; class wxThreadInternal;
class WXDLLEXPORT wxThread { class WXDLLEXPORT wxThread {
public: public:
@@ -126,6 +139,9 @@ public:
bool IsAlive() const; bool IsAlive() const;
// Returns true if the thread is running (not paused, not killed). // Returns true if the thread is running (not paused, not killed).
bool IsRunning() const; bool IsRunning() const;
// Returns true if the thread is suspended
bool IsPaused() const { return IsAlive() && !IsRunning(); }
// Returns true if the thread is the main thread (aka the GUI thread). // Returns true if the thread is the main thread (aka the GUI thread).
static bool IsMain(); static bool IsMain();
@@ -137,6 +153,7 @@ protected:
void TestDestroy(); void TestDestroy();
// Exits from the current thread. // Exits from the current thread.
void Exit(void *status = NULL); void Exit(void *status = NULL);
private: private:
// Entry point for the thread. // Entry point for the thread.
virtual void *Entry() = 0; virtual void *Entry() = 0;
@@ -147,11 +164,12 @@ private:
wxThreadInternal *p_internal; wxThreadInternal *p_internal;
}; };
// --------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Global variables // Global functions and variables
// ----------------------------------------------------------------------------
// GUI mutex handling. // GUI mutex handling.
void WXDLLEXPORT wxMutexGuiEnter(); void WXDLLEXPORT wxMutexGuiEnter();
void WXDLLEXPORT wxMutexGuiLeave(); void WXDLLEXPORT wxMutexGuiLeave();
#endif #endif // __THREADH__

225
samples/thread/test.cpp
View File

@@ -31,66 +31,80 @@
// Define a new application type // Define a new application type
class MyApp: public wxApp class MyApp: public wxApp
{ {
public: public:
bool OnInit(void); bool OnInit(void);
}; };
WX_DEFINE_ARRAY(wxThread *,wxArrayThread); WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
// Define a new frame type // Define a new frame type
class MyFrame: public wxFrame class MyFrame: public wxFrame
{ {
public: public:
// ctor
MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h); MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
public: // operations
void WriteText(const wxString& text) { m_txtctrl->WriteText(text); }
// callbacks
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
void OnStartThread(wxCommandEvent& event); void OnStartThread(wxCommandEvent& event);
void OnStopThread(wxCommandEvent& event); void OnStopThread(wxCommandEvent& event);
void OnPauseThread(wxCommandEvent& event); void OnPauseThread(wxCommandEvent& event);
void OnResumeThread(wxCommandEvent& event);
void OnSize(wxSizeEvent &event); void OnSize(wxSizeEvent &event);
bool OnClose(void) { return TRUE; } bool OnClose(void) { return TRUE; }
public:
wxArrayThread m_threads;
public: private:
wxArrayThread m_threads; wxTextCtrl *m_txtctrl;
wxTextCtrl *m_txtctrl;
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
}; };
class MyThread: public wxThread class MyThread: public wxThread
{ {
public: public:
MyThread(MyFrame *frame); MyThread(MyFrame *frame);
void *Entry(); void *Entry();
public:
public:
size_t m_count;
MyFrame *m_frame; MyFrame *m_frame;
}; };
MyThread::MyThread(MyFrame *frame) MyThread::MyThread(MyFrame *frame)
: wxThread() : wxThread()
{ {
m_frame = frame; m_count = 0;
m_frame = frame;
} }
void *MyThread::Entry() void *MyThread::Entry()
{ {
wxString text; wxString text;
DeferDestroy(TRUE);
while (1) {
TestDestroy();
wxMutexGuiEnter();
text.Printf("Thread 0x%x: Hello !\n", GetID()); text.Printf("[%u] Thread 0x%x here.\n", ++m_count, GetID());
DeferDestroy(TRUE); m_frame->WriteText(text);
while (1) { wxMutexGuiLeave();
TestDestroy(); wxSleep(1);
wxMutexGuiEnter(); }
m_frame->m_txtctrl->WriteText(text);
wxMutexGuiLeave(); return NULL;
wxSleep(1);
}
return NULL;
} }
// ID for the menu commands // ID for the menu commands
@@ -100,14 +114,17 @@ void *MyThread::Entry()
#define TEST_START_THREAD 103 #define TEST_START_THREAD 103
#define TEST_STOP_THREAD 104 #define TEST_STOP_THREAD 104
#define TEST_PAUSE_THREAD 105 #define TEST_PAUSE_THREAD 105
#define TEST_RESUME_THREAD 106
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(TEST_QUIT, MyFrame::OnQuit) EVT_MENU(TEST_QUIT, MyFrame::OnQuit)
EVT_MENU(TEST_ABOUT, MyFrame::OnAbout) EVT_MENU(TEST_ABOUT, MyFrame::OnAbout)
EVT_MENU(TEST_START_THREAD, MyFrame::OnStartThread) EVT_MENU(TEST_START_THREAD, MyFrame::OnStartThread)
EVT_MENU(TEST_STOP_THREAD, MyFrame::OnStopThread) EVT_MENU(TEST_STOP_THREAD, MyFrame::OnStopThread)
EVT_MENU(TEST_PAUSE_THREAD, MyFrame::OnPauseThread) EVT_MENU(TEST_PAUSE_THREAD, MyFrame::OnPauseThread)
EVT_SIZE(MyFrame::OnSize) EVT_MENU(TEST_RESUME_THREAD, MyFrame::OnResumeThread)
EVT_SIZE(MyFrame::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object // Create a new application object
@@ -116,93 +133,117 @@ IMPLEMENT_APP (MyApp)
// `Main program' equivalent, creating windows and returning main app frame // `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340); MyFrame *frame = new MyFrame((wxFrame *) NULL, "wxWindows thread sample",
50, 50, 450, 340);
// Make a menubar
wxMenu *file_menu = new wxMenu; // Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(TEST_ABOUT, "&About");
file_menu->Append(TEST_QUIT, "E&xit"); file_menu->Append(TEST_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar; file_menu->Append(TEST_QUIT, "E&xit");
menu_bar->Append(file_menu, "&File"); wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
wxMenu *thread_menu = new wxMenu;
thread_menu->Append(TEST_START_THREAD, "Start a new thread"); wxMenu *thread_menu = new wxMenu;
thread_menu->Append(TEST_STOP_THREAD, "Stop a running thread"); thread_menu->Append(TEST_START_THREAD, "Start a new thread");
thread_menu->Append(TEST_PAUSE_THREAD, "Pause a running thread"); thread_menu->Append(TEST_STOP_THREAD, "Stop a running thread");
menu_bar->Append(thread_menu, "Thread"); thread_menu->AppendSeparator();
frame->SetMenuBar(menu_bar); thread_menu->Append(TEST_PAUSE_THREAD, "Pause a running thread");
thread_menu->Append(TEST_RESUME_THREAD, "Resume suspended thread");
// Make a panel with a message menu_bar->Append(thread_menu, "Thread");
wxPanel *panel = new wxPanel( frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL ); frame->SetMenuBar(menu_bar);
(void)new wxStaticText( panel, -1, "Log window", wxPoint(10,10) ); // Show the frame
frame->Show(TRUE);
frame->m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10,30), wxSize(390, 190), SetTopWindow(frame);
wxTE_MULTILINE);
return TRUE;
// Show the frame
frame->Show(TRUE);
SetTopWindow(frame);
return TRUE;
} }
// My frame constructor // My frame constructor
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
{} {
wxPanel *panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(400, 200),
wxTAB_TRAVERSAL );
m_txtctrl = new wxTextCtrl(panel, -1, "", wxPoint(10,30), wxSize(390, 190),
wxTE_MULTILINE);
(void)new wxStaticText(panel, -1, "Log window", wxPoint(10,10));
}
void MyFrame::OnStartThread(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnStartThread(wxCommandEvent& WXUNUSED(event) )
{ {
MyThread *thread = new MyThread(this); MyThread *thread = new MyThread(this);
thread->Create(); thread->Create();
m_threads.Add(thread); m_threads.Add(thread);
} }
void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )
{ {
int no_thrd = m_threads.Count()-1; int no_thrd = m_threads.Count()-1;
if (no_thrd < 0)
return;
delete (m_threads[no_thrd]);
m_threads.Remove(no_thrd);
}
if (no_thrd < 0) void MyFrame::OnResumeThread(wxCommandEvent& WXUNUSED(event) )
return; {
// resume first suspended thread
delete (m_threads[no_thrd]); size_t n = 0;
m_threads.Remove(no_thrd); while ( n < m_threads.Count() && m_threads[n]->IsPaused() )
n--;
if ( n < 0 )
wxLogError("No thread to pause!");
else
m_threads[n]->Resume();
} }
void MyFrame::OnPauseThread(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnPauseThread(wxCommandEvent& WXUNUSED(event) )
{ {
// pause last running thread
int n = m_threads.Count() - 1;
while ( n >= 0 && !m_threads[n]->IsRunning() )
n--;
if ( n < 0 )
wxLogError("No thread to pause!");
else
m_threads[n]->Pause();
} }
void MyFrame::OnSize(wxSizeEvent& event ) void MyFrame::OnSize(wxSizeEvent& event )
{ {
wxFrame::OnSize(event); wxFrame::OnSize(event);
wxSize size( GetClientSize() ); wxSize size( GetClientSize() );
m_txtctrl->SetSize( 10, 30, size.x-20, size.y-40 ); m_txtctrl->SetSize( 10, 30, size.x-20, size.y-40 );
} }
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
{ {
unsigned int i; unsigned int i;
for (i=0;i<m_threads.Count();i++) for (i=0;i<m_threads.Count();i++)
delete (m_threads[i]); delete (m_threads[i]);
Close(TRUE); Close(TRUE);
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{ {
wxMessageDialog dialog(this, "wxThread sample (based on minimal)\nJulian Smart and Guilhem Lavaux", wxMessageDialog dialog(this, "wxThread sample (based on minimal)\nJulian Smart and Guilhem Lavaux",
"About wxThread sample", wxYES_NO|wxCANCEL); "About wxThread sample", wxYES_NO|wxCANCEL);
dialog.ShowModal(); dialog.ShowModal();
} }

98
src/msw/thread.cpp
View File

@@ -59,13 +59,18 @@ wxMutex::wxMutex()
{ {
p_internal = new wxMutexInternal; p_internal = new wxMutexInternal;
p_internal->p_mutex = CreateMutex(NULL, FALSE, NULL); p_internal->p_mutex = CreateMutex(NULL, FALSE, NULL);
if ( !p_internal->p_mutex )
{
wxLogSysError(_("Can not create mutex."));
}
m_locked = 0; m_locked = 0;
} }
wxMutex::~wxMutex() wxMutex::~wxMutex()
{ {
if (m_locked > 0) if (m_locked > 0)
wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked); wxLogDebug("Warning: freeing a locked mutex (%d locks).", m_locked);
CloseHandle(p_internal->p_mutex); CloseHandle(p_internal->p_mutex);
} }
@@ -75,10 +80,10 @@ wxMutexError wxMutex::Lock()
ret = WaitForSingleObject(p_internal->p_mutex, INFINITE); ret = WaitForSingleObject(p_internal->p_mutex, INFINITE);
if (ret == WAIT_ABANDONED) if (ret == WAIT_ABANDONED)
return MUTEX_BUSY; return wxMUTEX_BUSY;
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::TryLock() wxMutexError wxMutex::TryLock()
@@ -87,23 +92,25 @@ wxMutexError wxMutex::TryLock()
ret = WaitForSingleObject(p_internal->p_mutex, 0); ret = WaitForSingleObject(p_internal->p_mutex, 0);
if (ret == WAIT_TIMEOUT || ret == WAIT_ABANDONED) if (ret == WAIT_TIMEOUT || ret == WAIT_ABANDONED)
return MUTEX_BUSY; return wxMUTEX_BUSY;
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::Unlock() wxMutexError wxMutex::Unlock()
{ {
BOOL ret;
if (m_locked > 0) if (m_locked > 0)
m_locked--; m_locked--;
// Why does this have 3 args? The redundant ones removed by JACS BOOL ret = ReleaseMutex(p_internal->p_mutex);
// ret = ReleaseMutex(p_internal->p_mutex, 1, NULL); if ( ret != 0 )
ret = ReleaseMutex(p_internal->p_mutex); {
return MUTEX_NO_ERROR; wxLogSysError(_("Couldn't release a mutex"));
return wxMUTEX_MISC_ERROR;
}
return wxMUTEX_NO_ERROR;
} }
class wxConditionInternal { class wxConditionInternal {
@@ -116,6 +123,11 @@ wxCondition::wxCondition()
{ {
p_internal = new wxConditionInternal; p_internal = new wxConditionInternal;
p_internal->event = CreateEvent(NULL, FALSE, FALSE, NULL); p_internal->event = CreateEvent(NULL, FALSE, FALSE, NULL);
if ( !p_internal->event )
{
wxLogSysError(_("Can not create event object."));
}
p_internal->waiters = 0; p_internal->waiters = 0;
} }
@@ -157,7 +169,12 @@ void wxCondition::Broadcast()
int i; int i;
for (i=0;i<p_internal->waiters;i++) for (i=0;i<p_internal->waiters;i++)
SetEvent(p_internal->event); {
if ( SetEvent(p_internal->event) == 0 )
{
wxLogSysError(_("Couldn't change the state of event object."));
}
}
} }
class wxThreadInternal { class wxThreadInternal {
@@ -183,16 +200,19 @@ DWORD wxThreadInternal::WinThreadStart(LPVOID arg)
wxThreadError wxThread::Create() wxThreadError wxThread::Create()
{ {
int win_prio, prio = p_internal->prio; int prio = p_internal->prio;
p_internal->thread_id = CreateThread(NULL, 0, p_internal->thread_id = CreateThread(NULL, 0,
(LPTHREAD_START_ROUTINE)wxThreadInternal::WinThreadStart, (LPTHREAD_START_ROUTINE)wxThreadInternal::WinThreadStart,
(void *)this, CREATE_SUSPENDED, &p_internal->tid); (void *)this, CREATE_SUSPENDED, &p_internal->tid);
if (p_internal->thread_id == NULL) {
printf("Error = %d\n", GetLastError()); if ( p_internal->thread_id == NULL )
return THREAD_NO_RESOURCE; {
wxLogSysError(_("Can't create thread"));
return wxTHREAD_NO_RESOURCE;
} }
int win_prio;
if (prio <= 20) if (prio <= 20)
win_prio = THREAD_PRIORITY_LOWEST; win_prio = THREAD_PRIORITY_LOWEST;
else if (prio <= 40) else if (prio <= 40)
@@ -203,26 +223,57 @@ wxThreadError wxThread::Create()
win_prio = THREAD_PRIORITY_ABOVE_NORMAL; win_prio = THREAD_PRIORITY_ABOVE_NORMAL;
else if (prio <= 100) else if (prio <= 100)
win_prio = THREAD_PRIORITY_HIGHEST; win_prio = THREAD_PRIORITY_HIGHEST;
else
{
wxFAIL_MSG("invalid value of thread priority parameter");
win_prio = THREAD_PRIORITY_NORMAL;
}
SetThreadPriority(p_internal->thread_id, win_prio); SetThreadPriority(p_internal->thread_id, win_prio);
ResumeThread(p_internal->thread_id); ResumeThread(p_internal->thread_id);
p_internal->state = STATE_RUNNING; p_internal->state = STATE_RUNNING;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
wxThreadError wxThread::Destroy() wxThreadError wxThread::Destroy()
{ {
if (p_internal->state != STATE_RUNNING) if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING; return wxTHREAD_NOT_RUNNING;
if (p_internal->defer == FALSE) if (p_internal->defer == FALSE)
TerminateThread(p_internal->thread_id, 0); TerminateThread(p_internal->thread_id, 0);
else else
p_internal->state = STATE_CANCELED; p_internal->state = STATE_CANCELED;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
}
wxThreadError wxThread::Pause()
{
DWORD nSuspendCount = ::SuspendThread(p_internal->thread_id);
if ( nSuspendCount == (DWORD)-1 )
{
wxLogSysError(_("Can not suspend thread %x"), p_internal->thread_id);
return wxTHREAD_MISC_ERROR; // no idea what might provoke this error...
}
return wxTHREAD_NO_ERROR;
}
wxThreadError wxThread::Resume()
{
DWORD nSuspendCount = ::ResumeThread(p_internal->thread_id);
if ( nSuspendCount == (DWORD)-1 )
{
wxLogSysError(_("Can not resume thread %x"), p_internal->thread_id);
return wxTHREAD_MISC_ERROR; // no idea what might provoke this error...
}
return wxTHREAD_NO_ERROR;
} }
void wxThread::Exit(void *status) void wxThread::Exit(void *status)
@@ -335,3 +386,12 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
void WXDLLEXPORT wxMutexGuiEnter()
{
wxFAIL_MSG("not implemented");
}
void WXDLLEXPORT wxMutexGuiLeave()
{
wxFAIL_MSG("not implemented");
}