From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31395 invoked by alias); 21 Apr 2011 12:26:31 -0000 Received: (qmail 31384 invoked by uid 22791); 21 Apr 2011 12:26:30 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RFC_ABUSE_POST,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-vx0-f169.google.com (HELO mail-vx0-f169.google.com) (209.85.220.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 21 Apr 2011 12:26:16 +0000 Received: by vxk20 with SMTP id 20so1625515vxk.0 for ; Thu, 21 Apr 2011 05:26:15 -0700 (PDT) Received: by 10.52.179.103 with SMTP id df7mr1074051vdc.148.1303388775306; Thu, 21 Apr 2011 05:26:15 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.61.6 with HTTP; Thu, 21 Apr 2011 05:25:55 -0700 (PDT) From: Kevin Pouget Date: Thu, 21 Apr 2011 12:26:00 -0000 Message-ID: Subject: [Patch] PR Python/12692 Add gdb.selected_inferior() to Python interface. To: gdb-patches@sourceware.org Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-04/txt/msg00389.txt.bz2 Hello, I would like to introduce a new Python function, `gdb.selected_inferior()', which returns the Python obj corresponding to current_inferior; let me know what you think about it. I named the function `selected_inferior' according to the existing `selected_thread'. Cordially, Kevin -- 2011-04-21 Kevin Pouget PR Python/12692 Add gdb.selected_inferior() to Python interface. * gdb.texinfo (Inferiors In Python): Describe new gdb.selected_inferior() function. 2011-04-21 Kevin Pouget PR Python/12692 Add gdb.selected_inferior() to Python interface. * python/py-inferior.c (GdbMethods): New Python method definition. 2011-04-21 Kevin Pouget PR Python/12692 Add gdb.selected_inferior() to Python interface. * gdb.python/py-inferior.exp: Add testcase for gdb.selected_inferior(). --- gdb/doc/gdb.texinfo | 4 ++++ gdb/python/py-inferior.c | 13 +++++++++++++ gdb/python/python-internal.h | 1 + gdb/python/python.c | 3 +++ gdb/testsuite/gdb.python/py-inferior.exp | 12 ++++++++++-- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index c71d664..c2cd093 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -21916,6 +21916,10 @@ module: Return a tuple containing all inferior objects. @end defun +@defun selected_inferior +Return an object representing the current inferior. +@end defun + A @code{gdb.Inferior} object has the following attributes: @table @code diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index b9df394..46858c6 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -620,6 +620,19 @@ infpy_is_valid (PyObject *self, PyObject *args) Py_RETURN_TRUE; } +/* Implementation of gdb.selected_inferior() -> gdb.Inferior. + Returns the current inferior object. */ + +PyObject * +gdbpy_selected_inferior (PyObject *self, PyObject *args) +{ + PyObject *inf_obj; + + inf_obj = inferior_to_inferior_object (current_inferior()); + Py_INCREF (inf_obj); + + return inf_obj; +} /* Clear the INFERIOR pointer in an Inferior object and clear the thread list. */ diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index d3cb788..025add9 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -147,6 +147,7 @@ PyObject *gdbpy_create_lazy_string_object (CORE_ADDR address, long length, struct type *type); PyObject *gdbpy_inferiors (PyObject *unused, PyObject *unused2); PyObject *gdbpy_selected_thread (PyObject *self, PyObject *args); +PyObject *gdbpy_selected_inferior (PyObject *self, PyObject *args); PyObject *gdbpy_string_to_argv (PyObject *self, PyObject *args); PyObject *gdbpy_parameter (PyObject *self, PyObject *args); PyObject *gdbpy_parameter_value (enum var_types type, void *var); diff --git a/gdb/python/python.c b/gdb/python/python.c index 8a7bc66..20a2d03 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1276,6 +1276,9 @@ Arguments are separate by spaces and may be quoted." { "selected_thread", gdbpy_selected_thread, METH_NOARGS, "selected_thread () -> gdb.InferiorThread.\n\ Return the selected thread object." }, + { "selected_inferior", gdbpy_selected_inferior, METH_NOARGS, + "selected_inferior () -> gdb.Inferior.\n\ +Return the selected inferior object." }, { "inferiors", gdbpy_inferiors, METH_NOARGS, "inferiors () -> (gdb.Inferior, ...).\n\ Return a tuple containing all inferiors." }, diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp index 42ca920..518f2c1 100644 --- a/gdb/testsuite/gdb.python/py-inferior.exp +++ b/gdb/testsuite/gdb.python/py-inferior.exp @@ -66,6 +66,14 @@ gdb_test "python print 'result =', i0.pid" " = \[0-9\]+" "test Inferior.pid" gdb_test "python print 'result =', i0.was_attached" " = False" "test Inferior.was_attached" gdb_test "python print i0.threads ()" "\\(,\\)" "test Inferior.threads" +# Test gdb.selected_inferior() +gdb_test "add-inferior" "Added inferior 2" "Create new inferior" +gdb_test "py print gdb.selected_inferior().num" "1" "First inferior selected" +gdb_test "inferior 2" ".*" "Switch to second inferior" +gdb_test "py print gdb.selected_inferior().num" "2" "Second inferior selected" +gdb_test "inferior 1" ".*" "Switch to first inferior" +gdb_test_no_output "remove-inferiors 2" "Remove second inferior" + # Test memory read and write operations. gdb_py_test_silent_cmd "python addr = gdb.selected_frame ().read_var ('str')" \ @@ -199,14 +207,14 @@ gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get initial list" 1 gdb_test "python print len(inf_list)" "1" "Get inferior list length" gdb_test "python print inf_list\[0\].is_valid()" "True" \ "Check inferior validity" -gdb_test "add-inferior" "Added inferior 2.*" "add empty inferior 2" +gdb_test "add-inferior" "Added inferior 3.*" "add empty inferior 3" gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get new list" 1 gdb_test "python print len(inf_list)" "2" "Get inferior list length" gdb_test "python print inf_list\[0\].is_valid()" "True" \ "Check inferior validity" gdb_test "python print inf_list\[1\].is_valid()" "True" \ "Check inferior validity" -gdb_test_no_output "remove-inferiors 2" "remove-inferiors 2" +gdb_test_no_output "remove-inferiors 3" "remove-inferiors 3" gdb_test "python print inf_list\[0\].is_valid()" "False" \ "Check inferior validity" gdb_test "python print inf_list\[1\].is_valid()" "True" \ --