2011-09-15 Kevin Pouget <kevin.pouget@st.com>

	PR threads/12628
	* linux-fork.c (checkpoint_command): Disallow checkpointing of
	processes with multiple threads.
	(inf_has_multiple_thread_cb): New function.
	(inf_has_multiple_threads): New function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c9db20e5a913e17127cf466349447787d2721fab..c336dd8d31a99abb668978676ec62ce9c3419e23 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-15  Kevin Pouget  <kevin.pouget@st.com>
+
+       PR threads/12628
+       * linux-fork.c (checkpoint_command): Disallow checkpointing of
+       processes with multiple threads.
+       (inf_has_multiple_thread_cb): New function.
+       (inf_has_multiple_threads): New function.
+
 2011-09-15  Kevin Pouget <kevin.pouget@st.com>
 
        PR Python/12692 Add gdb.selected_inferior() to Python interface.

diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 7f654afedd6718e539124281a05bce7df61d84b5..de512c3b2f519ad60a564ce3b3141d4a9d4addf5 100644 (file)
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -616,6 +616,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)
 {
@@ -628,6 +655,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)