mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-28 11:43:36 +08:00
6a3753b34b
All callers of target_async pass it the same callback (inferior_event_handler). Since both common code and target backends need to be able to put the target in and out of target async mode at any given time, there's really no way that a different callback could be passed. This commit simplifies things, and removes the indirection altogether. Bonus: with this, gdb's target_async method ends up with the same signature as gdbserver's. Tested on x86_64 Fedora 20, native and gdbserver. gdb/ChangeLog: 2015-03-25 Pedro Alves <palves@redhat.com> * target.h <to_async>: Replace 'callback' and 'context' parameters with boolean 'enable' parameter. (target_async): Replace CALLBACK and CONTEXT parameters with boolean ENABLE parameter. * inf-loop.c (inferior_event_handler): Adjust. * linux-nat.c (linux_nat_attach, linux_nat_resume) (linux_nat_resume): Adjust. (async_client_callback, async_client_context): Delete. (handle_target_event): Call inferior_event_handler directly. (linux_nat_async): Replace 'callback' and 'context' parameters with boolean 'enable' parameter. Adjust. Remove references to async_client_callback and async_client_context. (linux_nat_close): Adjust. * record-btrace.c (record_btrace_async): Replace 'callback' and 'context' parameters with boolean 'enable' parameter. Adjust. (record_btrace_resume): Adjust. * record-full.c (record_full_async): Replace 'callback' and 'context' parameters with boolean 'enable' parameter. Adjust. (record_full_resume, record_full_core_resume): Adjust. * remote.c (struct remote_state) <async_client_callback, async_client_context>: Delete fields. (remote_start_remote, extended_remote_attach_1, remote_resume) (extended_remote_create_inferior): Adjust. (remote_async_serial_handler): Call inferior_event_handler directly. (remote_async): Replace 'callback' and 'context' parameters with boolean 'enable' parameter. Adjust. * top.c (gdb_readline_wrapper_cleanup, gdb_readline_wrapper): Adjust. * target-delegates.c: Regenerate.
150 lines
4.5 KiB
C
150 lines
4.5 KiB
C
/* Handling of inferior events for the event loop for GDB, the GNU debugger.
|
|
Copyright (C) 1999-2015 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 "language.h"
|
|
#include "gdbthread.h"
|
|
#include "continuations.h"
|
|
#include "interps.h"
|
|
#include "top.h"
|
|
#include "observer.h"
|
|
|
|
/* 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:
|
|
/* 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. */
|
|
{
|
|
|
|
TRY
|
|
{
|
|
fetch_inferior_event (client_data);
|
|
}
|
|
CATCH (ex, RETURN_MASK_ALL)
|
|
{
|
|
bpstat_clear_actions ();
|
|
do_all_intermediate_continuations (1);
|
|
do_all_continuations (1);
|
|
|
|
throw_exception (ex);
|
|
}
|
|
END_CATCH
|
|
}
|
|
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 (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)
|
|
{
|
|
|
|
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
|
|
{
|
|
bpstat_do_actions ();
|
|
}
|
|
CATCH (e, RETURN_MASK_ALL)
|
|
{
|
|
exception_print (gdb_stderr, e);
|
|
}
|
|
END_CATCH
|
|
}
|
|
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);
|
|
}
|