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

Comparing libev/event.c (file contents):
Revision 1.22 by root, Thu Nov 8 21:20:51 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 <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 (("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 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig)); 154 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
148 155
149 if (revents & EV_ERROR) 156 if (revents & EV_ERROR)
150 event_del (ev); 157 event_del (ev);
151 158
152 x_cb (ev, revents); 159 ev_x_cb (ev, revents);
153} 160}
154 161
155static void 162static void
156x_cb_io (EV_P_ struct ev_io *w, int revents) 163ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
157{ 164{
158 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));
159 166
160 if (revents & EV_ERROR) 167 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
161 event_del (ev); 168 event_del (ev);
162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
163 ev_io_stop (EV_A_ w);
164 169
165 x_cb (ev, revents); 170 ev_x_cb (ev, revents);
166} 171}
167 172
168static void 173static void
169x_cb_to (EV_P_ struct ev_timer *w, int revents) 174ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
170{ 175{
171 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 176 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
172 177
173 event_del (ev); 178 event_del (ev);
174 179
175 x_cb (ev, revents); 180 ev_x_cb (ev, revents);
176} 181}
177 182
178void 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)
179{ 184{
180 if (events & EV_SIGNAL) 185 if (events & EV_SIGNAL)
181 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 186 ev_init (&ev->iosig.sig, ev_x_cb_sig);
182 else 187 else
183 ev_watcher_init (&ev->iosig.io, x_cb_io); 188 ev_init (&ev->iosig.io, ev_x_cb_io);
184 189
185 ev_watcher_init (&ev->to, x_cb_to); 190 ev_init (&ev->to, ev_x_cb_to);
186 191
187 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 */
188 ev->ev_fd = fd; 193 ev->ev_fd = fd;
189 ev->ev_events = events; 194 ev->ev_events = events;
190 ev->ev_pri = 0; 195 ev->ev_pri = 0;
191 ev->ev_callback = cb; 196 ev->ev_callback = cb;
192 ev->ev_arg = arg; 197 ev->ev_arg = arg;
193 ev->ev_res = 0; 198 ev->ev_res = 0;
199 ev->ev_flags = EVLIST_INIT;
194} 200}
195 201
196int 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)
197{ 203{
198 return event_base_once (x_cur, fd, events, cb, arg, tv); 204 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
199} 205}
200 206
201int event_add (struct event *ev, struct timeval *tv) 207int event_add (struct event *ev, struct timeval *tv)
202{ 208{
203 dLOOPev; 209 dLOOPev;
204 210
205 /* disable all watchers */
206 event_del (ev);
207
208 if (ev->ev_events & EV_SIGNAL) 211 if (ev->ev_events & EV_SIGNAL)
209 { 212 {
213 if (!ev_is_active (&ev->iosig.sig))
214 {
210 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 215 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
211 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 }
212 } 220 }
213 else if (ev->ev_events & (EV_READ | EV_WRITE)) 221 else if (ev->ev_events & (EV_READ | EV_WRITE))
214 { 222 {
223 if (!ev_is_active (&ev->iosig.io))
224 {
215 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));
216 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 }
217 } 230 }
218 231
219 if (tv) 232 if (tv)
220 { 233 {
221 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 {
222 ev_timer_start (EV_A_ &ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
241 ev->ev_flags &= ~EVLIST_TIMEOUT;
223 } 242 }
243
244 ev->ev_flags |= EVLIST_ACTIVE;
224 245
225 return 0; 246 return 0;
226} 247}
227 248
228int event_del (struct event *ev) 249int event_del (struct event *ev)
229{ 250{
230 dLOOPev; 251 dLOOPev;
231 252
232 if (ev->ev_events & EV_SIGNAL) 253 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); 254 ev_signal_stop (EV_A_ &ev->iosig.sig);
237 }
238 else if (ev->ev_events & (EV_READ | EV_WRITE)) 255 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); 256 ev_io_stop (EV_A_ &ev->iosig.io);
243 }
244 257
245 if (ev_is_active (&ev->to)) 258 if (ev_is_active (&ev->to))
246 ev_timer_stop (EV_A_ &ev->to); 259 ev_timer_stop (EV_A_ &ev->to);
247 260
261 ev->ev_flags = EVLIST_INIT;
262
248 return 0; 263 return 0;
249} 264}
250 265
251void event_active (struct event *ev, int res, short ncalls) 266void event_active (struct event *ev, int res, short ncalls)
252{ 267{
268 dLOOPev;
269
253 if (res & EV_TIMEOUT) 270 if (res & EV_TIMEOUT)
254 ev_feed_event (&ev->to, res & EV_TIMEOUT); 271 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
255 272
256 if (res & EV_SIGNAL) 273 if (res & EV_SIGNAL)
257 ev_feed_event (&ev->iosig.sig, res & EV_SIGNAL); 274 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
258 275
259 if (res & (EV_READ | EV_WRITE)) 276 if (res & (EV_READ | EV_WRITE))
260 ev_feed_event (&ev->iosig.io, res & (EV_READ | EV_WRITE)); 277 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
261} 278}
262 279
263int event_pending (struct event *ev, short events, struct timeval *tv) 280int event_pending (struct event *ev, short events, struct timeval *tv)
264{ 281{
265 short revents = 0; 282 short revents = 0;
266 dLOOPev; 283 dLOOPev;
267
268 284
269 if (ev->ev_events & EV_SIGNAL) 285 if (ev->ev_events & EV_SIGNAL)
270 { 286 {
271 /* sig */ 287 /* sig */
272 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))
… …
282 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))
283 { 299 {
284 revents |= EV_TIMEOUT; 300 revents |= EV_TIMEOUT;
285 301
286 if (tv) 302 if (tv)
287 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 :) */
288 } 304 }
289 305
290 return events & revents; 306 return events & revents;
291} 307}
292 308
293int event_priority_init (int npri) 309int event_priority_init (int npri)
294{ 310{
295 return event_base_priority_init (x_cur, npri); 311 return event_base_priority_init (ev_x_cur, npri);
296} 312}
297 313
298int event_priority_set (struct event *ev, int pri) 314int event_priority_set (struct event *ev, int pri)
299{ 315{
300 ev->ev_pri = pri; 316 ev->ev_pri = pri;
… …
322{ 338{
323 return event_base_loop (base, 0); 339 return event_base_loop (base, 0);
324} 340}
325 341
326static void 342static void
327x_loopexit_cb (int revents, void *base) 343ev_x_loopexit_cb (int revents, void *base)
328{ 344{
329 dLOOPbase; 345 dLOOPbase;
330 346
331 ev_unloop (EV_A_ EVUNLOOP_ONCE); 347 ev_unloop (EV_A_ EVUNLOOP_ONE);
332} 348}
333 349
334int event_base_loopexit (struct event_base *base, struct timeval *tv) 350int event_base_loopexit (struct event_base *base, struct timeval *tv)
335{ 351{
336 ev_tstamp after = tv_get (tv); 352 ev_tstamp after = ev_tv_get (tv);
337 dLOOPbase; 353 dLOOPbase;
338 354
339 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);
340 356
341 return -1; 357 return 0;
342} 358}
343 359
344struct x_once 360struct ev_x_once
345{ 361{
346 int fd; 362 int fd;
347 void (*cb)(int, short, void *); 363 void (*cb)(int, short, void *);
348 void *arg; 364 void *arg;
349}; 365};
350 366
351static void 367static void
352x_once_cb (int revents, void *arg) 368ev_x_once_cb (int revents, void *arg)
353{ 369{
354 struct x_once *once = (struct x_once *)arg; 370 struct ev_x_once *once = (struct ev_x_once *)arg;
355 371
356 once->cb (once->fd, revents, once->arg); 372 once->cb (once->fd, (short)revents, once->arg);
357 free (once); 373 free (once);
358} 374}
359 375
360int 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)
361{ 377{
362 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));
363 dLOOPbase; 379 dLOOPbase;
364 380
365 if (!once) 381 if (!once)
366 return -1; 382 return -1;
367 383
368 once->fd = fd; 384 once->fd = fd;
369 once->cb = cb; 385 once->cb = cb;
370 once->arg = arg; 386 once->arg = arg;
371 387
372 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);
373 389
374 return 0; 390 return 0;
375} 391}
376 392
377int 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