This is more preparation bits for multi-target support. In a multi-target scenario, we need to address the case of different processes/threads running on different targets that happen to have the same PID/PTID. E.g., we can have both process 123 in target 1, and process 123 in target 2, while they're in reality different processes running on different machines. Or maybe we've loaded multiple instances of the same core file. Etc. To address this, in my WIP multi-target branch, threads and processes are uniquely identified by the (process_stratum target_ops *, ptid_t) and (process_stratum target_ops *, pid) tuples respectively. I.e., each process_stratum instance has its own thread/process number space. As you can imagine, that requires passing around target_ops * pointers in a number of functions where we're currently passing only a ptid_t or an int. E.g., when we look up a thread_info object by ptid_t in find_thread_ptid, the ptid_t alone isn't sufficient. In many cases though, we already have the thread_info or inferior pointer handy, but we "lose" it somewhere along the call stack, only to look it up again by ptid_t/pid. Since thread_info or inferior objects know their parent target, if we pass around thread_info or inferior pointers when possible, we avoid having to add extra target_ops parameters to many functions, and also, we eliminate a number of by ptid_t/int lookups. So that's what this patch does. In a bit more detail: - Changes a number of functions and methods to take a thread_info or inferior pointer instead of a ptid_t or int parameter. - Changes a number of structure fields from ptid_t/int to inferior or thread_info pointers. - Uses the inferior_thread() function whenever possible instead of inferior_ptid. - Uses thread_info pointers directly when possible instead of the is_running/is_stopped etc. routines that require a lookup. - A number of functions are eliminated along the way, such as: int valid_gdb_inferior_id (int num); int pid_to_gdb_inferior_id (int pid); int gdb_inferior_id_to_pid (int num); int in_inferior_list (int pid); - A few structures and places hold a thread_info pointer across inferior execution, so now they take a strong reference to the (refcounted) thread_info object to avoid the thread_info pointer getting stale. This is done in enable_thread_stack_temporaries and in the infcall.c code. - Related, there's a spot in infcall.c where using a RAII object to handle the refcount would be handy, so a gdb::ref_ptr specialization for thread_info is added (thread_info_ref, in gdbthread.h), along with a gdb_ref_ptr policy that works for all refcounted_object types (in common/refcounted-object.h). gdb/ChangeLog: 2018-06-21 Pedro Alves <palves@redhat.com> * ada-lang.h (ada_get_task_number): Take a thread_info pointer instead of a ptid_t. All callers adjusted. * ada-tasks.c (ada_get_task_number): Likewise. All callers adjusted. (print_ada_task_info, display_current_task_id, task_command_1): Adjust. * breakpoint.c (watchpoint_in_thread_scope): Adjust to use inferior_thread. (breakpoint_kind): Adjust. (remove_breakpoints_pid): Rename to ... (remove_breakpoints_inf): ... this. Adjust to take an inferior pointer. All callers adjusted. (bpstat_clear_actions): Use inferior_thread. (get_bpstat_thread): New. (bpstat_do_actions): Use it. (bpstat_check_breakpoint_conditions, bpstat_stop_status): Adjust to take a thread_info pointer. All callers adjusted. (set_longjmp_breakpoint_for_call_dummy, set_momentary_breakpoint) (breakpoint_re_set_thread): Use inferior_thread. * breakpoint.h (struct inferior): Forward declare. (bpstat_stop_status): Update. (remove_breakpoints_pid): Delete. (remove_breakpoints_inf): New. * bsd-uthread.c (bsd_uthread_target::wait) (bsd_uthread_target::update_thread_list): Use find_thread_ptid. * btrace.c (btrace_add_pc, btrace_enable, btrace_fetch) (maint_btrace_packet_history_cmd) (maint_btrace_clear_packet_history_cmd): Adjust. (maint_btrace_clear_cmd, maint_info_btrace_cmd): Adjust to use inferior_thread. * cli/cli-interp.c: Include "inferior.h". * common/refcounted-object.h (struct refcounted_object_ref_policy): New. * compile/compile-object-load.c: Include gdbthread.h. (store_regs): Use inferior_thread. * corelow.c (core_target::close): Use current_inferior. (core_target_open): Adjust to use first_thread_of_inferior and use the current inferior. * ctf.c (ctf_target::close): Adjust to use current_inferior. * dummy-frame.c (dummy_frame_id) <ptid>: Delete, replaced by ... <thread>: ... this new field. All references adjusted. (dummy_frame_pop, dummy_frame_discard, register_dummy_frame_dtor): Take a thread_info pointer instead of a ptid_t. * dummy-frame.h (dummy_frame_push, dummy_frame_pop) (dummy_frame_discard, register_dummy_frame_dtor): Take a thread_info pointer instead of a ptid_t. * elfread.c: Include "inferior.h". (elf_gnu_ifunc_resolver_stop, elf_gnu_ifunc_resolver_return_stop): Use inferior_thread. * eval.c (evaluate_subexp): Likewise. * frame.c (frame_pop, has_stack_frames, find_frame_sal): Use inferior_thread. * gdb_proc_service.h (struct thread_info): Forward declare. (struct ps_prochandle) <ptid>: Delete, replaced by ... <thread>: ... this new field. All references adjusted. * gdbarch.h, gdbarch.c: Regenerate. * gdbarch.sh (get_syscall_number): Replace 'ptid' parameter with a 'thread' parameter. All implementations and callers adjusted. * gdbthread.h (thread_info) <set_running>: New method. (delete_thread, delete_thread_silent): Take a thread_info pointer instead of a ptid. (global_thread_id_to_ptid, ptid_to_global_thread_id): Delete. (first_thread_of_process): Delete, replaced by ... (first_thread_of_inferior): ... this new function. All callers adjusted. (any_live_thread_of_process): Delete, replaced by ... (any_live_thread_of_inferior): ... this new function. All callers adjusted. (switch_to_thread, switch_to_no_thread): Declare. (is_executing): Delete. (enable_thread_stack_temporaries): Update comment. <enable_thread_stack_temporaries>: Take a thread_info pointer instead of a ptid_t. Incref the thread. <~enable_thread_stack_temporaries>: Decref the thread. <m_ptid>: Delete <m_thr>: New. (thread_stack_temporaries_enabled_p, push_thread_stack_temporary) (get_last_thread_stack_temporary) (value_in_thread_stack_temporaries, can_access_registers_thread): Take a thread_info pointer instead of a ptid_t. All callers adjusted. * infcall.c (get_call_return_value): Use inferior_thread. (run_inferior_call): Work with thread pointers instead of ptid_t. (call_function_by_hand_dummy): Work with thread pointers instead of ptid_t. Use thread_info_ref. * infcmd.c (proceed_thread_callback): Access thread's state directly. (ensure_valid_thread, ensure_not_running): Use inferior_thread, access thread's state directly. (continue_command): Use inferior_thread. (info_program_command): Use find_thread_ptid and access thread state directly. (proceed_after_attach_callback): Use thread state directly. (notice_new_inferior): Take a thread_info pointer instead of a ptid_t. All callers adjusted. (exit_inferior): Take an inferior pointer instead of a pid. All callers adjusted. (exit_inferior_silent): New. (detach_inferior): Delete. (valid_gdb_inferior_id, pid_to_gdb_inferior_id) (gdb_inferior_id_to_pid, in_inferior_list): Delete. (detach_inferior_command, kill_inferior_command): Use find_inferior_id instead of valid_gdb_inferior_id and gdb_inferior_id_to_pid. (inferior_command): Use inferior and thread pointers. * inferior.h (struct thread_info): Forward declare. (notice_new_inferior): Take a thread_info pointer instead of a ptid_t. All callers adjusted. (detach_inferior): Delete declaration. (exit_inferior, exit_inferior_silent): Take an inferior pointer instead of a pid. All callers adjusted. (gdb_inferior_id_to_pid, pid_to_gdb_inferior_id, in_inferior_list) (valid_gdb_inferior_id): Delete. * infrun.c (follow_fork_inferior, proceed_after_vfork_done) (handle_vfork_child_exec_or_exit, follow_exec): Adjust. (struct displaced_step_inferior_state) <pid>: Delete, replaced by ... <inf>: ... this new field. <step_ptid>: Delete, replaced by ... <step_thread>: ... this new field. (get_displaced_stepping_state): Take an inferior pointer instead of a pid. All callers adjusted. (displaced_step_in_progress_any_inferior): Adjust. (displaced_step_in_progress_thread): Take a thread pointer instead of a ptid_t. All callers adjusted. (displaced_step_in_progress, add_displaced_stepping_state): Take an inferior pointer instead of a pid. All callers adjusted. (get_displaced_step_closure_by_addr): Adjust. (remove_displaced_stepping_state): Take an inferior pointer instead of a pid. All callers adjusted. (displaced_step_prepare_throw, displaced_step_prepare) (displaced_step_fixup): Take a thread pointer instead of a ptid_t. All callers adjusted. (start_step_over): Adjust. (infrun_thread_ptid_changed): Remove bit updating ptids in the displaced step queue. (do_target_resume): Adjust. (fetch_inferior_event): Use inferior_thread. (context_switch, get_inferior_stop_soon): Take an execution_control_state pointer instead of a ptid_t. All callers adjusted. (switch_to_thread_cleanup): Delete. (stop_all_threads): Use scoped_restore_current_thread. * inline-frame.c: Include "gdbthread.h". (inline_state) <inline_state>: Take a thread pointer instead of a ptid_t. All callers adjusted. <ptid>: Delete, replaced by ... <thread>: ... this new field. (find_inline_frame_state): Take a thread pointer instead of a ptid_t. All callers adjusted. (skip_inline_frames, step_into_inline_frame) (inline_skipped_frames, inline_skipped_symbol): Take a thread pointer instead of a ptid_t. All callers adjusted. * inline-frame.h (skip_inline_frames, step_into_inline_frame) (inline_skipped_frames, inline_skipped_symbol): Likewise. * linux-fork.c (delete_checkpoint_command): Adjust to use thread pointers directly. * linux-nat.c (get_detach_signal): Likewise. * linux-thread-db.c (thread_from_lwp): New 'stopped' parameter. (thread_db_notice_clone): Adjust. (thread_db_find_new_threads_silently) (thread_db_find_new_threads_2, thread_db_find_new_threads_1): Take a thread pointer instead of a ptid_t. All callers adjusted. * mi/mi-cmd-var.c: Include "inferior.h". (mi_cmd_var_update_iter): Update to use thread pointers. * mi/mi-interp.c (mi_new_thread): Update to use the thread's inferior directly. (mi_output_running_pid, mi_inferior_count): Delete, bits factored out to ... (mi_output_running): ... this new function. (mi_on_resume_1): Adjust to use it. (mi_user_selected_context_changed): Adjust to use inferior_thread. * mi/mi-main.c (proceed_thread): Adjust to use thread pointers directly. (interrupt_thread_callback): : Adjust to use thread and inferior pointers. * proc-service.c: Include "gdbthread.h". (ps_pglobal_lookup): Adjust to use the thread's inferior directly. * progspace-and-thread.c: Include "inferior.h". * progspace.c: Include "inferior.h". * python/py-exitedevent.c (create_exited_event_object): Adjust to hold a reference to an inferior_object. * python/py-finishbreakpoint.c (bpfinishpy_init): Adjust to use inferior_thread. * python/py-inferior.c (struct inferior_object): Give the type a tag name instead of a typedef. (python_on_normal_stop): No need to check if the current thread is listed. (inferior_to_inferior_object): Change return type to inferior_object. All callers adjusted. (find_thread_object): Delete, bits factored out to ... (thread_to_thread_object): ... this new function. * python/py-infthread.c (create_thread_object): Use inferior_to_inferior_object. (thpy_is_stopped): Use thread pointer directly. (gdbpy_selected_thread): Use inferior_thread. * python/py-record-btrace.c (btpy_list_object) <ptid>: Delete field, replaced with ... <thread>: ... this new field. All users adjusted. (btpy_insn_or_gap_new): Drop const. (btpy_list_new): Take a thread pointer instead of a ptid_t. All callers adjusted. * python/py-record.c: Include "gdbthread.h". (recpy_insn_new, recpy_func_new): Take a thread pointer instead of a ptid_t. All callers adjusted. (gdbpy_current_recording): Use inferior_thread. * python/py-record.h (recpy_record_object) <ptid>: Delete field, replaced with ... <thread>: ... this new field. All users adjusted. (recpy_element_object) <ptid>: Delete field, replaced with ... <thread>: ... this new field. All users adjusted. (recpy_insn_new, recpy_func_new): Take a thread pointer instead of a ptid_t. All callers adjusted. * python/py-threadevent.c: Include "gdbthread.h". (get_event_thread): Use thread_to_thread_object. * python/python-internal.h (struct inferior_object): Forward declare. (find_thread_object, find_inferior_object): Delete declarations. (thread_to_thread_object, inferior_to_inferior_object): New declarations. * record-btrace.c: Include "inferior.h". (require_btrace_thread): Use inferior_thread. (record_btrace_frame_sniffer) (record_btrace_tailcall_frame_sniffer): Use inferior_thread. (get_thread_current_frame): Use scoped_restore_current_thread and switch_to_thread. (get_thread_current_frame): Use thread pointer directly. (record_btrace_replay_at_breakpoint): Use thread's inferior pointer directly. * record-full.c: Include "inferior.h". * regcache.c: Include "gdbthread.h". (get_thread_arch_regcache): Use the inferior's address space directly. (get_thread_regcache, registers_changed_thread): New. * regcache.h (get_thread_regcache(thread_info *thread)): New overload. (registers_changed_thread): New. (remote_target) <remote_detach_1>: Swap order of parameters. (remote_add_thread): <remote_add_thread>: Return the new thread. (get_remote_thread_info(ptid_t)): New overload. (remote_target::remote_notice_new_inferior): Use thread pointers directly. (remote_target::process_initial_stop_replies): Use thread_info::set_running. (remote_target::remote_detach_1, remote_target::detach) (extended_remote_target::detach): Adjust. * stack.c (frame_show_address): Use inferior_thread. * target-debug.h (target_debug_print_thread_info_pp): New. * target-delegates.c: Regenerate. * target.c (default_thread_address_space): Delete. (memory_xfer_partial_1): Use current_inferior. (target_detach): Use current_inferior. (target_thread_address_space): Delete. (generic_mourn_inferior): Use current_inferior. * target.h (struct target_ops) <thread_address_space>: Delete. (target_thread_address_space): Delete. * thread.c (init_thread_list): Use ALL_THREADS_SAFE. Use thread pointers directly. (delete_thread_1, delete_thread, delete_thread_silent): Take a thread pointer instead of a ptid_t. Adjust all callers. (ptid_to_global_thread_id, global_thread_id_to_ptid): Delete. (first_thread_of_process): Delete, replaced by ... (first_thread_of_inferior): ... this new function. All callers adjusted. (any_thread_of_process): Rename to ... (any_thread_of_inferior): ... this, and take an inferior pointer. (any_live_thread_of_process): Rename to ... (any_live_thread_of_inferior): ... this, and take an inferior pointer. (thread_stack_temporaries_enabled_p, push_thread_stack_temporary) (value_in_thread_stack_temporaries) (get_last_thread_stack_temporary): Take a thread pointer instead of a ptid_t. Adjust all callers. (thread_info::set_running): New. (validate_registers_access): Use inferior_thread. (can_access_registers_ptid): Rename to ... (can_access_registers_thread): ... this, and take a thread pointer. (print_thread_info_1): Adjust to compare thread pointers instead of ptids. (switch_to_no_thread, switch_to_thread): Make extern. (scoped_restore_current_thread::~scoped_restore_current_thread): Use m_thread pointer directly. (scoped_restore_current_thread::scoped_restore_current_thread): Use inferior_thread. (thread_command): Use thread pointer directly. (thread_num_make_value_helper): Use inferior_thread. * top.c (execute_command): Use inferior_thread. * tui/tui-interp.c: Include "inferior.h". * varobj.c (varobj_create): Use inferior_thread. (value_of_root_1): Use find_thread_global_id instead of global_thread_id_to_ptid.
814 lines
21 KiB
C
814 lines
21 KiB
C
/* GNU/Linux native-dependent code for debugging multiple forks.
|
|
|
|
Copyright (C) 2005-2018 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 "arch-utils.h"
|
|
#include "inferior.h"
|
|
#include "infrun.h"
|
|
#include "regcache.h"
|
|
#include "gdbcmd.h"
|
|
#include "infcall.h"
|
|
#include "objfiles.h"
|
|
#include "linux-fork.h"
|
|
#include "linux-nat.h"
|
|
#include "gdbthread.h"
|
|
#include "source.h"
|
|
|
|
#include "nat/gdb_ptrace.h"
|
|
#include "gdb_wait.h"
|
|
#include <dirent.h>
|
|
#include <ctype.h>
|
|
|
|
struct fork_info *fork_list;
|
|
static int highest_fork_num;
|
|
|
|
/* Fork list data structure: */
|
|
struct fork_info
|
|
{
|
|
struct fork_info *next;
|
|
ptid_t ptid;
|
|
ptid_t parent_ptid;
|
|
int num; /* Convenient handle (GDB fork id). */
|
|
readonly_detached_regcache *savedregs; /* Convenient for info fork, saves
|
|
having to actually switch contexts. */
|
|
CORE_ADDR pc;
|
|
int clobber_regs; /* True if we should restore saved regs. */
|
|
off_t *filepos; /* Set of open file descriptors' offsets. */
|
|
int maxfd;
|
|
};
|
|
|
|
/* Fork list methods: */
|
|
|
|
int
|
|
forks_exist_p (void)
|
|
{
|
|
return (fork_list != NULL);
|
|
}
|
|
|
|
/* Return the last fork in the list. */
|
|
|
|
static struct fork_info *
|
|
find_last_fork (void)
|
|
{
|
|
struct fork_info *last;
|
|
|
|
if (fork_list == NULL)
|
|
return NULL;
|
|
|
|
for (last = fork_list; last->next != NULL; last = last->next)
|
|
;
|
|
return last;
|
|
}
|
|
|
|
/* Add a fork to the internal fork list. */
|
|
|
|
struct fork_info *
|
|
add_fork (pid_t pid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
if (fork_list == NULL && pid != ptid_get_pid (inferior_ptid))
|
|
{
|
|
/* Special case -- if this is the first fork in the list
|
|
(the list is hitherto empty), and if this new fork is
|
|
NOT the current inferior_ptid, then add inferior_ptid
|
|
first, as a special zeroeth fork id. */
|
|
highest_fork_num = -1;
|
|
add_fork (ptid_get_pid (inferior_ptid)); /* safe recursion */
|
|
}
|
|
|
|
fp = XCNEW (struct fork_info);
|
|
fp->ptid = ptid_build (pid, pid, 0);
|
|
fp->num = ++highest_fork_num;
|
|
|
|
if (fork_list == NULL)
|
|
fork_list = fp;
|
|
else
|
|
{
|
|
struct fork_info *last = find_last_fork ();
|
|
|
|
last->next = fp;
|
|
}
|
|
|
|
return fp;
|
|
}
|
|
|
|
static void
|
|
free_fork (struct fork_info *fp)
|
|
{
|
|
/* Notes on step-resume breakpoints: since this is a concern for
|
|
threads, let's convince ourselves that it's not a concern for
|
|
forks. There are two ways for a fork_info to be created. First,
|
|
by the checkpoint command, in which case we're at a gdb prompt
|
|
and there can't be any step-resume breakpoint. Second, by a fork
|
|
in the user program, in which case we *may* have stepped into the
|
|
fork call, but regardless of whether we follow the parent or the
|
|
child, we will return to the same place and the step-resume
|
|
breakpoint, if any, will take care of itself as usual. And
|
|
unlike threads, we do not save a private copy of the step-resume
|
|
breakpoint -- so we're OK. */
|
|
|
|
if (fp)
|
|
{
|
|
if (fp->savedregs)
|
|
delete fp->savedregs;
|
|
if (fp->filepos)
|
|
xfree (fp->filepos);
|
|
xfree (fp);
|
|
}
|
|
}
|
|
|
|
static void
|
|
delete_fork (ptid_t ptid)
|
|
{
|
|
struct fork_info *fp, *fpprev;
|
|
|
|
fpprev = NULL;
|
|
|
|
linux_target->low_forget_process (ptid_get_pid (ptid));
|
|
|
|
for (fp = fork_list; fp; fpprev = fp, fp = fp->next)
|
|
if (ptid_equal (fp->ptid, ptid))
|
|
break;
|
|
|
|
if (!fp)
|
|
return;
|
|
|
|
if (fpprev)
|
|
fpprev->next = fp->next;
|
|
else
|
|
fork_list = fp->next;
|
|
|
|
free_fork (fp);
|
|
|
|
/* Special case: if there is now only one process in the list,
|
|
and if it is (hopefully!) the current inferior_ptid, then
|
|
remove it, leaving the list empty -- we're now down to the
|
|
default case of debugging a single process. */
|
|
if (fork_list != NULL && fork_list->next == NULL &&
|
|
ptid_equal (fork_list->ptid, inferior_ptid))
|
|
{
|
|
/* Last fork -- delete from list and handle as solo process
|
|
(should be a safe recursion). */
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
}
|
|
|
|
/* Find a fork_info by matching PTID. */
|
|
static struct fork_info *
|
|
find_fork_ptid (ptid_t ptid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (ptid_equal (fp->ptid, ptid))
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Find a fork_info by matching ID. */
|
|
static struct fork_info *
|
|
find_fork_id (int num)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (fp->num == num)
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Find a fork_info by matching pid. */
|
|
extern struct fork_info *
|
|
find_fork_pid (pid_t pid)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
if (pid == ptid_get_pid (fp->ptid))
|
|
return fp;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static ptid_t
|
|
fork_id_to_ptid (int num)
|
|
{
|
|
struct fork_info *fork = find_fork_id (num);
|
|
if (fork)
|
|
return fork->ptid;
|
|
else
|
|
return pid_to_ptid (-1);
|
|
}
|
|
|
|
static void
|
|
init_fork_list (void)
|
|
{
|
|
struct fork_info *fp, *fpnext;
|
|
|
|
if (!fork_list)
|
|
return;
|
|
|
|
for (fp = fork_list; fp; fp = fpnext)
|
|
{
|
|
fpnext = fp->next;
|
|
free_fork (fp);
|
|
}
|
|
|
|
fork_list = NULL;
|
|
}
|
|
|
|
/* Fork list <-> gdb interface. */
|
|
|
|
/* Utility function for fork_load/fork_save.
|
|
Calls lseek in the (current) inferior process. */
|
|
|
|
static off_t
|
|
call_lseek (int fd, off_t offset, int whence)
|
|
{
|
|
char exp[80];
|
|
|
|
snprintf (&exp[0], sizeof (exp), "(long) lseek (%d, %ld, %d)",
|
|
fd, (long) offset, whence);
|
|
return (off_t) parse_and_eval_long (&exp[0]);
|
|
}
|
|
|
|
/* Load infrun state for the fork PTID. */
|
|
|
|
static void
|
|
fork_load_infrun_state (struct fork_info *fp)
|
|
{
|
|
extern void nullify_last_target_wait_ptid ();
|
|
int i;
|
|
|
|
linux_nat_switch_fork (fp->ptid);
|
|
|
|
if (fp->savedregs && fp->clobber_regs)
|
|
get_current_regcache ()->restore (fp->savedregs);
|
|
|
|
registers_changed ();
|
|
reinit_frame_cache ();
|
|
|
|
stop_pc = regcache_read_pc (get_current_regcache ());
|
|
nullify_last_target_wait_ptid ();
|
|
|
|
/* Now restore the file positions of open file descriptors. */
|
|
if (fp->filepos)
|
|
{
|
|
for (i = 0; i <= fp->maxfd; i++)
|
|
if (fp->filepos[i] != (off_t) -1)
|
|
call_lseek (i, fp->filepos[i], SEEK_SET);
|
|
/* NOTE: I can get away with using SEEK_SET and SEEK_CUR because
|
|
this is native-only. If it ever has to be cross, we'll have
|
|
to rethink this. */
|
|
}
|
|
}
|
|
|
|
/* Save infrun state for the fork PTID.
|
|
Exported for use by linux child_follow_fork. */
|
|
|
|
static void
|
|
fork_save_infrun_state (struct fork_info *fp, int clobber_regs)
|
|
{
|
|
char path[PATH_MAX];
|
|
struct dirent *de;
|
|
DIR *d;
|
|
|
|
if (fp->savedregs)
|
|
delete fp->savedregs;
|
|
|
|
fp->savedregs = new readonly_detached_regcache (*get_current_regcache ());
|
|
fp->pc = regcache_read_pc (get_current_regcache ());
|
|
fp->clobber_regs = clobber_regs;
|
|
|
|
if (clobber_regs)
|
|
{
|
|
/* Now save the 'state' (file position) of all open file descriptors.
|
|
Unfortunately fork does not take care of that for us... */
|
|
snprintf (path, PATH_MAX, "/proc/%ld/fd",
|
|
(long) ptid_get_pid (fp->ptid));
|
|
if ((d = opendir (path)) != NULL)
|
|
{
|
|
long tmp;
|
|
|
|
fp->maxfd = 0;
|
|
while ((de = readdir (d)) != NULL)
|
|
{
|
|
/* Count open file descriptors (actually find highest
|
|
numbered). */
|
|
tmp = strtol (&de->d_name[0], NULL, 10);
|
|
if (fp->maxfd < tmp)
|
|
fp->maxfd = tmp;
|
|
}
|
|
/* Allocate array of file positions. */
|
|
fp->filepos = XRESIZEVEC (off_t, fp->filepos, fp->maxfd + 1);
|
|
|
|
/* Initialize to -1 (invalid). */
|
|
for (tmp = 0; tmp <= fp->maxfd; tmp++)
|
|
fp->filepos[tmp] = -1;
|
|
|
|
/* Now find actual file positions. */
|
|
rewinddir (d);
|
|
while ((de = readdir (d)) != NULL)
|
|
if (isdigit (de->d_name[0]))
|
|
{
|
|
tmp = strtol (&de->d_name[0], NULL, 10);
|
|
fp->filepos[tmp] = call_lseek (tmp, 0, SEEK_CUR);
|
|
}
|
|
closedir (d);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Kill 'em all, let God sort 'em out... */
|
|
|
|
void
|
|
linux_fork_killall (void)
|
|
{
|
|
/* Walk list and kill every pid. No need to treat the
|
|
current inferior_ptid as special (we do not return a
|
|
status for it) -- however any process may be a child
|
|
or a parent, so may get a SIGCHLD from a previously
|
|
killed child. Wait them all out. */
|
|
struct fork_info *fp;
|
|
pid_t pid, ret;
|
|
int status;
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
{
|
|
pid = ptid_get_pid (fp->ptid);
|
|
do {
|
|
/* Use SIGKILL instead of PTRACE_KILL because the former works even
|
|
if the thread is running, while the later doesn't. */
|
|
kill (pid, SIGKILL);
|
|
ret = waitpid (pid, &status, 0);
|
|
/* We might get a SIGCHLD instead of an exit status. This is
|
|
aggravated by the first kill above - a child has just
|
|
died. MVS comment cut-and-pasted from linux-nat. */
|
|
} while (ret == pid && WIFSTOPPED (status));
|
|
}
|
|
init_fork_list (); /* Clear list, prepare to start fresh. */
|
|
}
|
|
|
|
/* The current inferior_ptid has exited, but there are other viable
|
|
forks to debug. Delete the exiting one and context-switch to the
|
|
first available. */
|
|
|
|
void
|
|
linux_fork_mourn_inferior (void)
|
|
{
|
|
struct fork_info *last;
|
|
int status;
|
|
|
|
/* Wait just one more time to collect the inferior's exit status.
|
|
Do not check whether this succeeds though, since we may be
|
|
dealing with a process that we attached to. Such a process will
|
|
only report its exit status to its original parent. */
|
|
waitpid (ptid_get_pid (inferior_ptid), &status, 0);
|
|
|
|
/* OK, presumably inferior_ptid is the one who has exited.
|
|
We need to delete that one from the fork_list, and switch
|
|
to the next available fork. */
|
|
delete_fork (inferior_ptid);
|
|
|
|
/* There should still be a fork - if there's only one left,
|
|
delete_fork won't remove it, because we haven't updated
|
|
inferior_ptid yet. */
|
|
gdb_assert (fork_list);
|
|
|
|
last = find_last_fork ();
|
|
fork_load_infrun_state (last);
|
|
printf_filtered (_("[Switching to %s]\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
/* If there's only one fork, switch back to non-fork mode. */
|
|
if (fork_list->next == NULL)
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
|
|
/* The current inferior_ptid is being detached, but there are other
|
|
viable forks to debug. Detach and delete it and context-switch to
|
|
the first available. */
|
|
|
|
void
|
|
linux_fork_detach (int from_tty)
|
|
{
|
|
/* OK, inferior_ptid is the one we are detaching from. We need to
|
|
delete it from the fork_list, and switch to the next available
|
|
fork. */
|
|
|
|
if (ptrace (PTRACE_DETACH, ptid_get_pid (inferior_ptid), 0, 0))
|
|
error (_("Unable to detach %s"), target_pid_to_str (inferior_ptid));
|
|
|
|
delete_fork (inferior_ptid);
|
|
|
|
/* There should still be a fork - if there's only one left,
|
|
delete_fork won't remove it, because we haven't updated
|
|
inferior_ptid yet. */
|
|
gdb_assert (fork_list);
|
|
|
|
fork_load_infrun_state (fork_list);
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("[Switching to %s]\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
/* If there's only one fork, switch back to non-fork mode. */
|
|
if (fork_list->next == NULL)
|
|
delete_fork (inferior_ptid);
|
|
}
|
|
|
|
static void
|
|
inferior_call_waitpid_cleanup (void *fp)
|
|
{
|
|
struct fork_info *oldfp = (struct fork_info *) fp;
|
|
|
|
if (oldfp)
|
|
{
|
|
/* Switch back to inferior_ptid. */
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (oldfp);
|
|
insert_breakpoints ();
|
|
}
|
|
}
|
|
|
|
static int
|
|
inferior_call_waitpid (ptid_t pptid, int pid)
|
|
{
|
|
struct objfile *waitpid_objf;
|
|
struct value *waitpid_fn = NULL;
|
|
struct value *argv[4], *retv;
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
struct fork_info *oldfp = NULL, *newfp = NULL;
|
|
struct cleanup *old_cleanup;
|
|
int ret = -1;
|
|
|
|
if (!ptid_equal (pptid, inferior_ptid))
|
|
{
|
|
/* Switch to pptid. */
|
|
oldfp = find_fork_ptid (inferior_ptid);
|
|
gdb_assert (oldfp != NULL);
|
|
newfp = find_fork_ptid (pptid);
|
|
gdb_assert (newfp != NULL);
|
|
fork_save_infrun_state (oldfp, 1);
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (newfp);
|
|
insert_breakpoints ();
|
|
}
|
|
|
|
old_cleanup = make_cleanup (inferior_call_waitpid_cleanup, oldfp);
|
|
|
|
/* Get the waitpid_fn. */
|
|
if (lookup_minimal_symbol ("waitpid", NULL, NULL).minsym != NULL)
|
|
waitpid_fn = find_function_in_inferior ("waitpid", &waitpid_objf);
|
|
if (!waitpid_fn
|
|
&& lookup_minimal_symbol ("_waitpid", NULL, NULL).minsym != NULL)
|
|
waitpid_fn = find_function_in_inferior ("_waitpid", &waitpid_objf);
|
|
if (!waitpid_fn)
|
|
goto out;
|
|
|
|
/* Get the argv. */
|
|
argv[0] = value_from_longest (builtin_type (gdbarch)->builtin_int, pid);
|
|
argv[1] = value_from_pointer (builtin_type (gdbarch)->builtin_data_ptr, 0);
|
|
argv[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
|
|
argv[3] = 0;
|
|
|
|
retv = call_function_by_hand (waitpid_fn, NULL, 3, argv);
|
|
if (value_as_long (retv) < 0)
|
|
goto out;
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
do_cleanups (old_cleanup);
|
|
return ret;
|
|
}
|
|
|
|
/* Fork list <-> user interface. */
|
|
|
|
static void
|
|
delete_checkpoint_command (const char *args, int from_tty)
|
|
{
|
|
ptid_t ptid, pptid;
|
|
struct fork_info *fi;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to delete)"));
|
|
|
|
ptid = fork_id_to_ptid (parse_and_eval_long (args));
|
|
if (ptid_equal (ptid, minus_one_ptid))
|
|
error (_("No such checkpoint id, %s"), args);
|
|
|
|
if (ptid_equal (ptid, inferior_ptid))
|
|
error (_("\
|
|
Please switch to another checkpoint before deleting the current one"));
|
|
|
|
if (ptrace (PTRACE_KILL, ptid_get_pid (ptid), 0, 0))
|
|
error (_("Unable to kill pid %s"), target_pid_to_str (ptid));
|
|
|
|
fi = find_fork_ptid (ptid);
|
|
gdb_assert (fi);
|
|
pptid = fi->parent_ptid;
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("Killed %s\n"), target_pid_to_str (ptid));
|
|
|
|
delete_fork (ptid);
|
|
|
|
/* If fi->parent_ptid is not a part of lwp but it's a part of checkpoint
|
|
list, waitpid the ptid.
|
|
If fi->parent_ptid is a part of lwp and it is stopped, waitpid the
|
|
ptid. */
|
|
thread_info *parent = find_thread_ptid (pptid);
|
|
if ((parent == NULL && find_fork_ptid (pptid))
|
|
|| (parent != NULL && parent->state == THREAD_STOPPED))
|
|
{
|
|
if (inferior_call_waitpid (pptid, ptid_get_pid (ptid)))
|
|
warning (_("Unable to wait pid %s"), target_pid_to_str (ptid));
|
|
}
|
|
}
|
|
|
|
static void
|
|
detach_checkpoint_command (const char *args, int from_tty)
|
|
{
|
|
ptid_t ptid;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to detach)"));
|
|
|
|
ptid = fork_id_to_ptid (parse_and_eval_long (args));
|
|
if (ptid_equal (ptid, minus_one_ptid))
|
|
error (_("No such checkpoint id, %s"), args);
|
|
|
|
if (ptid_equal (ptid, inferior_ptid))
|
|
error (_("\
|
|
Please switch to another checkpoint before detaching the current one"));
|
|
|
|
if (ptrace (PTRACE_DETACH, ptid_get_pid (ptid), 0, 0))
|
|
error (_("Unable to detach %s"), target_pid_to_str (ptid));
|
|
|
|
if (from_tty)
|
|
printf_filtered (_("Detached %s\n"), target_pid_to_str (ptid));
|
|
|
|
delete_fork (ptid);
|
|
}
|
|
|
|
/* Print information about currently known checkpoints. */
|
|
|
|
static void
|
|
info_checkpoints_command (const char *arg, int from_tty)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
struct symtab_and_line sal;
|
|
struct fork_info *fp;
|
|
ULONGEST pc;
|
|
int requested = -1;
|
|
struct fork_info *printed = NULL;
|
|
|
|
if (arg && *arg)
|
|
requested = (int) parse_and_eval_long (arg);
|
|
|
|
for (fp = fork_list; fp; fp = fp->next)
|
|
{
|
|
if (requested > 0 && fp->num != requested)
|
|
continue;
|
|
|
|
printed = fp;
|
|
if (ptid_equal (fp->ptid, inferior_ptid))
|
|
printf_filtered ("* ");
|
|
else
|
|
printf_filtered (" ");
|
|
|
|
pc = fp->pc;
|
|
printf_filtered ("%d %s", fp->num, target_pid_to_str (fp->ptid));
|
|
if (fp->num == 0)
|
|
printf_filtered (_(" (main process)"));
|
|
printf_filtered (_(" at "));
|
|
fputs_filtered (paddress (gdbarch, pc), gdb_stdout);
|
|
|
|
sal = find_pc_line (pc, 0);
|
|
if (sal.symtab)
|
|
printf_filtered (_(", file %s"),
|
|
symtab_to_filename_for_display (sal.symtab));
|
|
if (sal.line)
|
|
printf_filtered (_(", line %d"), sal.line);
|
|
if (!sal.symtab && !sal.line)
|
|
{
|
|
struct bound_minimal_symbol msym;
|
|
|
|
msym = lookup_minimal_symbol_by_pc (pc);
|
|
if (msym.minsym)
|
|
printf_filtered (", <%s>", MSYMBOL_LINKAGE_NAME (msym.minsym));
|
|
}
|
|
|
|
putchar_filtered ('\n');
|
|
}
|
|
if (printed == NULL)
|
|
{
|
|
if (requested > 0)
|
|
printf_filtered (_("No checkpoint number %d.\n"), requested);
|
|
else
|
|
printf_filtered (_("No checkpoints.\n"));
|
|
}
|
|
}
|
|
|
|
/* The PID of the process we're checkpointing. */
|
|
static int checkpointing_pid = 0;
|
|
|
|
int
|
|
linux_fork_checkpointing_p (int pid)
|
|
{
|
|
return (checkpointing_pid == pid);
|
|
}
|
|
|
|
/* Callback for iterate over threads. Used to check whether
|
|
the current inferior is multi-threaded. Returns true as soon
|
|
as it sees the second thread of the current inferior. */
|
|
|
|
static int
|
|
inf_has_multiple_thread_cb (struct thread_info *tp, void *data)
|
|
{
|
|
int *count_p = (int *) data;
|
|
|
|
if (current_inferior ()->pid == ptid_get_pid (tp->ptid))
|
|
(*count_p)++;
|
|
|
|
/* Stop the iteration if multiple threads have been detected. */
|
|
return *count_p > 1;
|
|
}
|
|
|
|
/* Return true if the current inferior is multi-threaded. */
|
|
|
|
static int
|
|
inf_has_multiple_threads (void)
|
|
{
|
|
int count = 0;
|
|
|
|
iterate_over_threads (inf_has_multiple_thread_cb, &count);
|
|
return (count > 1);
|
|
}
|
|
|
|
static void
|
|
checkpoint_command (const char *args, int from_tty)
|
|
{
|
|
struct objfile *fork_objf;
|
|
struct gdbarch *gdbarch;
|
|
struct target_waitstatus last_target_waitstatus;
|
|
ptid_t last_target_ptid;
|
|
struct value *fork_fn = NULL, *ret;
|
|
struct fork_info *fp;
|
|
pid_t retpid;
|
|
|
|
if (!target_has_execution)
|
|
error (_("The program is not being run."));
|
|
|
|
/* Ensure that the inferior is not multithreaded. */
|
|
update_thread_list ();
|
|
if (inf_has_multiple_threads ())
|
|
error (_("checkpoint: can't checkpoint multiple threads."));
|
|
|
|
/* Make the inferior fork, record its (and gdb's) state. */
|
|
|
|
if (lookup_minimal_symbol ("fork", NULL, NULL).minsym != NULL)
|
|
fork_fn = find_function_in_inferior ("fork", &fork_objf);
|
|
if (!fork_fn)
|
|
if (lookup_minimal_symbol ("_fork", NULL, NULL).minsym != NULL)
|
|
fork_fn = find_function_in_inferior ("fork", &fork_objf);
|
|
if (!fork_fn)
|
|
error (_("checkpoint: can't find fork function in inferior."));
|
|
|
|
gdbarch = get_objfile_arch (fork_objf);
|
|
ret = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
|
|
|
|
/* Tell linux-nat.c that we're checkpointing this inferior. */
|
|
{
|
|
scoped_restore save_pid
|
|
= make_scoped_restore (&checkpointing_pid, ptid_get_pid (inferior_ptid));
|
|
|
|
ret = call_function_by_hand (fork_fn, NULL, 0, &ret);
|
|
}
|
|
|
|
if (!ret) /* Probably can't happen. */
|
|
error (_("checkpoint: call_function_by_hand returned null."));
|
|
|
|
retpid = value_as_long (ret);
|
|
get_last_target_status (&last_target_ptid, &last_target_waitstatus);
|
|
|
|
fp = find_fork_pid (retpid);
|
|
|
|
if (from_tty)
|
|
{
|
|
int parent_pid;
|
|
|
|
printf_filtered (_("checkpoint %d: fork returned pid %ld.\n"),
|
|
fp != NULL ? fp->num : -1, (long) retpid);
|
|
if (info_verbose)
|
|
{
|
|
parent_pid = ptid_get_lwp (last_target_ptid);
|
|
if (parent_pid == 0)
|
|
parent_pid = ptid_get_pid (last_target_ptid);
|
|
printf_filtered (_(" gdb says parent = %ld.\n"),
|
|
(long) parent_pid);
|
|
}
|
|
}
|
|
|
|
if (!fp)
|
|
error (_("Failed to find new fork"));
|
|
fork_save_infrun_state (fp, 1);
|
|
fp->parent_ptid = last_target_ptid;
|
|
}
|
|
|
|
static void
|
|
linux_fork_context (struct fork_info *newfp, int from_tty)
|
|
{
|
|
/* Now we attempt to switch processes. */
|
|
struct fork_info *oldfp;
|
|
|
|
gdb_assert (newfp != NULL);
|
|
|
|
oldfp = find_fork_ptid (inferior_ptid);
|
|
gdb_assert (oldfp != NULL);
|
|
|
|
fork_save_infrun_state (oldfp, 1);
|
|
remove_breakpoints ();
|
|
fork_load_infrun_state (newfp);
|
|
insert_breakpoints ();
|
|
|
|
printf_filtered (_("Switching to %s\n"),
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
|
|
}
|
|
|
|
/* Switch inferior process (checkpoint) context, by checkpoint id. */
|
|
static void
|
|
restart_command (const char *args, int from_tty)
|
|
{
|
|
struct fork_info *fp;
|
|
|
|
if (!args || !*args)
|
|
error (_("Requires argument (checkpoint id to restart)"));
|
|
|
|
if ((fp = find_fork_id (parse_and_eval_long (args))) == NULL)
|
|
error (_("Not found: checkpoint id %s"), args);
|
|
|
|
linux_fork_context (fp, from_tty);
|
|
}
|
|
|
|
void
|
|
_initialize_linux_fork (void)
|
|
{
|
|
init_fork_list ();
|
|
|
|
/* Checkpoint command: create a fork of the inferior process
|
|
and set it aside for later debugging. */
|
|
|
|
add_com ("checkpoint", class_obscure, checkpoint_command, _("\
|
|
Fork a duplicate process (experimental)."));
|
|
|
|
/* Restart command: restore the context of a specified checkpoint
|
|
process. */
|
|
|
|
add_com ("restart", class_obscure, restart_command, _("\
|
|
restart N: restore program context from a checkpoint.\n\
|
|
Argument N is checkpoint ID, as displayed by 'info checkpoints'."));
|
|
|
|
/* Delete checkpoint command: kill the process and remove it from
|
|
the fork list. */
|
|
|
|
add_cmd ("checkpoint", class_obscure, delete_checkpoint_command, _("\
|
|
Delete a checkpoint (experimental)."),
|
|
&deletelist);
|
|
|
|
/* Detach checkpoint command: release the process to run independently,
|
|
and remove it from the fork list. */
|
|
|
|
add_cmd ("checkpoint", class_obscure, detach_checkpoint_command, _("\
|
|
Detach from a checkpoint (experimental)."),
|
|
&detachlist);
|
|
|
|
/* Info checkpoints command: list all forks/checkpoints
|
|
currently under gdb's control. */
|
|
|
|
add_info ("checkpoints", info_checkpoints_command,
|
|
_("IDs of currently known checkpoints."));
|
|
}
|