From patchwork Wed Jan 15 19:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 37396 Received: (qmail 79201 invoked by alias); 15 Jan 2020 19:12:42 -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 79023 invoked by uid 89); 15 Jan 2020 19:12:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.26.124) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 15 Jan 2020 19:12:30 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id CA6C223D11A for ; Wed, 15 Jan 2020 14:12:28 -0500 (EST) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id d9sfFn_nLXp7; Wed, 15 Jan 2020 14:12:28 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 64A7623CF94; Wed, 15 Jan 2020 14:12:28 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 64A7623CF94 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1579115548; bh=Z6QXMo5IQuW0sx0pVV+SzZINd3Sc63YqRmMAsJj7rAw=; h=From:To:Date:Message-Id:MIME-Version; b=bN324T0TTF2KdlG1lapgEWo4hXSNpsk0JePkEpP2/teLXrJ45LHJYfMKLAfHT+wko MBgkbWNrXgO5meGp1kMBTseAvHMyZD5IaD9AqPqigIlY0poy3df1B0b7j1/K4TRCMK 6nOHHl/Z9o47KWe+p8ZKgoP4mMD5/yFjrpboACUO7uMZLPib5hOzRKg8XCt9tM92fm w8HaFkBTnlovYyWmekvLl9AGc4pxbH4DVGUeFQ+Ff2cGm9BERZvOJAsJGITgj+r33G 0/vTqCgZC4WAB4dnYXTh8jo3WHav8tP0yWzwYlyxJg6gIc8sIqlnlpR/VvkptrnSpy xbJpPrv0Mpshw== Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id b4au6SSkvWQG; Wed, 15 Jan 2020 14:12:28 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by mail.efficios.com (Postfix) with ESMTPSA id 3A2B323CDD7; Wed, 15 Jan 2020 14:12:28 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/4] gdb: remove use of iterate_over_inferiors in py-inferior.c Date: Wed, 15 Jan 2020 14:12:19 -0500 Message-Id: <20200115191222.28208-2-simon.marchi@efficios.com> In-Reply-To: <20200115191222.28208-1-simon.marchi@efficios.com> References: <20200115191222.28208-1-simon.marchi@efficios.com> MIME-Version: 1.0 Use range-based for instead of iterate_over_inferiors in one spot in the Python code. gdb/ChangeLog: * python/py-inferior.c (build_inferior_list): Remove. (gdbpy_ref): Use range-based for loop to iterate over inferiors. --- gdb/python/py-inferior.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 4adc5d6f9988..fd7d8a8aa709 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -462,18 +462,6 @@ infpy_get_progspace (PyObject *self, void *closure) return pspace_to_pspace_object (pspace).release (); } -static int -build_inferior_list (struct inferior *inf, void *arg) -{ - PyObject *list = (PyObject *) arg; - gdbpy_ref inferior = inferior_to_inferior_object (inf); - - if (inferior == NULL) - return 0; - - return PyList_Append (list, (PyObject *) inferior.get ()) ? 1 : 0; -} - /* Implementation of gdb.inferiors () -> (gdb.Inferior, ...). Returns a tuple of all inferiors. */ PyObject * @@ -483,8 +471,16 @@ gdbpy_inferiors (PyObject *unused, PyObject *unused2) if (list == NULL) return NULL; - if (iterate_over_inferiors (build_inferior_list, list.get ())) - return NULL; + for (inferior *inf : all_inferiors ()) + { + gdbpy_ref inferior = inferior_to_inferior_object (inf); + + if (inferior == NULL) + continue; + + if (PyList_Append (list.get (), (PyObject *) inferior.get ()) != 0) + return NULL; + } return PyList_AsTuple (list.get ()); }