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

Diff Legend

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