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.2 by root, Fri Nov 2 16:54:35 2007 UTC vs.
Revision 1.9 by root, Tue Nov 6 17:09:45 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <poll.h> 32#include <poll.h>
33 33
34static struct pollfd *polls;
35static int pollmax, pollcnt;
36static int *pollidxs; /* maps fds into structure indices */
37static int pollidxmax;
38
39static void 34static void
40pollidx_init (int *base, int count) 35pollidx_init (int *base, int count)
41{ 36{
42 while (count--) 37 while (count--)
43 *base++ = -1; 38 *base++ = -1;
44} 39}
45 40
46static void 41static void
47poll_modify (int fd, int oev, int nev) 42poll_modify (EV_P_ int fd, int oev, int nev)
48{ 43{
49 int idx; 44 int idx;
45
46 if (oev == nev)
47 return;
48
50 array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init); 49 array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);
51 50
52 idx = pollidxs [fd]; 51 idx = pollidxs [fd];
53 52
54 if (idx < 0) /* need to allocate a new pollfd */ 53 if (idx < 0) /* need to allocate a new pollfd */
55 { 54 {
56 idx = pollcnt++; 55 idx = pollcnt++;
57 array_needsize (polls, pollmax, pollcnt, ); 56 array_needsize (struct pollfd, polls, pollmax, pollcnt, );
58 polls [idx].fd = fd; 57 polls [idx].fd = fd;
59 } 58 }
60 59
61 if (nev) 60 if (nev)
62 polls [idx].events = 61 polls [idx].events =
… …
72 } 71 }
73 } 72 }
74} 73}
75 74
76static void 75static void
77poll_poll (ev_tstamp timeout) 76poll_poll (EV_P_ ev_tstamp timeout)
78{ 77{
78 int i;
79 int res = poll (polls, pollcnt, ceil (timeout * 1000.)); 79 int res = poll (polls, pollcnt, ceil (timeout * 1000.));
80 80
81 if (res > 0) 81 if (res < 0)
82 {
83 int i;
84
85 for (i = 0; i < pollcnt; ++i)
86 fd_event (
87 polls [i].fd,
88 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
89 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
90 );
91 }
92 else if (res < 0)
93 { 82 {
94 if (errno == EBADF) 83 if (errno == EBADF)
95 fd_ebadf (); 84 fd_ebadf (EV_A);
96 else if (errno == ENOMEM) 85 else if (errno == ENOMEM && !syserr_cb)
97 fd_enomem (); 86 fd_enomem (EV_A);
87 else if (errno != EINTR)
88 syserr ("(libev) poll");
89
90 return;
98 } 91 }
92
93 for (i = 0; i < pollcnt; ++i)
94 fd_event (
95 EV_A_
96 polls [i].fd,
97 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
98 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
99 );
100}
101
102static int
103poll_init (EV_P_ int flags)
104{
105 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */
106 method_modify = poll_modify;
107 method_poll = poll_poll;
108
109 pollidxs = 0; pollidxmax = 0;
110 polls = 0; pollmax = 0; pollcnt = 0;
111
112 return EVMETHOD_POLL;
99} 113}
100 114
101static void 115static void
102poll_init (int flags) 116poll_destroy (EV_P)
103{ 117{
104 ev_method = EVMETHOD_POLL; 118 ev_free (pollidxs);
105 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */ 119 ev_free (polls);
106 method_modify = poll_modify;
107 method_poll = poll_poll;
108} 120}
121

Diff Legend

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