gdb: print target in print_target_wait_results

Extend `print_target_wait_results` to print the target from which the
wait result came.

Approved-By: Pedro Alves <pedro@palves.net>

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3d5ede8fc10a879b09a548379aba228b39ef2a6f..0b8728799613ca00806b2aa1008418c83654af9e 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3972,7 +3972,8 @@ delete_just_stopped_threads_single_step_breakpoints (void)
 
 void
 print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
-                          const struct target_waitstatus &ws)
+                          const struct target_waitstatus &ws,
+                          process_stratum_target *proc_target)
 {
   infrun_debug_printf ("target_wait (%s [%s], status) =",
                       waiton_ptid.to_string ().c_str (),
@@ -3981,6 +3982,20 @@ print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
                       result_ptid.to_string ().c_str (),
                       target_pid_to_str (result_ptid).c_str ());
   infrun_debug_printf ("  %s", ws.to_string ().c_str ());
+
+  if (proc_target != nullptr)
+    infrun_debug_printf ("  from target %d (%s)",
+                        proc_target->connection_number,
+                        proc_target->shortname ());
+}
+
+/* Wrapper for print_target_wait_results above for convenience.  */
+
+static void
+print_target_wait_results (ptid_t waiton_ptid,
+                          const execution_control_state &ecs)
+{
+  print_target_wait_results (waiton_ptid, ecs.ptid, ecs.ws, ecs.target);
 }
 
 /* Select a thread at random, out of those which are resumed and have
@@ -4332,7 +4347,8 @@ prepare_for_detach (void)
          event.ptid = do_target_wait_1 (inf, pid_ptid, &event.ws, 0);
 
          if (debug_infrun)
-           print_target_wait_results (pid_ptid, event.ptid, event.ws);
+           print_target_wait_results (pid_ptid, event.ptid, event.ws,
+                                      event.target);
 
          handle_one (event);
        }
@@ -4388,7 +4404,7 @@ wait_for_inferior (inferior *inf)
       ecs.target = inf->process_target ();
 
       if (debug_infrun)
-       print_target_wait_results (minus_one_ptid, ecs.ptid, ecs.ws);
+       print_target_wait_results (minus_one_ptid, ecs);
 
       /* Now figure out what to do with the result of the result.  */
       handle_inferior_event (&ecs);
@@ -4669,7 +4685,7 @@ fetch_inferior_event ()
       switch_to_target_no_thread (ecs.target);
 
     if (debug_infrun)
-      print_target_wait_results (minus_one_ptid, ecs.ptid, ecs.ws);
+      print_target_wait_results (minus_one_ptid, ecs);
 
     /* If an error happens while handling the event, propagate GDB's
        knowledge of the executing state to the frontend/user running
@@ -5232,7 +5248,8 @@ poll_one_curr_target (struct target_waitstatus *ws)
   event_ptid = target_wait (minus_one_ptid, ws, TARGET_WNOHANG);
 
   if (debug_infrun)
-    print_target_wait_results (minus_one_ptid, event_ptid, *ws);
+    print_target_wait_results (minus_one_ptid, event_ptid, *ws,
+                              current_inferior ()->process_target ());
 
   return event_ptid;
 }

diff --git a/gdb/infrun.h b/gdb/infrun.h
index 2067fd5f93d3999a79eb0aa095e2e64288ad2360..b9b64aca45a695a5cbdc9d1edbcbf314e937150a 100644 (file)
--- a/gdb/infrun.h
+++ b/gdb/infrun.h
@@ -256,7 +256,8 @@ extern void print_stop_event (struct ui_out *uiout, bool displays = true);
 /* Pretty print the results of target_wait, for debugging purposes.  */
 
 extern void print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
-                                      const struct target_waitstatus &ws);
+                                      const struct target_waitstatus &ws,
+                                      process_stratum_target *proc_target);
 
 extern int signal_stop_state (int);
 

diff --git a/gdb/remote.c b/gdb/remote.c
index 7dc057c056884ad5f42242b66757b4d871f1de3d..75cc21c505b4c52d01cd2fb54c1f60d5eaaf6509 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -4943,7 +4943,7 @@ remote_target::process_initial_stop_replies (int from_tty)
 
       event_ptid = target_wait (waiton_ptid, &ws, TARGET_WNOHANG);
       if (remote_debug)
-       print_target_wait_results (waiton_ptid, event_ptid, ws);
+       print_target_wait_results (waiton_ptid, event_ptid, ws, this);
 
       switch (ws.kind ())
        {