Re: [PATCH] PR/12691 Add the inferior to Python exited event

[Kevin Pouget <kevin.pouget@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2675 bytes --]

On Thu, Sep 1, 2011 at 1:08 PM, Kevin Pouget <kevin.pouget@gmail.com> wrote:
> On Thu, Sep 1, 2011 at 12:07 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>>> From: Kevin Pouget <kevin.pouget@gmail.com>
>>> Date: Thu, 1 Sep 2011 10:44:39 +0200
>>> Cc: Tom Tromey <tromey@redhat.com>, gdb-patches@sourceware.org
>>>
>>> On Wed, Aug 31, 2011 at 7:56 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>>> >> From: Tom Tromey <tromey@redhat.com>
>>> >> Cc: Kevin Pouget <kevin.pouget@gmail.com>, gdb-patches@sourceware.org
>>> >> Date: Wed, 31 Aug 2011 11:53:21 -0600
>>> >>
>>> >> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
>>> >>
>>> >> Eli> I'd still like to hear from someone "in the know" how is it possible
>>> >> Eli> that the exit code won't be available, but let's not block the commit
>>> >> Eli> on that behalf.
>>> >>
>>> >> It can happen at least on detach.
>>> >
>>> > Right, thanks.  Perhaps we should mention that in parentheses.
>>> >
>>>
>>> do you want it to appear in my patch, something like
>>>
>>> > Optional, will exist only in the case that the inferior exited with some status---i.e., not detached)
>>>
>>> along with
>>>
>>> >> +An integer representing the exit code which the inferior has returned.
>>> > I think we would be better off without that "has" word.
>>>
>>> ?
>>
>> No, I meant something like
>>
>>  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.)
>>
>
> right, I've updated the patch, is it fine for you ?
>
>
> thanks,
>
> Kevin
>
> 2011-09-20  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-09-01  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-09-01  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.
>

ping

Eli, could you confirm that you agree with the last version of the
documentation?

Thanks,

Kevin

[-- Attachment #2: 0001-PR-12691-Add-the-inferior-to-Python-exited-event.patch --]
[-- Type: text/x-patch, Size: 3687 bytes --]

From 4d6bbef65231e37144b6b17ecd4c76bf629cf111 Mon Sep 17 00:00:00 2001
From: Kevin Pouget <kevin.pouget@st.com>
Date: Wed, 31 Aug 2011 16:32:45 +0200
Subject: [PATCH] PR/12691 Add the inferior to Python exited event

---
 gdb/doc/gdb.texinfo                    |   11 +++++++----
 gdb/python/py-exitedevent.c            |    6 ++++++
 gdb/testsuite/gdb.python/py-events.c   |    1 +
 gdb/testsuite/gdb.python/py-events.exp |   11 ++++++++++-
 gdb/testsuite/gdb.python/py-events.py  |    1 +
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 23b2a98..795334d 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22285,12 +22285,15 @@ 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
 @defivar 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.)
+@end defivar
+@defivar ExitedEvent inferior
+A reference to the inferior which triggered the @{exited} event.
 @end defivar
 @end table
 
diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c
index 08150e5..5ee6eb8 100644
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -37,6 +37,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:
diff --git a/gdb/testsuite/gdb.python/py-events.c b/gdb/testsuite/gdb.python/py-events.c
index ceb697e..665ca51 100644
--- 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 e5d6daf..cdf4ae6 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -42,6 +42,8 @@ if ![runto_main ] then {
     return -1
 }
 
+gdb_test_no_output "set detach-on-fork off" "Don't detach on fork"
+
 gdb_test "Test_Events" "Event testers registered."
 
 gdb_breakpoint "first"
@@ -56,4 +58,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 1 terminated."
diff --git a/gdb/testsuite/gdb.python/py-events.py b/gdb/testsuite/gdb.python/py-events.py
index 9f05b9f..b40f074 100644
--- a/gdb/testsuite/gdb.python/py-events.py
+++ b/gdb/testsuite/gdb.python/py-events.py
@@ -41,6 +41,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)):
-- 
1.7.6