From patchwork Thu Nov 10 22:19:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17403 Received: (qmail 82908 invoked by alias); 10 Nov 2016 22:26:53 -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 82860 invoked by uid 89); 10 Nov 2016 22:26:52 -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=92, 7, 927, *self, Hx-languages-length:2648 X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Thu, 10 Nov 2016 22:26:46 +0000 Received: (qmail 9808 invoked by uid 0); 10 Nov 2016 22:20:05 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy10.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:05 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 6NL21u01j2f2jeq01NL5JY; Thu, 10 Nov 2016 15:20:05 -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=sxHxHnpblMEauLzAwCIA: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 1c4xhS-0002sd-AW; Thu, 10 Nov 2016 15:20:02 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 20/20] Use gdbpy_enter_varobj in py-varobj.c Date: Thu, 10 Nov 2016 15:19:47 -0700 Message-Id: <1478816387-27064-21-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: 1c4xhS-0002sd-AW 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: 21 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This converts the remaining functions in py-varobj.c to use gdbpy_enter_varobj. 2016-11-10 Tom Tromey * python/py-varobj.c (py_varobj_iter_dtor, py_varobj_iter_next): Use gdbpy_enter_varobj. --- gdb/ChangeLog | 5 +++++ gdb/python/py-varobj.c | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 839f24d..aafb07a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-10 Tom Tromey + * python/py-varobj.c (py_varobj_iter_dtor, py_varobj_iter_next): + Use gdbpy_enter_varobj. + +2016-11-10 Tom Tromey + * varobj.c (gdbpy_enter_varobj): New constructor. * python/python-internal.h (gdbpy_enter_varobj): New class. * python/py-varobj.c (py_varobj_get_iterator): Use diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c index 5d02549..f28bf43 100644 --- a/gdb/python/py-varobj.c +++ b/gdb/python/py-varobj.c @@ -39,11 +39,8 @@ static void py_varobj_iter_dtor (struct varobj_iter *self) { struct py_varobj_iter *dis = (struct py_varobj_iter *) self; - struct cleanup *back_to = varobj_ensure_python_env (self->var); - + gdbpy_enter_varobj enter_py (self->var); Py_XDECREF (dis->iter); - - do_cleanups (back_to); } /* Implementation of the 'next' method of pretty-printed varobj @@ -53,8 +50,6 @@ static varobj_item * py_varobj_iter_next (struct varobj_iter *self) { struct py_varobj_iter *t = (struct py_varobj_iter *) self; - struct cleanup *back_to; - PyObject *item; PyObject *py_v; varobj_item *vitem; const char *name = NULL; @@ -62,9 +57,9 @@ py_varobj_iter_next (struct varobj_iter *self) if (!gdb_python_initialized) return NULL; - back_to = varobj_ensure_python_env (self->var); + gdbpy_enter_varobj enter_py (self->var); - item = PyIter_Next (t->iter); + gdbpy_reference item (PyIter_Next (t->iter)); if (item == NULL) { @@ -92,7 +87,7 @@ py_varobj_iter_next (struct varobj_iter *self) name_str = xstrprintf ("", self->next_raw_index++); - item = Py_BuildValue ("(ss)", name_str, value_str.get ()); + item.reset (Py_BuildValue ("(ss)", name_str, value_str.get ())); xfree (name_str); if (item == NULL) { @@ -108,7 +103,7 @@ py_varobj_iter_next (struct varobj_iter *self) } } - if (!PyArg_ParseTuple (item, "sO", &name, &py_v)) + if (!PyArg_ParseTuple (item.get (), "sO", &name, &py_v)) { gdbpy_print_stack (); error (_("Invalid item from the child list")); @@ -121,7 +116,6 @@ py_varobj_iter_next (struct varobj_iter *self) vitem->name = name; self->next_raw_index++; - do_cleanups (back_to); return vitem; }