gdb/

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

diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index d9463bd9aa4cd6b2918f4156d5b0674b631b1663..028fcbc09d0feb35c27be4eee90f3acf19118302 100644 (file)
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -1,7 +1,6 @@
 /* GNU/Linux native-dependent code for debugging multiple forks.
 
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -49,7 +48,7 @@ struct fork_info
   struct fork_info *next;
   ptid_t ptid;
   ptid_t parent_ptid;
-  int num;                     /* Convenient handle (GDB fork id) */
+  int num;                     /* Convenient handle (GDB fork id).  */
   struct regcache *savedregs;  /* Convenient for info fork, saves
                                   having to actually switch contexts.  */
   int clobber_regs;            /* True if we should restore saved regs.  */
@@ -419,7 +418,7 @@ inferior_call_waitpid_cleanup (void *fp)
 
   if (oldfp)
     {
-      /* Switch back to inferior_ptid. */
+      /* Switch back to inferior_ptid.  */
       remove_breakpoints ();
       fork_load_infrun_state (oldfp);
       insert_breakpoints ();
@@ -443,7 +442,7 @@ inferior_call_waitpid (ptid_t pptid, int pid)
       oldfp = find_fork_ptid (inferior_ptid);
       gdb_assert (oldfp != NULL);
       newfp = find_fork_ptid (pptid);
-      gdb_assert (oldfp != NULL);
+      gdb_assert (newfp != NULL);
       fork_save_infrun_state (oldfp, 1);
       remove_breakpoints ();
       fork_load_infrun_state (newfp);
@@ -584,14 +583,7 @@ info_checkpoints_command (char *arg, int from_tty)
 
       sal = find_pc_line (pc, 0);
       if (sal.symtab)
-       {
-         char *tmp = strrchr (sal.symtab->filename, '/');
-
-         if (tmp)
-           printf_filtered (_(", file %s"), tmp + 1);
-         else
-           printf_filtered (_(", file %s"), sal.symtab->filename);
-       }
+       printf_filtered (_(", file %s"), lbasename (sal.symtab->filename));
       if (sal.line)
        printf_filtered (_(", line %d"), sal.line);
       if (!sal.symtab && !sal.line)
@@ -623,6 +615,33 @@ linux_fork_checkpointing_p (int pid)
   return (checkpointing_pid == pid);
 }
 
+/* Callback for iterate over threads.  Used to check whether
+   the current inferior is multi-threaded.  Returns true as soon
+   as it sees the second thread of the current inferior.  */
+
+static int
+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))
+    (*count_p)++;
+  
+  /* Stop the iteration if multiple threads have been detected.  */
+  return *count_p > 1;
+}
+
+/* Return true if the current inferior is multi-threaded.  */
+
+static int
+inf_has_multiple_threads (void)
+{
+  int count = 0;
+
+  iterate_over_threads (inf_has_multiple_thread_cb, &count);
+  return (count > 1);
+}
+
 static void
 checkpoint_command (char *args, int from_tty)
 {
@@ -635,6 +654,14 @@ checkpoint_command (char *args, int from_tty)
   pid_t retpid;
   struct cleanup *old_chain;
 
+  if (!target_has_execution) 
+    error (_("The program is not being run."));
+
+  /* Ensure that the inferior is not multithreaded.  */
+  update_thread_list ();
+  if (inf_has_multiple_threads ())
+    error (_("checkpoint: can't checkpoint multiple threads."));
+  
   /* Make the inferior fork, record its (and gdb's) state.  */
 
   if (lookup_minimal_symbol ("fork", NULL, NULL) != NULL)