mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-28 04:25:10 +08:00
3b12939dfc
When sync_execution (a boolean) is true, it means we're running a
foreground command -- we hide the prompt stop listening to input, give
the inferior the terminal, then go to the event loop waiting for the
target to stop.
With multiple independent UIs, we need to track whether each UI is
synchronously blocked waiting for the target. IOW, if you do
"continue" in one console, that console stops accepting commands, but
you should still be free to type other commands in the others
consoles.
Just simply making sync_execution be per-UI alone not sufficient,
because of this in fetch_inferior_event:
/* 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 (current_ui->async && was_sync && !sync_execution)
observer_notify_sync_execution_done ();
We'd have to record at entry the "was_sync" state for each UI, not
just of the current UI.
This patch instead replaces the sync_execution flag by a per-UI
tristate flag indicating the command line prompt state:
enum prompt_state
{
/* The command line is blocked simulating synchronous execution.
This is used to implement the foreground execution commands
('run', 'continue', etc.). We won't display the prompt and
accept further commands until the execution is actually over. */
PROMPT_BLOCKED,
/* The command finished; display the prompt before returning back to
the top level. */
PROMPT_NEEDED,
/* We've displayed the prompt already, ready for input. */
PROMPTED,
;
I think the end result is _much_ clearer than the current code, and,
it addresses the original motivation too.
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* annotate.c: Include top.h.
(async_background_execution_p): Delete.
(print_value_flags): Check the UI's prompt state rather then
async_background_execution_p.
* event-loop.c (start_event_loop): Set the prompt state to
PROMPT_NEEDED.
* event-top.c (display_gdb_prompt, async_enable_stdin)
(async_disable_stdin): Check the current UI's prompt state instead
of the sync_execution global.
(command_line_handler): Set the prompt state to PROMPT_NEEDED
before running a command, and display the prompt if still needed
afterwards.
* infcall.c (struct call_thread_fsm) <waiting_ui>: New field.
(new_call_thread_fsm): New parameter 'waiting_ui'. Store it.
(call_thread_fsm_should_stop): Set the prompt state to
PROMPT_NEEDED.
(run_inferior_call): Adjust to temporarily set the prompt state to
PROMPT_BLOCKED instead of using the sync_execution global.
(call_function_by_hand_dummy): Pass the current UI to
new_call_thread_fsm.
* infcmd.c: Include top.h.
(continue_1): Check the current UI's prompt state instead of the
sync_execution global.
(continue_command): Validate global execution state before calling
prepare_execution_command.
(step_1): Call all_uis_check_sync_execution_done.
(attach_post_wait): Don't call async_enable_stdin here. Remove
reference to sync_execution.
* infrun.c (sync_execution): Delete global.
(follow_fork_inferior)
(reinstall_readline_callback_handler_cleanup): Check the current
UI's prompt state instead of the sync_execution global.
(check_curr_ui_sync_execution_done)
(all_uis_check_sync_execution_done): New functions.
(fetch_inferior_event): Call all_uis_check_sync_execution_done
instead of trying to determine whether the global sync execution
changed.
(handle_no_resumed): Check the prompt state of all UIs.
(normal_stop): Emit the no unwait-for even to all PROMPT_BLOCKED
UIs. Emit the "Switching to" notification to all UIs. Enable
stdin in all UIs.
* infrun.h (sync_execution): Delete.
(all_uis_check_sync_execution_done): Declare.
* main.c (captured_command_loop): Don't call
interp_pre_command_loop if the prompt is blocked.
(catch_command_errors, catch_command_errors_const): Adjust.
(captured_main): Set the initial prompt state to PROMPT_NEEDED.
* mi/mi-interp.c (display_mi_prompt): Set the prompt state to
PROMPTED.
(mi_interpreter_resume): Don't clear sync_execution. Remove hack
comment.
(mi_execute_command_input_handler): Set the prompt state to
PROMPT_NEEDED before executing the command, and only display the
prompt if the prompt state is PROMPT_NEEDED afterwards.
(mi_on_resume_1): Adjust to check the prompt state.
* target.c (target_terminal_inferior): Adjust to check the prompt
state.
* top.c (wait_sync_command_done, maybe_wait_sync_command_done)
(execute_command): Check the current UI's prompt state instead of
sync_execution.
* top.h (enum prompt_state): New.
(struct ui) <prompt_state>: New field.
(ALL_UIS): New macro.
601 lines
12 KiB
C
601 lines
12 KiB
C
/* Annotation routines for GDB.
|
||
Copyright (C) 1986-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 "annotate.h"
|
||
#include "value.h"
|
||
#include "target.h"
|
||
#include "gdbtypes.h"
|
||
#include "breakpoint.h"
|
||
#include "observer.h"
|
||
#include "inferior.h"
|
||
#include "infrun.h"
|
||
#include "top.h"
|
||
|
||
|
||
/* Prototypes for local functions. */
|
||
|
||
extern void _initialize_annotate (void);
|
||
|
||
static void print_value_flags (struct type *);
|
||
|
||
static void breakpoint_changed (struct breakpoint *b);
|
||
|
||
|
||
void (*deprecated_annotate_signalled_hook) (void);
|
||
void (*deprecated_annotate_signal_hook) (void);
|
||
|
||
/* Booleans indicating whether we've emitted certain notifications.
|
||
Used to suppress useless repeated notifications until the next time
|
||
we're ready to accept more commands. Reset whenever a prompt is
|
||
displayed. */
|
||
static int frames_invalid_emitted;
|
||
static int breakpoints_invalid_emitted;
|
||
|
||
static void
|
||
print_value_flags (struct type *t)
|
||
{
|
||
if (can_dereference (t))
|
||
printf_filtered (("*"));
|
||
else
|
||
printf_filtered (("-"));
|
||
}
|
||
|
||
static void
|
||
annotate_breakpoints_invalid (void)
|
||
{
|
||
if (annotation_level == 2
|
||
&& (!breakpoints_invalid_emitted
|
||
|| current_ui->prompt_state != PROMPT_BLOCKED))
|
||
{
|
||
/* If the inferior owns the terminal (e.g., we're resuming),
|
||
make sure to leave with the inferior still owning it. */
|
||
int was_inferior = target_terminal_is_inferior ();
|
||
|
||
target_terminal_ours_for_output ();
|
||
|
||
printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
|
||
|
||
if (was_inferior)
|
||
target_terminal_inferior ();
|
||
|
||
breakpoints_invalid_emitted = 1;
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_breakpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032breakpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_catchpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032catchpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_watchpoint (int num)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032watchpoint %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_starting (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032starting\n"));
|
||
}
|
||
|
||
void
|
||
annotate_stopped (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032stopped\n"));
|
||
}
|
||
|
||
void
|
||
annotate_exited (int exitstatus)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032exited %d\n"), exitstatus);
|
||
}
|
||
|
||
void
|
||
annotate_signalled (void)
|
||
{
|
||
if (deprecated_annotate_signalled_hook)
|
||
deprecated_annotate_signalled_hook ();
|
||
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032signalled\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_name (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-name\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_string (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-string\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_string_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-string-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal (void)
|
||
{
|
||
if (deprecated_annotate_signal_hook)
|
||
deprecated_annotate_signal_hook ();
|
||
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032signal\n"));
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_headers (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-headers\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field (int num)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field %d\n"), num);
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_table (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-table\n"));
|
||
}
|
||
|
||
void
|
||
annotate_record (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032record\n"));
|
||
}
|
||
|
||
void
|
||
annotate_breakpoints_table_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032breakpoints-table-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frames_invalid (void)
|
||
{
|
||
if (annotation_level == 2
|
||
&& (!frames_invalid_emitted
|
||
|| current_ui->prompt_state != PROMPT_BLOCKED))
|
||
{
|
||
/* If the inferior owns the terminal (e.g., we're resuming),
|
||
make sure to leave with the inferior still owning it. */
|
||
int was_inferior = target_terminal_is_inferior ();
|
||
|
||
target_terminal_ours_for_output ();
|
||
|
||
printf_unfiltered (("\n\032\032frames-invalid\n"));
|
||
|
||
if (was_inferior)
|
||
target_terminal_inferior ();
|
||
|
||
frames_invalid_emitted = 1;
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_new_thread (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
{
|
||
printf_unfiltered (("\n\032\032new-thread\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_thread_changed (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
{
|
||
printf_unfiltered (("\n\032\032thread-changed\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_field_begin (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032field-begin "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_field_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_field_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032field-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_quit (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032quit\n"));
|
||
}
|
||
|
||
void
|
||
annotate_error (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032error\n"));
|
||
}
|
||
|
||
void
|
||
annotate_error_begin (void)
|
||
{
|
||
if (annotation_level > 1)
|
||
fprintf_filtered (gdb_stderr, "\n\032\032error-begin\n");
|
||
}
|
||
|
||
void
|
||
annotate_value_history_begin (int histindex, struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032value-history-begin %d "), histindex);
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_value_begin (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032value-begin "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_value_history_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-history-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_value_history_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-history-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_value_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032value-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_number_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-number-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_format (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-format\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_expression (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-expression\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_expression_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-expression-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_value (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-value\n"));
|
||
}
|
||
|
||
void
|
||
annotate_display_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032display-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_name_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-name-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_arg_value (struct type *type)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032arg-value "));
|
||
print_value_flags (type);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_arg_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032arg-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_source (char *filename, int line, int character, int mid,
|
||
struct gdbarch *gdbarch, CORE_ADDR pc)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032source "));
|
||
else
|
||
printf_filtered (("\032\032"));
|
||
|
||
printf_filtered (("%s:%d:%d:%s:%s\n"), filename, line, character,
|
||
mid ? "middle" : "beg", paddress (gdbarch, pc));
|
||
}
|
||
|
||
void
|
||
annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
|
||
{
|
||
if (annotation_level > 1)
|
||
printf_filtered (("\n\032\032frame-begin %d %s\n"),
|
||
level, paddress (gdbarch, pc));
|
||
}
|
||
|
||
void
|
||
annotate_function_call (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032function-call\n"));
|
||
}
|
||
|
||
void
|
||
annotate_signal_handler_caller (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032signal-handler-caller\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_address (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-address\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_address_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-address-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_function_name (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-function-name\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_args (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-args\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_begin (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-begin\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_file (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-file\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_file_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-file-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_line (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-line\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_source_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-source-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_where (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-where\n"));
|
||
}
|
||
|
||
void
|
||
annotate_frame_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032frame-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_array_section_begin (int idx, struct type *elttype)
|
||
{
|
||
if (annotation_level == 2)
|
||
{
|
||
printf_filtered (("\n\032\032array-section-begin %d "), idx);
|
||
print_value_flags (elttype);
|
||
printf_filtered (("\n"));
|
||
}
|
||
}
|
||
|
||
void
|
||
annotate_elt_rep (unsigned int repcount)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt-rep %u\n"), repcount);
|
||
}
|
||
|
||
void
|
||
annotate_elt_rep_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt-rep-end\n"));
|
||
}
|
||
|
||
void
|
||
annotate_elt (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032elt\n"));
|
||
}
|
||
|
||
void
|
||
annotate_array_section_end (void)
|
||
{
|
||
if (annotation_level == 2)
|
||
printf_filtered (("\n\032\032array-section-end\n"));
|
||
}
|
||
|
||
/* Called when GDB is about to display the prompt. Used to reset
|
||
annotation suppression whenever we're ready to accept new
|
||
frontend/user commands. */
|
||
|
||
void
|
||
annotate_display_prompt (void)
|
||
{
|
||
frames_invalid_emitted = 0;
|
||
breakpoints_invalid_emitted = 0;
|
||
}
|
||
|
||
static void
|
||
breakpoint_changed (struct breakpoint *b)
|
||
{
|
||
if (b->number <= 0)
|
||
return;
|
||
|
||
annotate_breakpoints_invalid ();
|
||
}
|
||
|
||
void
|
||
_initialize_annotate (void)
|
||
{
|
||
observer_attach_breakpoint_created (breakpoint_changed);
|
||
observer_attach_breakpoint_deleted (breakpoint_changed);
|
||
observer_attach_breakpoint_modified (breakpoint_changed);
|
||
}
|