jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show backtrace when catching a C++ exception through Python. 

* Change: In PyHurricane.h, in HCATCH macro, show the backtrace when
    catching a C++ exception. No need to use the "hex" stream manipulator
    if we cast into (void*).
This commit is contained in:
Jean-Paul Chaput 2016-09-12 23:29:35 +02:00
parent 5435ca1933
commit 6e1d3f0372
2 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hurricane/src/hurricane/hurricane/Commons.h
View File

@ -775,7 +775,7 @@ class tstream : public std::ostream {
inline tstream& _tabw ( int count ); inline tstream& _tabw ( int count );
public: public:
// Overload for manipulators. // Overload for manipulators.
inline tstream& operator<< ( std::ostream &(*pf)(std::ostream &) ); inline tstream& operator<< ( std::ostream& (*pf)(std::ostream &) );
private: private:
int _minLevel; int _minLevel;
int _maxLevel; int _maxLevel;
@ -844,9 +844,16 @@ template<typename T>
inline tstream& operator<< ( tstream& o, const T* t ) inline tstream& operator<< ( tstream& o, const T* t )
{ if (o.enabled()) { static_cast<std::ostream&>(o) << getString<const T*>(t); } return o; }; { if (o.enabled()) { static_cast<std::ostream&>(o) << getString<const T*>(t); } return o; };
template<>
inline tstream& operator<< ( tstream& o, std::ios_base& (*pf)(std::ios_base&) )
{ if (o.enabled()) { static_cast<std::ostream&>(o) << pf; } return o; };
struct _Tsetw { int n_; }; struct _Tsetw { int n_; };
inline _Tsetw tsetw ( int n ) { return { n }; } inline _Tsetw tsetw ( int n ) { return { n }; }
struct _Tsetf { int n_; };
inline _Tsetf tsetf ( int n ) { return { n }; }
template<> template<>
inline tstream& operator<< ( tstream& o, _Tsetw manip ) inline tstream& operator<< ( tstream& o, _Tsetw manip )
{ if (o.enabled()) { static_cast<std::ostream&>(o) << std::setw(manip.n_); } return o; } { if (o.enabled()) { static_cast<std::ostream&>(o) << std::setw(manip.n_); } return o; }

98
hurricane/src/isobar/hurricane/isobar/PyHurricane.h
View File

@ -685,12 +685,12 @@ extern "C" {
#define DirectDeleteMethod(PY_FUNC_NAME, PY_SELF_TYPE) \ #define DirectDeleteMethod(PY_FUNC_NAME, PY_SELF_TYPE) \
static void PY_FUNC_NAME ( PY_SELF_TYPE *self ) \ static void PY_FUNC_NAME ( PY_SELF_TYPE *self ) \
{ \ { \
cdebug_log(20,0) << #PY_SELF_TYPE"_DeAlloc(" << hex << self << ") " \ cdebug_log(20,0) << #PY_SELF_TYPE"_DeAlloc(" << (void*)self << ") " \
<< hex << (void*)(self->ACCESS_OBJECT) \ << (void*)(self->ACCESS_OBJECT) \
<< ":" << self->ACCESS_OBJECT << endl; \ << ":" << self->ACCESS_OBJECT << endl; \
\ \
if ( self->ACCESS_OBJECT ) { \ if ( self->ACCESS_OBJECT ) { \
cdebug_log(20,0) << "C++ object := " << hex \ cdebug_log(20,0) << "C++ object := " \
<< &(self->ACCESS_OBJECT) << endl; \ << &(self->ACCESS_OBJECT) << endl; \
delete self->ACCESS_OBJECT; \ delete self->ACCESS_OBJECT; \
} \ } \
@ -705,7 +705,7 @@ extern "C" {
#define PlugDeleteMethod(PY_FUNC_NAME,PY_SELF_TYPE) \ #define PlugDeleteMethod(PY_FUNC_NAME,PY_SELF_TYPE) \
static void PY_FUNC_NAME ( PY_SELF_TYPE *self ) \ static void PY_FUNC_NAME ( PY_SELF_TYPE *self ) \
{ \ { \
cdebug_log(20,0) << "PyHObject_DeAlloc(" << hex << self << ") " \ cdebug_log(20,0) << "PyHObject_DeAlloc(" << (void*)self << ") " \
<< self->ACCESS_OBJECT << endl; \ << self->ACCESS_OBJECT << endl; \
\ \
PyObject_DEL ( self ); \ PyObject_DEL ( self ); \
@ -974,7 +974,7 @@ extern "C" {
return ( PyString_FromString("<PyObject invalid dynamic-cast>") ); \ return ( PyString_FromString("<PyObject invalid dynamic-cast>") ); \
\ \
ostringstream repr; \ ostringstream repr; \
repr << "[" << hex << self << "<->" << (void*)object << " " << getString(object) << "]"; \ repr << "[" << (void*)self << "<->" << (void*)object << " " << getString(object) << "]"; \
\ \
return ( PyString_FromString(repr.str().c_str()) ); \ return ( PyString_FromString(repr.str().c_str()) ); \
} }
@ -1040,8 +1040,8 @@ extern "C" {
if (pyObject == NULL) { return NULL; } \ if (pyObject == NULL) { return NULL; } \
\ \
pyObject->ACCESS_OBJECT = object; \ pyObject->ACCESS_OBJECT = object; \
cdebug_log(20,0) << "Py" #SELF_TYPE "_Link(" << hex << pyObject << ") " \ cdebug_log(20,0) << "Py" #SELF_TYPE "_Link(" << (void*)pyObject << ") " \
<< hex << (void*)object << ":" << object << endl; \ << (void*)object << ":" << object << endl; \
HCATCH \ HCATCH \
\ \
return ( (PyObject*)pyObject ); \ return ( (PyObject*)pyObject ); \
@ -1102,8 +1102,8 @@ extern "C" {
pyObject = (Py##SELF_TYPE*)proxy->getShadow (); \ pyObject = (Py##SELF_TYPE*)proxy->getShadow (); \
Py_INCREF ( ACCESS_CLASS(pyObject) ); \ Py_INCREF ( ACCESS_CLASS(pyObject) ); \
} \ } \
cdebug_log(20,0) << "PyDbo" #SELF_TYPE "_Link(" << hex << pyObject << ") " \ cdebug_log(20,0) << "PyDbo" #SELF_TYPE "_Link(" << (void*)pyObject << ") " \
<< hex << (void*)object << ":" << object << endl; \ << (void*)object << ":" << object << endl; \
HCATCH \ HCATCH \
\ \
return ( (PyObject*)pyObject ); \ return ( (PyObject*)pyObject ); \
@ -1115,8 +1115,8 @@ extern "C" {
# define DBoDeleteMethod(SELF_TYPE) \ # define DBoDeleteMethod(SELF_TYPE) \
static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \ static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \
{ \ { \
cdebug_log(20,0) << "PyDbObject_DeAlloc(" << hex << self << ") " \ cdebug_log(20,0) << "PyDbObject_DeAlloc(" << (void*)self << ") " \
<< hex << (void*)(self->ACCESS_OBJECT) << ":" << self->ACCESS_OBJECT << endl; \ << (void*)(self->ACCESS_OBJECT) << ":" << self->ACCESS_OBJECT << endl; \
\ \
if ( self->ACCESS_OBJECT != NULL ) { \ if ( self->ACCESS_OBJECT != NULL ) { \
ProxyProperty* proxy = static_cast<ProxyProperty*> \ ProxyProperty* proxy = static_cast<ProxyProperty*> \
@ -1140,8 +1140,8 @@ extern "C" {
# define PythonOnlyDeleteMethod(SELF_TYPE) \ # define PythonOnlyDeleteMethod(SELF_TYPE) \
static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \ static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \
{ \ { \
cdebug_log(20,0) << "PythonOnlyObject_DeAlloc(" << hex << self << ") " \ cdebug_log(20,0) << "PythonOnlyObject_DeAlloc(" << (void*)self << ") " \
<< hex << (void*)(self->ACCESS_OBJECT) \ << (void*)(self->ACCESS_OBJECT) \
<< ":" << self->ACCESS_OBJECT << endl; \ << ":" << self->ACCESS_OBJECT << endl; \
PyObject_DEL ( self ); \ PyObject_DEL ( self ); \
} }
@ -1155,7 +1155,7 @@ extern "C" {
# define NoObjectDeleteMethod(SELF_TYPE) \ # define NoObjectDeleteMethod(SELF_TYPE) \
static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \ static void Py##SELF_TYPE##_DeAlloc ( Py##SELF_TYPE *self ) \
{ \ { \
cdebug_log(20,0) << "PythonOnlyObject_DeAlloc(" << hex << self << ") " \ cdebug_log(20,0) << "PythonOnlyObject_DeAlloc(" << (void*)self << ") " \
<< "[no object]" << endl; \ << "[no object]" << endl; \
PyObject_DEL ( self ); \ PyObject_DEL ( self ); \
} }
@ -1168,7 +1168,7 @@ extern "C" {
#define PyTypeObjectLinkPyTypeWithoutObject(PY_SELF_TYPE,SELF_TYPE) \ #define PyTypeObjectLinkPyTypeWithoutObject(PY_SELF_TYPE,SELF_TYPE) \
extern void Py##PY_SELF_TYPE##_LinkPyType() { \ extern void Py##PY_SELF_TYPE##_LinkPyType() { \
cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \ cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \
\ \
PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \ PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \
PyType##PY_SELF_TYPE.tp_methods = Py##PY_SELF_TYPE##_Methods; \ PyType##PY_SELF_TYPE.tp_methods = Py##PY_SELF_TYPE##_Methods; \
@ -1186,7 +1186,7 @@ extern "C" {
DirectCmpMethod (Py##PY_SELF_TYPE##_Cmp, IsPy##PY_SELF_TYPE, Py##PY_SELF_TYPE) \ DirectCmpMethod (Py##PY_SELF_TYPE##_Cmp, IsPy##PY_SELF_TYPE, Py##PY_SELF_TYPE) \
DirectHashMethod(Py##PY_SELF_TYPE##_Hash, Py##SELF_TYPE) \ DirectHashMethod(Py##PY_SELF_TYPE##_Hash, Py##SELF_TYPE) \
extern void Py##PY_SELF_TYPE##_LinkPyType() { \ extern void Py##PY_SELF_TYPE##_LinkPyType() { \
cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \ cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \
\ \
PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \ PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \
PyType##PY_SELF_TYPE.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##_Cmp; \ PyType##PY_SELF_TYPE.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##_Cmp; \
@ -1203,7 +1203,7 @@ extern "C" {
DirectCmpMethod (Py##PY_SELF_TYPE##_Cmp, IsPy##PY_SELF_TYPE, Py##PY_SELF_TYPE) \ DirectCmpMethod (Py##PY_SELF_TYPE##_Cmp, IsPy##PY_SELF_TYPE, Py##PY_SELF_TYPE) \
DirectHashMethod(Py##PY_SELF_TYPE##_Hash, Py##SELF_TYPE) \ DirectHashMethod(Py##PY_SELF_TYPE##_Hash, Py##SELF_TYPE) \
extern void Py##PY_SELF_TYPE##_LinkPyType() { \ extern void Py##PY_SELF_TYPE##_LinkPyType() { \
cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \ cdebug_log(20,0) << "Py" #PY_SELF_TYPE "_LinkType()" << endl; \
\ \
PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \ PyType##PY_SELF_TYPE.tp_dealloc = (destructor) Py##PY_SELF_TYPE##_DeAlloc; \
PyType##PY_SELF_TYPE.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##_Cmp; \ PyType##PY_SELF_TYPE.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##_Cmp; \
@ -1230,7 +1230,7 @@ extern "C" {
DirectCmpMethod (Py##PY_SELF_TYPE##Locator_Cmp, IsPy##PY_SELF_TYPE##Locator, Py##PY_SELF_TYPE##Locator) \ DirectCmpMethod (Py##PY_SELF_TYPE##Locator_Cmp, IsPy##PY_SELF_TYPE##Locator, Py##PY_SELF_TYPE##Locator) \
extern void Py##PY_SELF_TYPE##Locator_LinkPyType () \ extern void Py##PY_SELF_TYPE##Locator_LinkPyType () \
{ \ { \
cdebug_log(20,0) << "Py" #PY_SELF_TYPE "Locator_LinkType()" << endl; \ cdebug_log(20,0) << "Py" #PY_SELF_TYPE "Locator_LinkType()" << endl; \
\ \
PyType##PY_SELF_TYPE##Locator.tp_dealloc = (destructor)Py##PY_SELF_TYPE##Locator_DeAlloc; \ PyType##PY_SELF_TYPE##Locator.tp_dealloc = (destructor)Py##PY_SELF_TYPE##Locator_DeAlloc; \
PyType##PY_SELF_TYPE##Locator.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##Locator_Cmp; \ PyType##PY_SELF_TYPE##Locator.tp_compare = (cmpfunc) Py##PY_SELF_TYPE##Locator_Cmp; \
@ -1443,38 +1443,38 @@ extern "C" {
# define HTRY try { # define HTRY try {
# define HCATCH \ # define HCATCH \
} \ } \
catch ( const Warning& w ) { \ catch ( const Warning& w ) { \
std::string message = "\n" + getString(w); \ std::string message = "\n" + getString(w); \
PyErr_Warn ( HurricaneWarning, const_cast<char*>(message.c_str()) ); \ PyErr_Warn ( HurricaneWarning, const_cast<char*>(message.c_str()) ); \
} \ } \
catch ( const Error& e ) { \ catch ( const Error& e ) { \
std::string message = "\n" + getString(e); \ std::string message = "\n" + getString(e) + "\n" + e.where(); \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
catch ( const Bug& e ) { \ catch ( const Bug& e ) { \
std::string message = "\n" + getString(e); \ std::string message = "\n" + getString(e); \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
catch ( const Exception& e ) { \ catch ( const Exception& e ) { \
std::string message = "\nUnknown Hurricane::Exception"; \ std::string message = "\nUnknown Hurricane::Exception"; \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
catch ( const std::exception& e ) { \ catch ( const std::exception& e ) { \
std::string message = "\n" + std::string(e.what()); \ std::string message = "\n" + std::string(e.what()); \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
catch ( ... ) { \ catch ( ... ) { \
std::string message = \ std::string message = \
"\nUnmanaged exception, neither a Hurricane::Error nor" \ "\nUnmanaged exception, neither a Hurricane::Error nor" \
" a std::exception."; \ " a std::exception."; \
PyErr_SetString ( HurricaneError, message.c_str() ); \ PyErr_SetString ( HurricaneError, message.c_str() ); \
return NULL; \ return NULL; \
} \ } \
} // End of extern "C". } // End of extern "C".