darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR gdb/8677

Browse source 
* event-loop.c (handle_file_event): Don't handle POLLHUP as error.
This commit is contained in:
Andreas Schwab 2011-05-25 07:59:04 +00:00
parent 1706a06f9e
commit 652c71b432
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-25 Andreas Schwab <schwab@redhat.com>
PR gdb/8677
* event-loop.c (handle_file_event): Don't handle POLLHUP as error.
2011-05-24 Keith Seitz <keiths@redhat.com>
PR breakpoint/12803

16
gdb/event-loop.c
View file

@ -759,7 +759,6 @@ handle_file_event (event_data data)
int mask;
#ifdef HAVE_POLL
int error_mask;
int error_mask_returned;
#endif
int event_file_desc = data.integer;
@ -783,22 +782,19 @@ handle_file_event (event_data data)
if (use_poll)
{
#ifdef HAVE_POLL
/* POLLHUP means EOF, but can be combined with POLLIN to
signal more data to read. */
error_mask = POLLHUP | POLLERR | POLLNVAL;
mask = (file_ptr->ready_mask & file_ptr->mask) |
(file_ptr->ready_mask & error_mask);
error_mask_returned = mask & error_mask;
mask = file_ptr->ready_mask & (file_ptr->mask | error_mask);
if (error_mask_returned != 0)
if ((mask & (POLLERR | POLLNVAL)) != 0)
{
/* Work in progress. We may need to tell somebody
what kind of error we had. */
if (error_mask_returned & POLLHUP)
printf_unfiltered (_("Hangup detected on fd %d\n"),
file_ptr->fd);
if (error_mask_returned & POLLERR)
if (mask & POLLERR)
printf_unfiltered (_("Error detected on fd %d\n"),
file_ptr->fd);
if (error_mask_returned & POLLNVAL)
if (mask & POLLNVAL)
printf_unfiltered (_("Invalid or non-`poll'able fd %d\n"),
file_ptr->fd);
file_ptr->error = 1;