drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* select.cc (cygwin_select): Add common introducer and leaver debug output. 

(select_stuff::poll): Remove unneeded debugging.
This commit is contained in:
Christopher Faylor 2011-12-07 23:14:47 +00:00
parent 13b4946d2a
commit d4f8245048
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-07 Christopher Faylor <me.cygwin2011@cgf.cx>
* select.cc (cygwin_select): Add common introducer and leaver debug
output.
(select_stuff::poll): Remove unneeded debugging.
2011-12-07 Christopher Faylor <me.cygwin2011@cgf.cx> 2011-12-07 Christopher Faylor <me.cygwin2011@cgf.cx>
* exceptions.cc (ctrl_c_handler): Remove _my_tls.remove since it can * exceptions.cc (ctrl_c_handler): Remove _my_tls.remove since it can

20
winsup/cygwin/select.cc
View File

@ -94,7 +94,7 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
fd_set *dummy_writefds = allocfd_set (maxfds); fd_set *dummy_writefds = allocfd_set (maxfds);
fd_set *dummy_exceptfds = allocfd_set (maxfds); fd_set *dummy_exceptfds = allocfd_set (maxfds);
select_printf ("%d, %p, %p, %p, %p", maxfds, readfds, writefds, exceptfds, to); select_printf ("select(%d, %p, %p, %p, %p)", maxfds, readfds, writefds, exceptfds, to);
pthread_testcancel (); pthread_testcancel ();
@ -130,6 +130,7 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
fd_set *w = allocfd_set (maxfds); fd_set *w = allocfd_set (maxfds);
fd_set *e = allocfd_set (maxfds); fd_set *e = allocfd_set (maxfds);
int res = 1;
/* Degenerate case. No fds to wait for. Just wait. */ /* Degenerate case. No fds to wait for. Just wait. */
if (sel.start.next == NULL) if (sel.start.next == NULL)
{ {
@ -146,17 +147,25 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
default: default:
break; break;
} }
timeout = 1; res = 0;
} }
else if (sel.always_ready || ms == 0) else if (sel.always_ready || ms == 0)
/* Don't bother waiting. */; res = 0;
else if ((timeout = sel.wait (r, w, e, ms) < 0)) else if ((timeout = sel.wait (r, w, e, ms) < 0))
return -1; /* some kind of error */ res = -1; /* some kind of error */
if (res >= 0)
{
copyfd_set (readfds, r, maxfds); copyfd_set (readfds, r, maxfds);
copyfd_set (writefds, w, maxfds); copyfd_set (writefds, w, maxfds);
copyfd_set (exceptfds, e, maxfds); copyfd_set (exceptfds, e, maxfds);
return timeout ? 0 : sel.poll (readfds, writefds, exceptfds); if (res > 0)
res = sel.poll (readfds, writefds, exceptfds);
}
syscall_printf ("%R = select (%d, %p, %p, %p, %p)", res, maxfds, readfds,
writefds, exceptfds, to);
return res;
} }
extern "C" int extern "C" int
@ -445,7 +454,6 @@ select_stuff::poll (fd_set *readfds, fd_set *writefds, fd_set *exceptfds)
while ((s = s->next)) while ((s = s->next))
n += (!s->peek || s->peek (s, true)) ? n += (!s->peek || s->peek (s, true)) ?
set_bits (s, readfds, writefds, exceptfds) : 0; set_bits (s, readfds, writefds, exceptfds) : 0;
select_printf ("returning %d", n);
return n; return n;
} }