[binutils-gdb] PR remote/19496, timeout in forking-threads-plus-bkpt

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0d5b594f86aa7c8f38487802f75841460ab705bf

commit 0d5b594f86aa7c8f38487802f75841460ab705bf
Author: Pedro Alves <palves@redhat.com>
Date:   Thu Mar 17 10:21:37 2016 +0000

    PR remote/19496, timeout in forking-threads-plus-bkpt
    
    This patch addresses a failure in
    gdb.threads/forking-threads-plus-breakpoint.exp:
    
    FAIL: gdb.threads/forking-threads-plus-breakpoint.exp: cond_bp_target=1:
    detach_on_fork=on: inferior 1 exited (timeout)
    
    Cause:
    
    A fork event was reported to GDB before GDB knew about the parent
    thread, followed immediately by a breakpoint event in a different
    thread.  The parent thread was subsequently added via
    remote_notice_new_inferior in process_stop_reply, but when the thread
    was added the thread_info.state was set to THREAD_STOPPED.  The fork
    event was then handled correctly, but when the fork parent was resumed
    via a call to keep_going, the state was unchanged.
    
    The breakpoint event was then handled, which caused all the
    non-breakpoint threads to be stopped.  When the breakpoint thread was
    resumed, all the non-breakpoint threads were resumed via
    infrun.c:restart_threads.  Our old fork parent wasn't restarted,
    because it still had thread_info.state set to THREAD_STOPPED.
    Ultimately the program under debug hung waiting for a pthread_join
    while the old fork parent was stopped forever by GDB.
    
    Fix:
    
    Since this is non-stop, then the bug is that the thread should have
    been added in THREAD_RUNNING state.  Consider that infrun may be
    pulling target events out of the target_ops backend into its own event
    queue, but, not process them immediately.  E.g., infrun may be
    stopping all threads temporarily for a step-over-breakpoint operation
    for thread A (stop_all_threads).  The waitstatus of all threads is
    thus left pending in the thread structure (save_status), including the
    fork event of thread B.  Right at this point, if the user does "info
    threads", that should show thread B (the fork parent) running, not
    stopped, even if internally, gdb is holding it paused for a little
    bit.
    
    Thus if in non-stop mode, always add new threads in the external
    user-visible THREAD_RUNNING state.  Change remote_notice_new_inferior
    to accept the internal executing state of the thread instead, with
    EXECUTING set to 1 when we discover a thread that is running on the
    target (such as through remote_update_thread_list), and 0 when the
    thread is really paused (such as when we see a stop reply).
    
    Tested on x86_64 Linux and Nios II Linux target with x86 Linux host.
    
    gdb/ChangeLog:
    2016-03-17  Pedro Alves  <palves@redhat.com>
    	    Don Breazeal  <donb@codesourcery.com>
    
    	PR remote/19496
    	* infcmd.c (notice_new_inferior): Use the 'leave_running' argument
    	instead of checking the 'non_stop' global.
    	* remote.c (remote_add_thread): New parameter 'executing'.  Use it
    	to set the new thread's executing state.
    	(remote_notice_new_inferior): Rename parameter 'running' to
    	'executing'.  Always set the thread state to THREAD_RUNNING in
    	non-stop mode, and to THREAD_STOPPED in all-stop mode.  Pass
    	EXECUTING to remote_add_thread and notice_new_inferior.
    	(remote_update_thread_list): Update to pass executing state, not
    	running state.

Diff:
---
 gdb/ChangeLog | 15 +++++++++++++++
 gdb/infcmd.c  |  7 +------
 gdb/remote.c  | 30 ++++++++++++++++++------------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 32d1a83..f5099d9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2016-03-17  Pedro Alves  <palves@redhat.com>
+	    Don Breazeal  <donb@codesourcery.com>
+
+	PR remote/19496
+	* infcmd.c (notice_new_inferior): Use the 'leave_running' argument
+	instead of checking the 'non_stop' global.
+	* remote.c (remote_add_thread): New parameter 'executing'.  Use it
+	to set the new thread's executing state.
+	(remote_notice_new_inferior): Rename parameter 'running' to
+	'executing'.  Always set the thread state to THREAD_RUNNING in
+	non-stop mode, and to THREAD_STOPPED in all-stop mode.  Pass
+	EXECUTING to remote_add_thread and notice_new_inferior.
+	(remote_update_thread_list): Update to pass executing state, not
+	running state.
+
 2016-03-17  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* syscalls/s390-linux.xml: Add NUMA syscalls and new syscalls up
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index a80bf0a..d687116 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -2903,11 +2903,7 @@ notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
 
   old_chain = make_cleanup (null_cleanup, NULL);
 
-  /* If in non-stop, leave threads as running as they were.  If
-     they're stopped for some reason other than us telling it to, the
-     target reports a signal != GDB_SIGNAL_0.  We don't try to
-     resume threads with such a stop signal.  */
-  mode = non_stop ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_NOTHING;
+  mode = leave_running ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_NOTHING;
 
   if (!ptid_equal (inferior_ptid, null_ptid))
     make_cleanup_restore_current_thread ();
@@ -2943,7 +2939,6 @@ notice_new_inferior (ptid_t ptid, int leave_running, int from_tty)
       return;
     }
 
-  mode = leave_running ? ATTACH_POST_WAIT_RESUME : ATTACH_POST_WAIT_NOTHING;
   attach_post_wait ("" /* args */, from_tty, mode);
 
   do_cleanups (old_chain);
diff --git a/gdb/remote.c b/gdb/remote.c
index f09a06e..af0a08a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1801,7 +1801,7 @@ remote_add_inferior (int fake_pid_p, int pid, int attached,
    according to RUNNING.  */
 
 static void
-remote_add_thread (ptid_t ptid, int running)
+remote_add_thread (ptid_t ptid, int running, int executing)
 {
   struct remote_state *rs = get_remote_state ();
 
@@ -1816,7 +1816,7 @@ remote_add_thread (ptid_t ptid, int running)
   else
     add_thread (ptid);
 
-  set_executing (ptid, running);
+  set_executing (ptid, executing);
   set_running (ptid, running);
 }
 
@@ -1824,11 +1824,17 @@ remote_add_thread (ptid_t ptid, int running)
    It may be the first time we hear about such thread, so take the
    opportunity to add it to GDB's thread list.  In case this is the
    first time we're noticing its corresponding inferior, add it to
-   GDB's inferior list as well.  */
+   GDB's inferior list as well.  EXECUTING indicates whether the
+   thread is (internally) executing or stopped.  */
 
 static void
-remote_notice_new_inferior (ptid_t currthread, int running)
+remote_notice_new_inferior (ptid_t currthread, int executing)
 {
+  /* In non-stop mode, we assume new found threads are (externally)
+     running until proven otherwise with a stop reply.  In all-stop,
+     we can only get here if all threads are stopped.  */
+  int running = target_is_non_stop_p () ? 1 : 0;
+
   /* If this is a new thread, add it to GDB's thread list.
      If we leave it up to WFI to do this, bad things will happen.  */
 
@@ -1836,7 +1842,7 @@ remote_notice_new_inferior (ptid_t currthread, int running)
     {
       /* We're seeing an event on a thread id we knew had exited.
 	 This has to be a new thread reusing the old id.  Add it.  */
-      remote_add_thread (currthread, running);
+      remote_add_thread (currthread, running, executing);
       return;
     }
 
@@ -1857,7 +1863,7 @@ remote_notice_new_inferior (ptid_t currthread, int running)
 	    thread_change_ptid (inferior_ptid, currthread);
 	  else
 	    {
-	      remote_add_thread (currthread, running);
+	      remote_add_thread (currthread, running, executing);
 	      inferior_ptid = currthread;
 	    }
 	  return;
@@ -1888,7 +1894,7 @@ remote_notice_new_inferior (ptid_t currthread, int running)
 	}
 
       /* This is really a new thread.  Add it.  */
-      remote_add_thread (currthread, running);
+      remote_add_thread (currthread, running, executing);
 
       /* If we found a new inferior, let the common code do whatever
 	 it needs to with it (e.g., read shared libraries, insert
@@ -1899,7 +1905,7 @@ remote_notice_new_inferior (ptid_t currthread, int running)
 	  struct remote_state *rs = get_remote_state ();
 
 	  if (!rs->starting_up)
-	    notice_new_inferior (currthread, running, 0);
+	    notice_new_inferior (currthread, executing, 0);
 	}
     }
 }
@@ -3259,12 +3265,12 @@ remote_update_thread_list (struct target_ops *ops)
 	    {
 	      struct private_thread_info *info;
 	      /* In non-stop mode, we assume new found threads are
-		 running until proven otherwise with a stop reply.  In
-		 all-stop, we can only get here if all threads are
+		 executing until proven otherwise with a stop reply.
+		 In all-stop, we can only get here if all threads are
 		 stopped.  */
-	      int running = target_is_non_stop_p () ? 1 : 0;
+	      int executing = target_is_non_stop_p () ? 1 : 0;
 
-	      remote_notice_new_inferior (item->ptid, running);
+	      remote_notice_new_inferior (item->ptid, executing);
 
 	      info = demand_private_info (item->ptid);
 	      info->core = item->core;