From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24735 invoked by alias); 2 Jun 2011 19:21:27 -0000 Received: (qmail 24726 invoked by uid 22791); 2 Jun 2011 19:21:25 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 02 Jun 2011 19:21:07 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p52JKxRe010191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 2 Jun 2011 15:20:59 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p52JKw8F012535; Thu, 2 Jun 2011 15:20:58 -0400 Received: from opsy.redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p52JKvUh020794; Thu, 2 Jun 2011 15:20:58 -0400 Received: by opsy.redhat.com (Postfix, from userid 500) id 78FE9378142; Thu, 2 Jun 2011 13:20:57 -0600 (MDT) From: Tom Tromey To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: RFA: fix PR mi/12661 References: <201104271926.30493.pedro@codesourcery.com> <201106021834.58440.pedro@codesourcery.com> Date: Thu, 02 Jun 2011 19:21:00 -0000 In-Reply-To: <201106021834.58440.pedro@codesourcery.com> (Pedro Alves's message of "Thu, 2 Jun 2011 18:34:58 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-06/txt/msg00038.txt.bz2 >>>>> "Pedro" == Pedro Alves writes: Pedro> Looks good to me, thanks. I've thought before of adding such Pedro> a field, so we could show it in "info inferiors". Pedro> You'll want to update the docs to mention the exit_code/exit-code Pedro> fields aren't always present, I think. Good point, here is the patch with a doc addition. Ok? I plan to add this to 7.3, as the Python event is new there, and it is best to start it off correctly. Tom 2011-06-02 Tom Tromey * 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) : New fields. * inferior.c (exit_inferior_1): Initialize new fields. 2011-06-02 Tom Tromey * gdb.texinfo (GDB/MI Async Records): Document 'exit-code' field. (Events In Python): Note that exit_code is optional. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 0ac5672..ad75867 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -22093,7 +22093,9 @@ inherited attribute refer to @code{gdb.ThreadEvent} above. @item events.exited Emits @code{events.ExitedEvent} which indicates that the inferior has exited. -@code{events.ExitedEvent} has one attribute: +@code{events.ExitedEvent} has one optional attribute. This attribute +will exist only in the case that the inferior exited with some +status. @table @code @defivar ExitedEvent exit_code An integer representing the exit code which the inferior has returned. @@ -25140,11 +25142,12 @@ was attached to a program. The @var{id} field contains the @value{GDBN} identifier of the thread group. The @var{pid} field contains process identifier, specific to the operating system. -@itemx =thread-group-exited,id="@var{id}" +@itemx =thread-group-exited,id="@var{id}"[,exit-code="@var{code}"] A thread group is no longer associated with a running program, either because the program has exited, or because it was detached from. The @var{id} field contains the @value{GDBN} identifier of the -thread group. +thread group. The @var{code} field is the exit code of the inferior; +it exists only when the inferior exited with some code. @item =thread-created,id="@var{id}",group-id="@var{gid}" @itemx =thread-exited,id="@var{id}",group-id="@var{gid}" diff --git a/gdb/inferior.c b/gdb/inferior.c index db4dd41..48bb181 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -280,6 +280,9 @@ exit_inferior_1 (struct inferior *inftoex, int silent) inf->vfork_parent->vfork_child = NULL; inf->vfork_parent = NULL; } + + inf->has_exit_code = 0; + inf->exit_code = 0; } void diff --git a/gdb/inferior.h b/gdb/inferior.h index f8adb6c..acae0f7 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -509,6 +509,11 @@ struct inferior /* Private data used by the target vector implementation. */ struct private_inferior *private; + /* HAS_EXIT_CODE is true if the inferior exited with an exit code. + In this case, the EXIT_CODE field is also valid. */ + int has_exit_code; + LONGEST exit_code; + /* We keep a count of the number of times the user has requested a particular syscall to be tracked, and pass this information to the target. This lets capable targets implement filtering directly. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 2d6d523..63f2035 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3298,6 +3298,11 @@ handle_inferior_event (struct execution_control_state *ecs) that the user can inspect this again later. */ set_internalvar_integer (lookup_internalvar ("_exitcode"), (LONGEST) ecs->ws.value.integer); + + /* Also record this in the inferior itself. */ + current_inferior ()->has_exit_code = 1; + current_inferior ()->exit_code = (LONGEST) ecs->ws.value.integer; + gdb_flush (gdb_stdout); target_mourn_inferior (); singlestep_breakpoints_inserted_p = 0; diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index c075b0c..7358b73 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -366,8 +366,14 @@ mi_inferior_exit (struct inferior *inf) struct mi_interp *mi = top_level_interpreter_data (); target_terminal_ours (); - fprintf_unfiltered (mi->event_channel, "thread-group-exited,id=\"i%d\"", - inf->num); + if (inf->has_exit_code) + fprintf_unfiltered (mi->event_channel, + "thread-group-exited,id=\"i%d\",exit-code=\"%s\"", + inf->num, int_string (inf->exit_code, 8, 0, 0, 1)); + else + fprintf_unfiltered (mi->event_channel, + "thread-group-exited,id=\"i%d\"", inf->num); + gdb_flush (mi->event_channel); } diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h index bc95521..f4b3ee2 100644 --- a/gdb/python/py-event.h +++ b/gdb/python/py-event.h @@ -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); diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c index 457a4fe..08150e5 100644 --- a/gdb/python/py-exitedevent.c +++ b/gdb/python/py-exitedevent.c @@ -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; diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index b9df394..eda31b5 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -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 (get_current_arch (), 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);