X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Flinux-fork.c;h=72695bb458cb187ee6b058e27850e80a462799c1;hb=fd79271bd9dd6bb1626fb6f5ec3a415dc24950b1;hp=16403c96016690371dd59156b7f2feb234ea3b2c;hpb=7022349d5c86bae74b49225515f42d2e221bd368;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 16403c9601..72695bb458 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-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -38,9 +38,6 @@ 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 { @@ -48,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; @@ -96,7 +94,7 @@ add_fork (pid_t pid) } fp = XCNEW (struct fork_info); - fp->ptid = ptid_build (pid, pid, 0); + fp->ptid = ptid_t (pid, pid, 0); fp->num = ++highest_fork_num; if (fork_list == NULL) @@ -129,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); @@ -143,7 +141,7 @@ delete_fork (ptid_t ptid) fpprev = NULL; - linux_nat_forget_process (ptid_get_pid (ptid)); + 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)) @@ -264,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. */ @@ -295,9 +294,10 @@ fork_save_infrun_state (struct fork_info *fp, int clobber_regs) 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) @@ -410,7 +410,7 @@ linux_fork_mourn_inferior (void) the first available. */ void -linux_fork_detach (const 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 @@ -506,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; @@ -536,10 +536,11 @@ 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, ptid_get_pid (ptid))) warning (_("Unable to wait pid %s"), target_pid_to_str (ptid)); @@ -547,7 +548,7 @@ Please switch to another checkpoint before deleting the current one")); } static void -detach_checkpoint_command (char *args, int from_tty) +detach_checkpoint_command (const char *args, int from_tty) { ptid_t ptid; @@ -574,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; @@ -593,15 +594,11 @@ info_checkpoints_command (char *arg, int from_tty) printed = fp; if (ptid_equal (fp->ptid, inferior_ptid)) - { - printf_filtered ("* "); - pc = regcache_read_pc (get_current_regcache ()); - } + 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)")); @@ -671,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; @@ -764,7 +761,7 @@ linux_fork_context (struct fork_info *newfp, int from_tty) /* 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; @@ -792,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. */