X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Flinux-fork.c;h=cfe1ce555af0aac8ce8952bdd2f5dbe76618ce73;hb=11b5219af5c54762a68469ade4005e5dd2362f87;hp=c0004d16b27d5a4e76aaf2e4d1b702be9cdb1efd;hpb=2277426b30143428d49daf1d3e422f5096c4c4cb;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index c0004d16b2..cfe1ce555a 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -1,6 +1,6 @@ /* GNU/Linux native-dependent code for debugging multiple forks. - Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2005-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -25,14 +25,15 @@ #include "infcall.h" #include "objfiles.h" #include "gdb_assert.h" -#include "gdb_string.h" +#include #include "linux-fork.h" #include "linux-nat.h" +#include "gdbthread.h" +#include "source.h" #include #include "gdb_wait.h" -#include -#include "gdb_dirent.h" +#include #include struct fork_info *fork_list; @@ -41,16 +42,14 @@ static int highest_fork_num; /* Prevent warning from -Wmissing-prototypes. */ extern void _initialize_linux_fork (void); -int detach_fork = 1; /* Default behavior is to detach - newly forked processes (legacy). */ - /* Fork list data structure: */ struct fork_info { struct fork_info *next; ptid_t ptid; - int num; /* Convenient handle (GDB fork id) */ - struct regcache *savedregs; /* Convenient for info fork, saves + ptid_t parent_ptid; + int num; /* Convenient handle (GDB fork id). */ + struct regcache *savedregs; /* Convenient for info fork, saves having to actually switch contexts. */ int clobber_regs; /* True if we should restore saved regs. */ off_t *filepos; /* Set of open file descriptors' offsets. */ @@ -59,31 +58,30 @@ struct fork_info /* Fork list methods: */ -extern int +int forks_exist_p (void) { return (fork_list != NULL); } -/* Add a fork to internal fork list. - Called from linux child_follow_fork. */ +/* Add a fork to the internal fork list. */ -extern struct fork_info * +struct fork_info * add_fork (pid_t pid) { struct fork_info *fp; - if (fork_list == NULL && pid != PIDGET (inferior_ptid)) + 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 (PIDGET (inferior_ptid)); /* safe recursion */ + add_fork (ptid_get_pid (inferior_ptid)); /* safe recursion */ } - fp = XZALLOC (struct fork_info); + fp = XCNEW (struct fork_info); fp->ptid = ptid_build (pid, pid, 0); fp->num = ++highest_fork_num; fp->next = fork_list; @@ -123,6 +121,8 @@ delete_fork (ptid_t ptid) fpprev = NULL; + linux_nat_forget_process (ptid_get_pid (ptid)); + for (fp = fork_list; fp; fpprev = fp, fp = fp->next) if (ptid_equal (fp->ptid, ptid)) break; @@ -137,7 +137,7 @@ delete_fork (ptid_t ptid) free_fork (fp); - /* Special case: if there is now only one process in the list, + /* 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. */ @@ -218,7 +218,7 @@ init_fork_list (void) /* Fork list <-> gdb interface. */ -/* Utility function for fork_load/fork_save. +/* Utility function for fork_load/fork_save. Calls lseek in the (current) inferior process. */ static off_t @@ -268,7 +268,7 @@ fork_load_infrun_state (struct fork_info *fp) static void fork_save_infrun_state (struct fork_info *fp, int clobber_regs) { - char path[MAXPATHLEN]; + char path[PATH_MAX]; struct dirent *de; DIR *d; @@ -282,7 +282,8 @@ fork_save_infrun_state (struct fork_info *fp, int 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, MAXPATHLEN, "/proc/%ld/fd", (long) PIDGET (fp->ptid)); + snprintf (path, PATH_MAX, "/proc/%ld/fd", + (long) ptid_get_pid (fp->ptid)); if ((d = opendir (path)) != NULL) { long tmp; @@ -297,7 +298,7 @@ fork_save_infrun_state (struct fork_info *fp, int clobber_regs) fp->maxfd = tmp; } /* Allocate array of file positions. */ - fp->filepos = xrealloc (fp->filepos, + fp->filepos = xrealloc (fp->filepos, (fp->maxfd + 1) * sizeof (*fp->filepos)); /* Initialize to -1 (invalid). */ @@ -319,7 +320,7 @@ fork_save_infrun_state (struct fork_info *fp, int clobber_regs) /* Kill 'em all, let God sort 'em out... */ -extern void +void linux_fork_killall (void) { /* Walk list and kill every pid. No need to treat the @@ -333,7 +334,7 @@ linux_fork_killall (void) for (fp = fork_list; fp; fp = fp->next) { - pid = PIDGET (fp->ptid); + 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. */ @@ -351,7 +352,7 @@ linux_fork_killall (void) forks to debug. Delete the exiting one and context-switch to the first available. */ -extern void +void linux_fork_mourn_inferior (void) { /* Wait just one more time to collect the inferior's exit status. @@ -385,14 +386,14 @@ linux_fork_mourn_inferior (void) viable forks to debug. Detach and delete it and context-switch to the first available. */ -extern void -linux_fork_detach (char *args, int from_tty) +void +linux_fork_detach (const char *args, 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, PIDGET (inferior_ptid), 0, 0)) + 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); @@ -413,12 +414,78 @@ linux_fork_detach (char *args, int from_tty) delete_fork (inferior_ptid); } +static void +inferior_call_waitpid_cleanup (void *fp) +{ + struct fork_info *oldfp = 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) != NULL) + waitpid_fn = find_function_in_inferior ("waitpid", &waitpid_objf); + if (!waitpid_fn && lookup_minimal_symbol ("_waitpid", NULL, NULL) != 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, 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_fork_command (char *args, int from_tty) +delete_checkpoint_command (char *args, int from_tty) { - ptid_t ptid; + ptid_t ptid, pptid; + struct fork_info *fi; if (!args || !*args) error (_("Requires argument (checkpoint id to delete)")); @@ -428,19 +495,35 @@ delete_fork_command (char *args, int from_tty) error (_("No such checkpoint id, %s"), args); if (ptid_equal (ptid, inferior_ptid)) - error (_("Please switch to another checkpoint before deleting the current one")); + error (_("\ +Please switch to another checkpoint before deleting the current one")); - if (ptrace (PTRACE_KILL, PIDGET (ptid), 0, 0)) + 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 stoped, waitpid the + ptid. */ + if ((!find_thread_ptid (pptid) && find_fork_ptid (pptid)) + || (find_thread_ptid (pptid) && is_stopped (pptid))) + { + if (inferior_call_waitpid (pptid, ptid_get_pid (ptid))) + warning (_("Unable to wait pid %s"), target_pid_to_str (ptid)); + } } static void -detach_fork_command (char *args, int from_tty) +detach_checkpoint_command (char *args, int from_tty) { ptid_t ptid; @@ -455,7 +538,7 @@ detach_fork_command (char *args, int from_tty) error (_("\ Please switch to another checkpoint before detaching the current one")); - if (ptrace (PTRACE_DETACH, PIDGET (ptid), 0, 0)) + if (ptrace (PTRACE_DETACH, ptid_get_pid (ptid), 0, 0)) error (_("Unable to detach %s"), target_pid_to_str (ptid)); if (from_tty) @@ -464,17 +547,14 @@ Please switch to another checkpoint before detaching the current one")); delete_fork (ptid); } -/* Print information about currently known forks. */ +/* Print information about currently known checkpoints. */ static void -info_forks_command (char *arg, int from_tty) +info_checkpoints_command (char *arg, int from_tty) { struct gdbarch *gdbarch = get_current_arch (); - struct frame_info *cur_frame; struct symtab_and_line sal; - struct symtab *cur_symtab; struct fork_info *fp; - int cur_line; ULONGEST pc; int requested = -1; struct fork_info *printed = NULL; @@ -506,23 +586,17 @@ info_forks_command (char *arg, int from_tty) sal = find_pc_line (pc, 0); if (sal.symtab) - { - char *tmp = strrchr (sal.symtab->filename, '/'); - - if (tmp) - printf_filtered (_(", file %s"), tmp + 1); - else - printf_filtered (_(", file %s"), sal.symtab->filename); - } + 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 minimal_symbol *msym; + struct bound_minimal_symbol msym; msym = lookup_minimal_symbol_by_pc (pc); - if (msym) - printf_filtered (", <%s>", SYMBOL_LINKAGE_NAME (msym)); + if (msym.minsym) + printf_filtered (", <%s>", SYMBOL_LINKAGE_NAME (msym.minsym)); } putchar_filtered ('\n'); @@ -545,6 +619,33 @@ 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 (char *args, int from_tty) { @@ -556,8 +657,15 @@ checkpoint_command (char *args, int from_tty) struct fork_info *fp; pid_t retpid; struct cleanup *old_chain; - long i; + 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) != NULL) @@ -573,7 +681,7 @@ checkpoint_command (char *args, int from_tty) /* Tell linux-nat.c that we're checkpointing this inferior. */ old_chain = make_cleanup_restore_integer (&checkpointing_pid); - checkpointing_pid = PIDGET (inferior_ptid); + checkpointing_pid = ptid_get_pid (inferior_ptid); ret = call_function_by_hand (fork_fn, 0, &ret); do_cleanups (old_chain); @@ -586,14 +694,14 @@ checkpoint_command (char *args, int from_tty) { int parent_pid; - printf_filtered (_("checkpoint: fork returned pid %ld.\n"), + printf_filtered (_("checkpoint: fork returned pid %ld.\n"), (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"), + printf_filtered (_(" gdb says parent = %ld.\n"), (long) parent_pid); } } @@ -602,6 +710,7 @@ checkpoint_command (char *args, int from_tty) if (!fp) error (_("Failed to find new fork")); fork_save_infrun_state (fp, 1); + fp->parent_ptid = last_target_ptid; } static void @@ -609,8 +718,6 @@ linux_fork_context (struct fork_info *newfp, int from_tty) { /* Now we attempt to switch processes. */ struct fork_info *oldfp; - ptid_t ptid; - int id, i; gdb_assert (newfp != NULL); @@ -622,10 +729,10 @@ linux_fork_context (struct fork_info *newfp, int from_tty) fork_load_infrun_state (newfp); insert_breakpoints (); - printf_filtered (_("Switching to %s\n"), + printf_filtered (_("Switching to %s\n"), target_pid_to_str (inferior_ptid)); - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* Switch inferior process (checkpoint) context, by checkpoint id. */ @@ -648,21 +755,6 @@ _initialize_linux_fork (void) { init_fork_list (); - /* Set/show detach-on-fork: user-settable mode. */ - - add_setshow_boolean_cmd ("detach-on-fork", class_obscure, &detach_fork, _("\ -Set whether gdb will detach the child of a fork."), _("\ -Show whether gdb will detach the child of a fork."), _("\ -Tells gdb whether to detach the child of a fork."), - NULL, NULL, &setlist, &showlist); - - /* Set/show restart-auto-finish: user-settable count. Causes the - first "restart" of a fork to do some number of "finish" commands - before returning to user. - - Useful because otherwise the virgin fork process will be stopped - somewhere in the un-interesting fork system call. */ - /* Checkpoint command: create a fork of the inferior process and set it aside for later debugging. */ @@ -677,22 +769,22 @@ restart : 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 - fork list. */ + the fork list. */ - add_cmd ("checkpoint", class_obscure, delete_fork_command, _("\ + add_cmd ("checkpoint", class_obscure, delete_checkpoint_command, _("\ Delete a checkpoint (experimental)."), &deletelist); - /* Detach checkpoint command: release the process to run independently, + /* Detach checkpoint command: release the process to run independently, and remove it from the fork list. */ - add_cmd ("checkpoint", class_obscure, detach_fork_command, _("\ + add_cmd ("checkpoint", class_obscure, detach_checkpoint_command, _("\ Detach from a checkpoint (experimental)."), &detachlist); - /* Info checkpoints command: list all forks/checkpoints + /* Info checkpoints command: list all forks/checkpoints currently under gdb's control. */ - add_info ("checkpoints", info_forks_command, + add_info ("checkpoints", info_checkpoints_command, _("IDs of currently known checkpoints.")); }