*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / linux-fork.c

diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 46b0d904c092230d11e8858c8f115dc81e8a6c11..bb4468268c29dba615d1aa2d5c9aa7ad974c1d36 100644 (file)
--- 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 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,8 +24,10 @@
 #include "regcache.h"
 #include "gdbcmd.h"
 #include "infcall.h"
+#include "gdb_assert.h"
 #include "gdb_string.h"
 #include "linux-fork.h"
+#include "linux-nat.h"
 
 #include <sys/ptrace.h>
 #include <sys/wait.h>
@@ -72,8 +74,7 @@ add_fork (pid_t pid)
 {
   struct fork_info *fp;
 
-  if (fork_list == NULL &&
-      pid != PIDGET (inferior_ptid))
+  if (fork_list == NULL && pid != PIDGET (inferior_ptid))
     {
       /* Special case -- if this is the first fork in the list
         (the list is hitherto empty), and if this new fork is
@@ -84,7 +85,7 @@ add_fork (pid_t pid)
     }
 
   fp = XZALLOC (struct fork_info);
-  fp->ptid = pid_to_ptid (pid);
+  fp->ptid = ptid_build (pid, pid, 0);
   fp->num = ++highest_fork_num;
   fp->next = fork_list;
   fork_list = fp;
@@ -239,9 +240,21 @@ fork_load_infrun_state (struct fork_info *fp)
   extern void nullify_last_target_wait_ptid ();
   int i;
 
+  inferior_ptid = fp->ptid;
+
+  linux_nat_switch_fork (inferior_ptid);
+
   if (fp->savedregs && fp->clobber_regs)
     regcache_cpy (current_regcache, fp->savedregs);
 
+  registers_changed ();
+  reinit_frame_cache ();
+
+  /* We must select a new frame before making any inferior calls to
+     avoid warnings.  */
+  select_frame (get_current_frame ());
+
+  stop_pc = read_pc ();
   nullify_last_target_wait_ptid ();
 
   /* Now restore the file positions of open file descriptors.  */
@@ -322,17 +335,22 @@ linux_fork_killall (void)
      status for it) -- however any process may be a child
      or a parent, so may get a SIGCHLD from a previously
      killed child.  Wait them all out.  */
+  struct fork_info *fp;
   pid_t pid, ret;
   int status;
 
-  do {
-    pid = PIDGET (fork_list->ptid);
-    do {
-      ptrace (PT_KILL, pid, 0, 0);
-      ret = waitpid (pid, &status, 0);
-    } while (ret == pid && WIFSTOPPED (status));
-    delete_fork (fork_list->ptid);
-  } while (fork_list != NULL);
+  for (fp = fork_list; fp; fp = fp->next)
+    {
+      pid = PIDGET (fp->ptid);
+      do {
+       ptrace (PT_KILL, pid, 0, 0);
+       ret = waitpid (pid, &status, 0);
+       /* We might get a SIGCHLD instead of an exit status.  This is
+        aggravated by the first kill above - a child has just
+        died.  MVS comment cut-and-pasted from linux-nat.  */
+      } while (ret == pid && WIFSTOPPED (status));
+    }
+  init_fork_list ();   /* Clear list, prepare to start fresh.  */
 }
 
 /* The current inferior_ptid has exited, but there are other viable
@@ -354,12 +372,19 @@ linux_fork_mourn_inferior (void)
      We need to delete that one from the fork_list, and switch
      to the next available fork.  */
   delete_fork (inferior_ptid);
-  if (fork_list)       /* Paranoia, shouldn't happen.  */
-    {
-      inferior_ptid = fork_list[0].ptid;
-      printf_filtered (_("[Switching to %s]\n"), 
-                      target_pid_to_str (inferior_ptid));
-    }
+
+  /* There should still be a fork - if there's only one left,
+     delete_fork won't remove it, because we haven't updated
+     inferior_ptid yet.  */
+  gdb_assert (fork_list);
+
+  fork_load_infrun_state (fork_list);
+  printf_filtered (_("[Switching to %s]\n"),
+                  target_pid_to_str (inferior_ptid));
+
+  /* If there's only one fork, switch back to non-fork mode.  */
+  if (fork_list->next == NULL)
+    delete_fork (inferior_ptid);
 }
 
 /* Fork list <-> user interface.  */
@@ -379,7 +404,7 @@ delete_fork_command (char *args, int from_tty)
   if (ptid_equal (ptid, inferior_ptid))
     error (_("Please switch to another fork/checkpoint before deleting the current one"));
 
-  if (ptrace (PTRACE_KILL, ptid, 0, 0))
+  if (ptrace (PTRACE_KILL, PIDGET (ptid), 0, 0))
     error (_("Unable to kill pid %s"), target_tid_to_str (ptid));
 
   if (from_tty)
@@ -403,7 +428,7 @@ detach_fork_command (char *args, int from_tty)
   if (ptid_equal (ptid, inferior_ptid))
     error (_("Please switch to another fork before detaching the current one"));
 
-  if (ptrace (PTRACE_DETACH, ptid, 0, 0))
+  if (ptrace (PTRACE_DETACH, PIDGET (ptid), 0, 0))
     error (_("Unable to detach %s"), target_pid_to_str (ptid));
 
   if (from_tty)
@@ -555,17 +580,10 @@ linux_fork_context (struct fork_info *newfp, int from_tty)
     error (_("No such fork/process"));
 
   if (!oldfp)
-    {
-      oldfp = add_fork (ptid_get_pid (inferior_ptid));
-    }
+    oldfp = add_fork (ptid_get_pid (inferior_ptid));
 
   fork_save_infrun_state (oldfp, 1);
-  inferior_ptid = newfp->ptid;
   fork_load_infrun_state (newfp);
-  registers_changed ();
-  reinit_frame_cache ();
-  stop_pc = read_pc ();
-  select_frame (get_current_frame ());
 
   printf_filtered (_("Switching to %s\n"), 
                   target_pid_to_str (inferior_ptid));