[PATCH 3/4] gdbserver: Ensure all debug output uses debug functions
Alan Hayward
Alan.Hayward@arm.com
Tue Apr 16 10:17:00 GMT 2019
All debug output needs to go via debug functions to ensure it writes to the
correct output stream.
gdb/ChangeLog:
2019-04-16 Alan Hayward <alan.hayward@arm.com>
* nat/linux-waitpid.c (linux_debug): Call debug_vprintf.
gdb/gdbserver/ChangeLog:
2019-04-16 Alan Hayward <alan.hayward@arm.com>
* ax.c (ax_vdebug): Call debug_printf.
* debug.c (debug_write): New function.
* debug.h (debug_write): New declaration.
* linux-low.c (sigchld_handler): Call debug_write.
---
gdb/gdbserver/ax.c | 4 ++++
gdb/gdbserver/debug.c | 9 +++++++++
gdb/gdbserver/debug.h | 3 +++
gdb/gdbserver/linux-low.c | 7 +++----
gdb/nat/linux-waitpid.c | 2 +-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c
index a16fba1ccd..7b8df91749 100644
--- a/gdb/gdbserver/ax.c
+++ b/gdb/gdbserver/ax.c
@@ -36,7 +36,11 @@ ax_vdebug (const char *fmt, ...)
va_start (ap, fmt);
vsprintf (buf, fmt, ap);
+#ifdef IN_PROCESS_AGENT
fprintf (stderr, PROG "/ax: %s\n", buf);
+#else
+ debug_printf (PROG "/ax: %s\n", buf);
+#endif
va_end (ap);
}
diff --git a/gdb/gdbserver/debug.c b/gdb/gdbserver/debug.c
index 53647c1ea6..adb35292eb 100644
--- a/gdb/gdbserver/debug.c
+++ b/gdb/gdbserver/debug.c
@@ -131,3 +131,12 @@ do_debug_exit (const char *function_name)
if (function_name != NULL)
debug_printf ("<<<< exiting %s\n", function_name);
}
+
+/* See debug.h. */
+
+size_t
+debug_write (const void *buf, size_t nbyte)
+{
+ int fd = fileno (debug_file);
+ return write (fd, buf, nbyte);
+}
diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h
index f65c91c9eb..29e58ad8a4 100644
--- a/gdb/gdbserver/debug.h
+++ b/gdb/gdbserver/debug.h
@@ -35,6 +35,9 @@ void debug_flush (void);
void do_debug_enter (const char *function_name);
void do_debug_exit (const char *function_name);
+/* Async signal safe debug output function that calls write directly. */
+size_t debug_write (const void *buf, size_t nbyte);
+
/* These macros are for use in major functions that produce a lot of
debugging output. They help identify in the mass of debugging output
when these functions enter and exit. debug_enter is intended to be
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 168f4b2abc..917b1c290b 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -6185,10 +6185,9 @@ sigchld_handler (int signo)
{
do
{
- /* fprintf is not async-signal-safe, so call write
- directly. */
- if (write (2, "sigchld_handler\n",
- sizeof ("sigchld_handler\n") - 1) < 0)
+ /* Use the async signal safe debug function. */
+ if (debug_write ("sigchld_handler\n",
+ sizeof ("sigchld_handler\n") - 1) < 0)
break; /* just ignore */
} while (0);
}
diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c
index e31c088f66..a7d11ab8d3 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.c
@@ -42,7 +42,7 @@ linux_debug (const char *format, ...)
{
va_list args;
va_start (args, format);
- vfprintf (stderr, format, args);
+ debug_vprintf (format, args);
va_end (args);
}
#endif
--
2.20.1 (Apple Git-117)
More information about the Gdb-patches
mailing list