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

Comparing libev/event.c (file contents):
Revision 1.28 by root, Mon Nov 12 08:00:05 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 <assert.h> 42#include <assert.h>
… …
106void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
107{ 115{
108 dLOOPbase; 116 dLOOPbase;
109 117
110#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
111 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
113#endif 121#endif
114} 122}
115 123
116int event_dispatch (void) 124int event_dispatch (void)
… …
158static void 166static void
159x_cb_io (EV_P_ struct ev_io *w, int revents) 167x_cb_io (EV_P_ struct ev_io *w, int revents)
160{ 168{
161 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));
162 170
163 if (revents & EV_ERROR) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
164 event_del (ev); 172 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
170 173
171 x_cb (ev, revents); 174 x_cb (ev, revents);
172} 175}
173 176
174static void 177static void
… …
207 210
208int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
209{ 212{
210 dLOOPev; 213 dLOOPev;
211 214
212 /* disable all watchers */
213 event_del (ev);
214
215 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
216 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
217 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
218 ev_signal_start (EV_A_ &ev->iosig.sig); 220 ev_signal_start (EV_A_ &ev->iosig.sig);
219 221
220 ev->ev_flags |= EVLIST_SIGNAL; 222 ev->ev_flags |= EVLIST_SIGNAL;
223 }
221 } 224 }
222 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
223 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
224 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));
225 ev_io_start (EV_A_ &ev->iosig.io); 230 ev_io_start (EV_A_ &ev->iosig.io);
226 231
227 ev->ev_flags |= EVLIST_INSERTED; 232 ev->ev_flags |= EVLIST_INSERTED;
233 }
228 } 234 }
229 235
230 if (tv) 236 if (tv)
231 { 237 {
232 ev_timer_set (&ev->to, tv_get (tv), 0.); 238 ev->to.repeat = tv_get (tv);
233 ev_timer_start (EV_A_ &ev->to); 239 ev_timer_again (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT; 240 ev->ev_flags |= EVLIST_TIMEOUT;
236 } 241 }
242 else
243 {
244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
246 }
237 247
238 ev->ev_flags |= EVLIST_ACTIVE; 248 ev->ev_flags |= EVLIST_ACTIVE;
239 249
240 return 0; 250 return 0;
241} 251}
… …
243int event_del (struct event *ev) 253int event_del (struct event *ev)
244{ 254{
245 dLOOPev; 255 dLOOPev;
246 256
247 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
248 {
249 /* sig */
250 if (ev_is_active (&ev->iosig.sig))
251 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
252 }
253 else if (ev->ev_events & (EV_READ | EV_WRITE)) 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 {
255 /* io */
256 if (ev_is_active (&ev->iosig.io))
257 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
258 }
259 261
260 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
261 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
262 264
263 ev->ev_flags = EVLIST_INIT; 265 ev->ev_flags = EVLIST_INIT;
… …
281 283
282int event_pending (struct event *ev, short events, struct timeval *tv) 284int event_pending (struct event *ev, short events, struct timeval *tv)
283{ 285{
284 short revents = 0; 286 short revents = 0;
285 dLOOPev; 287 dLOOPev;
286
287 288
288 if (ev->ev_events & EV_SIGNAL) 289 if (ev->ev_events & EV_SIGNAL)
289 { 290 {
290 /* sig */ 291 /* sig */
291 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))
… …
345static void 346static void
346x_loopexit_cb (int revents, void *base) 347x_loopexit_cb (int revents, void *base)
347{ 348{
348 dLOOPbase; 349 dLOOPbase;
349 350
350 ev_unloop (EV_A_ EVUNLOOP_ONCE); 351 ev_unloop (EV_A_ EVUNLOOP_ONE);
351} 352}
352 353
353int event_base_loopexit (struct event_base *base, struct timeval *tv) 354int event_base_loopexit (struct event_base *base, struct timeval *tv)
354{ 355{
355 ev_tstamp after = tv_get (tv); 356 ev_tstamp after = tv_get (tv);
356 dLOOPbase; 357 dLOOPbase;
357 358
358 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);
359 360
360 return -1; 361 return 0;
361} 362}
362 363
363struct x_once 364struct x_once
364{ 365{
365 int fd; 366 int fd;

Diff Legend

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