X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finf-loop.c;h=aac936f374baef7bca2ec08b8c3cf8b3d7fa2788;hb=b08b78e7d4bb56f395d3212eed6184ede236c760;hp=ed60cc323015ab8dfa0f76c18d574f08da8d01ea;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c index ed60cc3230..aac936f374 100644 --- a/gdb/inf-loop.c +++ b/gdb/inf-loop.c @@ -1,12 +1,12 @@ /* Handling of inferior events for the event loop for GDB, the GNU debugger. - Copyright 1999 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. Written by Elena Zannoni 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 2 of the License, or + 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, @@ -15,118 +15,73 @@ 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, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" -#include "inferior.h" /* For fetch_inferior_event. */ -#include "target.h" /* For enum inferior_event_type. */ +#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" -static int fetch_inferior_event_wrapper (gdb_client_data client_data); -static void complete_execution (void); +/* General function to handle events in the inferior. */ -void -inferior_event_handler_wrapper (gdb_client_data client_data) -{ - inferior_event_handler (INF_QUIT_REQ, 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) { switch (event_type) { - case INF_ERROR: - printf_unfiltered ("error detected from target.\n"); - target_async (NULL, 0); - pop_target (); - discard_all_continuations (); - do_exec_error_cleanups (ALL_CLEANUPS); - break; - 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 get rid of the target. */ - if (!catch_errors (fetch_inferior_event_wrapper, - client_data, "", RETURN_MASK_ALL)) - { - target_async (NULL, 0); - pop_target (); - discard_all_continuations (); - do_exec_error_cleanups (ALL_CLEANUPS); - display_gdb_prompt (0); - } + fetch_inferior_event (client_data); break; case INF_EXEC_COMPLETE: - /* Is there anything left to do for the command issued to - complete? */ - do_all_continuations (); - /* Reset things after target has stopped for the async commands. */ - complete_execution (); - break; + 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_can_async_p ()) + target_async (0); + } - case INF_EXEC_CONTINUE: - /* Is there anything left to do for the command issued to - complete? */ - do_all_intermediate_continuations (); - break; + /* Do all continuations associated with the whole inferior (not + a particular thread). */ + if (!ptid_equal (inferior_ptid, null_ptid)) + do_all_inferior_continuations (0); - case INF_QUIT_REQ: - /* FIXME: ezannoni 1999-10-04. This call should really be a - target vector entry, so that it can be used for any kind of - targets. */ - async_remote_interrupt_twice (NULL); + /* 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_TIMER: default: - printf_unfiltered ("Event type not recognized.\n"); + printf_unfiltered (_("Event type not recognized.\n")); break; } } - -static int -fetch_inferior_event_wrapper (gdb_client_data client_data) -{ - fetch_inferior_event (client_data); - return 1; -} - -/* Reset proper settings after an asynchronous command has finished. - If the execution command was in synchronous mode, register stdin - with the event loop, and reset the prompt. */ - -static void -complete_execution (void) -{ - target_executing = 0; - - /* 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. */ - target_async (NULL, 0); - - if (sync_execution) - { - do_exec_error_cleanups (ALL_CLEANUPS); - display_gdb_prompt (0); - } - else - { - if (exec_done_display_p) - printf_unfiltered ("completed.\n"); - } -}