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

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