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

Diff Legend

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