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

terminate child threads in frame dtor, not in OnQuit() (otherwise they're left running if we just close the window)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-21 23:54:47 +00:00
parent 598dc9b777
commit 4e5bbd4022
1 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
samples/thread/thread.cpp
View File

@@ -75,6 +75,7 @@ class MyFrame: public wxFrame
public: public:
// ctor // ctor
MyFrame(wxFrame *frame, const wxString& title, int x, int y, int w, int h); MyFrame(wxFrame *frame, const wxString& title, int x, int y, int w, int h);
virtual ~MyFrame();
// operations // operations
void WriteText(const wxString& text) { m_txtctrl->WriteText(text); } void WriteText(const wxString& text) { m_txtctrl->WriteText(text); }
@@ -428,6 +429,51 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title,
} }
MyFrame::~MyFrame()
{
// NB: although the OS will terminate all the threads anyhow when the main
// one exits, it's good practice to do it ourselves -- even if it's not
// completely trivial in this example
// tell all the threads to terminate: note that they can't terminate while
// we're deleting them because they will block in their OnExit() -- this is
// important as otherwise we might access invalid array elements
wxThread *thread;
wxGetApp().m_critsect.Enter();
// check if we have any threads running first
const wxArrayThread& threads = wxGetApp().m_threads;
size_t count = threads.GetCount();
if ( count )
{
// set the flag for MyThread::OnExit()
wxGetApp().m_waitingUntilAllDone = TRUE;
// stop all threads
while ( ! threads.IsEmpty() )
{
thread = threads.Last();
wxGetApp().m_critsect.Leave();
thread->Delete();
wxGetApp().m_critsect.Enter();
}
}
wxGetApp().m_critsect.Leave();
if ( count )
{
// now wait for them to really terminate
wxGetApp().m_semAllDone.Wait();
}
//else: no threads to terminate, no condition to wait for
}
MyThread *MyFrame::CreateThread() MyThread *MyFrame::CreateThread()
{ {
MyThread *thread = new MyThread(this); MyThread *thread = new MyThread(this);
@@ -597,50 +643,6 @@ void MyFrame::OnIdle(wxIdleEvent& event)
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
{ {
// NB: although the OS will terminate all the threads anyhow when the main
// one exits, it's good practice to do it ourselves -- even if it's not
// completely trivial in this example
// tell all the threads to terminate: note that they can't terminate while
// we're deleting them because they will block in their OnExit() -- this is
// important as otherwise we might access invalid array elements
{
wxThread *thread;
wxGetApp().m_critsect.Enter();
// check if we have any threads running first
const wxArrayThread& threads = wxGetApp().m_threads;
size_t count = threads.GetCount();
if ( count )
{
// set the flag for MyThread::OnExit()
wxGetApp().m_waitingUntilAllDone = TRUE;
// stop all threads
while ( ! threads.IsEmpty() )
{
thread = threads.Last();
wxGetApp().m_critsect.Leave();
thread->Delete();
wxGetApp().m_critsect.Enter();
}
}
wxGetApp().m_critsect.Leave();
if ( count )
{
// now wait for them to really terminate
wxGetApp().m_semAllDone.Wait();
}
//else: no threads to terminate, no condition to wait for
}
Close(TRUE); Close(TRUE);
} }