From patchwork Thu Nov 10 22:19:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17397 Received: (qmail 64590 invoked by alias); 10 Nov 2016 22:20:39 -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 64356 invoked by uid 89); 10 Nov 2016 22:20:37 -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= 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; Thu, 10 Nov 2016 22:20:03 +0000 Received: (qmail 5000 invoked by uid 0); 10 Nov 2016 22:20:02 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy9.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:02 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id 6NKx1u01C2f2jeq01NL0BJ; Thu, 10 Nov 2016 15:20:00 -0700 X-Authority-Analysis: v=2.1 cv=PIacp5aC 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=_4hgyhJJy4g89gPUMAcA:9 a=6dBGo5MWhtsp_hW9:21 a=ZwmCDvS9Vpd8vNjN:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:60120 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c4xhP-0002sd-2V; Thu, 10 Nov 2016 15:19:59 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 13/20] Use gdbpy_enter in py-prettyprint.c Date: Thu, 10 Nov 2016 15:19:40 -0700 Message-Id: <1478816387-27064-14-git-send-email-tom@tromey.com> In-Reply-To: <1478816387-27064-1-git-send-email-tom@tromey.com> References: <1478816387-27064-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c4xhP-0002sd-2V X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:60120 X-Source-Auth: tom+tromey.com X-Email-Count: 14 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== Change py-prettyprint.c to use gdbpy_enter. 2016-11-10 Tom Tromey * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Use gdbpy_enter, gdbpy_reference, unique_xmalloc_ptr. --- gdb/ChangeLog | 5 +++++ gdb/python/py-prettyprint.c | 45 +++++++++++++++------------------------------ 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 80d4329..a8237a8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-10 Tom Tromey + * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Use + gdbpy_enter, gdbpy_reference, unique_xmalloc_ptr. + +2016-11-10 Tom Tromey + * utils.h (htab_deleter): New struct. (htab_up): New typedef. * python/py-framefilter.c (gdbpy_apply_frame_filter): Use diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 58f43e7..d2ef920 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -684,12 +684,7 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang, const struct language_defn *language) { struct gdbarch *gdbarch = get_type_arch (type); - PyObject *printer = NULL; - PyObject *val_obj = NULL; struct value *value; - gdb::unique_xmalloc_ptr hint; - struct cleanup *cleanups; - enum ext_lang_rc result = EXT_LANG_RC_NOP; enum string_repr_result print_result; /* No pretty-printer support for unavailable values. */ @@ -699,7 +694,7 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang, if (!gdb_python_initialized) return EXT_LANG_RC_NOP; - cleanups = ensure_python_env (gdbarch, language); + gdbpy_enter enter_py (gdbarch, language); /* Instantiate the printer. */ if (valaddr) @@ -715,47 +710,37 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang, && VALUE_LVAL (value) != lval_computed) set_value_address (value, address + embedded_offset); - val_obj = value_to_value_object (value); - if (! val_obj) + gdbpy_reference val_obj (value_to_value_object (value)); + if (val_obj == NULL) { - result = EXT_LANG_RC_ERROR; - goto done; + print_stack_unless_memory_error (stream); + return EXT_LANG_RC_ERROR; } /* Find the constructor. */ - printer = find_pretty_printer (val_obj); - Py_DECREF (val_obj); - + gdbpy_reference printer (find_pretty_printer (val_obj.get ())); if (printer == NULL) { - result = EXT_LANG_RC_ERROR; - goto done; + print_stack_unless_memory_error (stream); + return EXT_LANG_RC_ERROR; } - make_cleanup_py_decref (printer); if (printer == Py_None) - { - result = EXT_LANG_RC_NOP; - goto done; - } + return EXT_LANG_RC_NOP; /* If we are printing a map, we want some special formatting. */ - hint = gdbpy_get_display_hint (printer); + gdb::unique_xmalloc_ptr hint (gdbpy_get_display_hint (printer.get ())); /* Print the section */ - print_result = print_string_repr (printer, hint.get (), stream, recurse, - options, language, gdbarch); + print_result = print_string_repr (printer.get (), hint.get (), stream, + recurse, options, language, gdbarch); if (print_result != string_repr_error) - print_children (printer, hint.get (), stream, recurse, options, language, - print_result == string_repr_none); + print_children (printer.get (), hint.get (), stream, recurse, options, + language, print_result == string_repr_none); - result = EXT_LANG_RC_OK; - - done: if (PyErr_Occurred ()) print_stack_unless_memory_error (stream); - do_cleanups (cleanups); - return result; + return EXT_LANG_RC_OK; }