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

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

Diff Legend

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