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.52 by root, Mon Apr 2 23:14:41 2012 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,2012 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:
10 * 9 *
11 * * Redistributions of source code must retain the above copyright 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
12 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
13 * 16 *
14 * * Redistributions in binary form must reproduce the above 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
15 * copyright notice, this list of conditions and the following 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
16 * disclaimer in the documentation and/or other materials provided 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 * with the distribution. 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
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 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL.
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
81const char *
74const char *event_get_version (void) 82event_get_version (void)
75{ 83{
84 /* returns ABI, not API or library, version */
76 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 85 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
77} 86}
78 87
88const char *
79const char *event_get_method (void) 89event_get_method (void)
80{ 90{
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
104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
105#endif
106
107 return ev_x_cur;
108}
109
110const char *
111event_base_get_method (const struct event_base *base)
112{
113 return "libev";
114}
115
116struct event_base *
117event_base_new (void)
118{
119#if EV_MULTIPLICITY
120 return (struct event_base *)ev_loop_new (EVFLAG_AUTO);
121#else
122 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY"));
89 return 0; 123 return NULL;
124#endif
90} 125}
91 126
92void event_base_free (struct event_base *base) 127void event_base_free (struct event_base *base)
93{ 128{
94 dLOOPbase; 129 dLOOPbase;
95 130
96 /* nop */ 131#if EV_MULTIPLICITY
132 if (!ev_is_default_loop (loop))
133 ev_loop_destroy (loop);
134#endif
97} 135}
98 136
99int event_dispatch (void) 137int event_dispatch (void)
100{ 138{
101 return event_base_dispatch (x_cur); 139 return event_base_dispatch (ev_x_cur);
102} 140}
103 141
104#ifdef EV_STANDALONE 142#ifdef EV_STANDALONE
105void event_set_log_callback (event_log_cb cb) 143void event_set_log_callback (event_log_cb cb)
106{ 144{
… …
108} 146}
109#endif 147#endif
110 148
111int event_loop (int flags) 149int event_loop (int flags)
112{ 150{
113 return event_base_loop (x_cur, flags); 151 return event_base_loop (ev_x_cur, flags);
114} 152}
115 153
116int event_loopexit (struct timeval *tv) 154int event_loopexit (struct timeval *tv)
117{ 155{
118 return event_base_loopexit (x_cur, tv); 156 return event_base_loopexit (ev_x_cur, tv);
119} 157}
120 158
159event_callback_fn event_get_callback
160(const struct event *ev)
161{
162 return ev->ev_callback;
163}
164
121static void 165static void
122x_cb (struct event *ev, int revents) 166ev_x_cb (struct event *ev, int revents)
123{ 167{
124 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 168 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
125 169
126 ev->ev_res = revents; 170 ev->ev_res = revents;
127 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 171 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
128} 172}
129 173
130static void 174static void
131x_cb_sig (EV_P_ struct ev_signal *w, int revents) 175ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
132{ 176{
133 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 177 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
134}
135 178
179 if (revents & EV_ERROR)
180 event_del (ev);
181
182 ev_x_cb (ev, revents);
183}
184
136static void 185static void
137x_cb_io (EV_P_ struct ev_io *w, int revents) 186ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
138{ 187{
139 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 188 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
140 189
141 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 190 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
142 ev_io_stop (w); 191 event_del (ev);
143 192
144 x_cb (ev, revents); 193 ev_x_cb (ev, revents);
145} 194}
146 195
147static void 196static void
148x_cb_to (EV_P_ struct ev_timer *w, int revents) 197ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 198{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 199 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
200
201 event_del (ev);
202
203 ev_x_cb (ev, revents);
151} 204}
152 205
153void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 206void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
154{ 207{
155 if (events & EV_SIGNAL) 208 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 209 ev_init (&ev->iosig.sig, ev_x_cb_sig);
157 else 210 else
158 ev_watcher_init (&ev->iosig.io, x_cb_io); 211 ev_init (&ev->iosig.io, ev_x_cb_io);
159 212
160 ev_watcher_init (&ev->to, x_cb_to); 213 ev_init (&ev->to, ev_x_cb_to);
161 214
162 ev->ev_base = x_cur; 215 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
163 ev->ev_fd = fd; 216 ev->ev_fd = fd;
164 ev->ev_events = events; 217 ev->ev_events = events;
165 ev->ev_pri = 0; 218 ev->ev_pri = 0;
166 ev->ev_callback = cb; 219 ev->ev_callback = cb;
167 ev->ev_arg = arg; 220 ev->ev_arg = arg;
168 ev->ev_res = 0; 221 ev->ev_res = 0;
222 ev->ev_flags = EVLIST_INIT;
169} 223}
170 224
171int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 225int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
172{ 226{
173 return event_base_once (x_cur, fd, events, cb, arg, tv); 227 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
174} 228}
175 229
176int event_add (struct event *ev, struct timeval *tv) 230int event_add (struct event *ev, struct timeval *tv)
177{ 231{
178 dLOOPev; 232 dLOOPev;
179 233
180 /* disable all watchers */
181 event_del (ev);
182
183 if (ev->ev_events & EV_SIGNAL) 234 if (ev->ev_events & EV_SIGNAL)
184 { 235 {
236 if (!ev_is_active (&ev->iosig.sig))
237 {
185 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 238 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
186 ev_signal_start (EV_A_ &ev->iosig.sig); 239 ev_signal_start (EV_A_ &ev->iosig.sig);
240
241 ev->ev_flags |= EVLIST_SIGNAL;
242 }
187 } 243 }
188 else if (ev->ev_events & (EV_READ | EV_WRITE)) 244 else if (ev->ev_events & (EV_READ | EV_WRITE))
189 { 245 {
246 if (!ev_is_active (&ev->iosig.io))
247 {
190 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 248 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); 249 ev_io_start (EV_A_ &ev->iosig.io);
250
251 ev->ev_flags |= EVLIST_INSERTED;
252 }
192 } 253 }
193 254
194 if (tv) 255 if (tv)
195 { 256 {
196 ev_timer_set (&ev->to, tv_get (tv), 0.); 257 ev->to.repeat = ev_tv_get (tv);
258 ev_timer_again (EV_A_ &ev->to);
259 ev->ev_flags |= EVLIST_TIMEOUT;
260 }
261 else
262 {
197 ev_timer_start (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
264 ev->ev_flags &= ~EVLIST_TIMEOUT;
198 } 265 }
266
267 ev->ev_flags |= EVLIST_ACTIVE;
199 268
200 return 0; 269 return 0;
201} 270}
202 271
203int event_del (struct event *ev) 272int event_del (struct event *ev)
204{ 273{
205 dLOOPev; 274 dLOOPev;
206 275
207 if (ev->ev_events & EV_SIGNAL) 276 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); 277 ev_signal_stop (EV_A_ &ev->iosig.sig);
212 } 278 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); 279 ev_io_stop (EV_A_ &ev->iosig.io);
218 }
219 280
220 if (ev_is_active (&ev->to)) 281 if (ev_is_active (&ev->to))
221 ev_timer_stop (EV_A_ &ev->to); 282 ev_timer_stop (EV_A_ &ev->to);
222 283
284 ev->ev_flags = EVLIST_INIT;
285
223 return 0; 286 return 0;
287}
288
289void event_active (struct event *ev, int res, short ncalls)
290{
291 dLOOPev;
292
293 if (res & EV_TIMEOUT)
294 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
295
296 if (res & EV_SIGNAL)
297 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
298
299 if (res & (EV_READ | EV_WRITE))
300 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
224} 301}
225 302
226int event_pending (struct event *ev, short events, struct timeval *tv) 303int event_pending (struct event *ev, short events, struct timeval *tv)
227{ 304{
305 short revents = 0;
228 dLOOPev; 306 dLOOPev;
229 307
230 short revents = 0;
231
232 if (ev->ev_events & EV_SIGNAL) 308 if (ev->ev_events & EV_SIGNAL)
233 { 309 {
234 /* sig */ 310 /* sig */
235 if (ev->iosig.sig.pending) 311 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
236 revents |= EV_SIGNAL; 312 revents |= EV_SIGNAL;
237 } 313 }
238 else 314 else if (ev->ev_events & (EV_READ | EV_WRITE))
239 { 315 {
240 /* io */ 316 /* io */
241 if (ev->iosig.io.pending) 317 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 318 revents |= ev->ev_events & (EV_READ | EV_WRITE);
243 } 319 }
244 320
245 if (ev->to.pending) 321 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
246 { 322 {
247 revents |= EV_TIMEOUT; 323 revents |= EV_TIMEOUT;
248 324
249 if (tv) 325 if (tv)
250 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 326 {
327 ev_tstamp at = ev_now (EV_A);
328
329 tv->tv_sec = (long)at;
330 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
331 }
251 } 332 }
252 333
253 return events & revents; 334 return events & revents;
254} 335}
255 336
256int event_priority_init (int npri) 337int event_priority_init (int npri)
257{ 338{
258 return event_base_priority_init (x_cur, npri); 339 return event_base_priority_init (ev_x_cur, npri);
259} 340}
260 341
261int event_priority_set (struct event *ev, int pri) 342int event_priority_set (struct event *ev, int pri)
262{ 343{
263 ev->ev_pri = pri; 344 ev->ev_pri = pri;
… …
274 355
275int event_base_loop (struct event_base *base, int flags) 356int event_base_loop (struct event_base *base, int flags)
276{ 357{
277 dLOOPbase; 358 dLOOPbase;
278 359
279 ev_loop (EV_A_ flags); 360 return !ev_run (EV_A_ flags);
280
281 return 0;
282} 361}
283 362
284int event_base_dispatch (struct event_base *base) 363int event_base_dispatch (struct event_base *base)
285{ 364{
286 return event_base_loop (base, 0); 365 return event_base_loop (base, 0);
287} 366}
288 367
289static void 368static void
290x_loopexit_cb (EV_P_ int revents, void *arg) 369ev_x_loopexit_cb (int revents, void *base)
291{ 370{
292 ev_unloop (EV_A_ 2); 371 dLOOPbase;
372
373 ev_break (EV_A_ EVBREAK_ONE);
293} 374}
294 375
295int event_base_loopexit (struct event_base *base, struct timeval *tv) 376int event_base_loopexit (struct event_base *base, struct timeval *tv)
296{ 377{
378 ev_tstamp after = ev_tv_get (tv);
297 dLOOPbase; 379 dLOOPbase;
298 ev_tstamp after = tv_get (tv);
299 380
300 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 381 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
301 382
302 return -1; 383 return 0;
303} 384}
304 385
305struct x_once 386struct ev_x_once
306{ 387{
307 int fd; 388 int fd;
308 void (*cb)(int, short, void *); 389 void (*cb)(int, short, void *);
309 void *arg; 390 void *arg;
310}; 391};
311 392
312static void 393static void
313x_once_cb (int revents, void *arg) 394ev_x_once_cb (int revents, void *arg)
314{ 395{
315 struct x_once *once = arg; 396 struct ev_x_once *once = (struct ev_x_once *)arg;
316 397
317 once->cb (once->fd, revents, once->arg); 398 once->cb (once->fd, (short)revents, once->arg);
318 free (once); 399 free (once);
319} 400}
320 401
321int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 402int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
322{ 403{
404 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
323 dLOOPbase; 405 dLOOPbase;
324 struct x_once *once = malloc (sizeof (struct x_once));
325 406
326 if (!once) 407 if (!once)
327 return -1; 408 return -1;
328 409
329 once->fd = fd; 410 once->fd = fd;
330 once->cb = cb; 411 once->cb = cb;
331 once->arg = arg; 412 once->arg = arg;
332 413
333 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 414 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
334 415
335 return 0; 416 return 0;
336} 417}
337 418
338int event_base_priority_init (struct event_base *base, int npri) 419int event_base_priority_init (struct event_base *base, int npri)
339{ 420{
340 dLOOPbase; 421 /*dLOOPbase;*/
341 422
342 return 0; 423 return 0;
343} 424}
344 425

Diff Legend

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