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

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