2004-06-25 Andrew Cagney <cagney@gnu.org>

* defs.h (deprecated_ui_loop_hook): Deprecated.
	* wince.c (child_wait): Update.
	* win32-nat.c (child_wait): Update.
	* v850ice.c (v850ice_wait): Update.
	* top.c (deprecated_ui_loop_hook): Update.
	* serial.h: Update.
	* ser-unix.c (do_hardwire_readchar, do_hardwire_readchar)
	(do_unix_readchar): Update.
	* ser-tcp.c (net_open): Update.
	* remote-sim.c (gdb_os_poll_quit): Update.
	* rdi-share/ardi.c (angel_RDI_ExecuteOrStep): Update.
This commit is contained in:
Andrew Cagney 2004-06-25 19:46:08 +00:00
parent 139181c8d6
commit 98bbd631cc
12 changed files with 43 additions and 26 deletions

View File

@ -1,3 +1,17 @@
2004-06-25 Andrew Cagney <cagney@gnu.org>
* defs.h (deprecated_ui_loop_hook): Deprecated.
* wince.c (child_wait): Update.
* win32-nat.c (child_wait): Update.
* v850ice.c (v850ice_wait): Update.
* top.c (deprecated_ui_loop_hook): Update.
* serial.h: Update.
* ser-unix.c (do_hardwire_readchar, do_hardwire_readchar)
(do_unix_readchar): Update.
* ser-tcp.c (net_open): Update.
* remote-sim.c (gdb_os_poll_quit): Update.
* rdi-share/ardi.c (angel_RDI_ExecuteOrStep): Update.
2004-06-24 Andrew Cagney <cagney@gnu.org>
* defs.h (deprecated_pre_add_symbol_hook)

View File

@ -1220,7 +1220,7 @@ extern int event_loop_p;
extern void (*deprecated_pre_add_symbol_hook) (const char *);
extern void (*deprecated_post_add_symbol_hook) (void);
extern void (*selected_frame_level_changed_hook) (int);
extern int (*ui_loop_hook) (int signo);
extern int (*deprecated_ui_loop_hook) (int signo);
extern void (*deprecated_init_ui_hook) (char *argv0);
extern void (*deprecated_command_loop_hook) (void);
extern void (*deprecated_show_load_progress) (const char *section,

View File

@ -1413,8 +1413,8 @@ static int angel_RDI_ExecuteOrStep(PointHandle *handle, word type,
signal(SIGINT, ardi_sigint_handler);
while( executing )
{
if (ui_loop_hook)
ui_loop_hook(0);
if (deprecated_ui_loop_hook)
deprecated_ui_loop_hook(0);
if (interrupt_request || stop_request)
{

View File

@ -632,8 +632,8 @@ gdbsim_stop (void)
static int
gdb_os_poll_quit (host_callback *p)
{
if (ui_loop_hook != NULL)
ui_loop_hook (0);
if (deprecated_ui_loop_hook != NULL)
deprecated_ui_loop_hook (0);
if (quit_flag) /* gdb's idea of quit */
{

View File

@ -48,7 +48,7 @@ void _initialize_ser_tcp (void);
/* seconds to wait for connect */
#define TIMEOUT 15
/* how many times per second to poll ui_loop_hook */
/* how many times per second to poll deprecated_ui_loop_hook */
#define POLL_INTERVAL 2
/* Open a tcp socket */
@ -132,9 +132,9 @@ net_open (struct serial *scb, const char *name)
/* While we wait for the connect to complete
poll the UI so it can update or the user can
interrupt. */
if (ui_loop_hook)
if (deprecated_ui_loop_hook)
{
if (ui_loop_hook (0))
if (deprecated_ui_loop_hook (0))
{
errno = EINTR;
net_close (scb);

View File

@ -578,11 +578,12 @@ do_hardwire_readchar (struct serial *scb, int timeout)
/* N.B. The UI may destroy our world (for instance by calling
remote_stop,) in which case we want to get out of here as
quickly as possible. It is not safe to touch scb, since
someone else might have freed it. The ui_loop_hook signals that
we should exit by returning 1. */
someone else might have freed it. The
deprecated_ui_loop_hook signals that we should exit by
returning 1. */
if (ui_loop_hook)
detach = ui_loop_hook (0);
if (deprecated_ui_loop_hook)
detach = deprecated_ui_loop_hook (0);
if (detach)
return SERIAL_TIMEOUT;
@ -957,12 +958,13 @@ do_unix_readchar (struct serial *scb, int timeout)
/* N.B. The UI may destroy our world (for instance by calling
remote_stop,) in which case we want to get out of here as
quickly as possible. It is not safe to touch scb, since
someone else might have freed it. The ui_loop_hook signals that
we should exit by returning 1. */
someone else might have freed it. The
deprecated_ui_loop_hook signals that we should exit by
returning 1. */
if (ui_loop_hook)
if (deprecated_ui_loop_hook)
{
if (ui_loop_hook (0))
if (deprecated_ui_loop_hook (0))
return SERIAL_TIMEOUT;
}

View File

@ -62,8 +62,9 @@ extern void serial_un_fdopen (struct serial *scb);
enum serial_rc {
SERIAL_ERROR = -1, /* General error. */
SERIAL_TIMEOUT = -2, /* Timeout or data-not-ready during read.
Unfortunately, through ui_loop_hook(), this
can also be a QUIT indication. */
Unfortunately, through
deprecated_ui_loop_hook(), this can also be
a QUIT indication. */
SERIAL_EOF = -3 /* General end-of-file or remote target
connection closed, indication. Includes
things like the line dropping dead. */

View File

@ -199,7 +199,7 @@ void (*deprecated_init_ui_hook) (char *argv0);
steal control from a real user interface's event loop. It returns
non-zero if the user is requesting a detach, zero otherwise. */
int (*ui_loop_hook) (int);
int (*deprecated_ui_loop_hook) (int);
/* Called instead of command_loop at top level. Can be invoked via
throw_exception(). */

View File

@ -441,7 +441,7 @@ v850ice_wait (ptid_t ptid, struct target_waitstatus *status)
{
if (count++ % 100000)
{
ui_loop_hook (0);
deprecated_ui_loop_hook (0);
count = 0;
}

View File

@ -1417,8 +1417,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
{
int detach = 0;
if (ui_loop_hook != NULL)
detach = ui_loop_hook (0);
if (deprecated_ui_loop_hook != NULL)
detach = deprecated_ui_loop_hook (0);
if (detach)
child_kill_inferior ();

View File

@ -1507,8 +1507,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
{
int detach = 0;
if (ui_loop_hook != NULL)
detach = ui_loop_hook (0);
if (deprecated_ui_loop_hook != NULL)
detach = deprecated_ui_loop_hook (0);
if (detach)
child_kill_inferior ();

View File

@ -1417,8 +1417,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
{
int detach = 0;
if (ui_loop_hook != NULL)
detach = ui_loop_hook (0);
if (deprecated_ui_loop_hook != NULL)
detach = deprecated_ui_loop_hook (0);
if (detach)
child_kill_inferior ();