gdb, remote: adjust debug printing

remote::wait () may get called rather frequently, polluting the logging
output with tons of

    [remote] wait: enter
    [remote] wait: exit

messages.

Similarly, remote_target::remote_notif_remove_queued_reply () will print
the debug message even if nothing was actually removed.  Change that to
only print a debug message if a stop reply was removed.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/remote.c b/gdb/remote.c
index 858076bfa426fcb915244bba1a0e4e92f7f656e1..88dc7c09184ae66b272c34d25e85296ae60c3b3e 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -8275,12 +8275,12 @@ remote_target::remote_notif_remove_queued_reply (ptid_t ptid)
     {
       result = std::move (*iter);
       rs->stop_reply_queue.erase (iter);
-    }
 
-  if (notif_debug)
-    gdb_printf (gdb_stdlog,
-               "notif: discard queued event: 'Stop' in %s\n",
-               ptid.to_string ().c_str ());
+      if (notif_debug)
+       gdb_printf (gdb_stdlog,
+                   "notif: discard queued event: 'Stop' in %s\n",
+                   ptid.to_string ().c_str ());
+    }
 
   return result;
 }
@@ -9186,8 +9186,6 @@ ptid_t
 remote_target::wait (ptid_t ptid, struct target_waitstatus *status,
                     target_wait_flags options)
 {
-  REMOTE_SCOPED_DEBUG_ENTER_EXIT;
-
   remote_state *rs = get_remote_state ();
 
   /* Start by clearing the flag that asks for our wait method to be called,