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

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

Diff Legend

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