92bcb5f949
Enabling target-async by default will require implementing sync execution on top of an async target, much like foreground command are implemented on the CLI in async mode. In order to do that, we will need better control of when to print the MI prompt. Currently the interp->display_prompt_p hook is all we have, and MI just always returns false, meaning, make display_gdb_prompt a no-op. We'll need to be able to know to print the MI prompt in some of the conditions that display_gdb_prompt is called from the core, but not all. This is all a litte twisted currently. As we can see, display_gdb_prompt is really CLI specific, so make the console interpreters (console/tui) themselves call it. To be able to do that, and add a few different observers that the interpreters can use to distinguish when or why the the prompt is being printed: #1 - one called whenever a command is cancelled due to an error. #2 - another for when a foreground command just finished. In both cases, CLI wants to print the prompt, while MI doesn't. MI will want to print the prompt in the second case when in a special MI mode. The display_gdb_prompt call in interp_set made me pause. The comment there reads: /* Finally, put up the new prompt to show that we are indeed here. Also, display_gdb_prompt for the console does some readline magic which is needed for the console interpreter, at least... */ But, that looks very much like a no-op to me currently: - the MI interpreter always return false in the prompt hook, meaning actually display no prompt. - the interpreter used at that point is still quiet. And the console/tui interpreters return false in the prompt hook if they're quiet, meaning actually display no prompt. The only remaining possible use would then be the readline magic. But whatever that might have been, it's not reacheable today either, because display_gdb_prompt returns early, before touching readline if the interpreter returns false in the display_prompt_p hook. Tested on x86_64 Fedora 20, sync and async modes. gdb/ 2014-05-29 Pedro Alves <palves@redhat.com> * cli/cli-interp.c (cli_interpreter_display_prompt_p): Delete. (_initialize_cli_interp): Adjust. * event-loop.c: Include "observer.h". (start_event_loop): Notify 'command_error' observers instead of calling display_gdb_prompt. Remove FIXME comment. * event-top.c (display_gdb_prompt): Remove call into the interpreters. * inf-loop.c: Include "observer.h". (inferior_event_handler): Notify 'command_error' observers instead of calling display_gdb_prompt. * infrun.c (fetch_inferior_event): Notify 'sync_execution_done' observers instead of calling display_gdb_prompt. * interps.c (interp_set): Don't call display_gdb_prompt. (current_interp_display_prompt_p): Delete. * interps.h (interp_prompt_p): Delete declaration. (interp_prompt_p_ftype): Delete. (struct interp_procs) <prompt_proc_p>: Delete field. (current_interp_display_prompt_p): Delete declaration. * mi-interp.c (mi_interpreter_prompt_p): Delete. (_initialize_mi_interp): Adjust. * tui-interp.c (tui_init): Install 'sync_execution_done' and 'command_error' observers. (tui_on_sync_execution_done, tui_on_command_error): New functions. (tui_display_prompt_p): Delete. (_initialize_tui_interp): Adjust. gdb/doc/ 2014-05-29 Pedro Alves <palves@redhat.com> * observer.texi (sync_execution_done, command_error): New subjects.
150 lines
4.8 KiB
C
150 lines
4.8 KiB
C
/* Handling of inferior events for the event loop for GDB, the GNU debugger.
|
|
Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
|
Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
|
|
|
|
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 "inferior.h"
|
|
#include "infrun.h"
|
|
#include "target.h" /* For enum inferior_event_type. */
|
|
#include "event-loop.h"
|
|
#include "event-top.h"
|
|
#include "inf-loop.h"
|
|
#include "remote.h"
|
|
#include "exceptions.h"
|
|
#include "language.h"
|
|
#include "gdbthread.h"
|
|
#include "continuations.h"
|
|
#include "interps.h"
|
|
#include "top.h"
|
|
#include "observer.h"
|
|
|
|
static int fetch_inferior_event_wrapper (gdb_client_data client_data);
|
|
|
|
/* General function to handle events in the inferior. So far it just
|
|
takes care of detecting errors reported by select() or poll(),
|
|
otherwise it assumes that all is OK, and goes on reading data from
|
|
the fd. This however may not always be what we want to do. */
|
|
void
|
|
inferior_event_handler (enum inferior_event_type event_type,
|
|
gdb_client_data client_data)
|
|
{
|
|
struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup ();
|
|
|
|
switch (event_type)
|
|
{
|
|
case INF_REG_EVENT:
|
|
/* Use catch errors for now, until the inner layers of
|
|
fetch_inferior_event (i.e. readchar) can return meaningful
|
|
error status. If an error occurs while getting an event from
|
|
the target, just cancel the current command. */
|
|
if (!catch_errors (fetch_inferior_event_wrapper,
|
|
client_data, "", RETURN_MASK_ALL))
|
|
{
|
|
bpstat_clear_actions ();
|
|
do_all_intermediate_continuations (1);
|
|
do_all_continuations (1);
|
|
async_enable_stdin ();
|
|
observer_notify_command_error ();
|
|
}
|
|
break;
|
|
|
|
case INF_EXEC_COMPLETE:
|
|
if (!non_stop)
|
|
{
|
|
/* Unregister the inferior from the event loop. This is done
|
|
so that when the inferior is not running we don't get
|
|
distracted by spurious inferior output. */
|
|
if (target_has_execution)
|
|
target_async (NULL, 0);
|
|
}
|
|
|
|
/* Do all continuations associated with the whole inferior (not
|
|
a particular thread). */
|
|
if (!ptid_equal (inferior_ptid, null_ptid))
|
|
do_all_inferior_continuations (0);
|
|
|
|
/* If we were doing a multi-step (eg: step n, next n), but it
|
|
got interrupted by a breakpoint, still do the pending
|
|
continuations. The continuation itself is responsible for
|
|
distinguishing the cases. The continuations are allowed to
|
|
touch the inferior memory, e.g. to remove breakpoints, so run
|
|
them before running breakpoint commands, which may resume the
|
|
target. */
|
|
if (non_stop
|
|
&& target_has_execution
|
|
&& !ptid_equal (inferior_ptid, null_ptid))
|
|
do_all_intermediate_continuations_thread (inferior_thread (), 0);
|
|
else
|
|
do_all_intermediate_continuations (0);
|
|
|
|
/* Always finish the previous command before running any
|
|
breakpoint commands. Any stop cancels the previous command.
|
|
E.g. a "finish" or "step-n" command interrupted by an
|
|
unrelated breakpoint is canceled. */
|
|
if (non_stop
|
|
&& target_has_execution
|
|
&& !ptid_equal (inferior_ptid, null_ptid))
|
|
do_all_continuations_thread (inferior_thread (), 0);
|
|
else
|
|
do_all_continuations (0);
|
|
|
|
/* When running a command list (from a user command, say), these
|
|
are only run when the command list is all done. */
|
|
if (interpreter_async)
|
|
{
|
|
volatile struct gdb_exception e;
|
|
|
|
check_frame_language_change ();
|
|
|
|
/* Don't propagate breakpoint commands errors. Either we're
|
|
stopping or some command resumes the inferior. The user will
|
|
be informed. */
|
|
TRY_CATCH (e, RETURN_MASK_ALL)
|
|
{
|
|
bpstat_do_actions ();
|
|
}
|
|
exception_print (gdb_stderr, e);
|
|
}
|
|
break;
|
|
|
|
case INF_EXEC_CONTINUE:
|
|
/* Is there anything left to do for the command issued to
|
|
complete? */
|
|
|
|
if (non_stop)
|
|
do_all_intermediate_continuations_thread (inferior_thread (), 0);
|
|
else
|
|
do_all_intermediate_continuations (0);
|
|
break;
|
|
|
|
case INF_TIMER:
|
|
default:
|
|
printf_unfiltered (_("Event type not recognized.\n"));
|
|
break;
|
|
}
|
|
|
|
discard_cleanups (cleanup_if_error);
|
|
}
|
|
|
|
static int
|
|
fetch_inferior_event_wrapper (gdb_client_data client_data)
|
|
{
|
|
fetch_inferior_event (client_data);
|
|
return 1;
|
|
}
|