From: Pedro Alves <palves@redhat.com>
Date: Wed, 6 Mar 2019 18:29:19 +0000 (+0000)
Subject: linux-fork.c: rewrite inf_has_multiple_threads
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e52c971f17ac747a065388b54a909f44b5582cd9;p=binutils-gdb.git

linux-fork.c: rewrite inf_has_multiple_threads

There's no need to iterate over all threads of all inferiors here.

gdb/ChangeLog:
2019-03-06  Pedro Alves  <palves@redhat.com>

	* linux-fork.c (inf_has_multiple_thread_cb): Delete.
	(inf_has_multiple_threads): Return 'bool' and rewrite using
	inferior_info::threads().
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7a7ee5fc807..f423232d95f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-fork.c (inf_has_multiple_thread_cb): Delete.
+	(inf_has_multiple_threads): Return 'bool' and rewrite using
+	inferior_info::threads().
+
 2019-03-06  Pedro Alves  <palves@redhat.com>
 
 	* linux-fork.c: Include <list>.
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 1c7b7ca1230..4bc454ba6dd 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -627,31 +627,20 @@ linux_fork_checkpointing_p (int pid)
   return (checkpointing_pid == pid);
 }
 
-/* Callback for iterate over threads.  Used to check whether
-   the current inferior is multi-threaded.  Returns true as soon
-   as it sees the second thread of the current inferior.  */
-
-static int
-inf_has_multiple_thread_cb (struct thread_info *tp, void *data)
-{
-  int *count_p = (int *) data;
-  
-  if (current_inferior ()->pid == tp->ptid.pid ())
-    (*count_p)++;
-  
-  /* Stop the iteration if multiple threads have been detected.  */
-  return *count_p > 1;
-}
-
 /* Return true if the current inferior is multi-threaded.  */
 
-static int
-inf_has_multiple_threads (void)
+static bool
+inf_has_multiple_threads ()
 {
   int count = 0;
 
-  iterate_over_threads (inf_has_multiple_thread_cb, &count);
-  return (count > 1);
+  /* Return true as soon as we see the second thread of the current
+     inferior.  */
+  for (thread_info *tp ATTRIBUTE_UNUSED : current_inferior ()->threads ())
+    if (++count > 1)
+      return true;
+
+  return false;
 }
 
 static void