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

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

Diff Legend

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