ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_poll.c
(Generate patch)

Comparing libev/ev_poll.c (file contents):
Revision 1.10 by root, Thu Nov 8 17:24:00 2007 UTC vs.
Revision 1.14 by root, Mon Nov 12 20:03:39 2007 UTC

… …
51 idx = pollidxs [fd]; 51 idx = pollidxs [fd];
52 52
53 if (idx < 0) /* need to allocate a new pollfd */ 53 if (idx < 0) /* need to allocate a new pollfd */
54 { 54 {
55 pollidxs [fd] = idx = pollcnt++; 55 pollidxs [fd] = idx = pollcnt++;
56 array_needsize (struct pollfd, polls, pollmax, pollcnt, ); 56 array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2);
57 polls [idx].fd = fd; 57 polls [idx].fd = fd;
58 } 58 }
59 59
60 assert (polls [idx].fd == fd); 60 assert (polls [idx].fd == fd);
61 61
… …
77 77
78static void 78static void
79poll_poll (EV_P_ ev_tstamp timeout) 79poll_poll (EV_P_ ev_tstamp timeout)
80{ 80{
81 int i; 81 int i;
82 int res = poll (polls, pollcnt, ceil (timeout * 1000.)); 82 int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
83 83
84 if (res < 0) 84 if (res < 0)
85 { 85 {
86 if (errno == EBADF) 86 if (errno == EBADF)
87 fd_ebadf (EV_A); 87 fd_ebadf (EV_A);
… …
92 92
93 return; 93 return;
94 } 94 }
95 95
96 for (i = 0; i < pollcnt; ++i) 96 for (i = 0; i < pollcnt; ++i)
97 if (polls [i].revents & POLLNVAL)
98 fd_kill (EV_A_ polls [i].fd);
99 else
97 fd_event ( 100 fd_event (
98 EV_A_ 101 EV_A_
99 polls [i].fd, 102 polls [i].fd,
100 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 103 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
101 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 104 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
102 ); 105 );
103} 106}
104 107
105static int 108static int
106poll_init (EV_P_ int flags) 109poll_init (EV_P_ int flags)
107{ 110{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines