From de4686ffaff8bade61657078990f392b3aa14ff4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 26 Dec 2021 23:23:57 -0700 Subject: [PATCH] Use gdb_stdlog for MI debugging When MI debugging is enabled, the logging output should be sent to gdb_stdlog. This is part of PR gdb/7233. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=7233 --- gdb/mi/mi-cmds.h | 3 --- gdb/mi/mi-main.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index 5945f03e5d3..c9358a697fc 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -192,9 +192,6 @@ private: extern mi_command *mi_cmd_lookup (const char *command); -/* Debug flag */ -extern int mi_debug_p; - extern void mi_execute_command (const char *cmd, int from_tty); #endif /* MI_MI_CMDS_H */ diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 710eef7e725..1f210c161e6 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -68,7 +68,8 @@ enum FROM_TTY = 0 }; -int mi_debug_p; +/* Debug flag */ +static int mi_debug_p; /* This is used to pass the current command timestamp down to continuation routines. */ @@ -1785,8 +1786,7 @@ captured_mi_execute_command (struct ui_out *uiout, struct mi_parse *context) case MI_COMMAND: /* A MI command was read from the input stream. */ if (mi_debug_p) - /* FIXME: gdb_???? */ - fprintf_unfiltered (mi->raw_stdout, + fprintf_unfiltered (gdb_stdlog, " token=`%s' command=`%s' args=`%s'\n", context->token, context->command, context->args); @@ -2091,7 +2091,7 @@ mi_execute_cli_command (const char *cmd, bool args_p, const char *args) gdb_assert (args == nullptr); if (mi_debug_p) - fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n", + fprintf_unfiltered (gdb_stdlog, "cli=%s run=%s\n", cmd, run.c_str ()); execute_command (run.c_str (), 0 /* from_tty */ ); -- 2.30.2