[0.3.x] renamed : onModuleLoad method to onLoadModule ( like in 0.2.x version )

git-svn-id: https://pykd.svn.codeplex.com/svn@89812 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\ussrhero_cp 2015-03-03 20:59:10 +00:00 committed by Mikhail I. Izmestev
parent 939406bae9
commit 607e8c0dc0
3 changed files with 10 additions and 10 deletions

View File

@ -150,7 +150,7 @@ kdlib::DebugCallbackResult EventHandler::onModuleLoad( kdlib::MEMOFFSET_64 offs
do { do {
python::override pythonHandler = get_override( "onModuleLoad" ); python::override pythonHandler = get_override( "onLoadModule" );
if ( !pythonHandler ) if ( !pythonHandler )
{ {
result = kdlib::EventHandler::onModuleLoad( offset, name ); result = kdlib::EventHandler::onModuleLoad( offset, name );
@ -201,7 +201,7 @@ kdlib::DebugCallbackResult EventHandler::onModuleUnload( kdlib::MEMOFFSET_64 of
do { do {
python::override pythonHandler = get_override( "onModuleUnload" ); python::override pythonHandler = get_override( "onUnloadModule" );
if ( !pythonHandler ) if ( !pythonHandler )
{ {
result = kdlib::EventHandler::onModuleUnload( offset, name ); result = kdlib::EventHandler::onModuleUnload( offset, name );

View File

@ -954,10 +954,10 @@ BOOST_PYTHON_MODULE( pykd )
.def( "onBreakpoint", &EventHandler::onBreakpoint, .def( "onBreakpoint", &EventHandler::onBreakpoint,
"Triggered breakpoint event. Parameter is int: ID of breakpoint\n" "Triggered breakpoint event. Parameter is int: ID of breakpoint\n"
"For ignore event method must return eventResult.noChange" ) "For ignore event method must return eventResult.noChange" )
.def( "onModuleLoad", &EventHandler::onModuleLoad, .def( "onLoadModule", &EventHandler::onModuleLoad,
"Triggered module load event. Parameter are long: module base, string: module name\n" "Triggered module load event. Parameter are long: module base, string: module name\n"
"For ignore event method must return eventResult.noChange" ) "For ignore event method must return eventResult.noChange" )
.def( "onModuleUnload", &EventHandler::onModuleUnload, .def( "onUnloadModule", &EventHandler::onModuleUnload,
"Triggered module unload event. Parameter are long: module base, string: module name\n" "Triggered module unload event. Parameter are long: module base, string: module name\n"
"For ignore event method must return eventResult.noChange" ) "For ignore event method must return eventResult.noChange" )
.def( "onException", &EventHandler::onException, .def( "onException", &EventHandler::onException,

View File

@ -16,21 +16,21 @@ class ModuleLoadHandler(pykd.eventHandler):
self.wasLoad = 0 self.wasLoad = 0
self.wasUnload = False self.wasUnload = False
def onModuleLoad(self, module): def onLoadModule(self, modBase, name):
"""Load module handler""" """Load module handler"""
if ( fnmatch.fnmatch(module.name().lower(), self.moduleMask) ): if ( fnmatch.fnmatch(name.lower(), self.moduleMask) ):
self.wasLoad = module.begin() self.wasLoad = modBase
return pykd.DEBUG_STATUS_NO_CHANGE return pykd.executionStatus.NoChange
def onModuleUnload(self, modBase): def onUnloadModule(self, modBase, name):
"""Unload module handler""" """Unload module handler"""
if ( self.wasLoad and (self.wasLoad == modBase) ): if ( self.wasLoad and (self.wasLoad == modBase) ):
self.wasUnload = True self.wasUnload = True
return pykd.DEBUG_STATUS_NO_CHANGE return pykd.executionStatus.NoChange
class EhLoadTest(unittest.TestCase): class EhLoadTest(unittest.TestCase):
"""Unit tests of [un-]load modules notification""" """Unit tests of [un-]load modules notification"""