diff mbox

[4/4,v2] python support for fetching separate debug files: owner

Message ID yjt2y4qn3zhk.fsf@ruffy.mtv.corp.google.com
State New
Headers show

Commit Message

Doug Evans Dec. 4, 2014, 8:56 p.m. UTC
Hi.

This patch is a replacement for
https://sourceware.org/ml/gdb-patches/2014-11/msg00492.html

That patch just added a boolean "is_separate_debug_file" attribute
to gdb.Objfile.  I wanted to keep things minimal/simple, but OTOH
I can see a need for getting the objfile backlink field, and why
have two attributes (is_separate_debug_file and owner) when one will do?

Regression tested on amd64-linux.

2014-12-04  Doug Evans  <dje@google.com>

	* NEWS: Mention gdb.Objfile.owner.
	* python/py-objfile.c (objfpy_get_owner): New function.
	(objfile_getset): Add "owner".

	doc/
	* python.texi (Objfiles In Python): Document Objfile.owner.

	testsuite/
	* gdb.python/py-objfile.exp: Add tests for objfile.owner.

Comments

Eli Zaretskii Dec. 4, 2014, 9:28 p.m. UTC | #1
> From: Doug Evans <dje@google.com>
> Date: Thu, 04 Dec 2014 12:56:55 -0800
> 
> This patch is a replacement for
> https://sourceware.org/ml/gdb-patches/2014-11/msg00492.html
> 
> That patch just added a boolean "is_separate_debug_file" attribute
> to gdb.Objfile.  I wanted to keep things minimal/simple, but OTOH
> I can see a need for getting the objfile backlink field, and why
> have two attributes (is_separate_debug_file and owner) when one will do?
> 
> Regression tested on amd64-linux.
> 
> 2014-12-04  Doug Evans  <dje@google.com>
> 
> 	* NEWS: Mention gdb.Objfile.owner.
> 	* python/py-objfile.c (objfpy_get_owner): New function.
> 	(objfile_getset): Add "owner".
> 
> 	doc/
> 	* python.texi (Objfiles In Python): Document Objfile.owner.
> 
> 	testsuite/
> 	* gdb.python/py-objfile.exp: Add tests for objfile.owner.
> 

OK for the documentation parts.

Thanks.
diff mbox

Patch

diff --git a/gdb/NEWS b/gdb/NEWS
index c30cda2..6a2cb9b 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -21,6 +21,7 @@ 
   ** New attribute 'producer' for gdb.Symtab objects.
   ** gdb.Objfile objects have a new attribute "progspace",
      which is the gdb.Progspace object of the containing program space.
+  ** gdb.Objfile objects have a new attribute "owner".
   ** gdb.Objfile objects have a new attribute "build_id",
      which is the build ID generated when the file was built.
   ** gdb.Objfile objects have a new method "add_separate_debug_file".
diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
index f2e4a6e..efd258d 100644
--- a/gdb/doc/python.texi
+++ b/gdb/doc/python.texi
@@ -3495,6 +3495,14 @@  class.
 The file name of the objfile as a string.
 @end defvar
 
+@defvar Objfile.owner
+For separate debug info objfiles this is the corresponding @code{gdb.Objfile}
+object that debug info is being provided for.
+Otherwise this is @code{None}.
+Separate debug info objfiles are added with the
+@code{gdb.Objfile.add_separate_debug_file} method, described below.
+@end defvar
+
 @defvar Objfile.build_id
 The build ID of the objfile as a string.
 If the objfile does not have a build ID then the value is @code{None}.
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index 292d310..51cf47c 100644
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -80,6 +80,25 @@  objfpy_get_filename (PyObject *self, void *closure)
   Py_RETURN_NONE;
 }
 
+/* If SELF is a separate debug-info file, return the "backlink" field.
+   Otherwise return None.  */
+
+static PyObject *
+objfpy_get_owner (PyObject *self, void *closure)
+{
+  objfile_object *obj = (objfile_object *) self;
+  struct objfile *objfile = obj->objfile;
+  struct objfile *owner;
+
+  OBJFPY_REQUIRE_VALID (obj);
+
+  owner = objfile->separate_debug_objfile_backlink;
+
+  if (owner != NULL)
+    return objfile_to_objfile_object (owner);
+  Py_RETURN_NONE;
+}
+
 /* An Objfile method which returns the objfile's build id, or None.  */
 
 static PyObject *
@@ -442,6 +461,9 @@  static PyGetSetDef objfile_getset[] =
     "The __dict__ for this objfile.", &objfile_object_type },
   { "filename", objfpy_get_filename, NULL,
     "The objfile's filename, or None.", NULL },
+  { "owner", objfpy_get_owner, NULL,
+    "The objfile owner of separate debug info objfiles, or None.",
+    NULL },
   { "build_id", objfpy_get_build_id, NULL,
     "The objfile's build id, or None.", NULL },
   { "progspace", objfpy_get_progspace, NULL,
diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
index 6c36f8e..f3a8a6c 100644
--- a/gdb/testsuite/gdb.python/py-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-objfile.exp
@@ -76,6 +76,9 @@  if ![runto_main] {
 gdb_py_test_silent_cmd "python objfile = gdb.objfiles()\[0\]" \
     "Get no-debug objfile file" 1
 
+gdb_test "python print (objfile.owner)" "None" \
+    "Test owner of real objfile."
+
 gdb_test "p main" "= {<text variable, no debug info>} $hex <main>" \
     "print main without debug info"
 
@@ -85,5 +88,8 @@  gdb_py_test_silent_cmd "python objfile.add_separate_debug_file(\"${binfile}\")"
 gdb_py_test_silent_cmd "python sep_objfile = gdb.objfiles()\[0\]" \
     "Get separate debug info objfile" 1
 
+gdb_test "python print (sep_objfile.owner.filename)" "${testfile}2" \
+    "Test owner of separate debug file"
+
 gdb_test "p main" "= {int \\(\\)} $hex <main>" \
     "print main with debug info"