From patchwork Thu Nov 10 22:19:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17392 Received: (qmail 61243 invoked by alias); 10 Nov 2016 22:20:13 -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 60780 invoked by uid 89); 10 Nov 2016 22:20:10 -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=gil, gdb_assert 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:02 +0000 Received: (qmail 29250 invoked by uid 0); 10 Nov 2016 22:20:00 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy4.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:00 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id 6NKw1u00V2f2jeq01NKzri; Thu, 10 Nov 2016 15:19:59 -0700 X-Authority-Analysis: v=2.1 cv=beT4Do/B 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=OayWNFGw0N21oS0mHzQA: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 1c4xhN-0002sd-Nj; Thu, 10 Nov 2016 15:19:57 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 10/20] Use gdbpy_enter in py-xmethods.c Date: Thu, 10 Nov 2016 15:19:37 -0700 Message-Id: <1478816387-27064-11-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: 1c4xhN-0002sd-Nj 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: 11 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== Change the simple parts of py-xmethods.c to use gdbpy_enter. 2016-11-10 Tom Tromey * python/py-xmethods.c (gdbpy_free_xmethod_worker_data) (gdbpy_clone_xmethod_worker_data): Use gdbpy_enter. --- gdb/ChangeLog | 5 +++++ gdb/python/py-xmethods.c | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9e2d08c..8a5a159 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-10 Tom Tromey + * python/py-xmethods.c (gdbpy_free_xmethod_worker_data) + (gdbpy_clone_xmethod_worker_data): Use gdbpy_enter. + +2016-11-10 Tom Tromey + * python/py-type.c (save_objfile_types): Use gdbpy_enter. 2016-11-10 Tom Tromey diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index 48205d8..2c86478 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -52,18 +52,15 @@ gdbpy_free_xmethod_worker_data (const struct extension_language_defn *extlang, void *data) { struct gdbpy_worker_data *worker_data = (struct gdbpy_worker_data *) data; - struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); /* We don't do much here, but we still need the GIL. */ - cleanups = ensure_python_env (get_current_arch (), current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); Py_DECREF (worker_data->worker); Py_DECREF (worker_data->this_type); xfree (worker_data); - - do_cleanups (cleanups); } /* Implementation of clone_xmethod_worker_data for Python. */ @@ -74,12 +71,11 @@ gdbpy_clone_xmethod_worker_data (const struct extension_language_defn *extlang, { struct gdbpy_worker_data *worker_data = (struct gdbpy_worker_data *) data, *new_data; - struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); /* We don't do much here, but we still need the GIL. */ - cleanups = ensure_python_env (get_current_arch (), current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); new_data = XCNEW (struct gdbpy_worker_data); new_data->worker = worker_data->worker; @@ -87,8 +83,6 @@ gdbpy_clone_xmethod_worker_data (const struct extension_language_defn *extlang, Py_INCREF (new_data->worker); Py_INCREF (new_data->this_type); - do_cleanups (cleanups); - return new_data; }