From fc543b5647fae76d4d6d1ebb6b7b30a0b02c7810 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 21 Feb 2003 23:55:39 +0000 Subject: [PATCH] better message when a C++ exception terminates a C++ thread --- src/libCom/osi/epicsThread.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libCom/osi/epicsThread.cpp b/src/libCom/osi/epicsThread.cpp index a268957f6..3d6b52114 100644 --- a/src/libCom/osi/epicsThread.cpp +++ b/src/libCom/osi/epicsThread.cpp @@ -50,13 +50,19 @@ extern "C" void epicsThreadCallEntryPoint ( void * pPvt ) return; } catch ( std::exception & except ) { + char name [128]; + epicsThreadGetName ( pThread->id, name, sizeof ( name ) ); errlogPrintf ( - "epicsThread: Unexpected C++ exception \"%s\" - terminating thread", - except.what () ); + "epicsThread: Unexpected C++ exception \"%s\" - terminating \"%s\"", + except.what (), name ); + std::unexpected (); } catch ( ... ) { + char name [128]; + epicsThreadGetName ( pThread->id, name, sizeof ( name ) ); errlogPrintf ( - "epicsThread: Unknown C++ exdception - terminating thread" ); + "epicsThread: Unknown C++ exception - terminating \"%s\"", name ); + std::unexpected (); } }