Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gdb: remove unnecessary parameter wait_ptid from do_target_wait"

Browse Source 
This reverts commit ac0d67ed1d.

There was nothing wrong with the commit which I'm reverting here, but
it removed some functionality that will be needed for a later commit;
that is, the ability for GDB to ask for events from a specific ptid_t
via the do_target_wait function.

In a follow up commit, this functionality will be used to implement
inferior function calls in multi-threaded inferiors.

This is not a straight revert of the above commit.  Reverting the
above commit replaces a 'nullptr' with 'NULL', I've gone in and
changed that, preserving the 'nullptr'.

Reviewed-By: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Tested-By: Luis Machado <luis.machado@arm.com>
Tested-By: Keith Seitz <keiths@redhat.com>
This commit is contained in:
Andrew Burgess
2022-05-09 17:51:54 +01:00
parent 198ff6ff81
commit 07505b613a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/infrun.c
View File

@@ -4125,7 +4125,8 @@ do_target_wait_1 (inferior *inf, ptid_t ptid,
more events. Polls for events from all inferiors/targets. */ more events. Polls for events from all inferiors/targets. */
static bool static bool
do_target_wait (execution_control_state *ecs, target_wait_flags options) do_target_wait (ptid_t wait_ptid, execution_control_state *ecs,
target_wait_flags options)
{ {
int num_inferiors = 0; int num_inferiors = 0;
int random_selector; int random_selector;
@@ -4135,9 +4136,10 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options)
polling the rest of the inferior list starting from that one in a polling the rest of the inferior list starting from that one in a
circular fashion until the whole list is polled once. */ circular fashion until the whole list is polled once. */
auto inferior_matches = [] (inferior *inf) auto inferior_matches = [&wait_ptid] (inferior *inf)
{ {
return inf->process_target () != nullptr; return (inf->process_target () != nullptr
&& ptid_t (inf->pid).matches (wait_ptid));
}; };
/* First see how many matching inferiors we have. */ /* First see how many matching inferiors we have. */
@@ -4176,7 +4178,7 @@ do_target_wait (execution_control_state *ecs, target_wait_flags options)
auto do_wait = [&] (inferior *inf) auto do_wait = [&] (inferior *inf)
{ {
ecs->ptid = do_target_wait_1 (inf, minus_one_ptid, &ecs->ws, options); ecs->ptid = do_target_wait_1 (inf, wait_ptid, &ecs->ws, options);
ecs->target = inf->process_target (); ecs->target = inf->process_target ();
return (ecs->ws.kind () != TARGET_WAITKIND_IGNORE); return (ecs->ws.kind () != TARGET_WAITKIND_IGNORE);
}; };
@@ -4626,7 +4628,7 @@ fetch_inferior_event ()
the event. */ the event. */
scoped_disable_commit_resumed disable_commit_resumed ("handling event"); scoped_disable_commit_resumed disable_commit_resumed ("handling event");
if (!do_target_wait (&ecs, TARGET_WNOHANG)) if (!do_target_wait (minus_one_ptid, &ecs, TARGET_WNOHANG))
{ {
infrun_debug_printf ("do_target_wait returned no event"); infrun_debug_printf ("do_target_wait returned no event");
disable_commit_resumed.reset_and_commit (); disable_commit_resumed.reset_and_commit ();