From: Simon Marchi <simon.marchi@ericsson.com>
To: <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 11/19] Remove usages of find_inferior in select_event_lwp
Date: Mon, 20 Nov 2017 16:35:00 -0000 [thread overview]
Message-ID: <1511195683-2055-12-git-send-email-simon.marchi@ericsson.com> (raw)
In-Reply-To: <1511195683-2055-1-git-send-email-simon.marchi@ericsson.com>
From: Simon Marchi <simon.marchi@polymtl.ca>
Replace with find_thread/for_each_thread. I inlined the callbacks,
because they are relatively simple.
gdb/gdbserver/ChangeLog:
* linux-low.c (select_singlestep_lwp_callback): Remove.
(count_events_callback): Remove.
(select_event_lwp_callback): Remove.
(select_event_lwp): Use find_thread/for_each_thread.
---
gdb/gdbserver/linux-low.c | 93 ++++++++++++++++-------------------------------
1 file changed, 31 insertions(+), 62 deletions(-)
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 85d5572..bffbc53 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -2817,64 +2817,11 @@ linux_wait_for_event (ptid_t ptid, int *wstatp, int options)
return linux_wait_for_event_filtered (ptid, ptid, wstatp, options);
}
-/* Count the LWP's that have had events. */
-
-static int
-count_events_callback (thread_info *thread, void *data)
-{
- struct lwp_info *lp = get_thread_lwp (thread);
- int *count = (int *) data;
-
- gdb_assert (count != NULL);
-
- /* Count only resumed LWPs that have an event pending. */
- if (thread->last_status.kind == TARGET_WAITKIND_IGNORE
- && lp->status_pending_p)
- (*count)++;
-
- return 0;
-}
-
-/* Select the LWP (if any) that is currently being single-stepped. */
-
-static int
-select_singlestep_lwp_callback (thread_info *thread, void *data)
-{
- struct lwp_info *lp = get_thread_lwp (thread);
-
- if (thread->last_status.kind == TARGET_WAITKIND_IGNORE
- && thread->last_resume_kind == resume_step
- && lp->status_pending_p)
- return 1;
- else
- return 0;
-}
-
-/* Select the Nth LWP that has had an event. */
-
-static int
-select_event_lwp_callback (thread_info *thread, void *data)
-{
- struct lwp_info *lp = get_thread_lwp (thread);
- int *selector = (int *) data;
-
- gdb_assert (selector != NULL);
-
- /* Select only resumed LWPs that have an event pending. */
- if (thread->last_status.kind == TARGET_WAITKIND_IGNORE
- && lp->status_pending_p)
- if ((*selector)-- == 0)
- return 1;
-
- return 0;
-}
-
/* Select one LWP out of those that have events pending. */
static void
select_event_lwp (struct lwp_info **orig_lp)
{
- int num_events = 0;
int random_selector;
struct thread_info *event_thread = NULL;
@@ -2888,10 +2835,15 @@ select_event_lwp (struct lwp_info **orig_lp)
would report it to the user as a random signal. */
if (!non_stop)
{
- event_thread
- = (struct thread_info *) find_inferior (&all_threads,
- select_singlestep_lwp_callback,
- NULL);
+ event_thread = find_thread ([] (thread_info *thread)
+ {
+ lwp_info *lp = get_thread_lwp (thread);
+
+ return (thread->last_status.kind == TARGET_WAITKIND_IGNORE
+ && thread->last_resume_kind == resume_step
+ && lp->status_pending_p);
+ });
+
if (event_thread != NULL)
{
if (debug_threads)
@@ -2905,7 +2857,16 @@ select_event_lwp (struct lwp_info **orig_lp)
which have had events. */
/* First see how many events we have. */
- find_inferior (&all_threads, count_events_callback, &num_events);
+ int num_events = 0;
+ for_each_thread ([&] (thread_info *thread)
+ {
+ lwp_info *lp = get_thread_lwp (thread);
+
+ /* Count only resumed LWPs that have an event pending. */
+ if (thread->last_status.kind == TARGET_WAITKIND_IGNORE
+ && lp->status_pending_p)
+ num_events++;
+ });
gdb_assert (num_events > 0);
/* Now randomly pick a LWP out of those that have had
@@ -2917,10 +2878,18 @@ select_event_lwp (struct lwp_info **orig_lp)
debug_printf ("SEL: Found %d SIGTRAP events, selecting #%d\n",
num_events, random_selector);
- event_thread
- = (struct thread_info *) find_inferior (&all_threads,
- select_event_lwp_callback,
- &random_selector);
+ event_thread = find_thread ([&] (thread_info *thread)
+ {
+ lwp_info *lp = get_thread_lwp (thread);
+
+ /* Select only resumed LWPs that have an event pending. */
+ if (thread->last_status.kind == TARGET_WAITKIND_IGNORE
+ && lp->status_pending_p)
+ if (random_selector-- == 0)
+ return true;
+
+ return false;
+ });
}
if (event_thread != NULL)
--
2.7.4
next prev parent reply other threads:[~2017-11-20 16:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 16:35 [PATCH 00/19] Remove find_inferior* and for_each_inferior* Simon Marchi
2017-11-20 16:35 ` [PATCH 16/19] Update comments Simon Marchi
2017-11-20 16:35 ` [PATCH 04/19] Remove find_inferior_id Simon Marchi
2017-11-20 16:35 ` [PATCH 19/19] Remove for_each_inferior_with_data Simon Marchi
2017-11-20 16:35 ` [PATCH 10/19] Remove usages of find_inferior calling not_stopped_callback Simon Marchi
2017-11-20 16:35 ` [PATCH 14/19] Remove usage of find_inferior in linux_resume Simon Marchi
2017-11-20 16:35 ` [PATCH 09/19] Remove usage of find_inferior in find_lwp_pid Simon Marchi
2017-11-20 16:35 ` [PATCH 01/19] Remove usage of find_inferior in regcache_invalidate_pid Simon Marchi
2017-11-20 16:35 ` [PATCH 05/19] Remove find_inferior_in_random Simon Marchi
2017-11-20 16:35 ` [PATCH 13/19] Remove usages of find_inferior in stop_all_lwps Simon Marchi
2017-11-20 16:35 ` [PATCH 12/19] Remove usage of find_inferior in linux_stabilize_threads Simon Marchi
2017-11-20 16:35 ` [PATCH 02/19] Remove usage of find_inferior in lynx_mourn Simon Marchi
2017-11-20 16:35 ` [PATCH 18/19] Remove for_each_inferior Simon Marchi
2017-11-20 16:35 ` [PATCH 17/19] Remove find_inferior Simon Marchi
2017-11-20 16:35 ` Simon Marchi [this message]
2017-11-20 16:35 ` [PATCH 08/19] Remove usage of find_inferior in linux_mourn Simon Marchi
2017-11-20 16:35 ` [PATCH 07/19] Remove usage of find_inferior in linux_detach Simon Marchi
2017-11-20 16:35 ` [PATCH 03/19] Remove usages of find_inferior in linux-mips-low.c Simon Marchi
2017-11-20 16:35 ` [PATCH 06/19] Remove usage of find_inferior in last_thread_of_process_p Simon Marchi
2017-11-20 16:35 ` [PATCH 15/19] Remove usages of find_inferior that call proceed_one_lwp Simon Marchi
2017-12-03 1:48 ` [PATCH 00/19] Remove find_inferior* and for_each_inferior* Simon Marchi
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=1511195683-2055-12-git-send-email-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).