From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1919 invoked by alias); 2 Jun 2014 18:30:43 -0000 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 Received: (qmail 1903 invoked by uid 89); 2 Jun 2014 18:30:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 02 Jun 2014 18:30:41 +0000 Received: from EUSAAHC008.ericsson.se (Unknown_Domain [147.117.188.96]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 64.95.27529.4727C835; Mon, 2 Jun 2014 14:47:48 +0200 (CEST) Received: from [142.133.110.254] (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.96) with Microsoft SMTP Server (TLS) id 14.3.174.1; Mon, 2 Jun 2014 14:30:38 -0400 Message-ID: <538CC2CD.9040309@ericsson.com> Date: Mon, 02 Jun 2014 18:30:00 -0000 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Pedro Alves , Tom Tromey CC: Subject: Re: [PATCH v5] Exit code of exited inferiors in -list-thread-groups References: <1400018204-29559-1-git-send-email-simon.marchi@ericsson.com> <87mweh31qi.fsf@fleche.redhat.com> <537CE38B.7040000@ericsson.com> <537CEBCB.5020401@redhat.com> In-Reply-To: <537CEBCB.5020401@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2014-06/txt/msg00035.txt.bz2 On 14-05-21 02:09 PM, Pedro Alves wrote: > On 05/21/2014 06:34 PM, Simon Marchi wrote: >> On Fri 16 May 2014 04:30:45 PM EDT, Tom Tromey wrote: >>>>>>>> "Simon" == Simon Marchi writes: >>> >>> Simon> This one was also from a year ago, I would like to make sure it is still >>> Simon> OK. >>> >>> Simon> + if (inferior->has_exit_code) >>> Simon> + ui_out_field_string (uiout, "exit-code", >>> Simon> + int_string (inferior->exit_code, 8, 0, 0, 1)); >>> >>> Why not the simpler ui_out_field_int? >>> Going out of the way to print it in octal seems a bit odd for a machine >>> interface. >>> >>> Tom >> >> Agreed. I found that the exit code is often represented in octal (the >> reason for this probably predates my birth). But for MI, it does not >> matter. > > Though it might be a little less surprising if all places that print > the exit code print it the same way. That way it's possible that > frontends just treat the exit code as a string, and present it as > is to the user. They may already be doing that. This is not a complex field to parse and output in whatever format. I don't see any value in leaving it octal just to save that amount of work to frontends. I mean, if a frontend can't parse a decimal number, how in the world does it use the rest of the MI. ;) To the doc change suggested by Eli, I added a precision about the base of the value. Including the doc change and the printing in decimal, does it look good ? See updated patch below. Simon ----------------------- >From c746bc18ab8cce63b8c7f7ef16b92535b8cc2a09 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 12 May 2014 16:18:25 -0400 Subject: [PATCH] Exit code of exited inferiors in -list-thread-groups Don't reset the exit code at inferior exit and print it in -list-thread-groups. gdb/ChangeLog: 2014-06-02 Simon Marchi * NEWS: Announce new exit-code field in -list-thread-groups output. * inferior.c (exit_inferior_1): Don't clear exit code. (inferior_appeared): Clear exit code. * mi/mi-main.c (print_one_inferior): Add printing of the exit code. gdb/testsuite/ChangeLog: 2014-06-02 Simon Marchi * gdb.mi/mi-exit-code.exp: New file. * gdb.mi/mi-exit-code.c: New file. gdb/doc/ChangeLog: 2014-06-02 Simon Marchi * gdb.texinfo (Miscellaneous gdb/mi Commands): Document new exit-code field in -list-thread-groups output. --- gdb/NEWS | 3 ++ gdb/doc/gdb.texinfo | 5 ++ gdb/inferior.c | 4 +- gdb/mi/mi-main.c | 2 + gdb/testsuite/gdb.mi/mi-exit-code.c | 27 +++++++++++ gdb/testsuite/gdb.mi/mi-exit-code.exp | 88 +++++++++++++++++++++++++++++++++++ 6 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.mi/mi-exit-code.c create mode 100644 gdb/testsuite/gdb.mi/mi-exit-code.exp diff --git a/gdb/NEWS b/gdb/NEWS index 8b57bd9..973526a 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -176,6 +176,9 @@ PowerPC64 GNU/Linux little-endian powerpc64le-*-linux* Previously "-gdb-set target-async off" affected both MI execution commands and CLI execution commands. + ** The -list-thread-groups command outputs an exit-code field for + inferiors that have exited. + *** Changes in GDB 7.7 * Improved support for process record-replay and reverse debugging on diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9f7fa18..1c71664 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -31229,6 +31229,11 @@ valid type. The target-specific process identifier. This field is only present for thread groups of type @samp{process} and only if the process exists. +@item exit-code +If this thread group is a @samp{process} that exited, this field is the +exit code of that inferior process in decimal form. Otherwise, the field +is not present. + @item num_children The number of children this thread group has. This field may be absent for an available thread group. diff --git a/gdb/inferior.c b/gdb/inferior.c index 23da0c7..66401ab 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -275,8 +275,6 @@ exit_inferior_1 (struct inferior *inftoex, int silent) inf->vfork_child = NULL; } - inf->has_exit_code = 0; - inf->exit_code = 0; inf->pending_detach = 0; } @@ -322,6 +320,8 @@ void inferior_appeared (struct inferior *inf, int pid) { inf->pid = pid; + inf->has_exit_code = 0; + inf->exit_code = 0; observer_notify_inferior_appeared (inf); } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 96dfc71..b908f76 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -659,6 +659,8 @@ print_one_inferior (struct inferior *inferior, void *xdata) ui_out_field_fmt (uiout, "id", "i%d", inferior->num); ui_out_field_string (uiout, "type", "process"); + if (inferior->has_exit_code) + ui_out_field_int (uiout, "exit-code", inferior->exit_code); if (inferior->pid != 0) ui_out_field_int (uiout, "pid", inferior->pid); diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.c b/gdb/testsuite/gdb.mi/mi-exit-code.c new file mode 100644 index 0000000..df711a6 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.c @@ -0,0 +1,27 @@ +/* Copyright 1999-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see http://www.gnu.org/licenses/>. */ + +int exit_code = 0; + +int +main (int argc, char **argv) +{ + if (argc > 1) + exit_code = atoi (argv[1]); + + return exit_code; +} diff --git a/gdb/testsuite/gdb.mi/mi-exit-code.exp b/gdb/testsuite/gdb.mi/mi-exit-code.exp new file mode 100644 index 0000000..5c072f9 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp @@ -0,0 +1,88 @@ +# Copyright 1999-2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +standard_testfile + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + untested "failed to compile $testfile" + return -1 +} + +proc test_list_thread_groups { } { + global hex + global decimal + + # Before any run, exit-code should not be present. + mi_gdb_test \ + "122-list-thread-groups" \ + "122\\^done,groups=\\\[\{id=\"i1\",type=\"process\"\}\]" \ + "-list-thread-groups before run shows no exit-code" + + with_test_prefix "first run" { + mi_run_to_main + + # During the run, exit-code should not be present. + mi_gdb_test \ + "123-list-thread-groups" \ + "123\\^done,groups=\\\[\{id=\"i1\",type=\"process\",pid=\"$decimal\",executable=\".*\".*" \ + "-list-thread-groups during run shows no exit-code" + + # Exit the inferior. + mi_send_resuming_command "exec-continue" "continuing to inferior exit" + mi_expect_stop "exited-normally" "" "" "" "" "" "exit normally" + + # After the run, exit-code should be present. + mi_gdb_test \ + "124-list-thread-groups" \ + "124\\^done,groups=\\\[\{id=\"i1\",type=\"process\",exit-code=\"0\",executable=\".*\"\}\]" \ + "-list-thread-groups after exit shows exit-code" + } + + with_test_prefix "second run" { + mi_run_to_main + + # Write the exit code we want in the global var + mi_gdb_test "set var exit_code = 12" ".*\\^done" "write exit code" + + # During the second run, exit-code should not be present. + mi_gdb_test \ + "125-list-thread-groups" \ + "125\\^done,groups=\\\[\{id=\"i1\",type=\"process\",pid=\"$decimal\",executable=\".*\".*" \ + "-list-thread-groups during run shows no exit-code" + + # Exit the inferior. + mi_send_resuming_command "exec-continue" "continuing to inferior exit" + mi_expect_stop "exited" "" "" "" "" "" "exit with code" + + # After the second run, exit-code should be present. + mi_gdb_test \ + "126-list-thread-groups" \ + "126\\^done,groups=\\\[\{id=\"i1\",type=\"process\",exit-code=\"12\",executable=\".*\"\}\]" \ + "-list-thread-groups after exit shows exit-code" + } +} + +test_list_thread_groups + +mi_gdb_exit +return 0 -- 2.0.0