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.8 by root, Tue Nov 6 00:52:33 2007 UTC vs.
Revision 1.34 by root, Wed Mar 31 11:57:35 2010 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,2008,2009,2010 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{
45 /* consider using memset (.., -1, ...), which is practically guaranteed
46 * to work on all systems implementing poll */
37 while (count--) 47 while (count--)
38 *base++ = -1; 48 *base++ = -1;
39} 49}
40 50
41static void 51static void
… …
44 int idx; 54 int idx;
45 55
46 if (oev == nev) 56 if (oev == nev)
47 return; 57 return;
48 58
49 array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init); 59 array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);
50 60
51 idx = pollidxs [fd]; 61 idx = pollidxs [fd];
52 62
53 if (idx < 0) /* need to allocate a new pollfd */ 63 if (idx < 0) /* need to allocate a new pollfd */
54 { 64 {
55 idx = pollcnt++; 65 pollidxs [fd] = idx = pollcnt++;
56 array_needsize (polls, pollmax, pollcnt, ); 66 array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2);
57 polls [idx].fd = fd; 67 polls [idx].fd = fd;
58 } 68 }
69
70 assert (polls [idx].fd == fd);
59 71
60 if (nev) 72 if (nev)
61 polls [idx].events = 73 polls [idx].events =
62 (nev & EV_READ ? POLLIN : 0) 74 (nev & EV_READ ? POLLIN : 0)
63 | (nev & EV_WRITE ? POLLOUT : 0); 75 | (nev & EV_WRITE ? POLLOUT : 0);
64 else /* remove pollfd */ 76 else /* remove pollfd */
65 { 77 {
66 if (idx < pollcnt--) 78 pollidxs [fd] = -1;
79
80 if (expect_true (idx < --pollcnt))
67 { 81 {
68 pollidxs [fd] = -1;
69 polls [idx] = polls [pollcnt]; 82 polls [idx] = polls [pollcnt];
70 pollidxs [polls [idx].fd] = idx; 83 pollidxs [polls [idx].fd] = idx;
71 } 84 }
72 } 85 }
73} 86}
74 87
75static void 88static void
76poll_poll (EV_P_ ev_tstamp timeout) 89poll_poll (EV_P_ ev_tstamp timeout)
77{ 90{
91 struct pollfd *p;
78 int i; 92 int res;
93
94 EV_RELEASE_CB;
79 int res = poll (polls, pollcnt, ceil (timeout * 1000.)); 95 res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
96 EV_ACQUIRE_CB;
80 97
81 if (res < 0) 98 if (expect_false (res < 0))
82 { 99 {
83 if (errno == EBADF) 100 if (errno == EBADF)
84 fd_ebadf (EV_A); 101 fd_ebadf (EV_A);
85 else if (errno == ENOMEM && !syserr_cb) 102 else if (errno == ENOMEM && !syserr_cb)
86 fd_enomem (EV_A); 103 fd_enomem (EV_A);
87 else if (errno != EINTR) 104 else if (errno != EINTR)
88 syserr ("(libev) poll"); 105 ev_syserr ("(libev) poll");
106 }
107 else
108 for (p = polls; res; ++p)
109 {
110 assert (("libev: poll() returned illegal result, broken BSD kernel?", p < polls + pollcnt));
89 111
90 return; 112 if (expect_false (p->revents)) /* this expect is debatable */
91 } 113 {
114 --res;
92 115
93 for (i = 0; i < pollcnt; ++i) 116 if (expect_false (p->revents & POLLNVAL))
94 fd_event ( 117 fd_kill (EV_A_ p->fd);
95 EV_A_ 118 else
96 polls [i].fd, 119 fd_event (
120 EV_A_
121 p->fd,
97 (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 122 (p->revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
98 | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 123 | (p->revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
99 ); 124 );
125 }
126 }
100} 127}
101 128
102static int 129int inline_size
103poll_init (EV_P_ int flags) 130poll_init (EV_P_ int flags)
104{ 131{
105 method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */ 132 backend_fudge = 0.; /* posix says this is zero */
106 method_modify = poll_modify; 133 backend_modify = poll_modify;
107 method_poll = poll_poll; 134 backend_poll = poll_poll;
108 135
109 pollidxs = 0; pollidxmax = 0; 136 pollidxs = 0; pollidxmax = 0;
110 polls = 0; pollmax = 0; pollcnt = 0; 137 polls = 0; pollmax = 0; pollcnt = 0;
111 138
112 return EVMETHOD_POLL; 139 return EVBACKEND_POLL;
113} 140}
114 141
115static void 142void inline_size
116poll_destroy (EV_P) 143poll_destroy (EV_P)
117{ 144{
118 ev_free (pollidxs); 145 ev_free (pollidxs);
119 ev_free (polls); 146 ev_free (polls);
120} 147}
148

Diff Legend

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