[PATCH v3] Exit code of exited inferiors in -list-thread-groups

[Simon Marchi <simon dot marchi at ericsson dot com>]

Here is a new version of my patch to show the exit code of exited 
inferiors in -list-thread-groups. I made changes following Pedro's 
comments at:
http://sourceware.org/ml/gdb-patches/2013-06/msg00126.html

This patch depends on this one (fixes to mi test suite):
http://sourceware.org/ml/gdb-patches/2013-06/msg00374.html

gdb/ChangeLog:
2013-06-17  Simon Marchi <simon.marchi@ericsson.com>

	* NEWS: Announce new exit-code field.
	* 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-17  Simon Marchi <simon.marchi@ericsson.com>

	* gdb.mi/mi-exit-code.exp: New file.
	* gdb.mi/mi-exit-code.c: New file.

gdb/doc/ChangeLog:
2013-06-17  Simon Marchi <simon.marchi@ericsson.com>

	* gdb.texinfo: Document new exit-code field.
---
 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   | 29 ++++++++++++++
 gdb/testsuite/gdb.mi/mi-exit-code.exp | 71 
+++++++++++++++++++++++++++++++++++
 6 files changed, 113 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 eea9917..8bd095a 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -76,6 +76,9 @@ show range-stepping

   ** The new command -dprintf-insert sets a dynamic printf breakpoint.

+  ** 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 e6ec4ff..1b4bc7e 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -34513,6 +34513,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 956fc5c..0a10930 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -571,6 +571,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..a523385
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.c
@@ -0,0 +1,29 @@
+/* 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 
<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..50d8530
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-exit-code.exp
@@ -0,0 +1,71 @@
+# 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 <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 mi-exit-code.exp
+    return -1
+}
+
+proc test_list_thread_groups { } {
+    global hex
+    global decimal
+
+    # Check 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 any run"
+
+    mi_run_to_main
+
+    # Check 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 first run"
+
+    # Exit the inferior.
+    mi_send_resuming_command "exec-continue" "continuing to exit 
inferior (first run)"
+    mi_expect_stop "exited-normally" "" "" "" "" "" "exiting inferior 
(first run)"
+
+    # Check 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 first run"
+
+    mi_run_to_main
+
+    # Write the exit code we want in the global var
+    mi_gdb_test "-data-write-memory-bytes &exit_code 08"
+
+    # Check 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 second run"
+
+    # Exit the inferior.
+    mi_send_resuming_command "exec-continue" "continuing to exit 
inferior (second run)"
+    mi_expect_stop "exited" "" "" "" "" "" "exiting inferior (second run)"
+
+    # Check 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 second run"
+
+}
+
+test_list_thread_groups
+
+mi_gdb_exit
+return 0