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

Comparing libev/event.c (file contents):
Revision 1.11 by root, Sun Nov 4 16:52:52 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#ifndef EV_EMBED 44#ifdef EV_EVENT_H
45# include EV_EVENT_H
46#else
38# include "event.h" 47# include "event.h"
39#endif 48#endif
40 49
41#if EV_MULTIPLICITY 50#if EV_MULTIPLICITY
42# 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
… …
50struct event_base 59struct event_base
51{ 60{
52 int dummy; 61 int dummy;
53}; 62};
54 63
55static struct event_base *x_cur; 64static struct event_base *ev_x_cur;
56
57static void
58tv_set (struct timeval *tv, ev_tstamp at)
59{
60 tv->tv_sec = (long)at;
61 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
62}
63 65
64static ev_tstamp 66static ev_tstamp
65tv_get (struct timeval *tv) 67ev_tv_get (struct timeval *tv)
66{ 68{
67 if (tv) 69 if (tv)
70 {
68 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 }
69 else 74 else
70 return -1.; 75 return -1.;
71} 76}
72 77
73#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)
74 80
81const char *
75const char *event_get_version (void) 82event_get_version (void)
76{ 83{
84 /* returns ABI, not API or library, version */
77 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 85 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
78} 86}
79 87
88const char *
80const char *event_get_method (void) 89event_get_method (void)
81{ 90{
82 return "libev"; 91 return "libev";
83} 92}
84 93
85void *event_init (void) 94void *event_init (void)
86{ 95{
87#if EV_MULTIPLICITY 96#if EV_MULTIPLICITY
88 if (x_cur) 97 if (ev_x_cur)
89 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 98 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
90 else 99 else
91 x_cur = ev_default_loop (EVMETHOD_AUTO); 100 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
92#else 101#else
93 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));
94 103
95 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
96#endif 105#endif
97 106
98 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
99} 125}
100 126
101void event_base_free (struct event_base *base) 127void event_base_free (struct event_base *base)
102{ 128{
103 dLOOPbase; 129 dLOOPbase;
104 130
105#if EV_MULTIPLICITY 131#if EV_MULTIPLICITY
132 if (!ev_is_default_loop (loop))
106 ev_loop_delete (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_EMBED 142#ifdef EV_STANDALONE
116void event_set_log_callback (event_log_cb cb) 143void event_set_log_callback (event_log_cb cb)
117{ 144{
118 /* nop */ 145 /* nop */
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 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);
162} 204}
163 205
164void 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)
165{ 207{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 208 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 209 ev_init (&ev->iosig.sig, ev_x_cb_sig);
172 else 210 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 211 ev_init (&ev->iosig.io, ev_x_cb_io);
174 212
175 ev_watcher_init (&ev->to, x_cb_to); 213 ev_init (&ev->to, ev_x_cb_to);
176 }
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 dLOOPev; 232 dLOOPev;
195 233
196 /* disable all watchers */
197 event_del (ev);
198
199 if (ev->ev_events & EV_SIGNAL) 234 if (ev->ev_events & EV_SIGNAL)
200 { 235 {
236 if (!ev_is_active (&ev->iosig.sig))
237 {
201 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 238 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
202 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 }
203 } 243 }
204 else if (ev->ev_events & (EV_READ | EV_WRITE)) 244 else if (ev->ev_events & (EV_READ | EV_WRITE))
205 { 245 {
246 if (!ev_is_active (&ev->iosig.io))
247 {
206 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));
207 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 }
208 } 253 }
209 254
210 if (tv) 255 if (tv)
211 { 256 {
212 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 {
213 ev_timer_start (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
264 ev->ev_flags &= ~EVLIST_TIMEOUT;
214 } 265 }
266
267 ev->ev_flags |= EVLIST_ACTIVE;
215 268
216 return 0; 269 return 0;
217} 270}
218 271
219int event_del (struct event *ev) 272int event_del (struct event *ev)
220{ 273{
221 dLOOPev; 274 dLOOPev;
222 275
223 if (ev->ev_events & EV_SIGNAL) 276 if (ev->ev_events & EV_SIGNAL)
224 {
225 /* sig */
226 if (ev_is_active (&ev->iosig.sig))
227 ev_signal_stop (EV_A_ &ev->iosig.sig); 277 ev_signal_stop (EV_A_ &ev->iosig.sig);
228 } 278 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 else
230 {
231 /* io */
232 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 279 ev_io_stop (EV_A_ &ev->iosig.io);
234 }
235 280
236 if (ev_is_active (&ev->to)) 281 if (ev_is_active (&ev->to))
237 ev_timer_stop (EV_A_ &ev->to); 282 ev_timer_stop (EV_A_ &ev->to);
238 283
284 ev->ev_flags = EVLIST_INIT;
285
239 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));
240} 301}
241 302
242int event_pending (struct event *ev, short events, struct timeval *tv) 303int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 304{
305 short revents = 0;
244 dLOOPev; 306 dLOOPev;
245 307
246 short revents = 0;
247
248 if (ev->ev_events & EV_SIGNAL) 308 if (ev->ev_events & EV_SIGNAL)
249 { 309 {
250 /* sig */ 310 /* sig */
251 if (ev->iosig.sig.pending) 311 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 312 revents |= EV_SIGNAL;
253 } 313 }
254 else 314 else if (ev->ev_events & (EV_READ | EV_WRITE))
255 { 315 {
256 /* io */ 316 /* io */
257 if (ev->iosig.io.pending) 317 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 318 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 319 }
260 320
261 if (ev->to.pending) 321 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 322 {
263 revents |= EV_TIMEOUT; 323 revents |= EV_TIMEOUT;
264 324
265 if (tv) 325 if (tv)
266 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 }
267 } 332 }
268 333
269 return events & revents; 334 return events & revents;
270} 335}
271 336
272int event_priority_init (int npri) 337int event_priority_init (int npri)
273{ 338{
274 return event_base_priority_init (x_cur, npri); 339 return event_base_priority_init (ev_x_cur, npri);
275} 340}
276 341
277int event_priority_set (struct event *ev, int pri) 342int event_priority_set (struct event *ev, int pri)
278{ 343{
279 ev->ev_pri = pri; 344 ev->ev_pri = pri;
… …
290 355
291int event_base_loop (struct event_base *base, int flags) 356int event_base_loop (struct event_base *base, int flags)
292{ 357{
293 dLOOPbase; 358 dLOOPbase;
294 359
295 ev_loop (EV_A_ flags); 360 return !ev_run (EV_A_ flags);
296
297 return 0;
298} 361}
299 362
300int event_base_dispatch (struct event_base *base) 363int event_base_dispatch (struct event_base *base)
301{ 364{
302 return event_base_loop (base, 0); 365 return event_base_loop (base, 0);
303} 366}
304 367
305static void 368static void
306x_loopexit_cb (int revents, void *base) 369ev_x_loopexit_cb (int revents, void *base)
307{ 370{
308 dLOOPbase; 371 dLOOPbase;
309 372
310 ev_unloop (EV_A_ EVUNLOOP_ONCE); 373 ev_break (EV_A_ EVBREAK_ONE);
311} 374}
312 375
313int event_base_loopexit (struct event_base *base, struct timeval *tv) 376int event_base_loopexit (struct event_base *base, struct timeval *tv)
314{ 377{
378 ev_tstamp after = ev_tv_get (tv);
315 dLOOPbase; 379 dLOOPbase;
316 ev_tstamp after = tv_get (tv);
317 380
318 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);
319 382
320 return -1; 383 return 0;
321} 384}
322 385
323struct x_once 386struct ev_x_once
324{ 387{
325 int fd; 388 int fd;
326 void (*cb)(int, short, void *); 389 void (*cb)(int, short, void *);
327 void *arg; 390 void *arg;
328}; 391};
329 392
330static void 393static void
331x_once_cb (int revents, void *arg) 394ev_x_once_cb (int revents, void *arg)
332{ 395{
333 struct x_once *once = arg; 396 struct ev_x_once *once = (struct ev_x_once *)arg;
334 397
335 once->cb (once->fd, revents, once->arg); 398 once->cb (once->fd, (short)revents, once->arg);
336 free (once); 399 free (once);
337} 400}
338 401
339int 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)
340{ 403{
404 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
341 dLOOPbase; 405 dLOOPbase;
342 struct x_once *once = malloc (sizeof (struct x_once));
343 406
344 if (!once) 407 if (!once)
345 return -1; 408 return -1;
346 409
347 once->fd = fd; 410 once->fd = fd;
348 once->cb = cb; 411 once->cb = cb;
349 once->arg = arg; 412 once->arg = arg;
350 413
351 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);
352 415
353 return 0; 416 return 0;
354} 417}
355 418
356int event_base_priority_init (struct event_base *base, int npri) 419int event_base_priority_init (struct event_base *base, int npri)
357{ 420{
358 dLOOPbase; 421 /*dLOOPbase;*/
359 422
360 return 0; 423 return 0;
361} 424}
362 425

Diff Legend

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