2011-10-04 Kevin Pouget <kevin.pouget@st.com>

       PR python/12691: Add the inferior to Python exited event
       * python/py-exitedevent.c (create_exited_event_object): Add inferior
       to exited_event.
       * python/py-event.h (emit_exited_event): Likewise
       * python/-inferior.c (python_inferior_exit): Likewise

 2011-10-04  Kevin Pouget  <kevin.pouget@st.com>

       PR python/12691: Add the inferior to Python exited event
       * gdb.python/py-events.exp: Test the inferior attribute of exited
       event with a fork.
       * gdb.python/py-events.py: Print inferior number on exit.
       * gdb.python/py-events.c: Fork the inferior.

 2011-10-04  Kevin Pouget  <kevin.pouget@st.com>

       PR python/12691: Add the inferior to Python exited event
       * gdb.texinfo (Events In Python): Describe exited inferior attribute.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 191ac2f9af0b80cc53caa29939174f454aae4cd7..5ea2c05f67d2f62748072d016b9d21071e01ee71 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-04  Kevin Pouget  <kevin.pouget@st.com>
+
+       PR python/12691: Add the inferior to Python exited event
+       * python/py-exitedevent.c (create_exited_event_object): Add inferior
+       to exited_event.
+       * python/py-event.h (emit_exited_event): Likewise
+       * python/-inferior.c (python_inferior_exit): Likewise
+
 2011-10-03  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-tasks.c (print_ada_task_info): Add "thread-id" field

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 262c656a83ba2cdaa47b00c6a73f6f9e56c6459a..4ccd64ca19624a53afa280c5e6e6056578c2af42 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04  Kevin Pouget  <kevin.pouget@st.com>
+
+       PR python/12691: Add the inferior to Python exited event
+       * gdb.texinfo (Events In Python): Describe exited inferior attribute.
+
 2011-10-03  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.texinfo (GDB/MI Miscellaneous Commands): Minor

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index aa7cdca457f020788fa952b370fc760c15a9a45c..dd0f7f61c0d7b47156f6232e15dc0f74957fb615 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22306,12 +22306,16 @@ 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 optional attribute.  This attribute
-will exist only in the case that the inferior exited with some
-status.
+@code{events.ExitedEvent} has two attributes:
 @table @code
 @defvar ExitedEvent.exit_code
-An integer representing the exit code which the inferior has returned.
+An integer representing the exit code, if available, which the inferior 
+has returned.  (The exit code could be unavailable if, for example,
+@value{GDBN} detaches from the inferior.) If the exit code is unavailable,
+the attribute does not exist.
+@end defvar
+@defvar ExitedEvent inferior
+A reference to the inferior which triggered the @code{exited} event.
 @end defvar
 @end table
 

diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h
index f4b3ee2569633af0ee31845ddcec275812ba3114..49d7b6a78acd226a9da5a60f9877f28cf4db7332 100644 (file)
--- 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 (const LONGEST *exit_code);
+extern int emit_exited_event (const LONGEST *exit_code, struct inferior *inf);
 
 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 08150e567f923457ff5d8d2a9a4302a784bb312f..85ea2e2a81bca26dcdc39f853151e41459a2f4d8 100644 (file)
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -22,9 +22,10 @@
 static PyTypeObject exited_event_object_type;
 
 static PyObject *
-create_exited_event_object (const LONGEST *exit_code)
+create_exited_event_object (const LONGEST *exit_code, struct inferior *inf)
 {
   PyObject *exited_event;
+  PyObject *inf_obj;
 
   exited_event = create_event_object (&exited_event_object_type);
 
@@ -37,6 +38,12 @@ create_exited_event_object (const LONGEST *exit_code)
                             PyLong_FromLongLong (*exit_code)) < 0)
     goto fail;
 
+  inf_obj = inferior_to_inferior_object (inf);
+  if (!inf_obj || evpy_add_attribute (exited_event,
+                                      "inferior",
+                                      inf_obj) < 0)
+    goto fail;
+
   return exited_event;
 
   fail:
@@ -48,14 +55,14 @@ create_exited_event_object (const LONGEST *exit_code)
    will create a new Python exited event object.  */
 
 int
-emit_exited_event (const LONGEST *exit_code)
+emit_exited_event (const LONGEST *exit_code, struct inferior *inf)
 {
   PyObject *event;
 
   if (evregpy_no_listeners_p (gdb_py_events.exited))
     return 0;
 
-  event = create_exited_event_object (exit_code);
+  event = create_exited_event_object (exit_code, inf);
 
   if (event)
     return evpy_emit_event (event, gdb_py_events.exited);

diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 8ed3ea5ef5529a8c524163bfb8540a72fb352087..275caea8ba716f487e8f776a4ff65d7307c2df18 100644 (file)
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -119,7 +119,7 @@ python_inferior_exit (struct inferior *inf)
   if (inf->has_exit_code)
     exit_code = &inf->exit_code;
 
-  if (emit_exited_event (exit_code) < 0)
+  if (emit_exited_event (exit_code, inf) < 0)
     gdbpy_print_stack ();
 
   do_cleanups (cleanup);

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9b5ff14c394758a4b3ea9e29b3350e20aec09b10..125316eaa0cf3eebdbae061ebb92e6f2587dd42d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-04  Kevin Pouget  <kevin.pouget@st.com>
+
+       PR python/12691: Add the inferior to Python exited event
+       * gdb.python/py-events.exp: Test the inferior attribute of exited
+       event with a fork.
+       * gdb.python/py-events.py: Print inferior number on exit.
+       * gdb.python/py-events.c: Fork the inferior.
+
 2011-10-03  Edjunior Machado  <emachado@linux.vnet.ibm.com>
 
        * gdb.base/jit.exp: Add testcase name to log message

diff --git a/gdb/testsuite/gdb.python/py-events.c b/gdb/testsuite/gdb.python/py-events.c
index ceb697ea279ab3c485cdabd999567b6cc3e3b3b9..665ca51ec541b7e6c945babbec88476a384ff615 100644 (file)
--- a/gdb/testsuite/gdb.python/py-events.c
+++ b/gdb/testsuite/gdb.python/py-events.c
@@ -17,6 +17,7 @@
 */
 
 int second(){
+  fork() ;
   return 12;
 }
 

diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 2d2139d1fd28030f9ca9e66945878233e5c8a4c5..18419fae1fad9582faa49c49918bea20d30627b5 100644 (file)
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -37,6 +37,8 @@ if ![runto_main ] then {
     return -1
 }
 
+gdb_test_no_output "set detach-on-fork off" ""
+
 gdb_test "Test_Events" "Event testers registered."
 
 gdb_breakpoint "first"
@@ -54,4 +56,11 @@ all threads stopped"
 #test exited event.
 gdb_test "continue" ".*event type: continue.*
 .*event type: exit.*
-.*exit code: 12.*"
+.*exit code: 12.*
+.*exit inf: 1.*" "Inferior 1 terminated."
+
+gdb_test "inferior 2" ".*Switching to inferior 2.*"
+gdb_test "continue" ".*event type: continue.*
+.*event type: exit.*
+.*exit code: 12.*
+.*exit inf: 2.*" "Inferior 2 terminated."

diff --git a/gdb/testsuite/gdb.python/py-events.py b/gdb/testsuite/gdb.python/py-events.py
index 10aea4f5d218c74f603cf166f35c7494d707f67f..6bdd935f3a516e1d160f53d85fb2f62969286179 100644 (file)
--- a/gdb/testsuite/gdb.python/py-events.py
+++ b/gdb/testsuite/gdb.python/py-events.py
@@ -43,6 +43,7 @@ def exit_handler (event):
     if (isinstance (event, gdb.ExitedEvent)):
         print "event type: exit"
     print "exit code: %d" % (event.exit_code)
+    print "exit inf: %d" % (event.inferior.num)
 
 def continue_handler (event):
     if (isinstance (event, gdb.ContinueEvent)):