gdbserver: Use debug_printf for debug output

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

	* linux-low.c (check_zombie_leaders): Use debug_printf for debug
	output.
	* notif.c (handle_notif_ack, notif_event_enque): Likewise.
	* remote-utils.c (putpkt_binary_1, readchar, getpkt): Use
	debug_printf and debug_flush for debug output.
	* server.c (handle_general_set): Likewise.
	* thread-db.c (try_thread_db_load): Use debug_printf for debug
	output.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b7a7e8f68a4cf188fdb4eb410269026033d21cea..c023c8b6f8b4c9de78c907c54f626bf3bcaa15bd 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,14 @@
+2016-11-23  Pedro Alves  <palves@redhat.com>
+
+       * linux-low.c (check_zombie_leaders): Use debug_printf for debug
+       output.
+       * notif.c (handle_notif_ack, notif_event_enque): Likewise.
+       * remote-utils.c (putpkt_binary_1, readchar, getpkt): Use
+       debug_printf and debug_flush for debug output.
+       * server.c (handle_general_set): Likewise.
+       * thread-db.c (try_thread_db_load): Use debug_printf for debug
+       output.
+
 2016-11-17  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * Makefile.in (.c.o): Replace rule with ...

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index b441ebccce58af4ace57b8df8639b36e5df0cf7c..4bf3955653512f067b119cce2943a1efe59ca25b 100644 (file)
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -1981,10 +1981,9 @@ check_zombie_leaders (void)
             thread execs).  */
 
          if (debug_threads)
-           fprintf (stderr,
-                    "CZL: Thread group leader %d zombie "
-                    "(it exited, or another thread execd).\n",
-                    leader_pid);
+           debug_printf ("CZL: Thread group leader %d zombie "
+                         "(it exited, or another thread execd).\n",
+                         leader_pid);
 
          delete_lwp (leader_lp);
        }

diff --git a/gdb/gdbserver/notif.c b/gdb/gdbserver/notif.c
index 945516798d599ceac610e0d48a412cb5cead248c..342f07bce9b51e8791a4d10a7388bdb0ae686094 100644 (file)
--- a/gdb/gdbserver/notif.c
+++ b/gdb/gdbserver/notif.c
@@ -104,8 +104,8 @@ handle_notif_ack (char *own_buf, int packet_len)
        = QUEUE_deque (notif_event_p, np->queue);
 
       if (remote_debug)
-       fprintf (stderr, "%s: acking %d\n", np->ack_name,
-                QUEUE_length (notif_event_p, np->queue));
+       debug_printf ("%s: acking %d\n", np->ack_name,
+                     QUEUE_length (notif_event_p, np->queue));
 
       xfree (head);
     }
@@ -124,8 +124,8 @@ notif_event_enque (struct notif_server *notif,
   QUEUE_enque (notif_event_p, notif->queue, event);
 
   if (remote_debug)
-    fprintf (stderr, "pending events: %s %d\n", notif->notif_name,
-            QUEUE_length (notif_event_p, notif->queue));
+    debug_printf ("pending events: %s %d\n", notif->notif_name,
+                 QUEUE_length (notif_event_p, notif->queue));
 
 }
 

diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 1d51010b27a5e58bbcb55ca77ecd3cab94806836..3212ec97150aad928a4e92180b0cecc1a135fdf1 100644 (file)
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -664,18 +664,18 @@ putpkt_binary_1 (char *buf, int cnt, int is_notif)
          if (remote_debug)
            {
              if (is_notif)
-               fprintf (stderr, "putpkt (\"%s\"); [notif]\n", buf2);
+               debug_printf ("putpkt (\"%s\"); [notif]\n", buf2);
              else
-               fprintf (stderr, "putpkt (\"%s\"); [noack mode]\n", buf2);
-             fflush (stderr);
+               debug_printf ("putpkt (\"%s\"); [noack mode]\n", buf2);
+             debug_flush ();
            }
          break;
        }
 
       if (remote_debug)
        {
-         fprintf (stderr, "putpkt (\"%s\"); [looking for ack]\n", buf2);
-         fflush (stderr);
+         debug_printf ("putpkt (\"%s\"); [looking for ack]\n", buf2);
+         debug_flush ();
        }
 
       cc = readchar ();
@@ -688,8 +688,8 @@ putpkt_binary_1 (char *buf, int cnt, int is_notif)
 
       if (remote_debug)
        {
-         fprintf (stderr, "[received '%c' (0x%x)]\n", cc, cc);
-         fflush (stderr);
+         debug_printf ("[received '%c' (0x%x)]\n", cc, cc);
+         debug_flush ();
        }
 
       /* Check for an input interrupt while we're here.  */
@@ -889,7 +889,7 @@ readchar (void)
          if (readchar_bufcnt == 0)
            {
              if (remote_debug)
-               fprintf (stderr, "readchar: Got EOF\n");
+               debug_printf ("readchar: Got EOF\n");
            }
          else
            perror ("readchar");
@@ -977,8 +977,8 @@ getpkt (char *buf)
            break;
          if (remote_debug)
            {
-             fprintf (stderr, "[getpkt: discarding char '%c']\n", c);
-             fflush (stderr);
+             debug_printf ("[getpkt: discarding char '%c']\n", c);
+             debug_flush ();
            }
 
          if (c < 0)
@@ -1024,8 +1024,8 @@ getpkt (char *buf)
     {
       if (remote_debug)
        {
-         fprintf (stderr, "getpkt (\"%s\");  [sending ack] \n", buf);
-         fflush (stderr);
+         debug_printf ("getpkt (\"%s\");  [sending ack] \n", buf);
+         debug_flush ();
        }
 
       if (write_prim ("+", 1) != 1)
@@ -1033,16 +1033,16 @@ getpkt (char *buf)
 
       if (remote_debug)
        {
-         fprintf (stderr, "[sent ack]\n");
-         fflush (stderr);
+         debug_printf ("[sent ack]\n");
+         debug_flush ();
        }
     }
   else
     {
       if (remote_debug)
        {
-         fprintf (stderr, "getpkt (\"%s\");  [no ack sent] \n", buf);
-         fflush (stderr);
+         debug_printf ("getpkt (\"%s\");  [no ack sent] \n", buf);
+         debug_flush ();
        }
     }
 

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 3f9ff2bbf49658b3f330b29ceba26d9736c51297..ef8dd0324287ea4d86e1edbf49e2f0d7a53f397d 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -706,8 +706,8 @@ handle_general_set (char *own_buf)
     {
       if (remote_debug)
        {
-         fprintf (stderr, "[noack mode enabled]\n");
-         fflush (stderr);
+         debug_printf ("[noack mode enabled]\n");
+         debug_flush ();
        }
 
       noack_mode = 1;
@@ -746,7 +746,7 @@ handle_general_set (char *own_buf)
       non_stop = req;
 
       if (remote_debug)
-       fprintf (stderr, "[%s mode enabled]\n", req_str);
+       debug_printf ("[%s mode enabled]\n", req_str);
 
       write_ok (own_buf);
       return;
@@ -762,10 +762,9 @@ handle_general_set (char *own_buf)
 
       if (remote_debug)
        {
-         if (disable_randomization)
-           fprintf (stderr, "[address space randomization disabled]\n");
-         else
-           fprintf (stderr, "[address space randomization enabled]\n");
+         debug_printf (disable_randomization
+                       ? "[address space randomization disabled]\n"
+                       : "[address space randomization enabled]\n");
        }
 
       write_ok (own_buf);
@@ -795,7 +794,7 @@ handle_general_set (char *own_buf)
       /* Update the flag.  */
       use_agent = req;
       if (remote_debug)
-       fprintf (stderr, "[%s agent]\n", req ? "Enable" : "Disable");
+       debug_printf ("[%s agent]\n", req ? "Enable" : "Disable");
       write_ok (own_buf);
       return;
     }
@@ -832,7 +831,7 @@ handle_general_set (char *own_buf)
        {
          const char *req_str = report_thread_events ? "enabled" : "disabled";
 
-         fprintf (stderr, "[thread events are now %s]\n", req_str);
+         debug_printf ("[thread events are now %s]\n", req_str);
        }
 
       write_ok (own_buf);

diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
index 0222bfcd73412a791d2b444f622ab1ce6593f9e2..2776557d723b724e1fe20a57e10c9db43717f5e2 100644 (file)
--- a/gdb/gdbserver/thread-db.c
+++ b/gdb/gdbserver/thread-db.c
@@ -590,8 +590,7 @@ try_thread_db_load (const char *library)
          const char *const libpath = dladdr_to_soname (td_init);
 
          if (libpath != NULL)
-           fprintf (stderr, "Host %s resolved to: %s.\n",
-                    library, libpath);
+           debug_printf ("Host %s resolved to: %s.\n", library, libpath);
        }
     }
 #endif