5ed8105e02
After all the make_cleanup_restore_current_thread fixing, I thought I'd convert that and its relatives (which are all cleanups) to RAII classes. scoped_restore_current_pspace_and_thread was put in a separate file to avoid a circular dependency. Tested on x86-64 Fedora 23, native and gdbserver. gdb/ChangeLog: 2017-05-04 Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add progspace-and-thread.c. (HFILES_NO_SRCDIR): Add progspace-and-thread.h. (COMMON_OBS): Add progspace-and-thread.o. * breakpoint.c: Include "progspace-and-thread.h". (update_inserted_breakpoint_locations) (insert_breakpoint_locations, create_longjmp_master_breakpoint): Use scoped_restore_current_pspace_and_thread. (create_std_terminate_master_breakpoint): Use scoped_restore_current_program_space. (remove_breakpoint): Use scoped_restore_current_pspace_and_thread. (print_breakpoint_location): Use scoped_restore_current_program_space. (bp_loc_is_permanent): Use scoped_restore_current_pspace_and_thread. (resolve_sal_pc): Use scoped_restore_current_pspace_and_thread. (download_tracepoint_locations): Use scoped_restore_current_pspace_and_thread. (breakpoint_re_set): Use scoped_restore_current_pspace_and_thread. * exec.c (exec_close_1): Use scoped_restore_current_program_space. (enum step_over_calls_kind): Moved from inferior.h. (class scoped_restore_current_thread): New class. * gdbthread.h (make_cleanup_restore_current_thread): Delete declaration. (scoped_restore_current_thread): New class. * infcmd.c: Include "common/gdb_optional.h". (continue_1, proceed_after_attach): Use scoped_restore_current_thread. (notice_new_inferior): Use scoped_restore_current_thread. * inferior.c: Include "progspace-and-thread.h". (restore_inferior, save_current_inferior): Delete. (add_inferior_command, clone_inferior_command): Use scoped_restore_current_pspace_and_thread. * inferior.h (scoped_restore_current_inferior): New class. * infrun.c: Include "progspace-and-thread.h" and "common/gdb_optional.h". (follow_fork_inferior): Use scoped_restore_current_pspace_and_thread. (scoped_restore_exited_inferior): New class. (handle_vfork_child_exec_or_exit): Use scoped_restore_exited_inferior, scoped_restore_current_pspace_and_thread, scoped_restore_current_thread and scoped_restore. (fetch_inferior_event): Use scoped_restore_current_thread. * linespec.c (decode_line_full, decode_line_1): Use scoped_restore_current_program_space. * mi/mi-main.c: Include "progspace-and-thread.h". (exec_continue): Use scoped_restore_current_thread. (mi_cmd_exec_run): Use scoped_restore_current_pspace_and_thread. (mi_cmd_trace_frame_collected): Use scoped_restore_current_thread. * proc-service.c (ps_pglobal_lookup): Use scoped_restore_current_program_space. * progspace-and-thread.c: New file. * progspace-and-thread.h: New file. * progspace.c (release_program_space, clone_program_space): Use scoped_restore_current_program_space. (restore_program_space, save_current_program_space) (save_current_space_and_thread): Delete. (switch_to_program_space_and_thread): Moved to progspace-and-thread.c. * progspace.h (save_current_program_space) (save_current_space_and_thread): Delete declarations. (scoped_restore_current_program_space): New class. * remote.c (remote_btrace_maybe_reopen): Use scoped_restore_current_thread. * symtab.c: Include "progspace-and-thread.h". (skip_prologue_sal): Use scoped_restore_current_pspace_and_thread. * thread.c (print_thread_info_1): Use scoped_restore_current_thread. (struct current_thread_cleanup): Delete. (do_restore_current_thread_cleanup) (restore_current_thread_cleanup_dtor): Rename/convert both to ... (scoped_restore_current_thread::~scoped_restore_current_thread): ... this new dtor. (make_cleanup_restore_current_thread): Rename/convert to ... (scoped_restore_current_thread::scoped_restore_current_thread): ... this new ctor. (thread_apply_all_command): Use scoped_restore_current_thread. (thread_apply_command): Use scoped_restore_current_thread. * tracepoint.c (tdump_command): Use scoped_restore_current_thread. * varobj.c (value_of_root_1): Use scoped_restore_current_thread.
453 lines
11 KiB
C
453 lines
11 KiB
C
/* Program and address space management, for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 2009-2017 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "gdbcmd.h"
|
||
#include "objfiles.h"
|
||
#include "arch-utils.h"
|
||
#include "gdbcore.h"
|
||
#include "solib.h"
|
||
#include "gdbthread.h"
|
||
|
||
/* The last program space number assigned. */
|
||
int last_program_space_num = 0;
|
||
|
||
/* The head of the program spaces list. */
|
||
struct program_space *program_spaces;
|
||
|
||
/* Pointer to the current program space. */
|
||
struct program_space *current_program_space;
|
||
|
||
/* The last address space number assigned. */
|
||
static int highest_address_space_num;
|
||
|
||
|
||
|
||
/* Keep a registry of per-program_space data-pointers required by other GDB
|
||
modules. */
|
||
|
||
DEFINE_REGISTRY (program_space, REGISTRY_ACCESS_FIELD)
|
||
|
||
/* An address space. It is used for comparing if pspaces/inferior/threads
|
||
see the same address space and for associating caches to each address
|
||
space. */
|
||
|
||
struct address_space
|
||
{
|
||
int num;
|
||
|
||
/* Per aspace data-pointers required by other GDB modules. */
|
||
REGISTRY_FIELDS;
|
||
};
|
||
|
||
/* Keep a registry of per-address_space data-pointers required by other GDB
|
||
modules. */
|
||
|
||
DEFINE_REGISTRY (address_space, REGISTRY_ACCESS_FIELD)
|
||
|
||
|
||
|
||
/* Create a new address space object, and add it to the list. */
|
||
|
||
struct address_space *
|
||
new_address_space (void)
|
||
{
|
||
struct address_space *aspace;
|
||
|
||
aspace = XCNEW (struct address_space);
|
||
aspace->num = ++highest_address_space_num;
|
||
address_space_alloc_data (aspace);
|
||
|
||
return aspace;
|
||
}
|
||
|
||
/* Maybe create a new address space object, and add it to the list, or
|
||
return a pointer to an existing address space, in case inferiors
|
||
share an address space on this target system. */
|
||
|
||
struct address_space *
|
||
maybe_new_address_space (void)
|
||
{
|
||
int shared_aspace = gdbarch_has_shared_address_space (target_gdbarch ());
|
||
|
||
if (shared_aspace)
|
||
{
|
||
/* Just return the first in the list. */
|
||
return program_spaces->aspace;
|
||
}
|
||
|
||
return new_address_space ();
|
||
}
|
||
|
||
static void
|
||
free_address_space (struct address_space *aspace)
|
||
{
|
||
address_space_free_data (aspace);
|
||
xfree (aspace);
|
||
}
|
||
|
||
int
|
||
address_space_num (struct address_space *aspace)
|
||
{
|
||
return aspace->num;
|
||
}
|
||
|
||
/* Start counting over from scratch. */
|
||
|
||
static void
|
||
init_address_spaces (void)
|
||
{
|
||
highest_address_space_num = 0;
|
||
}
|
||
|
||
|
||
|
||
/* Adds a new empty program space to the program space list, and binds
|
||
it to ASPACE. Returns the pointer to the new object. */
|
||
|
||
struct program_space *
|
||
add_program_space (struct address_space *aspace)
|
||
{
|
||
struct program_space *pspace;
|
||
|
||
pspace = XCNEW (struct program_space);
|
||
|
||
pspace->num = ++last_program_space_num;
|
||
pspace->aspace = aspace;
|
||
|
||
program_space_alloc_data (pspace);
|
||
|
||
if (program_spaces == NULL)
|
||
program_spaces = pspace;
|
||
else
|
||
{
|
||
struct program_space *last;
|
||
|
||
for (last = program_spaces; last->next != NULL; last = last->next)
|
||
;
|
||
last->next = pspace;
|
||
}
|
||
|
||
return pspace;
|
||
}
|
||
|
||
/* Releases program space PSPACE, and all its contents (shared
|
||
libraries, objfiles, and any other references to the PSPACE in
|
||
other modules). It is an internal error to call this when PSPACE
|
||
is the current program space, since there should always be a
|
||
program space. */
|
||
|
||
static void
|
||
release_program_space (struct program_space *pspace)
|
||
{
|
||
gdb_assert (pspace != current_program_space);
|
||
|
||
scoped_restore_current_program_space restore_pspace;
|
||
|
||
set_current_program_space (pspace);
|
||
|
||
breakpoint_program_space_exit (pspace);
|
||
no_shared_libraries (NULL, 0);
|
||
exec_close ();
|
||
free_all_objfiles ();
|
||
if (!gdbarch_has_shared_address_space (target_gdbarch ()))
|
||
free_address_space (pspace->aspace);
|
||
clear_section_table (&pspace->target_sections);
|
||
clear_program_space_solib_cache (pspace);
|
||
/* Discard any data modules have associated with the PSPACE. */
|
||
program_space_free_data (pspace);
|
||
xfree (pspace);
|
||
}
|
||
|
||
/* Copies program space SRC to DEST. Copies the main executable file,
|
||
and the main symbol file. Returns DEST. */
|
||
|
||
struct program_space *
|
||
clone_program_space (struct program_space *dest, struct program_space *src)
|
||
{
|
||
scoped_restore_current_program_space restore_pspace;
|
||
|
||
set_current_program_space (dest);
|
||
|
||
if (src->pspace_exec_filename != NULL)
|
||
exec_file_attach (src->pspace_exec_filename, 0);
|
||
|
||
if (src->symfile_object_file != NULL)
|
||
symbol_file_add_main (objfile_name (src->symfile_object_file), 0);
|
||
|
||
return dest;
|
||
}
|
||
|
||
/* Sets PSPACE as the current program space. It is the caller's
|
||
responsibility to make sure that the currently selected
|
||
inferior/thread matches the selected program space. */
|
||
|
||
void
|
||
set_current_program_space (struct program_space *pspace)
|
||
{
|
||
if (current_program_space == pspace)
|
||
return;
|
||
|
||
gdb_assert (pspace != NULL);
|
||
|
||
current_program_space = pspace;
|
||
|
||
/* Different symbols change our view of the frame chain. */
|
||
reinit_frame_cache ();
|
||
}
|
||
|
||
/* Returns true iff there's no inferior bound to PSPACE. */
|
||
|
||
int
|
||
program_space_empty_p (struct program_space *pspace)
|
||
{
|
||
if (find_inferior_for_program_space (pspace) != NULL)
|
||
return 0;
|
||
|
||
return 1;
|
||
}
|
||
|
||
/* 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
|
||
delete_program_space (struct program_space *pspace)
|
||
{
|
||
struct program_space *ss, **ss_link;
|
||
gdb_assert (pspace != NULL);
|
||
gdb_assert (pspace != current_program_space);
|
||
|
||
ss = program_spaces;
|
||
ss_link = &program_spaces;
|
||
while (ss != NULL)
|
||
{
|
||
if (ss == pspace)
|
||
{
|
||
*ss_link = ss->next;
|
||
break;
|
||
}
|
||
|
||
ss_link = &ss->next;
|
||
ss = *ss_link;
|
||
}
|
||
|
||
release_program_space (pspace);
|
||
}
|
||
|
||
/* Prints the list of program spaces and their details on UIOUT. If
|
||
REQUESTED is not -1, it's the ID of the pspace that should be
|
||
printed. Otherwise, all spaces are printed. */
|
||
|
||
static void
|
||
print_program_space (struct ui_out *uiout, int requested)
|
||
{
|
||
struct program_space *pspace;
|
||
int count = 0;
|
||
struct cleanup *old_chain;
|
||
|
||
/* Compute number of pspaces we will print. */
|
||
ALL_PSPACES (pspace)
|
||
{
|
||
if (requested != -1 && pspace->num != requested)
|
||
continue;
|
||
|
||
++count;
|
||
}
|
||
|
||
/* There should always be at least one. */
|
||
gdb_assert (count > 0);
|
||
|
||
old_chain = make_cleanup_ui_out_table_begin_end (uiout, 3, count, "pspaces");
|
||
uiout->table_header (1, ui_left, "current", "");
|
||
uiout->table_header (4, ui_left, "id", "Id");
|
||
uiout->table_header (17, ui_left, "exec", "Executable");
|
||
uiout->table_body ();
|
||
|
||
ALL_PSPACES (pspace)
|
||
{
|
||
struct inferior *inf;
|
||
int printed_header;
|
||
|
||
if (requested != -1 && requested != pspace->num)
|
||
continue;
|
||
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
if (pspace == current_program_space)
|
||
uiout->field_string ("current", "*");
|
||
else
|
||
uiout->field_skip ("current");
|
||
|
||
uiout->field_int ("id", pspace->num);
|
||
|
||
if (pspace->pspace_exec_filename)
|
||
uiout->field_string ("exec", pspace->pspace_exec_filename);
|
||
else
|
||
uiout->field_skip ("exec");
|
||
|
||
/* Print extra info that doesn't really fit in tabular form.
|
||
Currently, we print the list of inferiors bound to a pspace.
|
||
There can be more than one inferior bound to the same pspace,
|
||
e.g., both parent/child inferiors in a vfork, or, on targets
|
||
that share pspaces between inferiors. */
|
||
printed_header = 0;
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (inf->pspace == pspace)
|
||
{
|
||
if (!printed_header)
|
||
{
|
||
printed_header = 1;
|
||
printf_filtered ("\n\tBound inferiors: ID %d (%s)",
|
||
inf->num,
|
||
target_pid_to_str (pid_to_ptid (inf->pid)));
|
||
}
|
||
else
|
||
printf_filtered (", ID %d (%s)",
|
||
inf->num,
|
||
target_pid_to_str (pid_to_ptid (inf->pid)));
|
||
}
|
||
|
||
uiout->text ("\n");
|
||
}
|
||
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
/* Boolean test for an already-known program space id. */
|
||
|
||
static int
|
||
valid_program_space_id (int num)
|
||
{
|
||
struct program_space *pspace;
|
||
|
||
ALL_PSPACES (pspace)
|
||
if (pspace->num == num)
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* If ARGS is NULL or empty, print information about all program
|
||
spaces. Otherwise, ARGS is a text representation of a LONG
|
||
indicating which the program space to print information about. */
|
||
|
||
static void
|
||
maintenance_info_program_spaces_command (char *args, int from_tty)
|
||
{
|
||
int requested = -1;
|
||
|
||
if (args && *args)
|
||
{
|
||
requested = parse_and_eval_long (args);
|
||
if (!valid_program_space_id (requested))
|
||
error (_("program space ID %d not known."), requested);
|
||
}
|
||
|
||
print_program_space (current_uiout, requested);
|
||
}
|
||
|
||
/* Simply returns the count of program spaces. */
|
||
|
||
int
|
||
number_of_program_spaces (void)
|
||
{
|
||
struct program_space *pspace;
|
||
int count = 0;
|
||
|
||
ALL_PSPACES (pspace)
|
||
count++;
|
||
|
||
return count;
|
||
}
|
||
|
||
/* Update all program spaces matching to address spaces. The user may
|
||
have created several program spaces, and loaded executables into
|
||
them before connecting to the target interface that will create the
|
||
inferiors. All that happens before GDB has a chance to know if the
|
||
inferiors will share an address space or not. Call this after
|
||
having connected to the target interface and having fetched the
|
||
target description, to fixup the program/address spaces mappings.
|
||
|
||
It is assumed that there are no bound inferiors yet, otherwise,
|
||
they'd be left with stale referenced to released aspaces. */
|
||
|
||
void
|
||
update_address_spaces (void)
|
||
{
|
||
int shared_aspace = gdbarch_has_shared_address_space (target_gdbarch ());
|
||
struct program_space *pspace;
|
||
struct inferior *inf;
|
||
|
||
init_address_spaces ();
|
||
|
||
if (shared_aspace)
|
||
{
|
||
struct address_space *aspace = new_address_space ();
|
||
|
||
free_address_space (current_program_space->aspace);
|
||
ALL_PSPACES (pspace)
|
||
pspace->aspace = aspace;
|
||
}
|
||
else
|
||
ALL_PSPACES (pspace)
|
||
{
|
||
free_address_space (pspace->aspace);
|
||
pspace->aspace = new_address_space ();
|
||
}
|
||
|
||
for (inf = inferior_list; inf; inf = inf->next)
|
||
if (gdbarch_has_global_solist (target_gdbarch ()))
|
||
inf->aspace = maybe_new_address_space ();
|
||
else
|
||
inf->aspace = inf->pspace->aspace;
|
||
}
|
||
|
||
|
||
|
||
/* See progspace.h. */
|
||
|
||
void
|
||
clear_program_space_solib_cache (struct program_space *pspace)
|
||
{
|
||
VEC_free (so_list_ptr, pspace->added_solibs);
|
||
|
||
free_char_ptr_vec (pspace->deleted_solibs);
|
||
pspace->deleted_solibs = NULL;
|
||
}
|
||
|
||
|
||
|
||
void
|
||
initialize_progspace (void)
|
||
{
|
||
add_cmd ("program-spaces", class_maintenance,
|
||
maintenance_info_program_spaces_command,
|
||
_("Info about currently known program spaces."),
|
||
&maintenanceinfolist);
|
||
|
||
/* There's always one program space. Note that this function isn't
|
||
an automatic _initialize_foo function, since other
|
||
_initialize_foo routines may need to install their per-pspace
|
||
data keys. We can only allocate a progspace when all those
|
||
modules have done that. Do this before
|
||
initialize_current_architecture, because that accesses exec_bfd,
|
||
which in turn dereferences current_program_space. */
|
||
current_program_space = add_program_space (new_address_space ());
|
||
}
|