Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Hurd: Adjust to startup-with-shell changes.

Browse Source 
In commit 98882a2651, STARTUP_WITH_SHELL was made
a runtime toggle, startup-with-shell.  The Hurd code was missed to be adjusted;
it had a value hard-coded instead of using START_INFERIOR_TRAPS_EXPECTED.  Fix
that, and also simplify gnu-nat's pending_execs handling from counting to just
a flag.

	gdb/
	* gnu-nat.c (struct inf): Change pending_execs member to a 1-bit
	flag.  Adjust all users; in particular...
	(gnu_wait): ..., don't decrement its value in here...
	(gnu_create_inferior): ..., and instead set the flag in here,
	around the startup_inferior call, and call that one with
	START_INFERIOR_TRAPS_EXPECTED.
This commit is contained in:
Thomas Schwinge
2014-01-08 21:42:07 +01:00
parent 3398af6aa3
commit c82f56d9d7
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gdb/gnu-nat.c
View File

@@ -210,9 +210,9 @@ struct inf
unsigned int no_wait:1;
/* When starting a new inferior, we don't try to validate threads until all
the proper execs have been done. This is a count of how many execs we
the proper execs have been done, which this flag states we still
expect to happen. */
unsigned pending_execs;
unsigned int pending_execs:1;
/* Fields describing global state. */
@@ -1568,26 +1568,14 @@ rewait:
while execing. */
{
w->suppress = 1;
inf_debug (inf, "pending_execs = %d, ignoring minor event",
inf->pending_execs);
inf_debug (inf, "pending_execs, ignoring minor event");
}
else if (kind == TARGET_WAITKIND_STOPPED
&& w->status.value.sig == GDB_SIGNAL_TRAP)
/* Ah hah! A SIGTRAP from the inferior while starting up probably
means we've succesfully completed an exec! */
{
if (--inf->pending_execs == 0)
/* We're done! */
{
#if 0 /* do we need this? */
prune_threads (1); /* Get rid of the old shell
threads. */
renumber_threads (0); /* Give our threads reasonable
names. */
#endif
}
inf_debug (inf, "pending exec completed, pending_execs => %d",
inf->pending_execs);
inf_debug (inf, "one pending exec completed");
}
else if (kind == TARGET_WAITKIND_STOPPED)
/* It's possible that this signal is because of a crashed process
@@ -2146,7 +2134,7 @@ gnu_create_inferior (struct target_ops *ops,
push_target (ops);
inf->pending_execs = 2;
inf->pending_execs = 1;
inf->nomsg = 1;
inf->traced = 1;
@@ -2158,7 +2146,8 @@ gnu_create_inferior (struct target_ops *ops,
thread_change_ptid (inferior_ptid,
ptid_build (inf->pid, inf_pick_first_thread (), 0));
startup_inferior (inf->pending_execs);
startup_inferior (START_INFERIOR_TRAPS_EXPECTED);
inf->pending_execs = 0;
inf_validate_procinfo (inf);
inf_update_signal_thread (inf);