diff options
author | Tom Tromey <tom@tromey.com> | 2016-11-06 20:42:32 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2017-01-10 19:13:29 -0700 |
commit | abf5651e47c0396df58a37951bc03a349169c5f2 (patch) | |
tree | d2ff93fd1a4b9801b7c1407f78d370742de4e0a8 /gdb/python/py-exitedevent.c | |
parent | a68ff33e0dcb4733584265088030d12a31e740e4 (diff) | |
download | binutils-abf5651e47c0396df58a37951bc03a349169c5f2.zip binutils-abf5651e47c0396df58a37951bc03a349169c5f2.tar.gz binutils-abf5651e47c0396df58a37951bc03a349169c5f2.tar.bz2 |
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 <tom@tromey.com>
* 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.
Diffstat (limited to 'gdb/python/py-exitedevent.c')
-rw-r--r-- | gdb/python/py-exitedevent.c | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c index 96a7463..4590077 100644 --- a/gdb/python/py-exitedevent.c +++ b/gdb/python/py-exitedevent.c @@ -26,42 +26,29 @@ extern PyTypeObject exited_event_object_type static PyObject * create_exited_event_object (const LONGEST *exit_code, struct inferior *inf) { - PyObject *exited_event; - PyObject *inf_obj = NULL; + gdbpy_ref exited_event (create_event_object (&exited_event_object_type)); - exited_event = create_event_object (&exited_event_object_type); - - if (!exited_event) - goto fail; + if (exited_event == NULL) + return NULL; if (exit_code) { - PyObject *exit_code_obj = PyLong_FromLongLong (*exit_code); - int failed; + gdbpy_ref exit_code_obj (PyLong_FromLongLong (*exit_code)); if (exit_code_obj == NULL) - goto fail; - - failed = evpy_add_attribute (exited_event, "exit_code", - exit_code_obj) < 0; - Py_DECREF (exit_code_obj); - if (failed) - goto fail; + return NULL; + if (evpy_add_attribute (exited_event.get (), "exit_code", + exit_code_obj.get ()) < 0) + return NULL; } - inf_obj = inferior_to_inferior_object (inf); - if (!inf_obj || evpy_add_attribute (exited_event, - "inferior", - inf_obj) < 0) - goto fail; - Py_DECREF (inf_obj); + gdbpy_ref inf_obj (inferior_to_inferior_object (inf)); + if (inf_obj == NULL || evpy_add_attribute (exited_event.get (), + "inferior", + inf_obj.get ()) < 0) + return NULL; - return exited_event; - - fail: - Py_XDECREF (inf_obj); - Py_XDECREF (exited_event); - return NULL; + return exited_event.release (); } /* Callback that is used when an exit event occurs. This function @@ -70,15 +57,13 @@ create_exited_event_object (const LONGEST *exit_code, struct inferior *inf) int emit_exited_event (const LONGEST *exit_code, struct inferior *inf) { - PyObject *event; - if (evregpy_no_listeners_p (gdb_py_events.exited)) return 0; - event = create_exited_event_object (exit_code, inf); + gdbpy_ref event (create_exited_event_object (exit_code, inf)); - if (event) - return evpy_emit_event (event, gdb_py_events.exited); + if (event != NULL) + return evpy_emit_event (event.get (), gdb_py_events.exited); return -1; } |