gdb

	* python/py-inferior.c (python_inferior_exit): Use inferior's exit
	code fields.
	* python/py-exitedevent.c (create_exited_event_object): Change
	type of 'exit_code'.  Optionally add exit_code attribute.
	(emit_exited_event): Change type of 'exit_code'.
	* python/py-event.h (emit_exited_event): Update.
	* mi/mi-interp.c (mi_inferior_exit): Print exit code.
	* infrun.c (handle_inferior_event): Set exit code fields on
	inferior.
	* inferior.h (struct inferior) <has_exit_code, exit_code>: New
	fields.
	* inferior.c (exit_inferior_1): Initialize new fields.
gdb/doc
	* gdb.texinfo (GDB/MI Async Records): Document 'exit-code' field.
	(Events In Python): Note that exit_code is optional.

10 files changed, 59 insertions, 20 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 97a30af6abb..50e7a98469b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,20 @@
 2011-06-03  Tom Tromey  <tromey@redhat.com>
 
+	* python/py-inferior.c (python_inferior_exit): Use inferior's exit
+	code fields.
+	* python/py-exitedevent.c (create_exited_event_object): Change
+	type of 'exit_code'.  Optionally add exit_code attribute.
+	(emit_exited_event): Change type of 'exit_code'.
+	* python/py-event.h (emit_exited_event): Update.
+	* mi/mi-interp.c (mi_inferior_exit): Print exit code.
+	* infrun.c (handle_inferior_event): Set exit code fields on
+	inferior.
+	* inferior.h (struct inferior) <has_exit_code, exit_code>: New
+	fields.
+	* inferior.c (exit_inferior_1): Initialize new fields.
+
+2011-06-03  Tom Tromey  <tromey@redhat.com>
+
 	* dwarf2expr.c (get_signed_type): New function.
 	(execute_stack_op) <DW_OP_shra>: Always perform a signed shift.
 
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 0469b0ae558..7366ad99a27 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-03  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.texinfo (GDB/MI Async Records): Document 'exit-code' field.
+	(Events In Python): Note that exit_code is optional.
+
 2011-05-17  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.texinfo (Remote Protocol) <Overview>: Mention vCont is
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 584a52043f4..3a705c2c575 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22127,7 +22127,9 @@ inherited attribute refer to @code{gdb.ThreadEvent} above.
 
 @item events.exited
 Emits @code{events.ExitedEvent} which indicates that the inferior has exited.
-@code{events.ExitedEvent} has one attribute:
+@code{events.ExitedEvent} has one optional attribute.  This attribute
+will exist only in the case that the inferior exited with some
+status.
 @table @code
 @defivar ExitedEvent exit_code
 An integer representing the exit code which the inferior has returned.
@@ -25199,11 +25201,12 @@ was attached to a program.  The @var{id} field contains the
 @value{GDBN} identifier of the thread group.  The @var{pid} field
 contains process identifier, specific to the operating system.
 
-@itemx =thread-group-exited,id="@var{id}"
+@item =thread-group-exited,id="@var{id}"[,exit-code="@var{code}"]
 A thread group is no longer associated with a running program,
 either because the program has exited, or because it was detached
 from.  The @var{id} field contains the @value{GDBN} identifier of the
-thread group.
+thread group.  @var{code} is the exit code of the inferior; it exists
+only when the inferior exited with some code.
 
 @item =thread-created,id="@var{id}",group-id="@var{gid}"
 @itemx =thread-exited,id="@var{id}",group-id="@var{gid}"
diff --git a/gdb/inferior.c b/gdb/inferior.c
index d3e3585a334..bfdbf302a40 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -281,6 +281,9 @@ exit_inferior_1 (struct inferior *inftoex, int silent)
       inf->vfork_parent->vfork_child = NULL;
       inf->vfork_parent = NULL;
     }
+
+  inf->has_exit_code = 0;
+  inf->exit_code = 0;
 }
 
 void
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 9982a7a5379..346bb87a02d 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -517,6 +517,11 @@ struct inferior
   /* Private data used by the target vector implementation.  */
   struct private_inferior *private;
 
+  /* HAS_EXIT_CODE is true if the inferior exited with an exit code.
+     In this case, the EXIT_CODE field is also valid.  */
+  int has_exit_code;
+  LONGEST exit_code;
+
   /* We keep a count of the number of times the user has requested a
      particular syscall to be tracked, and pass this information to the
      target.  This lets capable targets implement filtering directly.  */
diff --git a/gdb/infrun.c b/gdb/infrun.c
index e0d808ae255..e0df5716476 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3308,6 +3308,11 @@ handle_inferior_event (struct execution_control_state *ecs)
          that the user can inspect this again later.  */
       set_internalvar_integer (lookup_internalvar ("_exitcode"),
 			       (LONGEST) ecs->ws.value.integer);
+
+      /* Also record this in the inferior itself.  */
+      current_inferior ()->has_exit_code = 1;
+      current_inferior ()->exit_code = (LONGEST) ecs->ws.value.integer;
+
       gdb_flush (gdb_stdout);
       target_mourn_inferior ();
       singlestep_breakpoints_inserted_p = 0;
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index c075b0c0b49..7358b7344e3 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -366,8 +366,14 @@ mi_inferior_exit (struct inferior *inf)
   struct mi_interp *mi = top_level_interpreter_data ();
 
   target_terminal_ours ();
-  fprintf_unfiltered (mi->event_channel, "thread-group-exited,id=\"i%d\"",
-		      inf->num);
+  if (inf->has_exit_code)
+    fprintf_unfiltered (mi->event_channel,
+			"thread-group-exited,id=\"i%d\",exit-code=\"%s\"",
+			inf->num, int_string (inf->exit_code, 8, 0, 0, 1));
+  else
+    fprintf_unfiltered (mi->event_channel,
+			"thread-group-exited,id=\"i%d\"", inf->num);
+
   gdb_flush (mi->event_channel);  
 }
 
diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h
index bc955210a3a..f4b3ee25696 100644
--- a/gdb/python/py-event.h
+++ b/gdb/python/py-event.h
@@ -104,7 +104,7 @@ typedef struct
 } event_object;
 
 extern int emit_continue_event (ptid_t ptid);
-extern int emit_exited_event (LONGEST exit_code);
+extern int emit_exited_event (const LONGEST *exit_code);
 
 extern int evpy_emit_event (PyObject *event,
                             eventregistry_object *registry);
diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c
index 457a4fe73eb..08150e567f9 100644
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -21,8 +21,8 @@
 
 static PyTypeObject exited_event_object_type;
 
-PyObject *
-create_exited_event_object (LONGEST exit_code)
+static PyObject *
+create_exited_event_object (const LONGEST *exit_code)
 {
   PyObject *exited_event;
 
@@ -31,9 +31,10 @@ create_exited_event_object (LONGEST exit_code)
   if (!exited_event)
     goto fail;
 
-  if (evpy_add_attribute (exited_event,
-                          "exit_code",
-                          PyLong_FromLongLong (exit_code)) < 0)
+  if (exit_code
+      && evpy_add_attribute (exited_event,
+			     "exit_code",
+			     PyLong_FromLongLong (*exit_code)) < 0)
     goto fail;
 
   return exited_event;
@@ -47,7 +48,7 @@ create_exited_event_object (LONGEST exit_code)
    will create a new Python exited event object.  */
 
 int
-emit_exited_event (LONGEST exit_code)
+emit_exited_event (const LONGEST *exit_code)
 {
   PyObject *event;
 
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 45f5f04c07e..da0a4b68156 100644
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -112,18 +112,14 @@ static void
 python_inferior_exit (struct inferior *inf)
 {
   struct cleanup *cleanup;
-  LONGEST exit_code = -1;
-  ptid_t ptidp;
-  struct target_waitstatus status;
+  const LONGEST *exit_code = NULL;
 
   cleanup = ensure_python_env (target_gdbarch, current_language);
 
-  get_last_target_status (&ptidp, &status);
+  if (inf->has_exit_code)
+    exit_code = &inf->exit_code;
 
-  exit_code = status.value.integer;
-
-  if (exit_code >= 0
-      && emit_exited_event (exit_code) < 0)
+  if (emit_exited_event (exit_code) < 0)
     gdbpy_print_stack ();
 
   do_cleanups (cleanup);