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

Comparing libev/event.c (file contents):
Revision 1.23 by root, Thu Nov 8 23:53:41 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>
34#include <assert.h> 42#include <assert.h>
35 43
36#ifndef WIN32 44#ifndef WIN32
37# include <sys/time.h> 45# include <sys/time.h>
38#endif 46#endif
39 47
40#include "ev.h" 48#ifdef EV_EVENT_H
49# include EV_EVENT_H
50#else
41#include "event.h" 51# include "event.h"
52#endif
42 53
43#if EV_MULTIPLICITY 54#if EV_MULTIPLICITY
44# 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
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 56# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else 57#else
… …
86 97
87void *event_init (void) 98void *event_init (void)
88{ 99{
89#if EV_MULTIPLICITY 100#if EV_MULTIPLICITY
90 if (x_cur) 101 if (x_cur)
91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 102 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
92 else 103 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 104 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
94#else 105#else
95 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));
96 107
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 108 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
98#endif 109#endif
99 110
100 return x_cur; 111 return x_cur;
101} 112}
102 113
103void event_base_free (struct event_base *base) 114void event_base_free (struct event_base *base)
104{ 115{
105 dLOOPbase; 116 dLOOPbase;
106 117
107#if EV_MULTIPLICITY 118#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop) 119 if (ev_default_loop (EVFLAG_AUTO) != loop)
109 ev_loop_destroy (loop); 120 ev_loop_destroy (loop);
110#endif 121#endif
111} 122}
112 123
113int event_dispatch (void) 124int event_dispatch (void)
… …
136x_cb (struct event *ev, int revents) 147x_cb (struct event *ev, int revents)
137{ 148{
138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 149 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
139 150
140 ev->ev_res = revents; 151 ev->ev_res = revents;
141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 152 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
142} 153}
143 154
144static void 155static void
145x_cb_sig (EV_P_ struct ev_signal *w, int revents) 156x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 157{
… …
155static void 166static void
156x_cb_io (EV_P_ struct ev_io *w, int revents) 167x_cb_io (EV_P_ struct ev_io *w, int revents)
157{ 168{
158 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));
159 170
160 if (revents & EV_ERROR) 171 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
161 event_del (ev); 172 event_del (ev);
162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
163 ev_io_stop (EV_A_ w);
164 173
165 x_cb (ev, revents); 174 x_cb (ev, revents);
166} 175}
167 176
168static void 177static void
… …
176} 185}
177 186
178void 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)
179{ 188{
180 if (events & EV_SIGNAL) 189 if (events & EV_SIGNAL)
181 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 190 ev_init (&ev->iosig.sig, x_cb_sig);
182 else 191 else
183 ev_watcher_init (&ev->iosig.io, x_cb_io); 192 ev_init (&ev->iosig.io, x_cb_io);
184 193
185 ev_watcher_init (&ev->to, x_cb_to); 194 ev_init (&ev->to, x_cb_to);
186 195
187 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 */
188 ev->ev_fd = fd; 197 ev->ev_fd = fd;
189 ev->ev_events = events; 198 ev->ev_events = events;
190 ev->ev_pri = 0; 199 ev->ev_pri = 0;
191 ev->ev_callback = cb; 200 ev->ev_callback = cb;
192 ev->ev_arg = arg; 201 ev->ev_arg = arg;
193 ev->ev_res = 0; 202 ev->ev_res = 0;
203 ev->ev_flags = EVLIST_INIT;
194} 204}
195 205
196int 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)
197{ 207{
198 return event_base_once (x_cur, fd, events, cb, arg, tv); 208 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
200 210
201int event_add (struct event *ev, struct timeval *tv) 211int event_add (struct event *ev, struct timeval *tv)
202{ 212{
203 dLOOPev; 213 dLOOPev;
204 214
205 /* disable all watchers */
206 event_del (ev);
207
208 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
209 { 216 {
217 if (!ev_is_active (&ev->iosig.sig))
218 {
210 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 219 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
211 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 }
212 } 224 }
213 else if (ev->ev_events & (EV_READ | EV_WRITE)) 225 else if (ev->ev_events & (EV_READ | EV_WRITE))
214 { 226 {
227 if (!ev_is_active (&ev->iosig.io))
228 {
215 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));
216 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 }
217 } 234 }
218 235
219 if (tv) 236 if (tv)
220 { 237 {
221 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 {
222 ev_timer_start (EV_A_ &ev->to); 244 ev_timer_stop (EV_A_ &ev->to);
245 ev->ev_flags &= ~EVLIST_TIMEOUT;
223 } 246 }
247
248 ev->ev_flags |= EVLIST_ACTIVE;
224 249
225 return 0; 250 return 0;
226} 251}
227 252
228int event_del (struct event *ev) 253int event_del (struct event *ev)
229{ 254{
230 dLOOPev; 255 dLOOPev;
231 256
232 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
233 {
234 /* sig */
235 if (ev_is_active (&ev->iosig.sig))
236 ev_signal_stop (EV_A_ &ev->iosig.sig); 258 ev_signal_stop (EV_A_ &ev->iosig.sig);
237 }
238 else if (ev->ev_events & (EV_READ | EV_WRITE)) 259 else if (ev->ev_events & (EV_READ | EV_WRITE))
239 {
240 /* io */
241 if (ev_is_active (&ev->iosig.io))
242 ev_io_stop (EV_A_ &ev->iosig.io); 260 ev_io_stop (EV_A_ &ev->iosig.io);
243 }
244 261
245 if (ev_is_active (&ev->to)) 262 if (ev_is_active (&ev->to))
246 ev_timer_stop (EV_A_ &ev->to); 263 ev_timer_stop (EV_A_ &ev->to);
264
265 ev->ev_flags = EVLIST_INIT;
247 266
248 return 0; 267 return 0;
249} 268}
250 269
251void event_active (struct event *ev, int res, short ncalls) 270void event_active (struct event *ev, int res, short ncalls)
… …
328static void 347static void
329x_loopexit_cb (int revents, void *base) 348x_loopexit_cb (int revents, void *base)
330{ 349{
331 dLOOPbase; 350 dLOOPbase;
332 351
333 ev_unloop (EV_A_ EVUNLOOP_ONCE); 352 ev_unloop (EV_A_ EVUNLOOP_ONE);
334} 353}
335 354
336int event_base_loopexit (struct event_base *base, struct timeval *tv) 355int event_base_loopexit (struct event_base *base, struct timeval *tv)
337{ 356{
338 ev_tstamp after = tv_get (tv); 357 ev_tstamp after = tv_get (tv);
… …
353static void 372static void
354x_once_cb (int revents, void *arg) 373x_once_cb (int revents, void *arg)
355{ 374{
356 struct x_once *once = (struct x_once *)arg; 375 struct x_once *once = (struct x_once *)arg;
357 376
358 once->cb (once->fd, revents, once->arg); 377 once->cb (once->fd, (short)revents, once->arg);
359 free (once); 378 free (once);
360} 379}
361 380
362int 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)
363{ 382{

Diff Legend

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