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.10 by root, Thu Nov 8 17:24:00 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 pollidxs [fd] = 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 }
59
60 assert (polls [idx].fd == fd);
60 61
61 if (nev) 62 if (nev)
62 polls [idx].events = 63 polls [idx].events =
63 (nev & EV_READ ? POLLIN : 0) 64 (nev & EV_READ ? POLLIN : 0)
64 | (nev & EV_WRITE ? POLLOUT : 0); 65 | (nev & EV_WRITE ? POLLOUT : 0);
65 else /* remove pollfd */ 66 else /* remove pollfd */
66 { 67 {
68 pollidxs [fd] = -1;
69
67 if (idx < pollcnt--) 70 if (idx < --pollcnt)
68 { 71 {
69 pollidxs [fd] = -1;
70 polls [idx] = polls [pollcnt]; 72 polls [idx] = polls [pollcnt];
71 pollidxs [polls [idx].fd] = idx; 73 pollidxs [polls [idx].fd] = idx;
72 } 74 }
73 } 75 }
74} 76}
75 77
76static void 78static void
77poll_poll (ev_tstamp timeout) 79poll_poll (EV_P_ ev_tstamp timeout)
78{ 80{
81 int i;
79 int res = poll (polls, pollcnt, ceil (timeout * 1000.)); 82 int res = poll (polls, pollcnt, ceil (timeout * 1000.));
80 83
81 if (res > 0) 84 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 { 85 {
94 if (errno == EBADF) 86 if (errno == EBADF)
95 fd_ebadf (); 87 fd_ebadf (EV_A);
96 else if (errno == ENOMEM) 88 else if (errno == ENOMEM && !syserr_cb)
97 fd_enomem (); 89 fd_enomem (EV_A);
90 else if (errno != EINTR)
91 syserr ("(libev) poll");
92
93 return;
98 } 94 }
95
96 for (i = 0; i < pollcnt; ++i)
97 fd_event (
98 EV_A_
99 polls [i].fd,
100 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
101 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
102 );
103}
104
105static int
106poll_init (EV_P_ int flags)
107{
108 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */
109 method_modify = poll_modify;
110 method_poll = poll_poll;
111
112 pollidxs = 0; pollidxmax = 0;
113 polls = 0; pollmax = 0; pollcnt = 0;
114
115 return EVMETHOD_POLL;
99} 116}
100 117
101static void 118static void
102poll_init (int flags) 119poll_destroy (EV_P)
103{ 120{
104 ev_method = EVMETHOD_POLL; 121 ev_free (pollidxs);
105 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */ 122 ev_free (polls);
106 method_modify = poll_modify;
107 method_poll = poll_poll;
108} 123}
124

Diff Legend

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