From abf5651e47c0396df58a37951bc03a349169c5f2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 Nov 2016 20:42:32 -0700 Subject: Change event code to use gdbpy_ref This changes the event code in the Python layer to use gdbpy_ref, simplifying the logic in many places. It also changes evpy_emit_event not to steal a reference to its argument. This is simpler to do now that gdbpy_ref is in use; it's also a reasonable cleanup in its own right. While doing this I realized that evpy_emit_event should not be calling gdbpy_print_stack (all the outermost callers do this if needed), so I removed this as well. 2017-01-10 Tom Tromey * python/py-threadevent.c (create_thread_event_object): Use gdbpy_ref. * python/py-stopevent.c (create_stop_event_object): Simplify. (emit_stop_event): Use gdbpy_ref. * python/py-signalevent.c (create_signal_event_object): Use gdbpy_ref. * python/py-newobjfileevent.c (create_new_objfile_event_object) (emit_new_objfile_event, create_clear_objfiles_event_object) (emit_clear_objfiles_event): Use gdbpy_ref. * python/py-infevents.c (create_inferior_call_event_object) (create_register_changed_event_object) (create_memory_changed_event_object, emit_inferior_call_event) (emit_memory_changed_event, emit_register_changed_event): Use gdbpy_ref. * python/py-exitedevent.c (create_exited_event_object) (emit_exited_event): Use gdbpy_ref. * python/py-event.h (evpy_emit_event): Remove CPYCHECKER_STEALS_REFERENCE_TO_ARG annotation. * python/py-event.c (evpy_emit_event): Use gdbpy_ref. * python/py-continueevent.c (emit_continue_event): Use gdbpy_ref. * python/py-breakpoint.c (gdbpy_breakpoint_created) (gdbpy_breakpoint_deleted, gdbpy_breakpoint_modified): Use gdbpy_ref. * python/py-bpevent.c (create_breakpoint_event_object): Use gdbpy_ref. --- gdb/python/py-bpevent.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'gdb/python/py-bpevent.c') diff --git a/gdb/python/py-bpevent.c b/gdb/python/py-bpevent.c index f9c7083..c9b53b5 100644 --- a/gdb/python/py-bpevent.c +++ b/gdb/python/py-bpevent.c @@ -19,6 +19,7 @@ #include "defs.h" #include "py-stopevent.h" +#include "py-ref.h" extern PyTypeObject breakpoint_event_object_type CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("event_object"); @@ -29,26 +30,22 @@ extern PyTypeObject breakpoint_event_object_type PyObject * create_breakpoint_event_object (PyObject *breakpoint_list, PyObject *first_bp) { - PyObject *breakpoint_event_obj = - create_stop_event_object (&breakpoint_event_object_type); + gdbpy_ref breakpoint_event_obj + (create_stop_event_object (&breakpoint_event_object_type)); - if (!breakpoint_event_obj) - goto fail; + if (breakpoint_event_obj == NULL) + return NULL; - if (evpy_add_attribute (breakpoint_event_obj, + if (evpy_add_attribute (breakpoint_event_obj.get (), "breakpoint", first_bp) < 0) - goto fail; - if (evpy_add_attribute (breakpoint_event_obj, + return NULL; + if (evpy_add_attribute (breakpoint_event_obj.get (), "breakpoints", breakpoint_list) < 0) - goto fail; + return NULL; - return breakpoint_event_obj; - - fail: - Py_XDECREF (breakpoint_event_obj); - return NULL; + return breakpoint_event_obj.release (); } GDBPY_NEW_EVENT_TYPE (breakpoint, -- cgit v1.1