This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 19/20] Introduce gdbpy_enter_varobj and use it
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Thu, 10 Nov 2016 15:19:46 -0700
- Subject: [RFA 19/20] Introduce gdbpy_enter_varobj and use it
- Authentication-results: sourceware.org; auth=none
- References: <1478816387-27064-1-git-send-email-tom@tromey.com>
This introduces gdbpy_enter_varobj, a subclass of gdbpy_enter; then
changes one function in py-varobj.c to use it. gdbpy_enter_varobj
takes a varobj as an argument, similar to varobj_ensure_python_env.
2016-11-10 Tom Tromey <tom@tromey.com>
* varobj.c (gdbpy_enter_varobj): New constructor.
* python/python-internal.h (gdbpy_enter_varobj): New class.
* python/py-varobj.c (py_varobj_get_iterator): Use
gdbpy_enter_varobj.
---
gdb/ChangeLog | 7 +++++++
gdb/python/py-varobj.c | 21 ++++++++-------------
gdb/python/python-internal.h | 12 ++++++++++++
gdb/varobj.c | 7 +++++++
4 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 41e4081..839f24d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2016-11-10 Tom Tromey <tom@tromey.com>
+ * varobj.c (gdbpy_enter_varobj): New constructor.
+ * python/python-internal.h (gdbpy_enter_varobj): New class.
+ * python/py-varobj.c (py_varobj_get_iterator): Use
+ gdbpy_enter_varobj.
+
+2016-11-10 Tom Tromey <tom@tromey.com>
+
* python/py-xmethods.c (gdbpy_get_xmethod_result_type): Use
gdbpy_enter, gdbpy_reference, unique_xmalloc_ptr.
(gdbpy_invoke_xmethod): Use gdbpy_reference, gdbpy_enter.
diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c
index 72c876c..5d02549 100644
--- a/gdb/python/py-varobj.c
+++ b/gdb/python/py-varobj.c
@@ -17,6 +17,7 @@
#include "python-internal.h"
#include "varobj.h"
#include "varobj-iter.h"
+#include "py-ref.h"
/* A dynamic varobj iterator "class" for python pretty-printed
varobjs. This inherits struct varobj_iter. */
@@ -167,28 +168,24 @@ py_varobj_iter_new (struct varobj *var, PyObject *pyiter)
struct varobj_iter *
py_varobj_get_iterator (struct varobj *var, PyObject *printer)
{
- PyObject *children;
PyObject *iter;
struct py_varobj_iter *py_iter;
- struct cleanup *back_to = varobj_ensure_python_env (var);
+
+ gdbpy_enter_varobj enter_py (var);
if (!PyObject_HasAttr (printer, gdbpy_children_cst))
- {
- do_cleanups (back_to);
- return NULL;
- }
+ return NULL;
- children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
- NULL);
+ gdbpy_reference children (PyObject_CallMethodObjArgs (printer,
+ gdbpy_children_cst,
+ NULL));
if (children == NULL)
{
gdbpy_print_stack ();
error (_("Null value returned for children"));
}
- make_cleanup_py_decref (children);
-
- iter = PyObject_GetIter (children);
+ iter = PyObject_GetIter (children.get ());
if (iter == NULL)
{
gdbpy_print_stack ();
@@ -197,7 +194,5 @@ py_varobj_get_iterator (struct varobj *var, PyObject *printer)
py_iter = py_varobj_iter_new (var, iter);
- do_cleanups (back_to);
-
return &py_iter->base;
}
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 2aca6ff..66856df 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -524,6 +524,18 @@ class gdbpy_enter
PyObject *m_error_type, *m_error_value, *m_error_traceback;
};
+/* Like gdbpy_enter, but takes a varobj. This is a subclass just to
+ make constructor delegation a little nicer. */
+class gdbpy_enter_varobj : public gdbpy_enter
+{
+ public:
+
+ /* This is defined in varobj.c, where it can access varobj
+ internals. */
+ gdbpy_enter_varobj (const struct varobj *var);
+
+};
+
struct cleanup *ensure_python_env (struct gdbarch *gdbarch,
const struct language_defn *language);
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 03edf0e..8abda59 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -233,6 +233,13 @@ varobj_ensure_python_env (const struct varobj *var)
return ensure_python_env (var->root->exp->gdbarch,
var->root->exp->language_defn);
}
+
+/* See python-internal.h. */
+gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var)
+: gdbpy_enter (var->root->exp->gdbarch, var->root->exp->language_defn)
+{
+}
+
#endif
/* Return the full FRAME which corresponds to the given CORE_ADDR
--
2.7.4