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

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

Diff Legend

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