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

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

Diff Legend

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