OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the intepreters output to all UIs 

When we have multiple consoles, MI channels, etc., then we need to
broadcast breakpoint hits, etc. to all UIs.  In the past, I've
adjusted most of the run control to communicate events to the
interpreters through observer notifications, so events would be
properly sent to console and MI streams, in sync and async modes.

This patch does the next logical step -- have each interpreter's
observers output interpreter-specific info to _all_ UIs.

Note that when we have multiple instances of active cli/tui
interpreters, then the cli_interp and tui_interp globals no longer
work.  This is addressed by this patch.

Also, the interpreters currently register some observers when resumed
and remove them when suspended.  If we have multiple instances of the
interpreters, and they can be suspended/resumed at different,
independent times, that no longer works.  What we instead do is always
install the observers, and then have the observers themselves know
when to do nothing.

An earlier prototype of this series did the looping over struct UIs in
common code, and then dispatched events to the interpreters through a
matching interp_on_foo method for each observer.  That turned out a
lot more complicated than the present solution, as we'd end up with
having to create a new interp method every time some interpreter
wanted to listen to some observer notification, resulting in a lot of
duplicated make-work and more coupling than desirable.

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

	* cli/cli-interp.c (cli_interp): Delete.
	(as_cli_interp): New function.
	(cli_on_normal_stop, cli_on_signal_received)
	(cli_on_end_stepping_range, cli_on_signal_exited, cli_on_exited)
	(cli_on_no_history): Send output to all CLI UIs.
	(cli_on_sync_execution_done, cli_on_command_error): Skip output if
	the top level interpreter is not a CLI.
	(cli_interpreter_init): Don't set cli_interp or install observers
	here.
	(_initialize_cli_interp): Install observers here.
	* event-top.c (main_ui_, ui_list): New globals.
	(current_ui): Point to main_ui_.
	(restore_ui_cleanup, switch_thru_all_uis_init)
	(switch_thru_all_uis_cond, switch_thru_all_uis_next): New
	functions.
	* mi/mi-interp.c (as_mi_interp): New function.
	(mi_interpreter_init): Don't install observers here.
	(mi_on_sync_execution_done): Skip output if the top level
	interpreter is not a MI.
	(mi_new_thread, mi_thread_exit, mi_record_changed)
	(mi_inferior_added, mi_inferior_appeared, mi_inferior_exit)
	(mi_inferior_removed): Send output to all MI UIs.
	(find_mi_interpreter, mi_interp_data): Delete.
	(find_mi_interp): New function.
	(mi_on_signal_received, mi_on_end_stepping_range)
	(mi_on_signal_exited, mi_on_exited, mi_on_no_history): Send output
	to all MI UIs.
	(mi_on_normal_stop): Rename to ...
	(mi_on_normal_stop_1): ... this.
	(mi_on_normal_stop): Reimplement, sending output to all MI UIs.
	(mi_traceframe_changed, mi_tsv_created, mi_tsv_deleted)
	(mi_tsv_modified, mi_breakpoint_created, mi_breakpoint_deleted)
	(mi_breakpoint_modified, mi_output_running_pid): Send output to
	all MI UIs.
	(mi_on_resume): Rename to ...
	(mi_on_resume_1): ... this.  Don't handle infcalls here.
	(mi_on_resume): Reimplement, sending output to all MI UIs.
	(mi_solib_loaded, mi_solib_unloaded, mi_command_param_changed)
	(mi_memory_changed): Send output to all MI UIs.
	(report_initial_inferior): Install observers here.
	* top.h (struct ui) <next>: New field.
	(ui_list): Declare.
	(struct switch_thru_all_uis): New.
	(switch_thru_all_uis_init, switch_thru_all_uis_cond)
	(switch_thru_all_uis_next): Declare.
	(SWITCH_THRU_ALL_UIS): New macro.
	* tui/tui-interp.c (tui_interp): Delete global.
	(as_tui_interp): New function.
	(tui_on_normal_stop, tui_on_signal_received)
	(tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited)
	(tui_on_no_history): Send output to all TUI UIs.
	(tui_on_sync_execution_done, tui_on_command_error): Skip output if
	the top level interpreter is not a TUI.
	(tui_init): Don't set tui_interp or install observers here.
	(_initialize_tui_interp): Install observers here.
This commit is contained in:
Pedro Alves 2016-06-21 01:11:45 +01:00
parent 8322445e05
commit 73ab01a07d
6 changed files with 935 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gdb/ChangeLog
View File

@ -1,3 +1,61 @@
2016-06-21 Pedro Alves <palves@redhat.com>
* cli/cli-interp.c (cli_interp): Delete.
(as_cli_interp): New function.
(cli_on_normal_stop, cli_on_signal_received)
(cli_on_end_stepping_range, cli_on_signal_exited, cli_on_exited)
(cli_on_no_history): Send output to all CLI UIs.
(cli_on_sync_execution_done, cli_on_command_error): Skip output if
the top level interpreter is not a CLI.
(cli_interpreter_init): Don't set cli_interp or install observers
here.
(_initialize_cli_interp): Install observers here.
* event-top.c (main_ui_, ui_list): New globals.
(current_ui): Point to main_ui_.
(restore_ui_cleanup, switch_thru_all_uis_init)
(switch_thru_all_uis_cond, switch_thru_all_uis_next): New
functions.
* mi/mi-interp.c (as_mi_interp): New function.
(mi_interpreter_init): Don't install observers here.
(mi_on_sync_execution_done): Skip output if the top level
interpreter is not a MI.
(mi_new_thread, mi_thread_exit, mi_record_changed)
(mi_inferior_added, mi_inferior_appeared, mi_inferior_exit)
(mi_inferior_removed): Send output to all MI UIs.
(find_mi_interpreter, mi_interp_data): Delete.
(find_mi_interp): New function.
(mi_on_signal_received, mi_on_end_stepping_range)
(mi_on_signal_exited, mi_on_exited, mi_on_no_history): Send output
to all MI UIs.
(mi_on_normal_stop): Rename to ...
(mi_on_normal_stop_1): ... this.
(mi_on_normal_stop): Reimplement, sending output to all MI UIs.
(mi_traceframe_changed, mi_tsv_created, mi_tsv_deleted)
(mi_tsv_modified, mi_breakpoint_created, mi_breakpoint_deleted)
(mi_breakpoint_modified, mi_output_running_pid): Send output to
all MI UIs.
(mi_on_resume): Rename to ...
(mi_on_resume_1): ... this. Don't handle infcalls here.
(mi_on_resume): Reimplement, sending output to all MI UIs.
(mi_solib_loaded, mi_solib_unloaded, mi_command_param_changed)
(mi_memory_changed): Send output to all MI UIs.
(report_initial_inferior): Install observers here.
* top.h (struct ui) <next>: New field.
(ui_list): Declare.
(struct switch_thru_all_uis): New.
(switch_thru_all_uis_init, switch_thru_all_uis_cond)
(switch_thru_all_uis_next): Declare.
(SWITCH_THRU_ALL_UIS): New macro.
* tui/tui-interp.c (tui_interp): Delete global.
(as_tui_interp): New function.
(tui_on_normal_stop, tui_on_signal_received)
(tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited)
(tui_on_no_history): Send output to all TUI UIs.
(tui_on_sync_execution_done, tui_on_command_error): Skip output if
the top level interpreter is not a TUI.
(tui_init): Don't set tui_interp or install observers here.
(_initialize_tui_interp): Install observers here.
2016-06-21 Pedro Alves <palves@redhat.com>
* cli/cli-interp.c (cli_uiout): Delete, moved into ...

127
gdb/cli/cli-interp.c
View File

@ -33,8 +33,16 @@ struct cli_interp
struct ui_out *cli_uiout;
};
/* The interpreter for the console interpreter. */
static struct interp *cli_interp;
/* Returns the INTERP's data cast as cli_interp if INTERP is a CLI,
and returns NULL otherwise. */
static struct cli_interp *
as_cli_interp (struct interp *interp)
{
if (strcmp (interp_name (interp), INTERP_CONSOLE) == 0)
return (struct cli_interp *) interp_data (interp);
return NULL;
}
/* Longjmp-safe wrapper for "execute_command". */
static struct gdb_exception safe_execute_command (struct ui_out *uiout,
@ -50,10 +58,17 @@ static struct gdb_exception safe_execute_command (struct ui_out *uiout,
static void
cli_on_normal_stop (struct bpstats *bs, int print_frame)
{
if (!interp_quiet_p (cli_interp))
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
if (print_frame)
print_stop_event (interp_ui_out (cli_interp));
print_stop_event (cli->cli_uiout);
}
}
@ -62,8 +77,17 @@ cli_on_normal_stop (struct bpstats *bs, int print_frame)
static void
cli_on_signal_received (enum gdb_signal siggnal)
{
if (!interp_quiet_p (cli_interp))
print_signal_received_reason (interp_ui_out (cli_interp), siggnal);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
print_signal_received_reason (cli->cli_uiout, siggnal);
}
}
/* Observer for the end_stepping_range notification. */
@ -71,8 +95,17 @@ cli_on_signal_received (enum gdb_signal siggnal)
static void
cli_on_end_stepping_range (void)
{
if (!interp_quiet_p (cli_interp))
print_end_stepping_range_reason (interp_ui_out (cli_interp));
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
print_end_stepping_range_reason (cli->cli_uiout);
}
}
/* Observer for the signalled notification. */
@ -80,8 +113,17 @@ cli_on_end_stepping_range (void)
static void
cli_on_signal_exited (enum gdb_signal siggnal)
{
if (!interp_quiet_p (cli_interp))
print_signal_exited_reason (interp_ui_out (cli_interp), siggnal);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
print_signal_exited_reason (cli->cli_uiout, siggnal);
}
}
/* Observer for the exited notification. */
@ -89,8 +131,17 @@ cli_on_signal_exited (enum gdb_signal siggnal)
static void
cli_on_exited (int exitstatus)
{
if (!interp_quiet_p (cli_interp))
print_exited_reason (interp_ui_out (cli_interp), exitstatus);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
print_exited_reason (cli->cli_uiout, exitstatus);
}
}
/* Observer for the no_history notification. */
@ -98,8 +149,17 @@ cli_on_exited (int exitstatus)
static void
cli_on_no_history (void)
{
if (!interp_quiet_p (cli_interp))
print_no_history_reason (interp_ui_out (cli_interp));
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
continue;
print_no_history_reason (cli->cli_uiout);
}
}
/* Observer for the sync_execution_done notification. */
@ -107,8 +167,12 @@ cli_on_no_history (void)
static void
cli_on_sync_execution_done (void)
{
if (!interp_quiet_p (cli_interp))
display_gdb_prompt (NULL);
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
return;
display_gdb_prompt (NULL);
}
/* Observer for the command_error notification. */
@ -116,8 +180,12 @@ cli_on_sync_execution_done (void)
static void
cli_on_command_error (void)
{
if (!interp_quiet_p (cli_interp))
display_gdb_prompt (NULL);
struct cli_interp *cli = as_cli_interp (top_level_interpreter ());
if (cli == NULL)
return;
display_gdb_prompt (NULL);
}
/* These implement the cli out interpreter: */
@ -125,19 +193,6 @@ cli_on_command_error (void)
static void *
cli_interpreter_init (struct interp *self, int top_level)
{
if (top_level)
cli_interp = self;
/* If changing this, remember to update tui-interp.c as well. */
observer_attach_normal_stop (cli_on_normal_stop);
observer_attach_end_stepping_range (cli_on_end_stepping_range);
observer_attach_signal_received (cli_on_signal_received);
observer_attach_signal_exited (cli_on_signal_exited);
observer_attach_exited (cli_on_exited);
observer_attach_no_history (cli_on_no_history);
observer_attach_sync_execution_done (cli_on_sync_execution_done);
observer_attach_command_error (cli_on_command_error);
return interp_data (self);
}
@ -269,4 +324,14 @@ void
_initialize_cli_interp (void)
{
interp_factory_register (INTERP_CONSOLE, cli_interp_factory);
/* If changing this, remember to update tui-interp.c as well. */
observer_attach_normal_stop (cli_on_normal_stop);
observer_attach_end_stepping_range (cli_on_end_stepping_range);
observer_attach_signal_received (cli_on_signal_received);
observer_attach_signal_exited (cli_on_signal_exited);
observer_attach_exited (cli_on_exited);
observer_attach_no_history (cli_on_no_history);
observer_attach_sync_execution_done (cli_on_sync_execution_done);
observer_attach_command_error (cli_on_command_error);
}

51
gdb/event-top.c
View File

@ -437,8 +437,55 @@ top_level_prompt (void)
return xstrdup (prompt);
}
static struct ui current_ui_;
struct ui *current_ui = &current_ui_;
/* The main UI. This is the UI that is bound to stdin/stdout/stderr.
It always exists and is created automatically when GDB starts
up. */
static struct ui main_ui_;
struct ui *current_ui = &main_ui_;
struct ui *ui_list = &main_ui_;
/* Cleanup that restores the current UI. */
static void
restore_ui_cleanup (void *data)
{
current_ui = (struct ui *) data;
}
/* See top.h. */
void
switch_thru_all_uis_init (struct switch_thru_all_uis *state)
{
state->iter = ui_list;
state->old_chain = make_cleanup (restore_ui_cleanup, current_ui);
}
/* See top.h. */
int
switch_thru_all_uis_cond (struct switch_thru_all_uis *state)
{
if (state->iter != NULL)
{
current_ui = state->iter;
return 1;
}
else
{
do_cleanups (state->old_chain);
return 0;
}
}
/* See top.h. */
void
switch_thru_all_uis_next (struct switch_thru_all_uis *state)
{
state->iter = state->iter->next;
}
/* Get a pointer to the current UI's line buffer. This is used to
construct a whole line of input from partial input. */

990
gdb/mi/mi-interp.c
View File

File diff suppressed because it is too large Load Diff

29
gdb/top.h
View File

@ -36,6 +36,9 @@ struct tl_interp_info;
struct ui
{
/* Pointer to next in singly-linked list. */
struct ui *next;
/* The UI's command line buffer. This is to used to accumulate
input until we have a whole command line. */
struct buffer line_buffer;
@ -83,8 +86,34 @@ struct ui
struct ui_file *m_gdb_stdlog;
};
/* The current UI. */
extern struct ui *current_ui;
/* The list of all UIs. */
extern struct ui *ui_list;
/* State for SWITCH_THRU_ALL_UIS. Declared here because it is meant
to be created on the stack, but should be treated as opaque. */
struct switch_thru_all_uis
{
struct ui *iter;
struct cleanup *old_chain;
};
/* Functions to drive SWITCH_THRU_ALL_UIS. Though declared here by
necessity, these functions should not be used other than via the
SWITCH_THRU_ALL_UIS macro defined below. */
extern void switch_thru_all_uis_init (struct switch_thru_all_uis *state);
extern int switch_thru_all_uis_cond (struct switch_thru_all_uis *state);
extern void switch_thru_all_uis_next (struct switch_thru_all_uis *state);
/* Traverse through all UI, and switch the current UI to the one
being iterated. */
#define SWITCH_THRU_ALL_UIS(STATE) \
for (switch_thru_all_uis_init (&STATE); \
switch_thru_all_uis_cond (&STATE); \
switch_thru_all_uis_next (&STATE))
/* From top.c. */
extern char *saved_command_line;
extern FILE *instream;

127
gdb/tui/tui-interp.c
View File

@ -38,8 +38,16 @@ static struct ui_out *tui_ui_out (struct interp *self);
gdb. */
static int tui_start_enabled = 0;
/* The TUI interpreter. */
static struct interp *tui_interp;
/* Returns the INTERP if the INTERP is a TUI, and returns NULL
otherwise. */
static struct interp *
as_tui_interp (struct interp *interp)
{
if (strcmp (interp_name (interp), INTERP_TUI) == 0)
return interp;
return NULL;
}
/* Cleanup the tui before exiting. */
@ -60,10 +68,17 @@ tui_exit (void)
static void
tui_on_normal_stop (struct bpstats *bs, int print_frame)
{
if (!interp_quiet_p (tui_interp))
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
if (print_frame)
print_stop_event (tui_ui_out (tui_interp));
print_stop_event (tui_ui_out (tui));
}
}
@ -72,8 +87,17 @@ tui_on_normal_stop (struct bpstats *bs, int print_frame)
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);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
print_signal_received_reason (tui_ui_out (tui), siggnal);
}
}
/* Observer for the end_stepping_range notification. */
@ -81,8 +105,17 @@ tui_on_signal_received (enum gdb_signal siggnal)
static void
tui_on_end_stepping_range (void)
{
if (!interp_quiet_p (tui_interp))
print_end_stepping_range_reason (tui_ui_out (tui_interp));
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
print_end_stepping_range_reason (tui_ui_out (tui));
}
}
/* Observer for the signal_exited notification. */
@ -90,8 +123,17 @@ tui_on_end_stepping_range (void)
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);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
print_signal_exited_reason (tui_ui_out (tui), siggnal);
}
}
/* Observer for the exited notification. */
@ -99,8 +141,17 @@ tui_on_signal_exited (enum gdb_signal siggnal)
static void
tui_on_exited (int exitstatus)
{
if (!interp_quiet_p (tui_interp))
print_exited_reason (tui_ui_out (tui_interp), exitstatus);
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
print_exited_reason (tui_ui_out (tui), exitstatus);
}
}
/* Observer for the no_history notification. */
@ -108,8 +159,17 @@ tui_on_exited (int exitstatus)
static void
tui_on_no_history (void)
{
if (!interp_quiet_p (tui_interp))
print_no_history_reason (tui_ui_out (tui_interp));
struct switch_thru_all_uis state;
SWITCH_THRU_ALL_UIS (state)
{
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
continue;
print_no_history_reason (tui_ui_out (tui));
}
}
/* Observer for the sync_execution_done notification. */
@ -117,8 +177,12 @@ tui_on_no_history (void)
static void
tui_on_sync_execution_done (void)
{
if (!interp_quiet_p (tui_interp))
display_gdb_prompt (NULL);
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
return;
display_gdb_prompt (NULL);
}
/* Observer for the command_error notification. */
@ -126,8 +190,12 @@ tui_on_sync_execution_done (void)
static void
tui_on_command_error (void)
{
if (!interp_quiet_p (tui_interp))
display_gdb_prompt (NULL);
struct interp *tui = as_tui_interp (top_level_interpreter ());
if (tui == NULL)
return;
display_gdb_prompt (NULL);
}
/* These implement the TUI interpreter. */
@ -138,9 +206,6 @@ 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 ();
@ -148,16 +213,6 @@ tui_init (struct interp *self, int top_level)
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;
}
@ -246,4 +301,14 @@ _initialize_tui_interp (void)
xfree (interpreter_p);
interpreter_p = xstrdup (INTERP_TUI);
}
/* 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);
}