[PATCH v3 29/44] gdbserver: wait for stopped threads in queue_stop_reply_callback

[Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>]

From: Markus Metzger <markus.t.metzger@intel.com>

In queue_stop_reply_callback, we check whether a thread is stopped in the
target and then assume that the thread's status is already filled in.

This would require targets to modify the thread's status rather than the
server setting it in response to a target wait call, which kind of breaks
the abstraction.

Call wait for a stopped thread and update the wait status before asserting
that it isn't TARGET_WAITKIND_IGNORE.
---
 gdbserver/server.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 4c12c487bcdb57baf8ea729d6e4f73e9f335e3a9..6707e27a788fb6e9de9854e9d025a2bbda38a474 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -3936,6 +3936,13 @@ queue_stop_reply_callback (thread_info *thread)
     {
       if (target_thread_stopped (thread))
 	{
+	  /* Wait for THREAD if we have not done that, already.  */
+	  client_state cs;
+	  cs.last_ptid = mywait (thread->id, &cs.last_status,
+				 TARGET_WNOHANG, 1);
+	  if (cs.last_ptid == thread->id)
+	    thread->last_status = cs.last_status;
+
 	  threads_debug_printf
 	    ("Reporting thread %s as already stopped with %s",
 	     target_pid_to_str (thread->id).c_str (),

-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928