diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/bsd-kvm.c | 2 | ||||
| -rw-r--r-- | gdb/corelow.c | 2 | ||||
| -rw-r--r-- | gdb/inferior.c | 23 | ||||
| -rw-r--r-- | gdb/inferior.h | 7 | ||||
| -rw-r--r-- | gdb/infrun.c | 2 | ||||
| -rw-r--r-- | gdb/tracectf.c | 2 | ||||
| -rw-r--r-- | gdb/tracefile-tfile.c | 2 |
7 files changed, 13 insertions, 27 deletions
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c index 49041ef..7fb51dc 100644 --- a/gdb/bsd-kvm.c +++ b/gdb/bsd-kvm.c @@ -154,7 +154,7 @@ bsd_kvm_target::close () bsd_kvm_corefile.clear (); switch_to_no_thread (); - exit_inferior_silent (current_inferior ()); + exit_inferior (current_inferior ()); } static LONGEST diff --git a/gdb/corelow.c b/gdb/corelow.c index 46bb107..4d692dc 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -328,7 +328,7 @@ core_target::clear_core () { switch_to_no_thread (); /* Avoid confusion from thread stuff. */ - exit_inferior_silent (current_inferior ()); + exit_inferior (current_inferior ()); /* Clear out solib state while the bfd is still open. See comments in clear_solib in solib.c. */ diff --git a/gdb/inferior.c b/gdb/inferior.c index 7220b70..cf4caa9 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -301,11 +301,10 @@ notify_inferior_disappeared (inferior *inf) gdb::observers::inferior_exit.notify (inf); } -/* If SILENT then be quiet -- don't announce a inferior exit, or the - exit of its threads. */ +/* See inferior.h. */ -static void -exit_inferior_1 (struct inferior *inf, int silent) +void +exit_inferior (struct inferior *inf) { inf->clear_thread_list (); @@ -335,27 +334,15 @@ exit_inferior_1 (struct inferior *inf, int silent) reinit_frame_cache (); } -void -exit_inferior (inferior *inf) -{ - exit_inferior_1 (inf, 0); -} - -void -exit_inferior_silent (inferior *inf) -{ - exit_inferior_1 (inf, 1); -} - /* See inferior.h. */ void detach_inferior (inferior *inf) { - /* Save the pid, since exit_inferior_1 will reset it. */ + /* Save the pid, since exit_inferior will reset it. */ int pid = inf->pid; - exit_inferior_1 (inf, 0); + exit_inferior (inf); if (print_inferior_events) gdb_printf (_("[Inferior %d (%s) detached]\n"), diff --git a/gdb/inferior.h b/gdb/inferior.h index c8429b8..0467258 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -704,12 +704,11 @@ extern void delete_inferior (struct inferior *todel); /* Delete an existing inferior list entry, due to inferior detaching. */ extern void detach_inferior (inferior *inf); +/* Notify observers and interpreters that INF has gone away. Reset the INF + object back to an default, empty, state. Clear register and frame + caches. */ extern void exit_inferior (inferior *inf); -extern void exit_inferior_silent (inferior *inf); - -extern void exit_inferior_num_silent (int num); - extern void inferior_appeared (struct inferior *inf, int pid); /* Search function to lookup an inferior of TARG by target 'pid'. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 72852e6..4730d29 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1328,7 +1328,7 @@ follow_exec (ptid_t ptid, const char *exec_file_target) following_inferior = add_inferior_with_spaces (); swap_terminal_info (following_inferior, execing_inferior); - exit_inferior_silent (execing_inferior); + exit_inferior (execing_inferior); following_inferior->pid = pid; } diff --git a/gdb/tracectf.c b/gdb/tracectf.c index 0ed2092..1f3ec58 100644 --- a/gdb/tracectf.c +++ b/gdb/tracectf.c @@ -1187,7 +1187,7 @@ ctf_target::close () trace_dirname.reset (); switch_to_no_thread (); /* Avoid confusion from thread stuff. */ - exit_inferior_silent (current_inferior ()); + exit_inferior (current_inferior ()); trace_reset_local_state (); } diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index 59055e7..3440f37 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -616,7 +616,7 @@ tfile_target::close () gdb_assert (trace_fd != -1); switch_to_no_thread (); /* Avoid confusion from thread stuff. */ - exit_inferior_silent (current_inferior ()); + exit_inferior (current_inferior ()); ::close (trace_fd); trace_fd = -1; |