diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-06-22 14:57:29 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-06-22 14:57:29 -0400 |
| commit | ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca (patch) | |
| tree | c5ae7224e2c4ed65a258e1acce6889e0e80bf9f2 | |
| parent | 4e317a765bbe1c47fb9d461b7effa40f34220c85 (diff) | |
| download | gdb-ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca.zip gdb-ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca.tar.gz gdb-ac0d67ed1dcf470bad6a3bc4800c2ddc9bedecca.tar.bz2 | |
gdb: remove unnecessary parameter wait_ptid from do_target_wait
do_target_wait has a wait_ptid parameter, to filter what ptid we wait
on. The sole caller of do_target_wait passes minus_one_ptid, meaning
"all ptids". So in practice, this parameter is not needed, remove it.
gdb/ChangeLog:
* infrun.c (do_target_wait): Remove wait_ptid parameter.
(fetch_inferior_event): Adjust.
Change-Id: I54119beb43db678e4b2081dc490f89e7ff878e74
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/infrun.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 995c8a1..2bef3a8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-06-22 Simon Marchi <simon.marchi@polymtl.ca> + * infrun.c (do_target_wait): Remove wait_ptid parameter. + (fetch_inferior_event): Adjust. + +2021-06-22 Simon Marchi <simon.marchi@polymtl.ca> + * python/lib/gdb/__init__.py (_execute_unwinders): Return tuple with name of chosen unwinder. * python/py-unwind.c (pyuw_sniffer): Print name of chosen diff --git a/gdb/infrun.c b/gdb/infrun.c index 4bd21fd..9469b74 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3670,8 +3670,7 @@ do_target_wait_1 (inferior *inf, ptid_t ptid, more events. Polls for events from all inferiors/targets. */ static bool -do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, - target_wait_flags options) +do_target_wait (execution_control_state *ecs, target_wait_flags options) { int num_inferiors = 0; int random_selector; @@ -3681,10 +3680,9 @@ do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, polling the rest of the inferior list starting from that one in a circular fashion until the whole list is polled once. */ - auto inferior_matches = [&wait_ptid] (inferior *inf) + auto inferior_matches = [] (inferior *inf) { - return (inf->process_target () != NULL - && ptid_t (inf->pid).matches (wait_ptid)); + return inf->process_target () != nullptr; }; /* First see how many matching inferiors we have. */ @@ -3723,7 +3721,7 @@ do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, auto do_wait = [&] (inferior *inf) { - ecs->ptid = do_target_wait_1 (inf, wait_ptid, &ecs->ws, options); + ecs->ptid = do_target_wait_1 (inf, minus_one_ptid, &ecs->ws, options); ecs->target = inf->process_target (); return (ecs->ws.kind != TARGET_WAITKIND_IGNORE); }; @@ -4080,7 +4078,7 @@ fetch_inferior_event () the event. */ scoped_disable_commit_resumed disable_commit_resumed ("handling event"); - if (!do_target_wait (minus_one_ptid, ecs, TARGET_WNOHANG)) + if (!do_target_wait (ecs, TARGET_WNOHANG)) { infrun_debug_printf ("do_target_wait returned no event"); disable_commit_resumed.reset_and_commit (); |