/* 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.
{
struct fork_info *oldfp = fp;
- /* Switch back to inferior_ptid. */
- remove_breakpoints ();
- fork_load_infrun_state (oldfp);
- insert_breakpoints ();
+ if (oldfp)
+ {
+ /* Switch back to inferior_ptid. */
+ remove_breakpoints ();
+ fork_load_infrun_state (oldfp);
+ insert_breakpoints ();
+ }
}
static int
{
struct objfile *waitpid_objf;
struct value *waitpid_fn = NULL;
- struct value *argv[4];
+ struct value *argv[4], *retv;
struct gdbarch *gdbarch = get_current_arch ();
struct fork_info *oldfp = NULL, *newfp = NULL;
- struct cleanup *old_cleanup = NULL;
+ struct cleanup *old_cleanup;
int ret = -1;
if (!ptid_equal (pptid, inferior_ptid))
remove_breakpoints ();
fork_load_infrun_state (newfp);
insert_breakpoints ();
-
- old_cleanup = make_cleanup (inferior_call_waitpid_cleanup, oldfp);
}
+ 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);
argv[2] = value_from_longest (builtin_type (gdbarch)->builtin_int, 0);
argv[3] = 0;
- call_function_by_hand (waitpid_fn, 3, argv);
+ retv = call_function_by_hand (waitpid_fn, 3, argv);
+ if (value_as_long (retv) < 0)
+ goto out;
ret = 0;
out:
- if (old_cleanup)
- do_cleanups (old_cleanup);
+ do_cleanups (old_cleanup);
return ret;
}
static void
delete_checkpoint_command (char *args, int from_tty)
{
- ptid_t ptid;
+ ptid_t ptid, pptid;
struct fork_info *fi;
if (!args || !*args)
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));
list, waitpid the ptid.
If fi->parent_ptid is a part of lwp and it is stoped, waitpid the
ptid. */
- if ((!find_thread_ptid (fi->parent_ptid) && find_fork_ptid (fi->parent_ptid))
- || (find_thread_ptid (fi->parent_ptid) && is_stopped (fi->parent_ptid)))
+ if ((!find_thread_ptid (pptid) && find_fork_ptid (pptid))
+ || (find_thread_ptid (pptid) && is_stopped (pptid)))
{
- if (inferior_call_waitpid (fi->parent_ptid, PIDGET (ptid)))
+ if (inferior_call_waitpid (pptid, PIDGET (ptid)))
warning (_("Unable to wait pid %s"), target_pid_to_str (ptid));
}
}