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

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

Diff Legend

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