zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-20 03:23:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[pykd] updated: !py print out traceback when exception happens

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@68359 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2011-07-28 11:41:30 +00:00
parent 89c524741a
commit 929b5a8088
1 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pykd/dbgext.cpp
View File

@ -806,6 +806,8 @@ py( PDEBUG_CLIENT4 client, PCSTR args)
// ïåðåíàïðàâëåíèå ñòàíäàðòíûõ ïîòîêîâ ÂÂ // ïåðåíàïðàâëåíèå ñòàíäàðòíûõ ïîòîêîâ ÂÂ
boost::python::object sys = boost::python::import("sys"); boost::python::object sys = boost::python::import("sys");
boost::python::object tracebackModule = boost::python::import("traceback");
dbgOut dout; dbgOut dout;
sys.attr("stdout") = boost::python::object( dout ); sys.attr("stdout") = boost::python::object( dout );
@ -864,11 +866,27 @@ py( PDEBUG_CLIENT4 client, PCSTR args)
if(errvalue != NULL) if(errvalue != NULL)
{ {
PyObject *s = PyObject_Str(errvalue); PyObject *errvalueStr= PyObject_Str(errvalue);
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "%s/n", PyString_AS_STRING( s ) );
Py_DECREF(s); dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "%s\n", PyString_AS_STRING( errvalueStr ) );
if ( traceback )
{
boost::python::object traceObj( boost::python::handle<>( boost::python::borrowed( traceback ) ) );
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "\nTraceback:\n" );
boost::python::object pFunc( tracebackModule.attr("format_tb") );
boost::python::list traceList( pFunc( traceObj ) );
for ( long i = 0; i < boost::python::len(traceList); ++i )
{
std::string traceLine = boost::python::extract<std::string>(traceList[i]);
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, traceLine.c_str() );
}
}
Py_DECREF(errvalueStr);
} }
Py_XDECREF(errvalue); Py_XDECREF(errvalue);
@ -914,6 +932,8 @@ pycmd( PDEBUG_CLIENT4 client, PCSTR args )
boost::python::object syntaxError = boost::python::import("exceptions").attr("SyntaxError"); boost::python::object syntaxError = boost::python::import("exceptions").attr("SyntaxError");
boost::python::object tracebackModule = boost::python::import("traceback");
std::string commandBuffer; std::string commandBuffer;
bool commandCompleted = true; bool commandCompleted = true;
@ -969,37 +989,48 @@ pycmd( PDEBUG_CLIENT4 client, PCSTR args )
} }
catch( boost::python::error_already_set const & ) catch( boost::python::error_already_set const & )
{ {
PyObject *errtype = NULL, *errvalue = NULL, *traceback = NULL; PyObject *errtype = NULL, *errvalue = NULL, *traceback = NULL, *errvalueStr = NULL;
PyErr_Fetch( &errtype, &errvalue, &traceback ); PyErr_Fetch( &errtype, &errvalue, &traceback );
if ( errtype && errvalue ) if ( errtype && errvalue )
{ {
PyObject *errvalueStr = PyObject_Str(errvalue); errvalueStr = PyObject_Str(errvalue);
std::string errValueStr = boost::python::extract<std::string>( errvalueStr ); do {
if ( PyErr_GivenExceptionMatches( syntaxError.ptr(), errtype ) )
{
boost::python::tuple errValueObj( boost::python::handle<>( boost::python::borrowed(errvalue) ) );
Py_XDECREF(errvalueStr);
if ( errValueObj[0] == "unexpected EOF while parsing" ) if ( PyErr_GivenExceptionMatches( syntaxError.ptr(), errtype ) )
{ {
commandCompleted = false; boost::python::tuple errValueObj( boost::python::handle<>( boost::python::borrowed(errvalue) ) );
if ( errValueObj[0] == "unexpected EOF while parsing" )
{
commandCompleted = false;
break;
}
} }
else
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "%s\n", PyString_AS_STRING(errvalueStr) );
if ( traceback )
{ {
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "%s\n", errValueStr.c_str() ); boost::python::object traceObj( boost::python::handle<>( boost::python::borrowed( traceback ) ) );
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "\nTraceback:\n" );
boost::python::object pFunc( tracebackModule.attr("format_tb") );
boost::python::list traceList( pFunc( traceObj ) );
for ( long i = 0; i < boost::python::len(traceList); ++i )
{
std::string traceLine = boost::python::extract<std::string>(traceList[i]);
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, traceLine.c_str() );
}
} }
}
else
{
dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "%s\n", errValueStr.c_str() );
}
} while( FALSE );
Py_XDECREF(errvalueStr);
Py_XDECREF(errvalue); Py_XDECREF(errvalue);
Py_XDECREF(errtype); Py_XDECREF(errtype);
Py_XDECREF(traceback); Py_XDECREF(traceback);