Refactor Python "gdb" module into a proper Python package, by introducing

[binutils.git] / gdb / python / py-exitedevent.c

diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c
index 457a4fe73eb37f336b6d55e96dd99977558f6076..d062f5f736c7c95f668b0efe5d198cf283b4fbed 100644 (file)
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -1,6 +1,6 @@
 /* Python interface to inferior exit events.
 
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,40 +21,59 @@
 
 static PyTypeObject exited_event_object_type;
 
-PyObject *
-create_exited_event_object (LONGEST exit_code)
+static PyObject *
+create_exited_event_object (const LONGEST *exit_code, struct inferior *inf)
 {
   PyObject *exited_event;
+  PyObject *inf_obj = NULL;
 
   exited_event = create_event_object (&exited_event_object_type);
 
   if (!exited_event)
     goto fail;
 
-  if (evpy_add_attribute (exited_event,
-                          "exit_code",
-                          PyLong_FromLongLong (exit_code)) < 0)
+  if (exit_code)
+    {
+      PyObject *exit_code_obj = PyLong_FromLongLong (*exit_code);
+      int failed;
+
+      if (exit_code_obj == NULL)
+       goto fail;
+
+      failed = evpy_add_attribute (exited_event, "exit_code",
+                                  exit_code_obj) < 0;
+      Py_DECREF (exit_code_obj);
+      if (failed)
+       goto fail;
+    }
+
+  inf_obj = inferior_to_inferior_object (inf);
+  if (!inf_obj || evpy_add_attribute (exited_event,
+                                      "inferior",
+                                      inf_obj) < 0)
     goto fail;
+  Py_DECREF (inf_obj);
 
   return exited_event;
 
-  fail:
-   Py_XDECREF (exited_event);
-   return NULL;
+ fail:
+  Py_XDECREF (inf_obj);
+  Py_XDECREF (exited_event);
+  return NULL;
 }
 
 /* Callback that is used when an exit event occurs.  This function
    will create a new Python exited event object.  */
 
 int
-emit_exited_event (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);