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

Comparing libev/event.c (file contents):
Revision 1.8 by root, Sat Nov 3 22:10:39 2007 UTC vs.
Revision 1.33 by root, Tue Dec 25 07:05:46 2007 UTC

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

Diff Legend

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