diff options
| author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:45 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:45 +0100 |
| commit | cb814510676f7f6c08b329af2f57006fa598b619 (patch) | |
| tree | dbc063197b94b01d4bfaf13288ca81f18890b7cf /gdb/infrun.c | |
| parent | 79aa2fe86f105fae162f780f760d655f212eaeb6 (diff) | |
| download | gdb-cb814510676f7f6c08b329af2f57006fa598b619.zip gdb-cb814510676f7f6c08b329af2f57006fa598b619.tar.gz gdb-cb814510676f7f6c08b329af2f57006fa598b619.tar.bz2 | |
Make the interpreters be per UI
Make each UI have its own interpreter list, top level interpreter,
current interpreter, etc. The "interpreter_async" global is not
really specific to an struct interp (it crosses interpreter-exec ...),
so I moved it to "struct ui" directly, while the other globals were
left hidden in interps.c, opaque to the rest of GDB.
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* breakpoint.c (bpstat_do_actions_1): Access the current UI's
async field instead of the interpreter_async global.
* cli/cli-script.c (execute_user_command, while_command)
(if_command, script_from_file): Likewise.
* compile/compile.c: Include top.h instead of interps.h.
(compile_file_command, compile_code_command)
(compile_print_command): Access the current UI's async field
instead of the interpreter_async global.
* guile/guile.c: Include top.h instead of interps.h.
(guile_repl_command, guile_command, gdbscm_execute_gdb_command):
Access the current UI's async field instead of the
interpreter_async global.
* guile/scm-ports.c: Include top.h instead of interps.h.
(ioscm_with_output_to_port_worker): Access the current UI's async
field instead of the interpreter_async global.
* inf-loop.c (inferior_event_handler): Likewise.
* infcall.c (run_inferior_call): Likewise.
* infrun.c (reinstall_readline_callback_handler_cleanup)
(fetch_inferior_event): Likewise.
* interps.c (interpreter_async): Delete.
(struct ui_interp_info): New.
(get_current_interp_info): New function.
(interp_list, current_interpreter, top_level_interpreter_ptr):
Delete.
(interp_add, interp_set, interp_lookup, interp_ui_out)
(current_interp_set_logging, interp_set_temp)
(current_interp_named_p): Adjust to per-UI interpreters.
(command_interpreter): Delete.
(command_interp, current_interp_command_loop, interp_quiet_p)
(interp_exec, interpreter_exec_cmd, interpreter_completer)
(top_level_interpreter, top_level_interpreter_data): Adjust to
per-UI interpreters.
* interps.h (interpreter_async): Delete.
* main.c (captured_command_loop): Access the current UI's async
field instead of the interpreter_async global.
* python/python.c (python_interactive_command, python_command)
(execute_gdb_command): Likewise.
* top.c (maybe_wait_sync_command_done, execute_command_to_string):
Access the current UI's async field instead of the
interpreter_async global.
* top.h (struct tl_interp_info): Forward declare.
(struct ui) <interp_info, async>: New fields.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 63204c2..f5b6ffc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3802,7 +3802,7 @@ wait_for_inferior (void) static void reinstall_readline_callback_handler_cleanup (void *arg) { - if (!interpreter_async) + if (!current_ui->async) { /* We're not going back to the top level event loop yet. Don't install the readline callback, as it'd prep the terminal, @@ -3989,7 +3989,7 @@ fetch_inferior_event (void *client_data) /* If the inferior was in sync execution mode, and now isn't, restore the prompt (a synchronous execution command has finished, and we're ready for input). */ - if (interpreter_async && was_sync && !sync_execution) + if (current_ui->async && was_sync && !sync_execution) observer_notify_sync_execution_done (); if (cmd_done |