AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle fatal exceptions in the other threads (based on patch 1459813 by Carl-Friedrich Braun)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-04-27 10:17:13 +00:00
parent f61ed7ee42
commit d3f8206ce7
1 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/msw/thread.cpp
View File

@ -29,10 +29,13 @@
#if wxUSE_THREADS
#include "wx/apptrait.h"
#include "wx/scopeguard.h"
#include "wx/msw/private.h"
#include "wx/msw/missing.h"
#include "wx/msw/seh.h"
#include "wx/except.h"
#include "wx/module.h"
#include "wx/thread.h"
@ -427,9 +430,12 @@ public:
HANDLE GetHandle() const { return m_hThread; }
DWORD GetId() const { return m_tid; }
// thread function
// the thread function forwarding to DoThreadStart
static THREAD_RETVAL THREAD_CALLCONV WinThreadStart(void *thread);
// really start the thread (if it's not already dead)
static THREAD_RETVAL DoThreadStart(wxThread *thread);
void KeepAlive()
{
if ( m_thread->IsDetached() )
@ -471,45 +477,63 @@ private:
wxThreadInternal& m_thrImpl;
};
THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
{
THREAD_RETVAL rc;
THREAD_RETVAL rc = (THREAD_RETVAL)-1;
wxThread * const thread = (wxThread *)param;
// first of all, check whether we hadn't been cancelled already and don't
// start the user code at all then
const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
if ( hasExited )
{
rc = (THREAD_RETVAL)-1;
}
else // do run thread
wxTRY
{
wxON_BLOCK_EXIT_OBJ0(*thread, wxThread::OnExit);
// store the thread object in the TLS
if ( !::TlsSetValue(gs_tlsThisThread, thread) )
{
wxLogSysError(_("Can not start thread: error writing TLS."));
return (DWORD)-1;
return (THREAD_RETVAL)-1;
}
rc = (THREAD_RETVAL)thread->Entry();
}
wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
thread->OnExit();
return rc;
}
// save IsDetached because thread object can be deleted by joinable
// threads after state is changed to STATE_EXITED.
bool isDetached = thread->IsDetached();
THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
{
THREAD_RETVAL rc = (THREAD_RETVAL)-1;
wxThread * const thread = (wxThread *)param;
// each thread has its own SEH translator so install our own a.s.a.p.
DisableAutomaticSETranslator();
// first of all, check whether we hadn't been cancelled already and don't
// start the user code at all then
const bool hasExited = thread->m_internal->GetState() == STATE_EXITED;
if ( !hasExited )
{
wxSEH_TRY
{
rc = DoThreadStart(thread);
}
wxSEH_HANDLE((THREAD_RETVAL)-1)
}
// save IsDetached because thread object can be deleted by joinable
// threads after state is changed to STATE_EXITED.
const bool isDetached = thread->IsDetached();
if ( !hasExited )
{
// enter m_critsect before changing the thread state
wxCriticalSectionLocker lock(thread->m_critsect);
//
// NB: can't use wxCriticalSectionLocker here as we use SEH and it's
// incompatible with C++ object dtors
thread->m_critsect.Enter();
thread->m_internal->SetState(STATE_EXITED);
thread->m_critsect.Leave();
}
// the thread may delete itself now if it wants, we don't need it any more