From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12946 invoked by alias); 25 Jun 2013 20:24:17 -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 12928 invoked by uid 89); 25 Jun 2013 20:24:15 -0000 X-Spam-SWARE-Status: No, score=-4.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,SPF_PASS autolearn=ham version=3.3.1 Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 25 Jun 2013 20:24:13 +0000 Received: from EUSAAHC008.ericsson.se (Unknown_Domain [147.117.188.96]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 4E.84.29608.B6CF9C15; Tue, 25 Jun 2013 22:24:12 +0200 (CEST) Received: from eusaamw0712.eamcs.ericsson.se (147.117.20.181) by EUSAAHC008.ericsson.se (147.117.188.96) with Microsoft SMTP Server (TLS) id 14.2.328.9; Tue, 25 Jun 2013 16:24:11 -0400 Received: from [142.133.110.167] (147.117.20.214) by smtps-am.internal.ericsson.com (147.117.20.181) with Microsoft SMTP Server (TLS) id 8.3.279.1; Tue, 25 Jun 2013 16:24:11 -0400 Message-ID: <51C9FC5B.9020306@ericsson.com> Date: Tue, 25 Jun 2013 20:53:00 -0000 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: GDB Patches Subject: [PATCH v4] Exit code of exited inferiors in -list-thread-groups Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-SW-Source: 2013-06/txt/msg00745.txt.bz2 Don't reset the exit code at inferior exit and print it in -list-thread-groups. Reminder: this patch depends on another one that fixes mi_expect_stop, the last version being this one: http://sourceware.org/ml/gdb-patches/2013-06/msg00736.html gdb/ChangeLog: 2013-06-25 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: 2013-06-25 Simon Marchi * gdb.mi/mi-exit-code.exp: New file. * gdb.mi/mi-exit-code.c: New file. gdb/doc/ChangeLog: 2013-06-25 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 | 3 ++ gdb/testsuite/gdb.mi/mi-exit-code.c | 27 +++++++++++ gdb/testsuite/gdb.mi/mi-exit-code.exp | 88 +++++++++++++++++++++++++++++++++++ 6 files changed, 128 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 b86e8d8..9356683 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -81,6 +81,9 @@ show range-stepping "--skip-unavailable" option. When used, only the available registers are displayed. + ** The -list-thread-groups command outputs an exit-code field for + inferiors that have exited. + * New system-wide configuration scripts A GDB installation now provides scripts suitable for use as system-wide configuration scripts for the following systems: diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index d25cdae..55a1656 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -34516,6 +34516,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 +The exit code of this thread group when it last exited. This field is +only present for thread groups of type @samp{process} and only if the +process is not running. + @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 b9e9a8d..3f111aa 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -276,8 +276,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; } @@ -323,6 +321,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 127f6ff..8adc382 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -572,6 +572,9 @@ 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_string (uiout, "exit-code", + int_string (inferior->exit_code, 8, 0, 0, 1)); 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..564efc7 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.c @@ -0,0 +1,27 @@ +/* Copyright 1999-2013 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 . */ + +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..c68c7cc --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp @@ -0,0 +1,88 @@ +# Copyright 1999-2013 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 = 8" ".*\\^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=\"010\",executable=\".*\"\}\]" \ + "-list-thread-groups after exit shows exit-code" + } +} + +test_list_thread_groups + +mi_gdb_exit +return 0