Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 1/4] Use foreach in gdbpy_inferiors
Date: Thu, 19 Sep 2019 21:28:00 -0000	[thread overview]
Message-ID: <20190919212825.7586-2-tom@tromey.com> (raw)
In-Reply-To: <20190919212825.7586-1-tom@tromey.com>

This changes gdbpy_inferiors to use foreach rather than a callback
function.

gdb/ChangeLog
2019-09-19  Tom Tromey  <tom@tromey.com>

	* python/py-inferior.c (build_inferior_list): Remove.
	(gdbpy_inferiors): Use foreach.
---
 gdb/ChangeLog            |  5 +++++
 gdb/python/py-inferior.c | 24 ++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 28882221a90..ecb95444a36 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_object> 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_safe ())
+    {
+      gdbpy_ref<inferior_object> inferior = inferior_to_inferior_object (inf);
+
+      if (inferior == NULL)
+	continue;
+
+      if (PyList_Append (list.get (), (PyObject *) inferior.get ()) == -1)
+	return NULL;
+    }
 
   return PyList_AsTuple (list.get ());
 }
-- 
2.17.2


  parent reply	other threads:[~2019-09-19 21:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-19 21:28 [PATCH 0/4] Remove some uses of iterate_over_inferiors Tom Tromey
2019-09-19 21:28 ` [PATCH 2/4] Don't use iterate_over_inferiors in top.c Tom Tromey
2019-09-19 21:28 ` [PATCH 4/4] Remove a use of iterate_over_threads from mi-main.c Tom Tromey
2019-09-19 21:28 ` Tom Tromey [this message]
2019-09-19 21:28 ` [PATCH 3/4] Don't use iterate_over_inferiors in target.c Tom Tromey
2019-09-20  2:16 ` [PATCH 0/4] Remove some uses of iterate_over_inferiors Simon Marchi
2019-09-20 14:02   ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190919212825.7586-2-tom@tromey.com \
    --to=tom@tromey.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox