[05/19] Remove find_inferior_in_random
Commit Message
From: Simon Marchi <simon.marchi@polymtl.ca>
Replace with find_thread_in_random.
gdb/gdbserver/ChangeLog:
* inferiors.c (find_inferior_in_random): Remove.
* inferiors.h (find_inferior_in_random): Remove.
* linux-low.c (status_pending_p_callback): Return bool, accept
parameter ptid directly.
(linux_wait_for_event_filtered): Use find_thread_in_random.
(linux_wait_1): Likewise.
---
gdb/gdbserver/inferiors.c | 12 ------------
gdb/gdbserver/inferiors.h | 3 ---
gdb/gdbserver/linux-low.c | 34 ++++++++++++++++++++--------------
3 files changed, 20 insertions(+), 29 deletions(-)
@@ -42,18 +42,6 @@ find_inferior (std::list<thread_info *> *thread_list,
});
}
-thread_info *
-find_inferior_in_random (std::list<thread_info *> *thread_list,
- int (*func) (thread_info *, void *),
- void *arg)
-{
- gdb_assert (thread_list == &all_threads);
-
- return find_thread_in_random ([&] (thread_info *thread) {
- return func (thread, arg);
- });
-}
-
void
for_each_inferior (std::list<thread_info *> *thread_list,
void (*action) (thread_info *))
@@ -142,9 +142,6 @@ void clear_inferiors (void);
thread_info *find_inferior (std::list<thread_info *> *thread_list,
int (*func) (thread_info *, void *), void *arg);
-thread_info *find_inferior_in_random (std::list<thread_info *> *thread_list,
- int (*func) (thread_info *, void *),
- void *arg);
void for_each_inferior (std::list<thread_info *> *thread_list,
void (*action) (thread_info *));
void for_each_inferior_with_data (std::list<thread_info *> *thread_list,
@@ -1806,16 +1806,15 @@ lwp_resumed (struct lwp_info *lwp)
return 0;
}
-/* Return 1 if this lwp has an interesting status pending. */
-static int
-status_pending_p_callback (thread_info *thread, void *arg)
+/* Return true if this lwp has an interesting status pending. */
+static bool
+status_pending_p_callback (thread_info *thread, ptid_t ptid)
{
struct lwp_info *lp = get_thread_lwp (thread);
- ptid_t ptid = * (ptid_t *) arg;
/* Check if we're only interested in events from a specific process
or a specific LWP. */
- if (!ptid_match (ptid_of (thread), ptid))
+ if (!thread->id.matches (ptid))
return 0;
if (!lwp_resumed (lp))
@@ -2666,9 +2665,11 @@ linux_wait_for_event_filtered (ptid_t wait_ptid, ptid_t filter_ptid,
if (ptid_equal (filter_ptid, minus_one_ptid) || ptid_is_pid (filter_ptid))
{
- event_thread = (struct thread_info *)
- find_inferior_in_random (&all_threads, status_pending_p_callback,
- &filter_ptid);
+ event_thread = find_thread_in_random ([&] (thread_info *thread)
+ {
+ return status_pending_p_callback (thread, filter_ptid);
+ });
+
if (event_thread != NULL)
event_child = get_thread_lwp (event_thread);
if (debug_threads && event_thread)
@@ -2779,9 +2780,11 @@ linux_wait_for_event_filtered (ptid_t wait_ptid, ptid_t filter_ptid,
/* ... and find an LWP with a status to report to the core, if
any. */
- event_thread = (struct thread_info *)
- find_inferior_in_random (&all_threads, status_pending_p_callback,
- &filter_ptid);
+ event_thread = find_thread_in_random ([&] (thread_info *thread)
+ {
+ return status_pending_p_callback (thread, filter_ptid);
+ });
+
if (event_thread != NULL)
{
event_child = get_thread_lwp (event_thread);
@@ -3192,10 +3195,13 @@ linux_wait_1 (ptid_t ptid,
in_step_range = 0;
ourstatus->kind = TARGET_WAITKIND_IGNORE;
+ auto status_pending_p_any = [&] (thread_info *thread)
+ {
+ return status_pending_p_callback (thread, minus_one_ptid);
+ };
+
/* Find a resumed LWP, if any. */
- if (find_inferior (&all_threads,
- status_pending_p_callback,
- &minus_one_ptid) != NULL)
+ if (find_thread (status_pending_p_any) != NULL)
any_resumed = 1;
else if ((find_inferior (&all_threads,
not_stopped_callback,