/* GNU/Linux native-dependent code for debugging multiple forks.
- Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GDB.
#include "gdb_string.h"
#include "linux-fork.h"
#include "linux-nat.h"
+#include "gdbthread.h"
#include <sys/ptrace.h>
#include "gdb_wait.h"
{
struct fork_info *next;
ptid_t ptid;
+ ptid_t parent_ptid;
int num; /* Convenient handle (GDB fork id) */
struct regcache *savedregs; /* Convenient for info fork, saves
having to actually switch contexts. */
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 (oldfp != 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_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)"));
if (ptrace (PTRACE_KILL, PIDGET (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, PIDGET (ptid)))
+ warning (_("Unable to wait pid %s"), target_pid_to_str (ptid));
+ }
}
static void
if (!fp)
error (_("Failed to find new fork"));
fork_save_infrun_state (fp, 1);
+ fp->parent_ptid = last_target_ptid;
}
static void