X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Flinux-fork.c;h=74d5c195d255172b8e70e09dfdaa90e99647642e;hb=d7e15655a40e9133a1cbf53ea071f82cd6745ac8;hp=21514011cdfceb75f08e34ec1e17a9a09cf3ff0b;hpb=05cba821addfe83535ad36f7487d1d2bbac48ba2;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 21514011cd..74d5c195d2 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-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -20,29 +20,24 @@ #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 "gdb_assert.h" -#include "gdb_string.h" #include "linux-fork.h" #include "linux-nat.h" #include "gdbthread.h" #include "source.h" -#include +#include "nat/gdb_ptrace.h" #include "gdb_wait.h" -#include -#include "gdb_dirent.h" +#include #include struct fork_info *fork_list; static int highest_fork_num; -/* Prevent warning from -Wmissing-prototypes. */ -extern void _initialize_linux_fork (void); - /* Fork list data structure: */ struct fork_info { @@ -50,8 +45,9 @@ struct fork_info ptid_t ptid; ptid_t parent_ptid; int num; /* Convenient handle (GDB fork id). */ - struct regcache *savedregs; /* Convenient for info fork, saves + 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; @@ -65,6 +61,21 @@ 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 * @@ -72,21 +83,29 @@ add_fork (pid_t pid) { struct fork_info *fp; - if (fork_list == NULL && pid != PIDGET (inferior_ptid)) + if (fork_list == NULL && pid != inferior_ptid.pid ()) { /* 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 (inferior_ptid.pid ()); /* safe recursion */ } - fp = XZALLOC (struct fork_info); - fp->ptid = ptid_build (pid, pid, 0); + fp = XCNEW (struct fork_info); + fp->ptid = ptid_t (pid, pid, 0); fp->num = ++highest_fork_num; - fp->next = fork_list; - fork_list = fp; + + if (fork_list == NULL) + fork_list = fp; + else + { + struct fork_info *last = find_last_fork (); + + last->next = fp; + } + return fp; } @@ -108,7 +127,7 @@ free_fork (struct fork_info *fp) if (fp) { if (fp->savedregs) - regcache_xfree (fp->savedregs); + delete fp->savedregs; if (fp->filepos) xfree (fp->filepos); xfree (fp); @@ -122,8 +141,10 @@ delete_fork (ptid_t ptid) fpprev = NULL; + linux_target->low_forget_process (ptid.pid ()); + for (fp = fork_list; fp; fpprev = fp, fp = fp->next) - if (ptid_equal (fp->ptid, ptid)) + if (fp->ptid == ptid) break; if (!fp) @@ -141,7 +162,7 @@ delete_fork (ptid_t ptid) 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)) + fork_list->ptid == inferior_ptid) { /* Last fork -- delete from list and handle as solo process (should be a safe recursion). */ @@ -156,7 +177,7 @@ find_fork_ptid (ptid_t ptid) struct fork_info *fp; for (fp = fork_list; fp; fp = fp->next) - if (ptid_equal (fp->ptid, ptid)) + if (fp->ptid == ptid) return fp; return NULL; @@ -182,7 +203,7 @@ 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)) + if (pid == fp->ptid.pid ()) return fp; return NULL; @@ -195,7 +216,7 @@ fork_id_to_ptid (int num) if (fork) return fork->ptid; else - return pid_to_ptid (-1); + return ptid_t (-1); } static void @@ -225,7 +246,7 @@ call_lseek (int fd, off_t offset, int whence) { char exp[80]; - snprintf (&exp[0], sizeof (exp), "lseek (%d, %ld, %d)", + snprintf (&exp[0], sizeof (exp), "(long) lseek (%d, %ld, %d)", fd, (long) offset, whence); return (off_t) parse_and_eval_long (&exp[0]); } @@ -241,12 +262,13 @@ fork_load_infrun_state (struct fork_info *fp) linux_nat_switch_fork (fp->ptid); if (fp->savedregs && fp->clobber_regs) - regcache_cpy (get_current_regcache (), fp->savedregs); + get_current_regcache ()->restore (fp->savedregs); registers_changed (); reinit_frame_cache (); - stop_pc = regcache_read_pc (get_current_regcache ()); + inferior_thread ()->suspend.stop_pc + = regcache_read_pc (get_current_regcache ()); nullify_last_target_wait_ptid (); /* Now restore the file positions of open file descriptors. */ @@ -267,21 +289,23 @@ 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; if (fp->savedregs) - regcache_xfree (fp->savedregs); + delete fp->savedregs; - fp->savedregs = regcache_dup (get_current_regcache ()); + 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, MAXPATHLEN, "/proc/%ld/fd", (long) PIDGET (fp->ptid)); + snprintf (path, PATH_MAX, "/proc/%ld/fd", + (long) fp->ptid.pid ()); if ((d = opendir (path)) != NULL) { long tmp; @@ -296,8 +320,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->maxfd + 1) * sizeof (*fp->filepos)); + fp->filepos = XRESIZEVEC (off_t, fp->filepos, fp->maxfd + 1); /* Initialize to -1 (invalid). */ for (tmp = 0; tmp <= fp->maxfd; tmp++) @@ -332,7 +355,7 @@ linux_fork_killall (void) for (fp = fork_list; fp; fp = fp->next) { - pid = PIDGET (fp->ptid); + pid = fp->ptid.pid (); do { /* Use SIGKILL instead of PTRACE_KILL because the former works even if the thread is running, while the later doesn't. */ @@ -353,13 +376,14 @@ linux_fork_killall (void) 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. */ - int status; - - waitpid (ptid_get_pid (inferior_ptid), &status, 0); + waitpid (inferior_ptid.pid (), &status, 0); /* OK, presumably inferior_ptid is the one who has exited. We need to delete that one from the fork_list, and switch @@ -371,7 +395,8 @@ linux_fork_mourn_inferior (void) inferior_ptid yet. */ gdb_assert (fork_list); - fork_load_infrun_state (fork_list); + last = find_last_fork (); + fork_load_infrun_state (last); printf_filtered (_("[Switching to %s]\n"), target_pid_to_str (inferior_ptid)); @@ -385,13 +410,13 @@ linux_fork_mourn_inferior (void) the first available. */ void -linux_fork_detach (char *args, int from_tty) +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, PIDGET (inferior_ptid), 0, 0)) + if (ptrace (PTRACE_DETACH, inferior_ptid.pid (), 0, 0)) error (_("Unable to detach %s"), target_pid_to_str (inferior_ptid)); delete_fork (inferior_ptid); @@ -415,7 +440,7 @@ linux_fork_detach (char *args, int from_tty) static void inferior_call_waitpid_cleanup (void *fp) { - struct fork_info *oldfp = fp; + struct fork_info *oldfp = (struct fork_info *) fp; if (oldfp) { @@ -437,7 +462,7 @@ inferior_call_waitpid (ptid_t pptid, int pid) struct cleanup *old_cleanup; int ret = -1; - if (!ptid_equal (pptid, inferior_ptid)) + if (pptid != inferior_ptid) { /* Switch to pptid. */ oldfp = find_fork_ptid (inferior_ptid); @@ -453,9 +478,10 @@ inferior_call_waitpid (ptid_t pptid, int pid) old_cleanup = make_cleanup (inferior_call_waitpid_cleanup, oldfp); /* Get the waitpid_fn. */ - if (lookup_minimal_symbol ("waitpid", NULL, NULL) != NULL) + 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) != NULL) + 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; @@ -466,7 +492,7 @@ inferior_call_waitpid (ptid_t pptid, int pid) argv[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0); argv[3] = 0; - retv = call_function_by_hand (waitpid_fn, 3, argv); + retv = call_function_by_hand (waitpid_fn, NULL, 3, argv); if (value_as_long (retv) < 0) goto out; @@ -480,7 +506,7 @@ out: /* Fork list <-> user interface. */ static void -delete_checkpoint_command (char *args, int from_tty) +delete_checkpoint_command (const char *args, int from_tty) { ptid_t ptid, pptid; struct fork_info *fi; @@ -489,14 +515,14 @@ delete_checkpoint_command (char *args, int from_tty) error (_("Requires argument (checkpoint id to delete)")); ptid = fork_id_to_ptid (parse_and_eval_long (args)); - if (ptid_equal (ptid, minus_one_ptid)) + if (ptid == minus_one_ptid) error (_("No such checkpoint id, %s"), args); - if (ptid_equal (ptid, inferior_ptid)) + if (ptid == inferior_ptid) error (_("\ Please switch to another checkpoint before deleting the current one")); - if (ptrace (PTRACE_KILL, PIDGET (ptid), 0, 0)) + if (ptrace (PTRACE_KILL, ptid.pid (), 0, 0)) error (_("Unable to kill pid %s"), target_pid_to_str (ptid)); fi = find_fork_ptid (ptid); @@ -510,18 +536,19 @@ Please switch to another checkpoint before deleting the current one")); /* 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 + If fi->parent_ptid is a part of lwp and it is stopped, waitpid the ptid. */ - if ((!find_thread_ptid (pptid) && find_fork_ptid (pptid)) - || (find_thread_ptid (pptid) && is_stopped (pptid))) + 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, PIDGET (ptid))) + if (inferior_call_waitpid (pptid, ptid.pid ())) warning (_("Unable to wait pid %s"), target_pid_to_str (ptid)); } } static void -detach_checkpoint_command (char *args, int from_tty) +detach_checkpoint_command (const char *args, int from_tty) { ptid_t ptid; @@ -529,14 +556,14 @@ detach_checkpoint_command (char *args, int from_tty) error (_("Requires argument (checkpoint id to detach)")); ptid = fork_id_to_ptid (parse_and_eval_long (args)); - if (ptid_equal (ptid, minus_one_ptid)) + if (ptid == minus_one_ptid) error (_("No such checkpoint id, %s"), args); - if (ptid_equal (ptid, inferior_ptid)) + if (ptid == inferior_ptid) error (_("\ Please switch to another checkpoint before detaching the current one")); - if (ptrace (PTRACE_DETACH, PIDGET (ptid), 0, 0)) + if (ptrace (PTRACE_DETACH, ptid.pid (), 0, 0)) error (_("Unable to detach %s"), target_pid_to_str (ptid)); if (from_tty) @@ -548,7 +575,7 @@ Please switch to another checkpoint before detaching the current one")); /* Print information about currently known checkpoints. */ static void -info_checkpoints_command (char *arg, int from_tty) +info_checkpoints_command (const char *arg, int from_tty) { struct gdbarch *gdbarch = get_current_arch (); struct symtab_and_line sal; @@ -566,16 +593,12 @@ info_checkpoints_command (char *arg, int from_tty) continue; printed = fp; - if (ptid_equal (fp->ptid, inferior_ptid)) - { - printf_filtered ("* "); - pc = regcache_read_pc (get_current_regcache ()); - } + if (fp->ptid == inferior_ptid) + printf_filtered ("* "); else - { - printf_filtered (" "); - pc = regcache_read_pc (fp->savedregs); - } + 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)")); @@ -590,11 +613,11 @@ info_checkpoints_command (char *arg, int from_tty) 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>", MSYMBOL_LINKAGE_NAME (msym.minsym)); } putchar_filtered ('\n'); @@ -626,7 +649,7 @@ 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)) + if (current_inferior ()->pid == tp->ptid.pid ()) (*count_p)++; /* Stop the iteration if multiple threads have been detected. */ @@ -645,7 +668,7 @@ inf_has_multiple_threads (void) } static void -checkpoint_command (char *args, int from_tty) +checkpoint_command (const char *args, int from_tty) { struct objfile *fork_objf; struct gdbarch *gdbarch; @@ -654,7 +677,6 @@ checkpoint_command (char *args, int from_tty) struct value *fork_fn = NULL, *ret; struct fork_info *fp; pid_t retpid; - struct cleanup *old_chain; if (!target_has_execution) error (_("The program is not being run.")); @@ -666,10 +688,10 @@ checkpoint_command (char *args, int from_tty) /* Make the inferior fork, record its (and gdb's) state. */ - if (lookup_minimal_symbol ("fork", NULL, NULL) != NULL) + 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) != NULL) + 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.")); @@ -678,33 +700,37 @@ checkpoint_command (char *args, int from_tty) ret = value_from_longest (builtin_type (gdbarch)->builtin_int, 0); /* Tell linux-nat.c that we're checkpointing this inferior. */ - old_chain = make_cleanup_restore_integer (&checkpointing_pid); - checkpointing_pid = PIDGET (inferior_ptid); + { + scoped_restore save_pid + = make_scoped_restore (&checkpointing_pid, inferior_ptid.pid ()); + + ret = call_function_by_hand (fork_fn, NULL, 0, &ret); + } - ret = call_function_by_hand (fork_fn, 0, &ret); - do_cleanups (old_chain); 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: fork returned pid %ld.\n"), - (long) retpid); + 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); + parent_pid = last_target_ptid.lwp (); if (parent_pid == 0) - parent_pid = ptid_get_pid (last_target_ptid); + parent_pid = last_target_ptid.pid (); printf_filtered (_(" gdb says parent = %ld.\n"), (long) parent_pid); } } - fp = find_fork_pid (retpid); if (!fp) error (_("Failed to find new fork")); fork_save_infrun_state (fp, 1); @@ -730,12 +756,12 @@ linux_fork_context (struct fork_info *newfp, int from_tty) 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. */ static void -restart_command (char *args, int from_tty) +restart_command (const char *args, int from_tty) { struct fork_info *fp; @@ -763,8 +789,8 @@ Fork a duplicate process (experimental).")); process. */ add_com ("restart", class_obscure, restart_command, _("\ -restart : restore program context from a checkpoint.\n\ -Argument 'n' is checkpoint ID, as displayed by 'info checkpoints'.")); +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. */