From dc6c87175b672f00e72997c0ff9dcf984e305285 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 2 Dec 2014 10:59:08 -0800 Subject: New python events: infcall, register/memory changed. gdb/ChangeLog: * NEWS: Mention new Python events. * Makefile.in (SUBDIR_PYTHON_OBS): Add py-infevents.o. (SUBDIR_PYTHON_SRCS): Add py-infevents.c. (py-infevents.o): New rule. * doc/observer.texi (inferior_call_pre, inferior_call_post) (memory_changed, register_changed): New observers. * infcall.c (call_function_by_hand): Notify observer before and after inferior call. * python/py-event.h (inferior_call_kind): New enum. (emit_inferior_call_event): New prototype. (emit_register_changed_event): New prototype. (emit_memory_changed_event): New prototype. * python/py-events.h (events_object): New registries inferior_call, memory_changed and register_changed. * python/py-evts.c (gdbpy_initialize_py_events): Add the inferior_call, memory_changed and register_changed registries. * python/py-infevents.c: New. * python/py-inferior.c (python_on_inferior_call_pre) (python_on_inferior_call_post, python_on_register_change) (python_on_memory_change): New functions. (gdbpy_initialize_inferior): Attach python handler to new observers. * python/py-infthread.c(gdbpy_create_ptid_object): New. (thpy_get_ptid) Use gdbpy_create_ptid_object. * python/python-internal.h: (gdbpy_create_ptid_object) (gdbpy_initialize_inferior_call_pre_event) (gdbpy_initialize_inferior_call_post_event) (gdbpy_initialize_register_changed_event) (gdbpy_initialize_memory_changed_event): New prototypes. * python/python.c (_initialize_python): Initialize new events. * valops.c (value_assign): Notify register_changed observer. gdb/doc/ChangeLog: * python.texi (Events In Python): Document new events InferiorCallPreEvent, InferiorCallPostEvent, MemoryChangedEvent and RegisterChangedEvent. gdb/testsuite/ChangeLog: * gdb.python/py-events.py (inferior_call_handler): New. (register_changed_handler, memory_changed_handler): New. (test_events.invoke): Register new handlers. * gdb.python/py-events.exp: Add tests for inferior call, memory_changed and register_changed events. --- gdb/python/py-infthread.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'gdb/python/py-infthread.c') diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c index 7fa2ca8..67a187c 100644 --- a/gdb/python/py-infthread.c +++ b/gdb/python/py-infthread.c @@ -134,23 +134,10 @@ thpy_get_ptid (PyObject *self, void *closure) int pid; long tid, lwp; thread_object *thread_obj = (thread_object *) self; - PyObject *ret; THPY_REQUIRE_VALID (thread_obj); - ret = PyTuple_New (3); - if (!ret) - return NULL; - - pid = ptid_get_pid (thread_obj->thread->ptid); - lwp = ptid_get_lwp (thread_obj->thread->ptid); - tid = ptid_get_tid (thread_obj->thread->ptid); - - PyTuple_SET_ITEM (ret, 0, PyInt_FromLong (pid)); - PyTuple_SET_ITEM (ret, 1, PyInt_FromLong (lwp)); - PyTuple_SET_ITEM (ret, 2, PyInt_FromLong (tid)); - - return ret; + return gdbpy_create_ptid_object (thread_obj->thread->ptid); } /* Implementation of InferiorThread.switch (). @@ -236,6 +223,30 @@ thpy_is_valid (PyObject *self, PyObject *args) Py_RETURN_TRUE; } +/* Return a reference to a new Python object representing a ptid_t. + The object is a tuple containing (pid, lwp, tid). */ +PyObject * +gdbpy_create_ptid_object (ptid_t ptid) +{ + int pid; + long tid, lwp; + PyObject *ret; + + ret = PyTuple_New (3); + if (!ret) + return NULL; + + pid = ptid_get_pid (ptid); + lwp = ptid_get_lwp (ptid); + tid = ptid_get_tid (ptid); + + PyTuple_SET_ITEM (ret, 0, PyInt_FromLong (pid)); + PyTuple_SET_ITEM (ret, 1, PyInt_FromLong (lwp)); + PyTuple_SET_ITEM (ret, 2, PyInt_FromLong (tid)); + + return ret; +} + /* Implementation of gdb.selected_thread () -> gdb.InferiorThread. Returns the selected thread object. */ -- cgit v1.1