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

Diff Legend

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