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

Comparing libev/event.c (file contents):
Revision 1.19 by root, Tue Nov 6 16:51:20 2007 UTC vs.
Revision 1.39 by root, Tue Jan 6 19:46:56 2009 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>
35 43
36#ifndef WIN32 44#ifdef EV_EVENT_H
37# include <sys/time.h> 45# include EV_EVENT_H
38#endif 46#else
39
40#include "ev.h"
41#include "event.h" 47# include "event.h"
48#endif
42 49
43#if EV_MULTIPLICITY 50#if EV_MULTIPLICITY
44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 51# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 52# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else 53#else
… …
52struct event_base 59struct event_base
53{ 60{
54 int dummy; 61 int dummy;
55}; 62};
56 63
57static struct event_base *x_cur; 64static struct event_base *ev_x_cur;
58 65
59static void 66static void
60tv_set (struct timeval *tv, ev_tstamp at) 67ev_tv_set (struct timeval *tv, ev_tstamp at)
61{ 68{
62 tv->tv_sec = (long)at; 69 tv->tv_sec = (long)at;
63 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6); 70 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
64} 71}
65 72
66static ev_tstamp 73static ev_tstamp
67tv_get (struct timeval *tv) 74ev_tv_get (struct timeval *tv)
68{ 75{
69 if (tv) 76 if (tv)
70 return tv->tv_sec + tv->tv_usec * 1e-6; 77 return tv->tv_sec + tv->tv_usec * 1e-6;
71 else 78 else
72 return -1.; 79 return -1.;
… …
85} 92}
86 93
87void *event_init (void) 94void *event_init (void)
88{ 95{
89#if EV_MULTIPLICITY 96#if EV_MULTIPLICITY
90 if (x_cur) 97 if (ev_x_cur)
91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 98 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
92 else 99 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 100 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
94#else 101#else
95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 102 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
96 103
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 104 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
98#endif 105#endif
99 106
100 return x_cur; 107 return ev_x_cur;
101} 108}
102 109
103void event_base_free (struct event_base *base) 110void event_base_free (struct event_base *base)
104{ 111{
105 dLOOPbase; 112 dLOOPbase;
106 113
107#if EV_MULTIPLICITY 114#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop) 115 if (ev_default_loop (EVFLAG_AUTO) != loop)
109 ev_loop_destroy (loop); 116 ev_loop_destroy (loop);
110#endif 117#endif
111} 118}
112 119
113int event_dispatch (void) 120int event_dispatch (void)
114{ 121{
115 return event_base_dispatch (x_cur); 122 return event_base_dispatch (ev_x_cur);
116} 123}
117 124
118#ifdef EV_STANDALONE 125#ifdef EV_STANDALONE
119void event_set_log_callback (event_log_cb cb) 126void event_set_log_callback (event_log_cb cb)
120{ 127{
… …
122} 129}
123#endif 130#endif
124 131
125int event_loop (int flags) 132int event_loop (int flags)
126{ 133{
127 return event_base_loop (x_cur, flags); 134 return event_base_loop (ev_x_cur, flags);
128} 135}
129 136
130int event_loopexit (struct timeval *tv) 137int event_loopexit (struct timeval *tv)
131{ 138{
132 return event_base_loopexit (x_cur, tv); 139 return event_base_loopexit (ev_x_cur, tv);
133} 140}
134 141
135static void 142static void
136x_cb (struct event *ev, int revents) 143ev_x_cb (struct event *ev, int revents)
137{ 144{
138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 145 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
139 146
140 ev->ev_res = revents; 147 ev->ev_res = revents;
141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 148 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
142} 149}
143 150
144static void 151static void
145x_cb_sig (EV_P_ struct ev_signal *w, int revents) 152ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 153{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 154 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
148}
149 155
156 if (revents & EV_ERROR)
157 event_del (ev);
158
159 ev_x_cb (ev, revents);
160}
161
150static void 162static void
151x_cb_io (EV_P_ struct ev_io *w, int revents) 163ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
152{ 164{
153 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 165 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
154 166
155 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 167 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
156 ev_io_stop (EV_A_ w); 168 event_del (ev);
157 169
158 x_cb (ev, revents); 170 ev_x_cb (ev, revents);
159} 171}
160 172
161static void 173static void
162x_cb_to (EV_P_ struct ev_timer *w, int revents) 174ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
163{ 175{
164 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 176 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
165 177
166 event_del (ev); 178 event_del (ev);
167 179
168 x_cb (ev, revents); 180 ev_x_cb (ev, revents);
169} 181}
170 182
171void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 183void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
172{ 184{
173 if (events & EV_SIGNAL) 185 if (events & EV_SIGNAL)
174 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 186 ev_init (&ev->iosig.sig, ev_x_cb_sig);
175 else 187 else
176 ev_watcher_init (&ev->iosig.io, x_cb_io); 188 ev_init (&ev->iosig.io, ev_x_cb_io);
177 189
178 ev_watcher_init (&ev->to, x_cb_to); 190 ev_init (&ev->to, ev_x_cb_to);
179 191
180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 192 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
181 ev->ev_fd = fd; 193 ev->ev_fd = fd;
182 ev->ev_events = events; 194 ev->ev_events = events;
183 ev->ev_pri = 0; 195 ev->ev_pri = 0;
184 ev->ev_callback = cb; 196 ev->ev_callback = cb;
185 ev->ev_arg = arg; 197 ev->ev_arg = arg;
186 ev->ev_res = 0; 198 ev->ev_res = 0;
199 ev->ev_flags = EVLIST_INIT;
187} 200}
188 201
189int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 202int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
190{ 203{
191 return event_base_once (x_cur, fd, events, cb, arg, tv); 204 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
192} 205}
193 206
194int event_add (struct event *ev, struct timeval *tv) 207int event_add (struct event *ev, struct timeval *tv)
195{ 208{
196 dLOOPev; 209 dLOOPev;
197 210
198 /* disable all watchers */
199 event_del (ev);
200
201 if (ev->ev_events & EV_SIGNAL) 211 if (ev->ev_events & EV_SIGNAL)
202 { 212 {
213 if (!ev_is_active (&ev->iosig.sig))
214 {
203 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 215 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
204 ev_signal_start (EV_A_ &ev->iosig.sig); 216 ev_signal_start (EV_A_ &ev->iosig.sig);
217
218 ev->ev_flags |= EVLIST_SIGNAL;
219 }
205 } 220 }
206 else if (ev->ev_events & (EV_READ | EV_WRITE)) 221 else if (ev->ev_events & (EV_READ | EV_WRITE))
207 { 222 {
223 if (!ev_is_active (&ev->iosig.io))
224 {
208 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 225 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
209 ev_io_start (EV_A_ &ev->iosig.io); 226 ev_io_start (EV_A_ &ev->iosig.io);
227
228 ev->ev_flags |= EVLIST_INSERTED;
229 }
210 } 230 }
211 231
212 if (tv) 232 if (tv)
213 { 233 {
214 ev_timer_set (&ev->to, tv_get (tv), 0.); 234 ev->to.repeat = ev_tv_get (tv);
235 ev_timer_again (EV_A_ &ev->to);
236 ev->ev_flags |= EVLIST_TIMEOUT;
237 }
238 else
239 {
215 ev_timer_start (EV_A_ &ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
241 ev->ev_flags &= ~EVLIST_TIMEOUT;
216 } 242 }
243
244 ev->ev_flags |= EVLIST_ACTIVE;
217 245
218 return 0; 246 return 0;
219} 247}
220 248
221int event_del (struct event *ev) 249int event_del (struct event *ev)
222{ 250{
223 dLOOPev; 251 dLOOPev;
224 252
225 if (ev->ev_events & EV_SIGNAL) 253 if (ev->ev_events & EV_SIGNAL)
226 {
227 /* sig */
228 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig); 254 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 }
231 else if (ev->ev_events & (EV_READ | EV_WRITE)) 255 else if (ev->ev_events & (EV_READ | EV_WRITE))
232 {
233 /* io */
234 if (ev_is_active (&ev->iosig.io))
235 ev_io_stop (EV_A_ &ev->iosig.io); 256 ev_io_stop (EV_A_ &ev->iosig.io);
236 }
237 257
238 if (ev_is_active (&ev->to)) 258 if (ev_is_active (&ev->to))
239 ev_timer_stop (EV_A_ &ev->to); 259 ev_timer_stop (EV_A_ &ev->to);
240 260
261 ev->ev_flags = EVLIST_INIT;
262
241 return 0; 263 return 0;
264}
265
266void event_active (struct event *ev, int res, short ncalls)
267{
268 dLOOPev;
269
270 if (res & EV_TIMEOUT)
271 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
272
273 if (res & EV_SIGNAL)
274 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
275
276 if (res & (EV_READ | EV_WRITE))
277 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
242} 278}
243 279
244int event_pending (struct event *ev, short events, struct timeval *tv) 280int event_pending (struct event *ev, short events, struct timeval *tv)
245{ 281{
246 short revents = 0; 282 short revents = 0;
247 dLOOPev; 283 dLOOPev;
248
249 284
250 if (ev->ev_events & EV_SIGNAL) 285 if (ev->ev_events & EV_SIGNAL)
251 { 286 {
252 /* sig */ 287 /* sig */
253 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 288 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
… …
263 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) 298 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
264 { 299 {
265 revents |= EV_TIMEOUT; 300 revents |= EV_TIMEOUT;
266 301
267 if (tv) 302 if (tv)
268 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 303 ev_tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
269 } 304 }
270 305
271 return events & revents; 306 return events & revents;
272} 307}
273 308
274int event_priority_init (int npri) 309int event_priority_init (int npri)
275{ 310{
276 return event_base_priority_init (x_cur, npri); 311 return event_base_priority_init (ev_x_cur, npri);
277} 312}
278 313
279int event_priority_set (struct event *ev, int pri) 314int event_priority_set (struct event *ev, int pri)
280{ 315{
281 ev->ev_pri = pri; 316 ev->ev_pri = pri;
… …
303{ 338{
304 return event_base_loop (base, 0); 339 return event_base_loop (base, 0);
305} 340}
306 341
307static void 342static void
308x_loopexit_cb (int revents, void *base) 343ev_x_loopexit_cb (int revents, void *base)
309{ 344{
310 dLOOPbase; 345 dLOOPbase;
311 346
312 ev_unloop (EV_A_ EVUNLOOP_ONCE); 347 ev_unloop (EV_A_ EVUNLOOP_ONE);
313} 348}
314 349
315int event_base_loopexit (struct event_base *base, struct timeval *tv) 350int event_base_loopexit (struct event_base *base, struct timeval *tv)
316{ 351{
317 ev_tstamp after = tv_get (tv); 352 ev_tstamp after = ev_tv_get (tv);
318 dLOOPbase; 353 dLOOPbase;
319 354
320 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 355 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
321 356
322 return -1; 357 return 0;
323} 358}
324 359
325struct x_once 360struct ev_x_once
326{ 361{
327 int fd; 362 int fd;
328 void (*cb)(int, short, void *); 363 void (*cb)(int, short, void *);
329 void *arg; 364 void *arg;
330}; 365};
331 366
332static void 367static void
333x_once_cb (int revents, void *arg) 368ev_x_once_cb (int revents, void *arg)
334{ 369{
335 struct x_once *once = (struct x_once *)arg; 370 struct ev_x_once *once = (struct ev_x_once *)arg;
336 371
337 once->cb (once->fd, revents, once->arg); 372 once->cb (once->fd, (short)revents, once->arg);
338 free (once); 373 free (once);
339} 374}
340 375
341int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 376int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
342{ 377{
343 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once)); 378 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
344 dLOOPbase; 379 dLOOPbase;
345 380
346 if (!once) 381 if (!once)
347 return -1; 382 return -1;
348 383
349 once->fd = fd; 384 once->fd = fd;
350 once->cb = cb; 385 once->cb = cb;
351 once->arg = arg; 386 once->arg = arg;
352 387
353 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 388 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
354 389
355 return 0; 390 return 0;
356} 391}
357 392
358int event_base_priority_init (struct event_base *base, int npri) 393int event_base_priority_init (struct event_base *base, int npri)

Diff Legend

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