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

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

Diff Legend

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