/* MI Interpreter Definitions and Commands for GDB, the GNU debugger.
- Copyright (C) 2002-2018 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "cli-out.h"
#include "thread-fsm.h"
#include "cli/cli-interp.h"
+#include "common/scope-exit.h"
/* These are the interpreter setup, etc. functions for the MI
interpreter. */
mi_interp::init (bool top_level)
{
mi_interp *mi = this;
- int mi_version;
/* Store the current output channel, so that we can create a console
channel that encapsulates and prefixes all gdb_output-type bits
mi->log = mi->err;
mi->targ = new mi_console_file (mi->raw_stdout, "@", '"');
mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0);
-
- /* INTERP_MI selects the most recent released version. "mi2" was
- released as part of GDB 6.0. */
- if (strcmp (name (), INTERP_MI) == 0)
- mi_version = 2;
- else if (strcmp (name (), INTERP_MI1) == 0)
- mi_version = 1;
- else if (strcmp (name (), INTERP_MI2) == 0)
- mi_version = 2;
- else if (strcmp (name (), INTERP_MI3) == 0)
- mi_version = 3;
- else
- gdb_assert_not_reached ("unhandled MI version");
-
- mi->mi_uiout = mi_out_new (mi_version);
+ mi->mi_uiout = mi_out_new (name ());
+ gdb_assert (mi->mi_uiout != nullptr);
mi->cli_uiout = cli_out_new (mi->out);
if (top_level)
mi_interp::exec (const char *command)
{
mi_execute_command_wrapper (command);
- return exception_none;
+ return gdb_exception ();
}
void
/* Now run the code. */
- std::string mi_error_message;
+ SCOPE_EXIT
+ {
+ mi_remove_notify_hooks ();
+ };
+
for (i = 1; i < argc; i++)
{
struct gdb_exception e = interp_exec (interp_to_use, argv[i]);
if (e.reason < 0)
- {
- mi_error_message = e.message;
- break;
- }
+ error ("%s", e.what ());
}
-
- mi_remove_notify_hooks ();
-
- if (!mi_error_message.empty ())
- error ("%s", mi_error_message.c_str ());
}
/* This inserts a number of hooks that are meant to produce
}
/* Observers for several run control events that print why the
- inferior has stopped to both the the MI event channel and to the MI
+ inferior has stopped to both the MI event channel and to the MI
console. If the MI interpreter is not active, print nothing. */
/* Observer for the signal_received notification. */
tp = inferior_thread ();
if (tp->thread_fsm != NULL
- && thread_fsm_finished_p (tp->thread_fsm))
+ && tp->thread_fsm->finished_p ())
{
enum async_reply_reason reason;
- reason = thread_fsm_async_reply_reason (tp->thread_fsm);
+ reason = tp->thread_fsm->async_reply_reason ();
mi_uiout->field_string ("reason", async_reason_lookup (reason));
}
- print_stop_event (mi_uiout);
console_interp = interp_lookup (current_ui, INTERP_CONSOLE);
- if (should_print_stop_to_console (console_interp, tp))
+ /* We only want to print the displays once, and we want it to
+ look just how it would on the console, so we use this to
+ decide whether the MI stop should include them. */
+ bool console_print = should_print_stop_to_console (console_interp, tp);
+ print_stop_event (mi_uiout, !console_print);
+
+ if (console_print)
print_stop_event (mi->cli_uiout);
mi_uiout->field_int ("thread-id", tp->global_num);
ui_out_redirect. */
mi_uiout->redirect (mi->event_channel);
- TRY
+ try
{
scoped_restore restore_uiout
= make_scoped_restore (¤t_uiout, mi_uiout);
print_breakpoint (bp);
}
- CATCH (ex, RETURN_MASK_ALL)
+ catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);
}
- END_CATCH
mi_uiout->redirect (NULL);
}
the consoles to use the supplied ui-file(s). */
void
-mi_interp::set_logging (ui_file_up logfile, bool logging_redirect)
+mi_interp::set_logging (ui_file_up logfile, bool logging_redirect,
+ bool debug_redirect)
{
struct mi_interp *mi = this;
if (logfile != NULL)
{
mi->saved_raw_stdout = mi->raw_stdout;
- mi->raw_stdout = make_logging_output (mi->raw_stdout,
- std::move (logfile),
- logging_redirect);
+ /* If something is being redirected, then grab logfile. */
+ ui_file *logfile_p = nullptr;
+ if (logging_redirect || debug_redirect)
+ {
+ logfile_p = logfile.get ();
+ mi->saved_raw_file_to_delete = logfile_p;
+ }
+
+ /* If something is not being redirected, then a tee containing both the
+ logfile and stdout. */
+ ui_file *tee = nullptr;
+ if (!logging_redirect || !debug_redirect)
+ {
+ tee = new tee_file (mi->raw_stdout, std::move (logfile));
+ mi->saved_raw_file_to_delete = tee;
+ }
+
+ mi->raw_stdout = logging_redirect ? logfile_p : tee;
+ mi->raw_stdlog = debug_redirect ? logfile_p : tee;
}
else
{
- delete mi->raw_stdout;
+ delete mi->saved_raw_file_to_delete;
mi->raw_stdout = mi->saved_raw_stdout;
- mi->saved_raw_stdout = NULL;
+ mi->saved_raw_stdout = nullptr;
+ mi->saved_raw_file_to_delete = nullptr;
}
-
+
mi->out->set_raw (mi->raw_stdout);
mi->err->set_raw (mi->raw_stdout);
mi->log->set_raw (mi->raw_stdout);
projects / deliverable / binutils-gdb.git / blobdiff