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

rollback previous changelist

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@86878 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2013-12-18 08:11:29 +00:00 committed by Mikhail I. Izmestev
parent 9884b06526
commit f3e27d30b8
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pykd/windbgext.cpp
View File

@ -38,10 +38,10 @@ void PykdExt::setUp()
PyImport_AppendInittab("pykd", initpykd ); PyImport_AppendInittab("pykd", initpykd );
Py_Initialize();
PyEval_InitThreads(); PyEval_InitThreads();
Py_Initialize();
python::object main = boost::python::import("__main__"); python::object main = boost::python::import("__main__");
python::object main_namespace = main.attr("__dict__"); python::object main_namespace = main.attr("__dict__");
@ -172,17 +172,14 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py)
PyThreadState *localState = NULL; PyThreadState *localState = NULL;
PyThreadState *globalState = NULL; PyThreadState *globalState = NULL;
PyGILState_STATE gilState;
PyEval_RestoreThread( m_pyState ); PyEval_RestoreThread( m_pyState );
if ( !global ) if ( !global )
{ {
globalState = Py_NewInterpreter(); globalState = PyThreadState_Swap( NULL );
localState = PyEval_SaveThread(); localState = Py_NewInterpreter();
gilState = PyGILState_Ensure();
python::object sys = python::import("sys"); python::object sys = python::import("sys");
@ -190,12 +187,6 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py)
sys.attr("stderr") = python::object( pykd::DbgOut() ); sys.attr("stderr") = python::object( pykd::DbgOut() );
sys.attr("stdin") = python::object( pykd::DbgIn() ); sys.attr("stdin") = python::object( pykd::DbgIn() );
} }
else
{
m_pyState = PyEval_SaveThread();
gilState = PyGILState_Ensure();
}
if ( args.size() == 0 ) if ( args.size() == 0 )
{ {
@ -223,9 +214,7 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py)
python::object global(main.attr("__dict__")); python::object global(main.attr("__dict__"));
try { try {
PykdInterruptWatch interruptWatch; PykdInterruptWatch interruptWatch;
python::exec_file( scriptFileName.c_str(), global ); python::exec_file( scriptFileName.c_str(), global );
} }
catch( python::error_already_set const & ) catch( python::error_already_set const & )
@ -234,18 +223,30 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py)
} }
} }
PyGILState_Release(gilState);
if ( !global ) if ( !global )
{ {
PyEval_RestoreThread( localState ); PyInterpreterState *interpreter = localState->interp;
Py_EndInterpreter(localState); while( interpreter->tstate_head != NULL )
{
PyThreadState *threadState = (PyThreadState*)(interpreter->tstate_head);
PyThreadState_Clear(threadState);
PyThreadState_Swap( NULL );
PyThreadState_Delete(threadState);
}
PyInterpreterState_Clear(interpreter);
PyInterpreterState_Delete(interpreter);
PyThreadState_Swap( globalState ); PyThreadState_Swap( globalState );
m_pyState = PyEval_SaveThread();
} }
m_pyState = PyEval_SaveThread();
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////