From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 08/14] Use gdbpy_reference in py-framefilter.c
Date: Mon, 07 Nov 2016 05:48:00 -0000 [thread overview]
Message-ID: <1478497656-11832-9-git-send-email-tom@tromey.com> (raw)
In-Reply-To: <1478497656-11832-1-git-send-email-tom@tromey.com>
This changes some code in py-framefilter.c to use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
* python/py-framefilter.c (extract_sym, extract_value)
(get_py_iter_from_func, bootstrap_python_frame_filters): Use
gdbpy_reference.
---
gdb/ChangeLog | 6 ++++
gdb/python/py-framefilter.c | 86 +++++++++++++++------------------------------
2 files changed, 35 insertions(+), 57 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53f2e5f..4921600 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2016-11-06 Tom Tromey <tom@tromey.com>
+ * python/py-framefilter.c (extract_sym, extract_value)
+ (get_py_iter_from_func, bootstrap_python_frame_filters): Use
+ gdbpy_reference.
+
+2016-11-06 Tom Tromey <tom@tromey.com>
+
* python/py-breakpoint.c (gdbpy_breakpoints): Use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index 6692ac5..d010408 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -30,6 +30,7 @@
#include "demangle.h"
#include "mi/mi-cmds.h"
#include "python-internal.h"
+#include "py-ref.h"
enum mi_print_types
{
@@ -55,17 +56,16 @@ static enum ext_lang_bt_status
extract_sym (PyObject *obj, char **name, struct symbol **sym,
struct block **sym_block, const struct language_defn **language)
{
- PyObject *result = PyObject_CallMethod (obj, "symbol", NULL);
+ gdbpy_reference result (PyObject_CallMethod (obj, "symbol", NULL));
if (result == NULL)
return EXT_LANG_BT_ERROR;
/* For 'symbol' callback, the function can return a symbol or a
string. */
- if (gdbpy_is_string (result))
+ if (gdbpy_is_string (result.get ()))
{
- *name = python_string_to_host_string (result);
- Py_DECREF (result);
+ *name = python_string_to_host_string (result.get ());
if (*name == NULL)
return EXT_LANG_BT_ERROR;
@@ -82,15 +82,13 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
{
/* This type checks 'result' during the conversion so we
just call it unconditionally and check the return. */
- *sym = symbol_object_to_symbol (result);
+ *sym = symbol_object_to_symbol (result.get ());
/* TODO: currently, we have no way to recover the block in which SYMBOL
was found, so we have no block to return. Trying to evaluate SYMBOL
will yield an incorrect value when it's located in a FRAME and
evaluated from another frame (as permitted in nested functions). */
*sym_block = NULL;
- Py_DECREF (result);
-
if (*sym == NULL)
{
PyErr_SetString (PyExc_RuntimeError,
@@ -129,7 +127,7 @@ extract_value (PyObject *obj, struct value **value)
{
if (PyObject_HasAttrString (obj, "value"))
{
- PyObject *vresult = PyObject_CallMethod (obj, "value", NULL);
+ gdbpy_reference vresult (PyObject_CallMethod (obj, "value", NULL));
if (vresult == NULL)
return EXT_LANG_BT_ERROR;
@@ -139,14 +137,12 @@ extract_value (PyObject *obj, struct value **value)
value. */
if (vresult == Py_None)
{
- Py_DECREF (vresult);
*value = NULL;
return EXT_LANG_BT_OK;
}
else
{
- *value = convert_value_from_python (vresult);
- Py_DECREF (vresult);
+ *value = convert_value_from_python (vresult.get ());
if (*value == NULL)
return EXT_LANG_BT_ERROR;
@@ -315,20 +311,17 @@ get_py_iter_from_func (PyObject *filter, char *func)
{
if (PyObject_HasAttrString (filter, func))
{
- PyObject *result = PyObject_CallMethod (filter, func, NULL);
+ gdbpy_reference result (PyObject_CallMethod (filter, func, NULL));
if (result != NULL)
{
if (result == Py_None)
{
- return result;
+ return result.release ();
}
else
{
- PyObject *iterator = PyObject_GetIter (result);
-
- Py_DECREF (result);
- return iterator;
+ return PyObject_GetIter (result.get ());
}
}
}
@@ -1445,60 +1438,39 @@ static PyObject *
bootstrap_python_frame_filters (struct frame_info *frame,
int frame_low, int frame_high)
{
- struct cleanup *cleanups =
- make_cleanup (null_cleanup, NULL);
- PyObject *module, *sort_func, *iterable, *frame_obj, *iterator;
- PyObject *py_frame_low, *py_frame_high;
-
- frame_obj = frame_info_to_frame_object (frame);
+ gdbpy_reference frame_obj (frame_info_to_frame_object (frame));
if (frame_obj == NULL)
- goto error;
- make_cleanup_py_decref (frame_obj);
+ return NULL;
- module = PyImport_ImportModule ("gdb.frames");
+ gdbpy_reference module (PyImport_ImportModule ("gdb.frames"));
if (module == NULL)
- goto error;
- make_cleanup_py_decref (module);
+ return NULL;
- sort_func = PyObject_GetAttrString (module, "execute_frame_filters");
+ gdbpy_reference sort_func (PyObject_GetAttrString (module.get (),
+ "execute_frame_filters"));
if (sort_func == NULL)
- goto error;
- make_cleanup_py_decref (sort_func);
+ return NULL;
- py_frame_low = PyInt_FromLong (frame_low);
+ gdbpy_reference py_frame_low (PyInt_FromLong (frame_low));
if (py_frame_low == NULL)
- goto error;
- make_cleanup_py_decref (py_frame_low);
+ return NULL;
- py_frame_high = PyInt_FromLong (frame_high);
+ gdbpy_reference py_frame_high (PyInt_FromLong (frame_high));
if (py_frame_high == NULL)
- goto error;
- make_cleanup_py_decref (py_frame_high);
+ return NULL;
- iterable = PyObject_CallFunctionObjArgs (sort_func, frame_obj,
- py_frame_low,
- py_frame_high,
- NULL);
+ gdbpy_reference iterable (PyObject_CallFunctionObjArgs (sort_func.get (),
+ frame_obj.get (),
+ py_frame_low.get (),
+ py_frame_high.get (),
+ NULL));
if (iterable == NULL)
- goto error;
-
- do_cleanups (cleanups);
+ return NULL;
if (iterable != Py_None)
- {
- iterator = PyObject_GetIter (iterable);
- Py_DECREF (iterable);
- }
+ return PyObject_GetIter (iterable.get ());
else
- {
- return iterable;
- }
-
- return iterator;
-
- error:
- do_cleanups (cleanups);
- return NULL;
+ return iterable.release ();
}
/* This is the only publicly exported function in this file. FRAME
--
2.7.4
next prev parent reply other threads:[~2016-11-07 5:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 6:00 [RFA 00/14] add a smart pointer for PyObject* Tom Tromey
2016-11-07 5:48 ` [RFA 10/14] Use gdbpy_reference in call_doc_function Tom Tromey
2016-11-07 5:48 ` [RFA 06/14] Use gdbpy_reference in gdbpy_inferiors Tom Tromey
2016-11-07 5:48 ` [RFA 13/14] Use gdbpy_reference in py-value.c Tom Tromey
2016-11-07 5:48 ` [RFA 07/14] Use gdbpy_reference in gdbpy_breakpoints Tom Tromey
2016-11-07 5:48 ` [RFA 12/14] Use gdbpy_reference in python.c Tom Tromey
2016-11-07 5:48 ` [RFA 03/14] Use gdbpy_reference in py-type.c Tom Tromey
2016-11-07 5:48 ` [RFA 01/14] Introduce py-ref.h Tom Tromey
2016-11-07 7:45 ` Jan Kratochvil
2016-11-07 15:48 ` Tom Tromey
2016-11-10 23:48 ` Pedro Alves
2016-11-12 17:31 ` Tom Tromey
2016-11-15 14:32 ` Pedro Alves
2016-11-16 23:18 ` Tom Tromey
2016-11-16 23:34 ` Pedro Alves
2016-11-07 5:48 ` [RFA 04/14] Use gdbpy_reference in gdbpy_string_to_argv Tom Tromey
2016-11-07 5:48 ` [RFA 14/14] Use gdbpy_reference in gdbpy_lookup_symbol Tom Tromey
2016-11-07 5:48 ` Tom Tromey [this message]
2016-11-07 5:48 ` [RFA 11/14] Use gdbpy_reference in py-prettyprint.c Tom Tromey
2016-11-07 5:48 ` [RFA 05/14] Use gdbpy_reference in py-function.c Tom Tromey
2016-11-07 5:56 ` [RFA 02/14] Change event code to use gdbpy_reference Tom Tromey
2016-11-11 0:09 ` Pedro Alves
2016-11-11 0:51 ` Pedro Alves
2016-11-07 5:57 ` [RFA 09/14] Use gdbpy_reference in py-linetable.c Tom Tromey
2016-11-08 4:07 ` [RFA 00/14] add a smart pointer for PyObject* Tom Tromey
2016-11-11 1:18 ` Pedro Alves
2016-11-11 3:34 ` Tom Tromey
2016-11-11 4:03 ` Pedro Alves
2016-11-11 5:49 ` Tom Tromey
2016-11-12 17:11 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478497656-11832-9-git-send-email-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox