From patchwork Mon Nov 7 05:47:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17252 Received: (qmail 79749 invoked by alias); 7 Nov 2016 05:48:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 78893 invoked by uid 89); 7 Nov 2016 05:48:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=H*r:4.86_1, H*Ad:U*tom, instantiates X-HELO: gproxy9-pub.mail.unifiedlayer.com Received: from gproxy9-pub.mail.unifiedlayer.com (HELO gproxy9-pub.mail.unifiedlayer.com) (69.89.20.122) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Mon, 07 Nov 2016 05:47:48 +0000 Received: (qmail 1883 invoked by uid 0); 7 Nov 2016 05:47:46 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy9.mail.unifiedlayer.com with SMTP; 7 Nov 2016 05:47:46 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id 4tnj1u0062f2jeq01tnmQ0; Sun, 06 Nov 2016 22:47:46 -0700 X-Authority-Analysis: v=2.1 cv=fZg+lSgF c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=oPekulhH9CO1ZP2h0wQA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:47918 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c3cmU-0008A3-TT; Sun, 06 Nov 2016 22:47:43 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 11/14] Use gdbpy_reference in py-prettyprint.c Date: Sun, 6 Nov 2016 22:47:33 -0700 Message-Id: <1478497656-11832-12-git-send-email-tom@tromey.com> In-Reply-To: <1478497656-11832-1-git-send-email-tom@tromey.com> References: <1478497656-11832-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c3cmU-0008A3-TT X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:47918 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes several functions in py-prettyprint.c to use gdbpy_reference. 2016-11-06 Tom Tromey * python/py-prettyprint.c (search_pp_list) (find_pretty_printer_from_objfiles) (find_pretty_printer_from_progspace) (find_pretty_printer_from_gdb, find_pretty_printer) (gdbpy_get_display_hint, gdbpy_get_varobj_pretty_printer): Use gdbpy_reference. --- gdb/ChangeLog | 9 +++++ gdb/python/py-prettyprint.c | 96 ++++++++++++++++----------------------------- 2 files changed, 43 insertions(+), 62 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9544515..1b49750 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2016-11-06 Tom Tromey + * python/py-prettyprint.c (search_pp_list) + (find_pretty_printer_from_objfiles) + (find_pretty_printer_from_progspace) + (find_pretty_printer_from_gdb, find_pretty_printer) + (gdbpy_get_display_hint, gdbpy_get_varobj_pretty_printer): Use + gdbpy_reference. + +2016-11-06 Tom Tromey + * python/py-param.c (call_doc_function): Use gdbpy_reference. 2016-11-06 Tom Tromey diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 8834344..0183b16 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -25,6 +25,7 @@ #include "extension-priv.h" #include "python.h" #include "python-internal.h" +#include "py-ref.h" /* Return type of print_string_repr. */ @@ -48,25 +49,23 @@ static PyObject * search_pp_list (PyObject *list, PyObject *value) { Py_ssize_t pp_list_size, list_index; - PyObject *function, *printer = NULL; pp_list_size = PyList_Size (list); for (list_index = 0; list_index < pp_list_size; list_index++) { - function = PyList_GetItem (list, list_index); + PyObject *function = PyList_GetItem (list, list_index); if (! function) return NULL; /* Skip if disabled. */ if (PyObject_HasAttr (function, gdbpy_enabled_cst)) { - PyObject *attr = PyObject_GetAttr (function, gdbpy_enabled_cst); + gdbpy_reference attr (PyObject_GetAttr (function, gdbpy_enabled_cst)); int cmp; - if (!attr) + if (attr == NULL) return NULL; - cmp = PyObject_IsTrue (attr); - Py_DECREF (attr); + cmp = PyObject_IsTrue (attr.get ()); if (cmp == -1) return NULL; @@ -74,13 +73,12 @@ search_pp_list (PyObject *list, PyObject *value) continue; } - printer = PyObject_CallFunctionObjArgs (function, value, NULL); - if (! printer) + gdbpy_reference printer (PyObject_CallFunctionObjArgs (function, value, + NULL)); + if (printer == NULL) return NULL; else if (printer != Py_None) - return printer; - - Py_DECREF (printer); + return printer.release (); } Py_RETURN_NONE; @@ -95,8 +93,6 @@ search_pp_list (PyObject *list, PyObject *value) static PyObject * find_pretty_printer_from_objfiles (PyObject *value) { - PyObject *pp_list; - PyObject *function; struct objfile *obj; ALL_OBJFILES (obj) @@ -109,18 +105,15 @@ find_pretty_printer_from_objfiles (PyObject *value) continue; } - pp_list = objfpy_get_printers (objf, NULL); - function = search_pp_list (pp_list, value); - Py_XDECREF (pp_list); + gdbpy_reference pp_list (objfpy_get_printers (objf, NULL)); + gdbpy_reference function (search_pp_list (pp_list.get (), value)); /* If there is an error in any objfile list, abort the search and exit. */ - if (! function) + if (function == NULL) return NULL; if (function != Py_None) - return function; - - Py_DECREF (function); + return function.release (); } Py_RETURN_NONE; @@ -135,16 +128,12 @@ find_pretty_printer_from_objfiles (PyObject *value) static PyObject * find_pretty_printer_from_progspace (PyObject *value) { - PyObject *pp_list; - PyObject *function; PyObject *obj = pspace_to_pspace_object (current_program_space); if (!obj) return NULL; - pp_list = pspy_get_printers (obj, NULL); - function = search_pp_list (pp_list, value); - Py_XDECREF (pp_list); - return function; + gdbpy_reference pp_list (pspy_get_printers (obj, NULL)); + return search_pp_list (pp_list.get (), value); } /* Subroutine of find_pretty_printer to simplify it. @@ -156,23 +145,16 @@ find_pretty_printer_from_progspace (PyObject *value) static PyObject * find_pretty_printer_from_gdb (PyObject *value) { - PyObject *pp_list; - PyObject *function; - /* Fetch the global pretty printer list. */ if (gdb_python_module == NULL || ! PyObject_HasAttrString (gdb_python_module, "pretty_printers")) Py_RETURN_NONE; - pp_list = PyObject_GetAttrString (gdb_python_module, "pretty_printers"); - if (pp_list == NULL || ! PyList_Check (pp_list)) - { - Py_XDECREF (pp_list); - Py_RETURN_NONE; - } + gdbpy_reference pp_list (PyObject_GetAttrString (gdb_python_module, + "pretty_printers")); + if (pp_list == NULL || ! PyList_Check (pp_list.get ())) + Py_RETURN_NONE; - function = search_pp_list (pp_list, value); - Py_XDECREF (pp_list); - return function; + return search_pp_list (pp_list.get (), value); } /* Find the pretty-printing constructor function for VALUE. If no @@ -182,24 +164,19 @@ find_pretty_printer_from_gdb (PyObject *value) static PyObject * find_pretty_printer (PyObject *value) { - PyObject *function; - /* Look at the pretty-printer list for each objfile in the current program-space. */ - function = find_pretty_printer_from_objfiles (value); + gdbpy_reference function (find_pretty_printer_from_objfiles (value)); if (function == NULL || function != Py_None) - return function; - Py_DECREF (function); + return function.release (); /* Look at the pretty-printer list for the current program-space. */ - function = find_pretty_printer_from_progspace (value); + function.reset (find_pretty_printer_from_progspace (value)); if (function == NULL || function != Py_None) - return function; - Py_DECREF (function); + return function.release (); /* Look at the pretty-printer list in the gdb module. */ - function = find_pretty_printer_from_gdb (value); - return function; + return find_pretty_printer_from_gdb (value); } /* Pretty-print a single value, via the printer object PRINTER. @@ -247,22 +224,22 @@ pretty_print_one_value (PyObject *printer, struct value **out_value) char * gdbpy_get_display_hint (PyObject *printer) { - PyObject *hint; char *result = NULL; if (! PyObject_HasAttr (printer, gdbpy_display_hint_cst)) return NULL; - hint = PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst, NULL); - if (hint) + gdbpy_reference hint (PyObject_CallMethodObjArgs (printer, + gdbpy_display_hint_cst, + NULL)); + if (hint != NULL) { - if (gdbpy_is_string (hint)) + if (gdbpy_is_string (hint.get ())) { - result = python_string_to_host_string (hint); + result = python_string_to_host_string (hint.get ()); if (result == NULL) gdbpy_print_stack (); } - Py_DECREF (hint); } else gdbpy_print_stack (); @@ -818,9 +795,6 @@ apply_varobj_pretty_printer (PyObject *printer_obj, PyObject * gdbpy_get_varobj_pretty_printer (struct value *value) { - PyObject *val_obj; - PyObject *pretty_printer = NULL; - TRY { value = value_copy (value); @@ -831,13 +805,11 @@ gdbpy_get_varobj_pretty_printer (struct value *value) } END_CATCH - val_obj = value_to_value_object (value); - if (! val_obj) + gdbpy_reference val_obj (value_to_value_object (value)); + if (val_obj == NULL) return NULL; - pretty_printer = find_pretty_printer (val_obj); - Py_DECREF (val_obj); - return pretty_printer; + return find_pretty_printer (val_obj.get ()); } /* A Python function which wraps find_pretty_printer and instantiates