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.5 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.23 by root, Thu Apr 10 06:48:12 2008 UTC

1/* 1/*
2 * libev epoll fd activity backend 2 * libev poll fd activity backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#include <poll.h> 40#include <poll.h>
33 41
34static void 42void inline_size
35pollidx_init (int *base, int count) 43pollidx_init (int *base, int count)
36{ 44{
37 while (count--) 45 while (count--)
38 *base++ = -1; 46 *base++ = -1;
39} 47}
40 48
41static void 49static void
42poll_modify (EV_P_ int fd, int oev, int nev) 50poll_modify (EV_P_ int fd, int oev, int nev)
43{ 51{
44 int idx; 52 int idx;
53
54 if (oev == nev)
55 return;
56
45 array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init); 57 array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);
46 58
47 idx = pollidxs [fd]; 59 idx = pollidxs [fd];
48 60
49 if (idx < 0) /* need to allocate a new pollfd */ 61 if (idx < 0) /* need to allocate a new pollfd */
50 { 62 {
51 idx = pollcnt++; 63 pollidxs [fd] = idx = pollcnt++;
52 array_needsize (polls, pollmax, pollcnt, ); 64 array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2);
53 polls [idx].fd = fd; 65 polls [idx].fd = fd;
54 } 66 }
67
68 assert (polls [idx].fd == fd);
55 69
56 if (nev) 70 if (nev)
57 polls [idx].events = 71 polls [idx].events =
58 (nev & EV_READ ? POLLIN : 0) 72 (nev & EV_READ ? POLLIN : 0)
59 | (nev & EV_WRITE ? POLLOUT : 0); 73 | (nev & EV_WRITE ? POLLOUT : 0);
60 else /* remove pollfd */ 74 else /* remove pollfd */
61 { 75 {
62 if (idx < pollcnt--) 76 pollidxs [fd] = -1;
77
78 if (expect_true (idx < --pollcnt))
63 { 79 {
64 pollidxs [fd] = -1;
65 polls [idx] = polls [pollcnt]; 80 polls [idx] = polls [pollcnt];
66 pollidxs [polls [idx].fd] = idx; 81 pollidxs [polls [idx].fd] = idx;
67 } 82 }
68 } 83 }
69} 84}
70 85
71static void 86static void
72poll_poll (EV_P_ ev_tstamp timeout) 87poll_poll (EV_P_ ev_tstamp timeout)
73{ 88{
89 struct pollfd *p;
74 int res = poll (polls, pollcnt, ceil (timeout * 1000.)); 90 int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
75 91
76 if (res > 0) 92 if (expect_false (res < 0))
77 {
78 int i;
79
80 for (i = 0; i < pollcnt; ++i)
81 fd_event (
82 EV_A_
83 polls [i].fd,
84 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
85 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
86 );
87 }
88 else if (res < 0)
89 { 93 {
90 if (errno == EBADF) 94 if (errno == EBADF)
91 fd_ebadf (EV_A); 95 fd_ebadf (EV_A);
92 else if (errno == ENOMEM) 96 else if (errno == ENOMEM && !syserr_cb)
93 fd_enomem (EV_A); 97 fd_enomem (EV_A);
98 else if (errno != EINTR)
99 syserr ("(libev) poll");
94 } 100 }
101
102 for (p = polls; res; ++p)
103 if (expect_false (p->revents)) /* this expect is debatable */
104 {
105 --res;
106
107 if (expect_false (p->revents & POLLNVAL))
108 fd_kill (EV_A_ p->fd);
109 else
110 fd_event (
111 EV_A_
112 p->fd,
113 (p->revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
114 | (p->revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
115 );
116 }
95} 117}
96 118
97static int 119int inline_size
98poll_init (EV_P_ int flags) 120poll_init (EV_P_ int flags)
99{ 121{
100 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */ 122 backend_fudge = 0.; /* posix says this is zero */
101 method_modify = poll_modify; 123 backend_modify = poll_modify;
102 method_poll = poll_poll; 124 backend_poll = poll_poll;
103 125
104 pollidxs = 0; pollidxmax = 0; 126 pollidxs = 0; pollidxmax = 0;
105 polls = 0; pollmax = 0; pollcnt = 0; 127 polls = 0; pollmax = 0; pollcnt = 0;
106 128
107 return EVMETHOD_POLL; 129 return EVBACKEND_POLL;
108} 130}
109 131
110static void 132void inline_size
111poll_destroy (EV_P) 133poll_destroy (EV_P)
112{ 134{
113 free (pollidxs); 135 ev_free (pollidxs);
114 free (polls); 136 ev_free (polls);
115} 137}
138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines