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

Comparing libev/event.c (file contents):
Revision 1.8 by root, Sat Nov 3 22:10:39 2007 UTC vs.
Revision 1.39 by root, Tue Jan 6 19:46:56 2009 UTC

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

Diff Legend

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