diff options
author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:51 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:51 +0100 |
commit | b2d86570b316c347384c4ba9bb3933ed5e807fca (patch) | |
tree | 28b5d6a9bf5fa7a41e0cfb3de98dd5583732c596 /gdb/main.c | |
parent | 9204d6922cb80f34dd799e57f7f0c74bc86e7027 (diff) | |
download | gdb-b2d86570b316c347384c4ba9bb3933ed5e807fca.zip gdb-b2d86570b316c347384c4ba9bb3933ed5e807fca.tar.gz gdb-b2d86570b316c347384c4ba9bb3933ed5e807fca.tar.bz2 |
Simplify starting the command event loop
All interpreter types (CLI/TUI/MI) print the prompt, and then call
start_event_loop.
Because we'll need an interpreter hook to display the
interpreter-specific prompt before going back to the event loop,
without actually starting an event loop, this patch moves the
start_event_loop call to common code, and replaces the command_loop
hook with a pre_command_look hook, that now just prints the prompt.
Turns out to be a cleanup on its own right anyway.
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* cli/cli-interp.c (cli_interpreter_pre_command_loop): New
function.
(cli_interp_procs): Install it instead of cli_command_loop.
* cli/cli-interp.h (cli_interpreter_pre_command_loop): Declare.
* event-top.c (cli_command_loop): Delete.
* interps.c (interp_new): Remove reference to command_loop_proc.
(current_interp_command_loop): Delete.
(interp_pre_command_loop): New function.
(interp_command_loop_ftype): Delete.
* interps.h (interp_pre_command_loop_ftype): New typedef.
(struct interp_procs) <command_loop_proc>: Delele field.
<pre_command_loop_proc>: New field.
(current_interp_command_loop): Delete declaration.
(interp_pre_command_loop): New declaration.
* main.c (captured_command_loop): Call interp_pre_command_loop
instead of current_interp_command_loop and start an event loop.
* mi/mi-interp.c (mi_command_loop): Delete.
(mi_interpreter_pre_command_loop): New.
(mi_interp_procs): Update.
* tui/tui-interp.c (tui_interp_procs): Install
cli_interpreter_pre_command_loop instead of cli_command_loop.
Diffstat (limited to 'gdb/main.c')
-rw-r--r-- | gdb/main.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -315,7 +315,12 @@ captured_command_loop (void *data) here on. */ current_ui->async = 1; - current_interp_command_loop (); + /* Give the interpreter a chance to print a prompt. */ + interp_pre_command_loop (top_level_interpreter ()); + + /* Now it's time to start the event loop. */ + start_event_loop (); + /* FIXME: cagney/1999-11-05: A correct command_loop() implementaton would clean things up (restoring the cleanup chain) to the state they were just prior to the call. Technically, this means that |