gdb
* python/py-inferior.c (python_inferior_exit): Use inferior's exit code fields. * python/py-exitedevent.c (create_exited_event_object): Change type of 'exit_code'. Optionally add exit_code attribute. (emit_exited_event): Change type of 'exit_code'. * python/py-event.h (emit_exited_event): Update. * mi/mi-interp.c (mi_inferior_exit): Print exit code. * infrun.c (handle_inferior_event): Set exit code fields on inferior. * inferior.h (struct inferior) <has_exit_code, exit_code>: New fields. * inferior.c (exit_inferior_1): Initialize new fields. gdb/doc * gdb.texinfo (GDB/MI Async Records): Document 'exit-code' field. (Events In Python): Note that exit_code is optional.
This commit is contained in:
parent
8ddd9a20a7
commit
8cf64490f2
10 changed files with 59 additions and 20 deletions
|
@ -104,7 +104,7 @@ typedef struct
|
|||
} event_object;
|
||||
|
||||
extern int emit_continue_event (ptid_t ptid);
|
||||
extern int emit_exited_event (LONGEST exit_code);
|
||||
extern int emit_exited_event (const LONGEST *exit_code);
|
||||
|
||||
extern int evpy_emit_event (PyObject *event,
|
||||
eventregistry_object *registry);
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
static PyTypeObject exited_event_object_type;
|
||||
|
||||
PyObject *
|
||||
create_exited_event_object (LONGEST exit_code)
|
||||
static PyObject *
|
||||
create_exited_event_object (const LONGEST *exit_code)
|
||||
{
|
||||
PyObject *exited_event;
|
||||
|
||||
|
@ -31,9 +31,10 @@ create_exited_event_object (LONGEST exit_code)
|
|||
if (!exited_event)
|
||||
goto fail;
|
||||
|
||||
if (evpy_add_attribute (exited_event,
|
||||
"exit_code",
|
||||
PyLong_FromLongLong (exit_code)) < 0)
|
||||
if (exit_code
|
||||
&& evpy_add_attribute (exited_event,
|
||||
"exit_code",
|
||||
PyLong_FromLongLong (*exit_code)) < 0)
|
||||
goto fail;
|
||||
|
||||
return exited_event;
|
||||
|
@ -47,7 +48,7 @@ create_exited_event_object (LONGEST exit_code)
|
|||
will create a new Python exited event object. */
|
||||
|
||||
int
|
||||
emit_exited_event (LONGEST exit_code)
|
||||
emit_exited_event (const LONGEST *exit_code)
|
||||
{
|
||||
PyObject *event;
|
||||
|
||||
|
|
|
@ -112,18 +112,14 @@ static void
|
|||
python_inferior_exit (struct inferior *inf)
|
||||
{
|
||||
struct cleanup *cleanup;
|
||||
LONGEST exit_code = -1;
|
||||
ptid_t ptidp;
|
||||
struct target_waitstatus status;
|
||||
const LONGEST *exit_code = NULL;
|
||||
|
||||
cleanup = ensure_python_env (target_gdbarch, current_language);
|
||||
|
||||
get_last_target_status (&ptidp, &status);
|
||||
if (inf->has_exit_code)
|
||||
exit_code = &inf->exit_code;
|
||||
|
||||
exit_code = status.value.integer;
|
||||
|
||||
if (exit_code >= 0
|
||||
&& emit_exited_event (exit_code) < 0)
|
||||
if (emit_exited_event (exit_code) < 0)
|
||||
gdbpy_print_stack ();
|
||||
|
||||
do_cleanups (cleanup);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue