aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2014-09-29 17:33:09 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2014-10-01 10:20:49 -0400
commit2ddf4301102f7a78a03bccf86051a63111b1fcc1 (patch)
tree3b82b7ae469e0201f1d6008bac6e9c7570a4729d /gdb
parent5fdeec1db01500cda1fa46be582fecc69ed1d1a3 (diff)
downloadfsf-binutils-gdb-2ddf4301102f7a78a03bccf86051a63111b1fcc1.zip
fsf-binutils-gdb-2ddf4301102f7a78a03bccf86051a63111b1fcc1.tar.gz
fsf-binutils-gdb-2ddf4301102f7a78a03bccf86051a63111b1fcc1.tar.bz2
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: * 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: * gdb.mi/mi-exit-code.exp: New file. * gdb.mi/mi-exit-code.c: New file. gdb/doc/ChangeLog: * gdb.texinfo (Miscellaneous gdb/mi Commands): Document new exit-code field in -list-thread-groups output.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/NEWS5
-rw-r--r--gdb/doc/ChangeLog5
-rw-r--r--gdb/doc/gdb.texinfo5
-rw-r--r--gdb/inferior.c4
-rw-r--r--gdb/mi/mi-main.c3
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.mi/mi-exit-code.c27
-rw-r--r--gdb/testsuite/gdb.mi/mi-exit-code.exp88
9 files changed, 149 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abb5513..8a268c5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-01 Simon Marchi <simon.marchi@ericsson.com>
+
+ * 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.
+
2014-10-01 Pedro Alves <palves@redhat.com>
* features/Makefile ($(outdir)/%.dat): Output "THIS FILE IS
diff --git a/gdb/NEWS b/gdb/NEWS
index 11326f1..b56fe8e 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -40,6 +40,11 @@ queue-signal signal-name-or-number
even in non-stop mode. The "auto" mode has been removed, and "off"
is now the default mode.
+* MI changes
+
+ ** The -list-thread-groups command outputs an exit-code field for
+ inferiors that have exited.
+
*** Changes in GDB 7.8
* New command line options
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 9a4bc09..d5e79e7 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01 Simon Marchi <simon.marchi@ericsson.com>
+
+ * gdb.texinfo (Miscellaneous gdb/mi Commands): Document new
+ exit-code field in -list-thread-groups output.
+
2014-09-22 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* gdb.texinfo (Set Breaks): Add missing "@end table".
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 026706a..429c650 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -31152,6 +31152,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 group's last exited thread, formatted in octal.
+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 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 59717ca..4d35ff0 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -658,6 +658,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/ChangeLog b/gdb/testsuite/ChangeLog
index b7cc1c6..cd17e5d1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01 Simon Marchi <simon.marchi@ericsson.com>
+
+ * gdb.mi/mi-exit-code.exp: New file.
+ * gdb.mi/mi-exit-code.c: New file.
+
2014-09-30 Yao Qi <yao@codesourcery.com>
* lib/prelink-support.exp (build_executable_own_libs): Error if
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 <http://www.gnu.org/licenses/>.
+
+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