Re: [PATCH 03/18] attach + target always in non-stop mode: stop all threads

[Pedro Alves <palves@redhat.com>]

On 11/23/2015 06:15 PM, Pedro Alves wrote:
> On 10/26/2015 10:22 AM, Yao Qi wrote:
>> Pedro Alves <palves@redhat.com> writes:
>>
>>> In addition, it's not defined whith thread manages to report the
>>
>> s/whith/which
>>
>>> initial attach stop, so always pick the lowest one (otherwise
>>> multi-attach.exp regresses).
>>
>> Shouldn't GDB pick the main thread rather than the lowest one?
> 
> It actually ends up being the same, and bit more generic to go with
> lowest, because target_attach should always adds the main thread first.
> Otherwise, there's no such concept of "main" thread in the common code.
> "The thread with pid == lwpid" holds true for NTPL/Linux, but not everywhere,
> and even then the leader thread may have exited already.  I'll update
> the comment.
> 

Like so?

Subject: [PATCH] attach + target always in non-stop mode: stop all threads

When running with "maint set target-non-stop on", and in all-stop
mode, nothing is stopping all threads after attaching.  vAttach in
non-stop can leave all threads running and GDB has to explicitly pause
them.

This is not visible with the native target, as in that case, attach
always stops all threads (the core re-resumes them in case of
"attach&").

In addition, it's not defined which thread manages to report the
initial attach stop, so always pick the lowest one (otherwise
multi-attach.exp regresses).

gdb/ChangeLog:
2015-11-23  Pedro Alves  <palves@redhat.com>

	* infcmd.c (attach_post_wait): If the target is always in non-stop
	mode, and the UI is in all-stop mode, stop all threads and pick
	the one with lowest number as current.
---
 gdb/infcmd.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9aae860..e481feb 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -2697,8 +2697,31 @@ attach_post_wait (char *args, int from_tty, enum attach_post_wait_mode mode)
 	 selected thread is stopped, others may still be executing.
 	 Be sure to explicitly stop all threads of the process.  This
 	 should have no effect on already stopped threads.  */
-      if (target_is_non_stop_p ())
+      if (non_stop)
 	target_stop (pid_to_ptid (inferior->pid));
+      else if (target_is_non_stop_p ())
+	{
+	  struct thread_info *thread;
+	  struct thread_info *lowest = inferior_thread ();
+	  int pid = current_inferior ()->pid;
+
+	  stop_all_threads ();
+
+	  /* It's not defined which thread will report the attach
+	     stop.  For consistency, always select the thread with
+	     lowest number, which should be the main thread, if it
+	     still exists.  */
+	  ALL_NON_EXITED_THREADS (thread)
+	    {
+	      if (ptid_get_pid (thread->ptid) == pid)
+		{
+		  if (thread->num < lowest->num)
+		    lowest = thread;
+		}
+	    }
+
+	  switch_to_thread (lowest->ptid);
+	}
 
       /* Tell the user/frontend where we're stopped.  */
       normal_stop ();
-- 
1.9.3