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

Comparing libev/event.c (file contents):
Revision 1.17 by root, Sun Nov 4 23:14:11 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>
34#include <sys/time.h>
35#include <assert.h> 42#include <assert.h>
36 43
37#include "ev.h" 44#ifndef WIN32
45# include <sys/time.h>
46#endif
47
48#ifdef EV_EVENT_H
49# include EV_EVENT_H
50#else
38#include "event.h" 51# include "event.h"
52#endif
39 53
40#if EV_MULTIPLICITY 54#if EV_MULTIPLICITY
41# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 55# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 56# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
43#else 57#else
… …
83 97
84void *event_init (void) 98void *event_init (void)
85{ 99{
86#if EV_MULTIPLICITY 100#if EV_MULTIPLICITY
87 if (x_cur) 101 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 102 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
89 else 103 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
91#else 105#else
92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 106 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
93 107
94 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 108 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
95#endif 109#endif
96 110
97 return x_cur; 111 return x_cur;
98} 112}
99 113
100void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
101{ 115{
102 dLOOPbase; 116 dLOOPbase;
103 117
104#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
106 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
107#endif 121#endif
108} 122}
109 123
110int event_dispatch (void) 124int event_dispatch (void)
… …
133x_cb (struct event *ev, int revents) 147x_cb (struct event *ev, int revents)
134{ 148{
135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
136 150
137 ev->ev_res = revents; 151 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
139} 153}
140 154
141static void 155static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 156x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 157{
144 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);
145} 164}
146 165
147static void 166static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 167x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 168{
150 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));
151 170
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
153 ev_io_stop (EV_A_ w); 172 event_del (ev);
154 173
155 x_cb (ev, revents); 174 x_cb (ev, revents);
156} 175}
157 176
158static void 177static void
… …
166} 185}
167 186
168void 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)
169{ 188{
170 if (events & EV_SIGNAL) 189 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 190 ev_init (&ev->iosig.sig, x_cb_sig);
172 else 191 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 192 ev_init (&ev->iosig.io, x_cb_io);
174 193
175 ev_watcher_init (&ev->to, x_cb_to); 194 ev_init (&ev->to, x_cb_to);
176 195
177 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 196 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
178 ev->ev_fd = fd; 197 ev->ev_fd = fd;
179 ev->ev_events = events; 198 ev->ev_events = events;
180 ev->ev_pri = 0; 199 ev->ev_pri = 0;
181 ev->ev_callback = cb; 200 ev->ev_callback = cb;
182 ev->ev_arg = arg; 201 ev->ev_arg = arg;
183 ev->ev_res = 0; 202 ev->ev_res = 0;
203 ev->ev_flags = EVLIST_INIT;
184} 204}
185 205
186int 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)
187{ 207{
188 return event_base_once (x_cur, fd, events, cb, arg, tv); 208 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
190 210
191int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
192{ 212{
193 dLOOPev; 213 dLOOPev;
194 214
195 /* disable all watchers */
196 event_del (ev);
197
198 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
199 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
200 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
201 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 }
202 } 224 }
203 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
205 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));
206 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 }
207 } 234 }
208 235
209 if (tv) 236 if (tv)
210 { 237 {
211 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 {
212 ev_timer_start (EV_A_ &ev->to); 244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
213 } 246 }
247
248 ev->ev_flags |= EVLIST_ACTIVE;
214 249
215 return 0; 250 return 0;
216} 251}
217 252
218int event_del (struct event *ev) 253int event_del (struct event *ev)
219{ 254{
220 dLOOPev; 255 dLOOPev;
221 256
222 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
223 {
224 /* sig */
225 if (ev_is_active (&ev->iosig.sig))
226 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
227 }
228 else if (ev->ev_events & (EV_READ | EV_WRITE)) 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 {
230 /* io */
231 if (ev_is_active (&ev->iosig.io))
232 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
233 }
234 261
235 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
236 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
237 264
265 ev->ev_flags = EVLIST_INIT;
266
238 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));
239} 282}
240 283
241int event_pending (struct event *ev, short events, struct timeval *tv) 284int event_pending (struct event *ev, short events, struct timeval *tv)
242{ 285{
286 short revents = 0;
243 dLOOPev; 287 dLOOPev;
244
245 short revents = 0;
246 288
247 if (ev->ev_events & EV_SIGNAL) 289 if (ev->ev_events & EV_SIGNAL)
248 { 290 {
249 /* sig */ 291 /* sig */
250 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 292 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
… …
304static void 346static void
305x_loopexit_cb (int revents, void *base) 347x_loopexit_cb (int revents, void *base)
306{ 348{
307 dLOOPbase; 349 dLOOPbase;
308 350
309 ev_unloop (EV_A_ EVUNLOOP_ONCE); 351 ev_unloop (EV_A_ EVUNLOOP_ONE);
310} 352}
311 353
312int event_base_loopexit (struct event_base *base, struct timeval *tv) 354int event_base_loopexit (struct event_base *base, struct timeval *tv)
313{ 355{
356 ev_tstamp after = tv_get (tv);
314 dLOOPbase; 357 dLOOPbase;
315 ev_tstamp after = tv_get (tv);
316 358
317 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);
318 360
319 return -1; 361 return 0;
320} 362}
321 363
322struct x_once 364struct x_once
323{ 365{
324 int fd; 366 int fd;
… …
327}; 369};
328 370
329static void 371static void
330x_once_cb (int revents, void *arg) 372x_once_cb (int revents, void *arg)
331{ 373{
332 struct x_once *once = arg; 374 struct x_once *once = (struct x_once *)arg;
333 375
334 once->cb (once->fd, revents, once->arg); 376 once->cb (once->fd, (short)revents, once->arg);
335 free (once); 377 free (once);
336} 378}
337 379
338int 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)
339{ 381{
382 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
340 dLOOPbase; 383 dLOOPbase;
341 struct x_once *once = malloc (sizeof (struct x_once));
342 384
343 if (!once) 385 if (!once)
344 return -1; 386 return -1;
345 387
346 once->fd = fd; 388 once->fd = fd;

Diff Legend

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