Delete program spaces directly when removing inferiors
When deleting an inferior, delete the associated program space as well if it becomes unused. This replaces the "pruning" approach, with which you could forget to call prune_program_spaces (as seen, with the -remove-inferior command, see [1]). This allows to remove the prune_program_spaces function. At the same time, I was able to clean up the delete_inferior* family: - delete_inferior is unused - delete_inferior_silent is only used in monitor_close, but is replaced with discard_all_inferiors [2], so it becomes unused - All remaining calls to delete_inferior_1 are with silent=1, so the parameter is removed - delete_inferior_1 is renamed to delete_inferior I renamed pspace_empty_p to program_space_empty_p. I prefer if the "exported" functions have a more explicit and standard name. Tested on Ubuntu 14.10. [1] https://sourceware.org/ml/gdb-patches/2014-09/msg00717.html [2] See https://sourceware.org/ml/gdb-patches/2015-07/msg00228.html and follow-ups for details. gdb/Changelog: * inferior.c (delete_inferior_1): Rename to ... (delete_inferior): ..., remove 'silent' parameter, delete program space when unused and remove call to prune_program_spaces. Remove the old, unused, delete_inferior. (delete_inferior_silent): Remove. (prune_inferiors): Change call from delete_inferior_1 to delete_inferior and remove 'silent' parameter. Remove call to prune_program_spaces. (remove_inferior_command): Idem. * inferior.h (delete_inferior_1): Rename to... (delete_inferior): ..., remove 'silent' parameter and remove the original delete_inferior. (delete_inferior_silent): Remove. * mi/mi-main.c (mi_cmd_remove_inferior): Change call from delete_inferior_1 to delete_inferior and remove 'silent' parameter. * progspace.c (prune_program_spaces): Remove. (pspace_empty_p): Rename to... (program_space_empty_p): ... and make non-static. (delete_program_space): New. * progspace.h (prune_program_spaces): Remove declaration. (program_space_empty_p): New declaration. (delete_program_space): New declaration. * monitor.c (monitor_close): Replace call to delete_thread_silent and delete_inferior_silent with discard_all_inferiors.
This commit is contained in:
Simon Marchi
parent
7e30235281
commit
7a41607e01
|
|
@ -1,3 +1,32 @@
|
|||
2015-07-08 Simon Marchi <simon.marchi@ericsson.com>
|
||||
|
||||
* inferior.c (delete_inferior_1): Rename to ...
|
||||
(delete_inferior): ..., remove 'silent' parameter, delete
|
||||
program space when unused and remove call to prune_program_spaces.
|
||||
Remove the old, unused, delete_inferior.
|
||||
(delete_inferior_silent): Remove.
|
||||
(prune_inferiors): Change call from delete_inferior_1 to
|
||||
delete_inferior and remove 'silent' parameter. Remove call to
|
||||
prune_program_spaces.
|
||||
(remove_inferior_command): Idem.
|
||||
* inferior.h (delete_inferior_1): Rename to...
|
||||
(delete_inferior): ..., remove 'silent' parameter and remove the
|
||||
original delete_inferior.
|
||||
(delete_inferior_silent): Remove.
|
||||
* mi/mi-main.c (mi_cmd_remove_inferior): Change call from
|
||||
delete_inferior_1 to delete_inferior and remove 'silent'
|
||||
parameter.
|
||||
* progspace.c (prune_program_spaces): Remove.
|
||||
(pspace_empty_p): Rename to...
|
||||
(program_space_empty_p): ... and make non-static.
|
||||
(delete_program_space): New.
|
||||
* progspace.h (prune_program_spaces): Remove declaration.
|
||||
(program_space_empty_p): New declaration.
|
||||
(delete_program_space): New declaration.
|
||||
* monitor.c (monitor_close): Replace call to
|
||||
delete_thread_silent and delete_inferior_silent with
|
||||
discard_all_inferiors.
|
||||
|
||||
2015-07-08 Patrick Palka <patrick@parcs.ath.cx>
|
||||
|
||||
* defs.h (deprecated_register_changed_hook): Remove prototype.
|
||||
|
|
|
|||
|
|
@ -184,11 +184,8 @@ delete_thread_of_inferior (struct thread_info *tp, void *data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* If SILENT then be quiet -- don't announce a inferior death, or the
|
||||
exit of its threads. */
|
||||
|
||||
void
|
||||
delete_inferior_1 (struct inferior *todel, int silent)
|
||||
delete_inferior (struct inferior *todel)
|
||||
{
|
||||
struct inferior *inf, *infprev;
|
||||
struct delete_thread_of_inferior_arg arg;
|
||||
|
|
@ -203,7 +200,7 @@ delete_inferior_1 (struct inferior *todel, int silent)
|
|||
return;
|
||||
|
||||
arg.pid = inf->pid;
|
||||
arg.silent = silent;
|
||||
arg.silent = 1;
|
||||
|
||||
iterate_over_threads (delete_thread_of_inferior, &arg);
|
||||
|
||||
|
|
@ -214,29 +211,13 @@ delete_inferior_1 (struct inferior *todel, int silent)
|
|||
|
||||
observer_notify_inferior_removed (inf);
|
||||
|
||||
/* If this program space is rendered useless, remove it. */
|
||||
if (program_space_empty_p (inf->pspace))
|
||||
delete_program_space (inf->pspace);
|
||||
|
||||
free_inferior (inf);
|
||||
}
|
||||
|
||||
void
|
||||
delete_inferior (int pid)
|
||||
{
|
||||
struct inferior *inf = find_inferior_pid (pid);
|
||||
|
||||
delete_inferior_1 (inf, 0);
|
||||
|
||||
if (print_inferior_events)
|
||||
printf_unfiltered (_("[Inferior %d exited]\n"), pid);
|
||||
}
|
||||
|
||||
void
|
||||
delete_inferior_silent (int pid)
|
||||
{
|
||||
struct inferior *inf = find_inferior_pid (pid);
|
||||
|
||||
delete_inferior_1 (inf, 1);
|
||||
}
|
||||
|
||||
|
||||
/* If SILENT then be quiet -- don't announce a inferior exit, or the
|
||||
exit of its threads. */
|
||||
|
||||
|
|
@ -509,11 +490,9 @@ prune_inferiors (void)
|
|||
}
|
||||
|
||||
*ss_link = ss->next;
|
||||
delete_inferior_1 (ss, 1);
|
||||
delete_inferior (ss);
|
||||
ss = *ss_link;
|
||||
}
|
||||
|
||||
prune_program_spaces ();
|
||||
}
|
||||
|
||||
/* Simply returns the count of inferiors. */
|
||||
|
|
@ -797,10 +776,8 @@ remove_inferior_command (char *args, int from_tty)
|
|||
continue;
|
||||
}
|
||||
|
||||
delete_inferior_1 (inf, 1);
|
||||
delete_inferior (inf);
|
||||
}
|
||||
|
||||
prune_program_spaces ();
|
||||
}
|
||||
|
||||
struct inferior *
|
||||
|
|
|
|||
|
|
@ -418,14 +418,7 @@ extern struct inferior *add_inferior (int pid);
|
|||
the CLI. */
|
||||
extern struct inferior *add_inferior_silent (int pid);
|
||||
|
||||
/* Delete an existing inferior list entry, due to inferior exit. */
|
||||
extern void delete_inferior (int pid);
|
||||
|
||||
extern void delete_inferior_1 (struct inferior *todel, int silent);
|
||||
|
||||
/* Same as delete_inferior, but don't print new inferior notifications
|
||||
to the CLI. */
|
||||
extern void delete_inferior_silent (int pid);
|
||||
extern void delete_inferior (struct inferior *todel);
|
||||
|
||||
/* Delete an existing inferior list entry, due to inferior detaching. */
|
||||
extern void detach_inferior (int pid);
|
||||
|
|
|
|||
|
|
@ -1964,7 +1964,7 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc)
|
|||
set_current_program_space (new_inferior->pspace);
|
||||
}
|
||||
|
||||
delete_inferior_1 (inf, 1 /* silent */);
|
||||
delete_inferior (inf);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -853,8 +853,7 @@ monitor_close (struct target_ops *self)
|
|||
|
||||
monitor_desc = NULL;
|
||||
|
||||
delete_thread_silent (monitor_ptid);
|
||||
delete_inferior_silent (ptid_get_pid (monitor_ptid));
|
||||
discard_all_inferiors ();
|
||||
}
|
||||
|
||||
/* Terminate the open connection to the remote debugger. Use this
|
||||
|
|
|
|||
|
|
@ -235,8 +235,8 @@ save_current_program_space (void)
|
|||
|
||||
/* Returns true iff there's no inferior bound to PSPACE. */
|
||||
|
||||
static int
|
||||
pspace_empty_p (struct program_space *pspace)
|
||||
int
|
||||
program_space_empty_p (struct program_space *pspace)
|
||||
{
|
||||
if (find_inferior_for_program_space (pspace) != NULL)
|
||||
return 0;
|
||||
|
|
@ -244,30 +244,31 @@ pspace_empty_p (struct program_space *pspace)
|
|||
return 1;
|
||||
}
|
||||
|
||||
/* Prune away automatically added program spaces that aren't required
|
||||
anymore. */
|
||||
/* Remove a program space from the program spaces list and release it. It is
|
||||
an error to call this function while PSPACE is the current program space. */
|
||||
|
||||
void
|
||||
prune_program_spaces (void)
|
||||
delete_program_space (struct program_space *pspace)
|
||||
{
|
||||
struct program_space *ss, **ss_link;
|
||||
struct program_space *current = current_program_space;
|
||||
gdb_assert(pspace != NULL);
|
||||
gdb_assert(pspace != current_program_space);
|
||||
|
||||
ss = program_spaces;
|
||||
ss_link = &program_spaces;
|
||||
while (ss)
|
||||
while (ss != NULL)
|
||||
{
|
||||
if (ss == current || !pspace_empty_p (ss))
|
||||
if (ss == pspace)
|
||||
{
|
||||
ss_link = &ss->next;
|
||||
ss = *ss_link;
|
||||
continue;
|
||||
*ss_link = ss->next;
|
||||
break;
|
||||
}
|
||||
|
||||
*ss_link = ss->next;
|
||||
release_program_space (ss);
|
||||
ss_link = &ss->next;
|
||||
ss = *ss_link;
|
||||
}
|
||||
|
||||
release_program_space (pspace);
|
||||
}
|
||||
|
||||
/* Prints the list of program spaces and their details on UIOUT. If
|
||||
|
|
|
|||
|
|
@ -236,9 +236,16 @@ extern struct program_space *current_program_space;
|
|||
pointer to the new object. */
|
||||
extern struct program_space *add_program_space (struct address_space *aspace);
|
||||
|
||||
/* Remove a program space from the program spaces list and release it. It is
|
||||
an error to call this function while PSPACE is the current program space. */
|
||||
extern void delete_program_space (struct program_space *pspace);
|
||||
|
||||
/* Returns the number of program spaces listed. */
|
||||
extern int number_of_program_spaces (void);
|
||||
|
||||
/* Returns true iff there's no inferior bound to PSPACE. */
|
||||
extern int program_space_empty_p (struct program_space *pspace);
|
||||
|
||||
/* Copies program space SRC to DEST. Copies the main executable file,
|
||||
and the main symbol file. Returns DEST. */
|
||||
extern struct program_space *clone_program_space (struct program_space *dest,
|
||||
|
|
@ -289,10 +296,6 @@ extern int address_space_num (struct address_space *aspace);
|
|||
mappings. */
|
||||
extern void update_address_spaces (void);
|
||||
|
||||
/* Prune away automatically added program spaces that aren't required
|
||||
anymore. */
|
||||
extern void prune_program_spaces (void);
|
||||
|
||||
/* Reset saved solib data at the start of an solib event. This lets
|
||||
us properly collect the data when calling solib_add, so it can then
|
||||
later be printed. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue