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

Comparing libev/event.c (file contents):
Revision 1.13 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.34 by root, Wed Apr 9 21:09:10 2008 UTC

… …
2 * libevent compatibility layer 2 * libevent compatibility layer
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 <stddef.h> 40#include <stddef.h>
33#include <stdlib.h> 41#include <stdlib.h>
34#include <sys/time.h>
35#include <assert.h> 42#include <assert.h>
36 43
37#include "ev.h" 44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H
49# include EV_EVENT_H
50#else
38#include "event.h" 51# include "event.h"
52#endif
39 53
40#if EV_MULTIPLICITY 54#if EV_MULTIPLICITY
41# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 55# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 56# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
43#else 57#else
… …
83 97
84void *event_init (void) 98void *event_init (void)
85{ 99{
86#if EV_MULTIPLICITY 100#if EV_MULTIPLICITY
87 if (x_cur) 101 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 102 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
89 else 103 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
91#else 105#else
92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
93 107
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 108 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
95#endif 109#endif
96 110
97 return x_cur; 111 return x_cur;
98} 112}
99 113
100void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
101{ 115{
102 dLOOPbase; 116 dLOOPbase;
103 117
104#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
106 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
107#endif 121#endif
108} 122}
109 123
110int event_dispatch (void) 124int event_dispatch (void)
… …
133x_cb (struct event *ev, int revents) 147x_cb (struct event *ev, int revents)
134{ 148{
135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
136 150
137 ev->ev_res = revents; 151 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
139} 153}
140 154
141static void 155static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 156x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 157{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
159
160 if (revents & EV_ERROR)
161 event_del (ev);
162
163 x_cb (ev, revents);
145} 164}
146 165
147static void 166static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 167x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 168{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 169 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
151 170
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
153 ev_io_stop (EV_A_ w); 172 event_del (ev);
154 173
155 x_cb (ev, revents); 174 x_cb (ev, revents);
156} 175}
157 176
158static void 177static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 178x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 179{
161 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 180 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
181
182 event_del (ev);
183
184 x_cb (ev, revents);
162} 185}
163 186
164void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 187void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
165{ 188{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 189 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 190 ev_init (&ev->iosig.sig, x_cb_sig);
172 else 191 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 192 ev_init (&ev->iosig.io, x_cb_io);
174 193
175 ev_watcher_init (&ev->to, x_cb_to); 194 ev_init (&ev->to, x_cb_to);
176 }
177 195
178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 196 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
179 ev->ev_fd = fd; 197 ev->ev_fd = fd;
180 ev->ev_events = events; 198 ev->ev_events = events;
181 ev->ev_pri = 0; 199 ev->ev_pri = 0;
182 ev->ev_callback = cb; 200 ev->ev_callback = cb;
183 ev->ev_arg = arg; 201 ev->ev_arg = arg;
184 ev->ev_res = 0; 202 ev->ev_res = 0;
203 ev->ev_flags = EVLIST_INIT;
185} 204}
186 205
187int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 206int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
188{ 207{
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 208 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
191 210
192int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
193{ 212{
194 dLOOPev; 213 dLOOPev;
195 214
196 /* disable all watchers */
197 event_del (ev);
198
199 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
200 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
201 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
202 ev_signal_start (EV_A_ &ev->iosig.sig); 220 ev_signal_start (EV_A_ &ev->iosig.sig);
221
222 ev->ev_flags |= EVLIST_SIGNAL;
223 }
203 } 224 }
204 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
205 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
206 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 229 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
207 ev_io_start (EV_A_ &ev->iosig.io); 230 ev_io_start (EV_A_ &ev->iosig.io);
231
232 ev->ev_flags |= EVLIST_INSERTED;
233 }
208 } 234 }
209 235
210 if (tv) 236 if (tv)
211 { 237 {
212 ev_timer_set (&ev->to, tv_get (tv), 0.); 238 ev->to.repeat = tv_get (tv);
239 ev_timer_again (EV_A_ &ev->to);
240 ev->ev_flags |= EVLIST_TIMEOUT;
241 }
242 else
243 {
213 ev_timer_start (EV_A_ &ev->to); 244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
214 } 246 }
247
248 ev->ev_flags |= EVLIST_ACTIVE;
215 249
216 return 0; 250 return 0;
217} 251}
218 252
219int event_del (struct event *ev) 253int event_del (struct event *ev)
220{ 254{
221 dLOOPev; 255 dLOOPev;
222 256
223 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
224 {
225 /* sig */
226 if (ev_is_active (&ev->iosig.sig))
227 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
228 } 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 else
230 {
231 /* io */
232 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
234 }
235 261
236 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
237 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
238 264
265 ev->ev_flags = EVLIST_INIT;
266
239 return 0; 267 return 0;
268}
269
270void event_active (struct event *ev, int res, short ncalls)
271{
272 dLOOPev;
273
274 if (res & EV_TIMEOUT)
275 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
276
277 if (res & EV_SIGNAL)
278 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
279
280 if (res & (EV_READ | EV_WRITE))
281 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
240} 282}
241 283
242int event_pending (struct event *ev, short events, struct timeval *tv) 284int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 285{
286 short revents = 0;
244 dLOOPev; 287 dLOOPev;
245 288
246 short revents = 0;
247 289
248 if (ev->ev_events & EV_SIGNAL) 290 if (ev->ev_events & EV_SIGNAL)
249 { 291 {
250 /* sig */ 292 /* sig */
251 if (ev->iosig.sig.pending) 293 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 294 revents |= EV_SIGNAL;
253 } 295 }
254 else 296 else if (ev->ev_events & (EV_READ | EV_WRITE))
255 { 297 {
256 /* io */ 298 /* io */
257 if (ev->iosig.io.pending) 299 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 300 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 301 }
260 302
261 if (ev->to.pending) 303 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 304 {
263 revents |= EV_TIMEOUT; 305 revents |= EV_TIMEOUT;
264 306
265 if (tv) 307 if (tv)
266 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 308 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
305static void 347static void
306x_loopexit_cb (int revents, void *base) 348x_loopexit_cb (int revents, void *base)
307{ 349{
308 dLOOPbase; 350 dLOOPbase;
309 351
310 ev_unloop (EV_A_ EVUNLOOP_ONCE); 352 ev_unloop (EV_A_ EVUNLOOP_ONE);
311} 353}
312 354
313int event_base_loopexit (struct event_base *base, struct timeval *tv) 355int event_base_loopexit (struct event_base *base, struct timeval *tv)
314{ 356{
357 ev_tstamp after = tv_get (tv);
315 dLOOPbase; 358 dLOOPbase;
316 ev_tstamp after = tv_get (tv);
317 359
318 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 360 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
319 361
320 return -1; 362 return 0;
321} 363}
322 364
323struct x_once 365struct x_once
324{ 366{
325 int fd; 367 int fd;
… …
328}; 370};
329 371
330static void 372static void
331x_once_cb (int revents, void *arg) 373x_once_cb (int revents, void *arg)
332{ 374{
333 struct x_once *once = arg; 375 struct x_once *once = (struct x_once *)arg;
334 376
335 once->cb (once->fd, revents, once->arg); 377 once->cb (once->fd, (short)revents, once->arg);
336 free (once); 378 free (once);
337} 379}
338 380
339int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 381int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
340{ 382{
383 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
341 dLOOPbase; 384 dLOOPbase;
342 struct x_once *once = malloc (sizeof (struct x_once));
343 385
344 if (!once) 386 if (!once)
345 return -1; 387 return -1;
346 388
347 once->fd = fd; 389 once->fd = fd;

Diff Legend

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