From patchwork Tue May 13 21:56:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 894 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx23.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 15B783600BE for ; Tue, 13 May 2014 14:56:56 -0700 (PDT) Received: by homiemail-mx23.g.dreamhost.com (Postfix, from userid 14314964) id 4FE8163A6B200; Tue, 13 May 2014 14:56:56 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx23.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx23.g.dreamhost.com (Postfix) with ESMTPS id 304EF63A3E0F0 for ; Tue, 13 May 2014 14:56:56 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; q=dns; s=default; b=kWOSHy9jtmRd1GyD a6W42fjLRe7l29uM2D4O2wVfGfny8d/hmDs7vS0129RQl6JNBIp757B8Zt//yWnN fD79OlssXd+sguQtd16372mpTjM9P41pet235A24hIntq7ze0oFeb6VbXN4HT04b mNyID1i1B0zaAA+3vTgWytyU8JI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; s=default; bh=KfQUbw7YxnnGgSNvoQTZnC seoiU=; b=ypzlmZFHdZCTd0pBBWqkdpXcmY751RBvpK6ASHByxugVcMwlD1wLTj UvS2CLKN5QhB0agynGI2X6nKoE3+qERHzi+IEQsF1mkWbW9csl+EyD1TdCIVQpaQ 43R8Y3RAZ49vej09SCHUXpZWDCHWEK70oYOxt6wxjD56D2gfapvmU= Received: (qmail 9877 invoked by alias); 13 May 2014 21:56:54 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 9860 invoked by uid 89); 13 May 2014 21:56:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 13 May 2014 21:56:52 +0000 Received: from EUSAAHC004.ericsson.se (Unknown_Domain [147.117.188.84]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 5E.57.02831.D5342735; Tue, 13 May 2014 18:07:57 +0200 (CEST) Received: from simark-hp.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.84) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 13 May 2014 17:56:50 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH v5] Exit code of exited inferiors in -list-thread-groups Date: Tue, 13 May 2014 17:56:44 -0400 Message-ID: <1400018204-29559-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in This one was also from a year ago, I would like to make sure it is still OK. Original submission: https://sourceware.org/ml/gdb-patches/2013-06/msg00744.html Don't reset the exit code at inferior exit and print it in -list-thread-groups. gdb/ChangeLog: 2014-05-13 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-05-13 Simon Marchi * gdb.mi/mi-exit-code.exp: New file. * gdb.mi/mi-exit-code.c: New file. gdb/doc/ChangeLog: 2014-05-13 Simon Marchi * gdb.texinfo (Miscellaneous gdb/mi Commands): Document new exit-code field in -list-thread-groups output. --- gdb/NEWS | 5 ++ 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, 130 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 d0c44ea..8c6b536 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -108,6 +108,11 @@ PowerPC64 GNU/Linux little-endian powerpc64le-*-linux* and "assf"), have been deprecated. Use the "sharedlibrary" command, or its alias "share", instead. +* MI changes + + ** 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 2aff5e5..6c19253 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -31134,6 +31134,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 90d9649..6bd1d1b 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 1598af0..d8d66c4 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -616,6 +616,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..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..025879a --- /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 = 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