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

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

Diff Legend

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