From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 64763 invoked by alias); 10 Nov 2016 22:20:40 -0000 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 Received: (qmail 64359 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: gproxy4-pub.mail.unifiedlayer.com Received: from gproxy4-pub.mail.unifiedlayer.com (HELO gproxy4-pub.mail.unifiedlayer.com) (69.89.23.142) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Thu, 10 Nov 2016 22:20:04 +0000 Received: (qmail 29432 invoked by uid 0); 10 Nov 2016 22:20:02 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy4.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:02 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 6NKz1u00d2f2jeq01NL2Cj; Thu, 10 Nov 2016 15:20:02 -0700 X-Authority-Analysis: v=2.1 cv=WL/sABcR 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=bkCKr0n7HXHuh2ygsG4A:9 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-Cx; Thu, 10 Nov 2016 15:19:59 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 14/20] Use gdbpy_enter in gdbpy_before_prompt_hook Date: Thu, 10 Nov 2016 22:20:00 -0000 Message-Id: <1478816387-27064-15-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-Cx 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: 15 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2016-11/txt/msg00261.txt.bz2 Change gdbpy_before_prompt_hook to use gdbpy_enter and gdbpy_reference. 2016-11-10 Tom Tromey * python/python.c (gdbpy_before_prompt_hook): Use gdbpy_enter, gdbpy_reference. --- gdb/ChangeLog | 5 +++++ gdb/python/python.c | 60 ++++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a8237a8..14ecd00 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-10 Tom Tromey + * python/python.c (gdbpy_before_prompt_hook): Use gdbpy_enter, + gdbpy_reference. + +2016-11-10 Tom Tromey + * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Use gdbpy_enter, gdbpy_reference, unique_xmalloc_ptr. diff --git a/gdb/python/python.c b/gdb/python/python.c index de75b0e..393937d 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1005,60 +1005,64 @@ static enum ext_lang_rc gdbpy_before_prompt_hook (const struct extension_language_defn *extlang, const char *current_gdb_prompt) { - struct cleanup *cleanup; gdb::unique_xmalloc_ptr prompt; if (!gdb_python_initialized) return EXT_LANG_RC_NOP; - cleanup = ensure_python_env (get_current_arch (), current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); if (gdb_python_module && PyObject_HasAttrString (gdb_python_module, "prompt_hook")) { - PyObject *hook; - - hook = PyObject_GetAttrString (gdb_python_module, "prompt_hook"); + gdbpy_reference hook (PyObject_GetAttrString (gdb_python_module, + "prompt_hook")); if (hook == NULL) - goto fail; - - make_cleanup_py_decref (hook); - - if (PyCallable_Check (hook)) { - PyObject *result; - PyObject *current_prompt; + gdbpy_print_stack (); + return EXT_LANG_RC_ERROR; + } - current_prompt = PyString_FromString (current_gdb_prompt); + if (PyCallable_Check (hook.get ())) + { + gdbpy_reference current_prompt + (PyString_FromString (current_gdb_prompt)); if (current_prompt == NULL) - goto fail; - - result = PyObject_CallFunctionObjArgs (hook, current_prompt, NULL); - - Py_DECREF (current_prompt); + { + gdbpy_print_stack (); + return EXT_LANG_RC_ERROR; + } + gdbpy_reference result + (PyObject_CallFunctionObjArgs (hook.get (), current_prompt.get (), + NULL)); if (result == NULL) - goto fail; - - make_cleanup_py_decref (result); + { + gdbpy_print_stack (); + return EXT_LANG_RC_ERROR; + } /* Return type should be None, or a String. If it is None, fall through, we will not set a prompt. If it is a string, set PROMPT. Anything else, set an exception. */ - if (result != Py_None && ! PyString_Check (result)) + if (result != Py_None && ! PyString_Check (result.get ())) { PyErr_Format (PyExc_RuntimeError, _("Return from prompt_hook must " \ "be either a Python string, or None")); - goto fail; + gdbpy_print_stack (); + return EXT_LANG_RC_ERROR; } if (result != Py_None) { - prompt = python_string_to_host_string (result); + prompt = python_string_to_host_string (result.get ()); if (prompt == NULL) - goto fail; + { + gdbpy_print_stack (); + return EXT_LANG_RC_ERROR; + } } } } @@ -1068,13 +1072,7 @@ gdbpy_before_prompt_hook (const struct extension_language_defn *extlang, if (prompt != NULL) set_prompt (prompt.get ()); - do_cleanups (cleanup); return prompt != NULL ? EXT_LANG_RC_OK : EXT_LANG_RC_NOP; - - fail: - gdbpy_print_stack (); - do_cleanups (cleanup); - return EXT_LANG_RC_ERROR; } -- 2.7.4