OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2000-03-22 Elena Zannoni <ezannoni@kwikemart.cygnus.com> 

* event-loop.c (handle_file_event): Run through indent.
This commit is contained in:
Elena Zannoni 2000-03-23 03:48:13 +00:00
parent 44f4577063
commit 7e5cd2dee0
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2000-03-22 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* event-loop.c (handle_file_event): Run through indent.
2000-03-22 Elena Zannoni <ezannoni@kwikemart.cygnus.com> 2000-03-22 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
From Philippe De Muyter <phdm@macqel.be> From Philippe De Muyter <phdm@macqel.be>

46
gdb/event-loop.c
View File

@ -396,26 +396,26 @@ gdb_do_one_event (void *data)
{ {
return 1; return 1;
} }
/* Are any timers that are ready? If so, put an event on the queue. */ /* Are any timers that are ready? If so, put an event on the queue. */
poll_timers (); poll_timers ();
/* Wait for a new event. If gdb_wait_for_event returns -1, /* Wait for a new event. If gdb_wait_for_event returns -1,
we should get out because this means that there are no we should get out because this means that there are no
event sources left. This will make the event loop stop, event sources left. This will make the event loop stop,
and the application exit. */ and the application exit. */
if (gdb_wait_for_event () < 0) if (gdb_wait_for_event () < 0)
{ {
return -1; return -1;
} }
/* Handle any new events occurred while waiting. */ /* Handle any new events occurred while waiting. */
if (process_event ()) if (process_event ())
{ {
return 1; return 1;
} }
/* If gdb_wait_for_event has returned 1, it means that one /* If gdb_wait_for_event has returned 1, it means that one
event has been handled. We break out of the loop. */ event has been handled. We break out of the loop. */
return 1; return 1;
@ -469,16 +469,16 @@ add_file_handler (int fd, handler_func * proc, gdb_client_data client_data)
{ {
#ifdef HAVE_POLL #ifdef HAVE_POLL
/* Check to see if poll () is usable. If not, we'll switch to /* Check to see if poll () is usable. If not, we'll switch to
use select. This can happen on systems like use select. This can happen on systems like
m68k-motorola-sys, `poll' cannot be used to wait for `stdin'. m68k-motorola-sys, `poll' cannot be used to wait for `stdin'.
On m68k-motorola-sysv, tty's are not stream-based and not On m68k-motorola-sysv, tty's are not stream-based and not
`poll'able.*/ `poll'able. */
fds.fd = fd; fds.fd = fd;
fds.events = POLLIN; fds.events = POLLIN;
if (poll (&fds, 1, 0) == 1 && (fds.revents & POLLNVAL)) if (poll (&fds, 1, 0) == 1 && (fds.revents & POLLNVAL))
use_poll = 0; use_poll = 0;
#else #else
internal_error ("event-loop.c : use_poll without HAVE_POLL"); internal_error ("event-loop.c : use_poll without HAVE_POLL");
#endif /* HAVE_POLL */ #endif /* HAVE_POLL */
} }
if (use_poll) if (use_poll)
@ -538,7 +538,7 @@ create_file_handler (int fd, int mask, handler_func * proc, gdb_client_data clie
if (gdb_notifier.poll_fds) if (gdb_notifier.poll_fds)
gdb_notifier.poll_fds = gdb_notifier.poll_fds =
(struct pollfd *) realloc (gdb_notifier.poll_fds, (struct pollfd *) realloc (gdb_notifier.poll_fds,
(gdb_notifier.num_fds) * sizeof (struct pollfd)); (gdb_notifier.num_fds) * sizeof (struct pollfd));
else else
gdb_notifier.poll_fds = gdb_notifier.poll_fds =
(struct pollfd *) xmalloc (sizeof (struct pollfd)); (struct pollfd *) xmalloc (sizeof (struct pollfd));
@ -599,7 +599,7 @@ delete_file_handler (int fd)
{ {
#ifdef HAVE_POLL #ifdef HAVE_POLL
/* Create a new poll_fds array by copying every fd's information but the /* Create a new poll_fds array by copying every fd's information but the
one we want to get rid of. */ one we want to get rid of. */
new_poll_fds = new_poll_fds =
(struct pollfd *) xmalloc ((gdb_notifier.num_fds - 1) * sizeof (struct pollfd)); (struct pollfd *) xmalloc ((gdb_notifier.num_fds - 1) * sizeof (struct pollfd));
@ -719,7 +719,7 @@ handle_file_event (int event_file_desc)
else else
file_ptr->error = 0; file_ptr->error = 0;
#else #else
internal_error ("event-loop.c : use_poll without HAVE_POLL"); internal_error ("event-loop.c : use_poll without HAVE_POLL");
#endif /* HAVE_POLL */ #endif /* HAVE_POLL */
} }
else else
@ -776,7 +776,7 @@ gdb_wait_for_event (void)
gdb_notifier.timeout_valid ? gdb_notifier.poll_timeout : -1); gdb_notifier.timeout_valid ? gdb_notifier.poll_timeout : -1);
/* Don't print anything if we get out of poll because of a /* Don't print anything if we get out of poll because of a
signal. */ signal. */
if (num_found == -1 && errno != EINTR) if (num_found == -1 && errno != EINTR)
perror_with_name ("Poll"); perror_with_name ("Poll");
#else #else
@ -789,9 +789,9 @@ gdb_wait_for_event (void)
gdb_notifier.ready_masks[1] = gdb_notifier.check_masks[1]; gdb_notifier.ready_masks[1] = gdb_notifier.check_masks[1];
gdb_notifier.ready_masks[2] = gdb_notifier.check_masks[2]; gdb_notifier.ready_masks[2] = gdb_notifier.check_masks[2];
num_found = select (gdb_notifier.num_fds, num_found = select (gdb_notifier.num_fds,
& gdb_notifier.ready_masks[0], &gdb_notifier.ready_masks[0],
& gdb_notifier.ready_masks[1], &gdb_notifier.ready_masks[1],
& gdb_notifier.ready_masks[2], &gdb_notifier.ready_masks[2],
gdb_notifier.timeout_valid gdb_notifier.timeout_valid
? &gdb_notifier.select_timeout : NULL); ? &gdb_notifier.select_timeout : NULL);
@ -830,7 +830,7 @@ gdb_wait_for_event (void)
if (file_ptr) if (file_ptr)
{ {
/* Enqueue an event only if this is still a new event for /* Enqueue an event only if this is still a new event for
this fd. */ this fd. */
if (file_ptr->ready_mask == 0) if (file_ptr->ready_mask == 0)
{ {
file_event_ptr = create_file_event (file_ptr->fd); file_event_ptr = create_file_event (file_ptr->fd);
@ -1137,7 +1137,7 @@ poll_timers (void)
/* Oops it expired already. Tell select / poll to return /* Oops it expired already. Tell select / poll to return
immediately. (Cannot simply test if delta.tv_sec is negative immediately. (Cannot simply test if delta.tv_sec is negative
because time_t might be unsigned.) */ because time_t might be unsigned.) */
if (timer_list.first_timer->when.tv_sec < time_now.tv_sec if (timer_list.first_timer->when.tv_sec < time_now.tv_sec
|| (timer_list.first_timer->when.tv_sec == time_now.tv_sec || (timer_list.first_timer->when.tv_sec == time_now.tv_sec
&& timer_list.first_timer->when.tv_usec < time_now.tv_usec)) && timer_list.first_timer->when.tv_usec < time_now.tv_usec))