Files
binutils-gdb/gdb/tui/tui-interp.c
Pedro Alves 8322445e05 Introduce interpreter factories
If every UI instance has its own set of interpreters, then the current
scheme of creating the interpreters at GDB initialization time no
longer works.  We need to create them whenever a new UI instance is
created.

The scheme implemented here has each interpreter register a factory
callback that when called creates a new instance of a specific
interpreter type.  Then, when some code in gdb looks up an interpreter
(always by name), if there's none yet, the factory method is called to
construct one.

gdb/ChangeLog:
2016-06-21  Pedro Alves  <palves@redhat.com>

	* cli/cli-interp.c (cli_uiout): Delete, moved into ...
	(struct cli_interp): ... this new structure.
	(cli_on_normal_stop, cli_on_signal_received)
	(cli_on_end_stepping_range, cli_on_signal_exited, cli_on_exited)
	(cli_on_no_history): Use interp_ui_out.
	(cli_interpreter_init): If top level, set the cli_interp global.
	(cli_interpreter_init): Return the interp's data instead of NULL.
	(cli_interpreter_resume, cli_interpreter_exec, cli_ui_out): Adjust
	to cli_uiout being in the interpreter's data.
	(cli_interp_procs): New, factored out from _initialize_cli_interp.
	(cli_interp_factory): New function.
	(_initialize_cli_interp): Call interp_factory_register.
	* interps.c (get_interp_info): New, factored out from ...
	(get_current_interp_info): ... this.
	(interp_new): Add parameter 'data'.  Store it.
	(struct interp_factory): New function.
	(interp_factory_p): New typedef.  Define a VEC_P.
	(interpreter_factories): New global.
	(interp_factory_register): New function.
	(interp_add): Add 'ui' parameter.  Use get_interp_info and
	interp_lookup_existing.
	(interp_lookup): Rename to ...
	(interp_lookup_existing): ... this.  Add 'ui' parameter.  Don't
	check for NULL or empty name here.
	(interp_lookup): Add 'ui' parameter and reimplement.
	(interp_set_temp, interpreter_exec_cmd): Adjust.
	(interpreter_completer): Complete on registered interpreter
	factories instead of interpreters.
	* interps.h (interp_factory_func): New typedef.
	(interp_factory_register): Declare.
	(interp_new, interp_add): Adjust.
	(interp_lookup): Declare.
	* main.c (captured_main): Adjust.
	* mi/mi-interp.c (mi_cmd_interpreter_exec): Adjust.
	(mi_interp_procs): New, factored out from
	_initialize_mi_interp.
	(mi_interp_factory): New function.
	* python/python.c (execute_gdb_command): Adjust.
	* tui/tui-interp.c (tui_init): If top level, set the tui_interp
	global.
	(tui_interp_procs): New.
	(tui_interp_factory): New function.
	(_initialize_tui_interp): Call interp_factory_register.
2016-06-21 01:11:45 +01:00

250 lines
5.8 KiB
C

/* TUI Interpreter definitions for GDB, the GNU debugger.
Copyright (C) 2003-2016 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "interps.h"
#include "top.h"
#include "event-top.h"
#include "event-loop.h"
#include "ui-out.h"
#include "cli-out.h"
#include "tui/tui-data.h"
#include "readline/readline.h"
#include "tui/tui-win.h"
#include "tui/tui.h"
#include "tui/tui-io.h"
#include "infrun.h"
#include "observer.h"
static struct ui_out *tui_ui_out (struct interp *self);
/* Set to 1 when the TUI mode must be activated when we first start
gdb. */
static int tui_start_enabled = 0;
/* The TUI interpreter. */
static struct interp *tui_interp;
/* Cleanup the tui before exiting. */
static void
tui_exit (void)
{
/* Disable the tui. Curses mode is left leaving the screen in a
clean state (see endwin()). */
tui_disable ();
}
/* Observers for several run control events. If the interpreter is
quiet (i.e., another interpreter is being run with
interpreter-exec), print nothing. */
/* Observer for the normal_stop notification. */
static void
tui_on_normal_stop (struct bpstats *bs, int print_frame)
{
if (!interp_quiet_p (tui_interp))
{
if (print_frame)
print_stop_event (tui_ui_out (tui_interp));
}
}
/* Observer for the signal_received notification. */
static void
tui_on_signal_received (enum gdb_signal siggnal)
{
if (!interp_quiet_p (tui_interp))
print_signal_received_reason (tui_ui_out (tui_interp), siggnal);
}
/* Observer for the end_stepping_range notification. */
static void
tui_on_end_stepping_range (void)
{
if (!interp_quiet_p (tui_interp))
print_end_stepping_range_reason (tui_ui_out (tui_interp));
}
/* Observer for the signal_exited notification. */
static void
tui_on_signal_exited (enum gdb_signal siggnal)
{
if (!interp_quiet_p (tui_interp))
print_signal_exited_reason (tui_ui_out (tui_interp), siggnal);
}
/* Observer for the exited notification. */
static void
tui_on_exited (int exitstatus)
{
if (!interp_quiet_p (tui_interp))
print_exited_reason (tui_ui_out (tui_interp), exitstatus);
}
/* Observer for the no_history notification. */
static void
tui_on_no_history (void)
{
if (!interp_quiet_p (tui_interp))
print_no_history_reason (tui_ui_out (tui_interp));
}
/* Observer for the sync_execution_done notification. */
static void
tui_on_sync_execution_done (void)
{
if (!interp_quiet_p (tui_interp))
display_gdb_prompt (NULL);
}
/* Observer for the command_error notification. */
static void
tui_on_command_error (void)
{
if (!interp_quiet_p (tui_interp))
display_gdb_prompt (NULL);
}
/* These implement the TUI interpreter. */
static void *
tui_init (struct interp *self, int top_level)
{
/* Install exit handler to leave the screen in a good shape. */
atexit (tui_exit);
if (top_level)
tui_interp = self;
tui_initialize_static_data ();
tui_initialize_io ();
tui_initialize_win ();
if (ui_file_isatty (gdb_stdout))
tui_initialize_readline ();
/* If changing this, remember to update cli-interp.c as well. */
observer_attach_normal_stop (tui_on_normal_stop);
observer_attach_signal_received (tui_on_signal_received);
observer_attach_end_stepping_range (tui_on_end_stepping_range);
observer_attach_signal_exited (tui_on_signal_exited);
observer_attach_exited (tui_on_exited);
observer_attach_no_history (tui_on_no_history);
observer_attach_sync_execution_done (tui_on_sync_execution_done);
observer_attach_command_error (tui_on_command_error);
return NULL;
}
static int
tui_resume (void *data)
{
struct ui_file *stream;
/* gdb_setup_readline will change gdb_stdout. If the TUI was
previously writing to gdb_stdout, then set it to the new
gdb_stdout afterwards. */
stream = cli_out_set_stream (tui_old_uiout, gdb_stdout);
if (stream != gdb_stdout)
{
cli_out_set_stream (tui_old_uiout, stream);
stream = NULL;
}
gdb_setup_readline ();
if (stream != NULL)
cli_out_set_stream (tui_old_uiout, gdb_stdout);
if (tui_start_enabled)
tui_enable ();
return 1;
}
static int
tui_suspend (void *data)
{
tui_start_enabled = tui_active;
tui_disable ();
return 1;
}
static struct ui_out *
tui_ui_out (struct interp *self)
{
if (tui_active)
return tui_out;
else
return tui_old_uiout;
}
static struct gdb_exception
tui_exec (void *data, const char *command_str)
{
internal_error (__FILE__, __LINE__, _("tui_exec called"));
}
/* The TUI interpreter's vtable. */
static const struct interp_procs tui_interp_procs = {
tui_init,
tui_resume,
tui_suspend,
tui_exec,
tui_ui_out,
NULL,
cli_command_loop
};
/* Factory for TUI interpreters. */
static struct interp *
tui_interp_factory (const char *name)
{
return interp_new (name, &tui_interp_procs, NULL);
}
/* Provide a prototype to silence -Wmissing-prototypes. */
extern initialize_file_ftype _initialize_tui_interp;
void
_initialize_tui_interp (void)
{
interp_factory_register (INTERP_TUI, tui_interp_factory);
if (interpreter_p && strcmp (interpreter_p, INTERP_TUI) == 0)
tui_start_enabled = 1;
if (interpreter_p && strcmp (interpreter_p, INTERP_CONSOLE) == 0)
{
xfree (interpreter_p);
interpreter_p = xstrdup (INTERP_TUI);
}
}