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

Comparing libev/event.c (file contents):
Revision 1.30 by root, Mon Nov 12 21:51:14 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 (EVFLAG_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 (EVFLAG_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 (EVFLAG_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;
… …
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, (short)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 {
167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
170 171
171 x_cb (ev, revents); 172 ev_x_cb (ev, revents);
172} 173}
173 174
174static void 175static void
175x_cb_to (EV_P_ struct ev_timer *w, int revents) 176ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
176{ 177{
177 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); 178 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
178 179
179 event_del (ev); 180 event_del (ev);
180 181
181 x_cb (ev, revents); 182 ev_x_cb (ev, revents);
182} 183}
183 184
184void 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)
185{ 186{
186 if (events & EV_SIGNAL) 187 if (events & EV_SIGNAL)
187 ev_init (&ev->iosig.sig, x_cb_sig); 188 ev_init (&ev->iosig.sig, ev_x_cb_sig);
188 else 189 else
189 ev_init (&ev->iosig.io, x_cb_io); 190 ev_init (&ev->iosig.io, ev_x_cb_io);
190 191
191 ev_init (&ev->to, x_cb_to); 192 ev_init (&ev->to, ev_x_cb_to);
192 193
193 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 */
194 ev->ev_fd = fd; 195 ev->ev_fd = fd;
195 ev->ev_events = events; 196 ev->ev_events = events;
196 ev->ev_pri = 0; 197 ev->ev_pri = 0;
197 ev->ev_callback = cb; 198 ev->ev_callback = cb;
198 ev->ev_arg = arg; 199 ev->ev_arg = arg;
… …
200 ev->ev_flags = EVLIST_INIT; 201 ev->ev_flags = EVLIST_INIT;
201} 202}
202 203
203int 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)
204{ 205{
205 return event_base_once (x_cur, fd, events, cb, arg, tv); 206 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
206} 207}
207 208
208int event_add (struct event *ev, struct timeval *tv) 209int event_add (struct event *ev, struct timeval *tv)
209{ 210{
210 dLOOPev; 211 dLOOPev;
211 212
212 /* disable all watchers */
213 event_del (ev);
214
215 if (ev->ev_events & EV_SIGNAL) 213 if (ev->ev_events & EV_SIGNAL)
216 { 214 {
215 if (!ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 217 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
218 ev_signal_start (EV_A_ &ev->iosig.sig); 218 ev_signal_start (EV_A_ &ev->iosig.sig);
219 219
220 ev->ev_flags |= EVLIST_SIGNAL; 220 ev->ev_flags |= EVLIST_SIGNAL;
221 }
221 } 222 }
222 else if (ev->ev_events & (EV_READ | EV_WRITE)) 223 else if (ev->ev_events & (EV_READ | EV_WRITE))
223 { 224 {
225 if (!ev_is_active (&ev->iosig.io))
226 {
224 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));
225 ev_io_start (EV_A_ &ev->iosig.io); 228 ev_io_start (EV_A_ &ev->iosig.io);
226 229
227 ev->ev_flags |= EVLIST_INSERTED; 230 ev->ev_flags |= EVLIST_INSERTED;
231 }
228 } 232 }
229 233
230 if (tv) 234 if (tv)
231 { 235 {
232 ev_timer_set (&ev->to, tv_get (tv), 0.); 236 ev->to.repeat = ev_tv_get (tv);
233 ev_timer_start (EV_A_ &ev->to); 237 ev_timer_again (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT; 238 ev->ev_flags |= EVLIST_TIMEOUT;
236 } 239 }
240 else
241 {
242 ev_timer_stop (EV_A_ &ev->to);
243 ev->ev_flags &= ~EVLIST_TIMEOUT;
244 }
237 245
238 ev->ev_flags |= EVLIST_ACTIVE; 246 ev->ev_flags |= EVLIST_ACTIVE;
239 247
240 return 0; 248 return 0;
241} 249}
… …
243int event_del (struct event *ev) 251int event_del (struct event *ev)
244{ 252{
245 dLOOPev; 253 dLOOPev;
246 254
247 if (ev->ev_events & EV_SIGNAL) 255 if (ev->ev_events & EV_SIGNAL)
248 {
249 /* sig */
250 if (ev_is_active (&ev->iosig.sig))
251 ev_signal_stop (EV_A_ &ev->iosig.sig); 256 ev_signal_stop (EV_A_ &ev->iosig.sig);
252 }
253 else if (ev->ev_events & (EV_READ | EV_WRITE)) 257 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 {
255 /* io */
256 if (ev_is_active (&ev->iosig.io))
257 ev_io_stop (EV_A_ &ev->iosig.io); 258 ev_io_stop (EV_A_ &ev->iosig.io);
258 }
259 259
260 if (ev_is_active (&ev->to)) 260 if (ev_is_active (&ev->to))
261 ev_timer_stop (EV_A_ &ev->to); 261 ev_timer_stop (EV_A_ &ev->to);
262 262
263 ev->ev_flags = EVLIST_INIT; 263 ev->ev_flags = EVLIST_INIT;
… …
281 281
282int event_pending (struct event *ev, short events, struct timeval *tv) 282int event_pending (struct event *ev, short events, struct timeval *tv)
283{ 283{
284 short revents = 0; 284 short revents = 0;
285 dLOOPev; 285 dLOOPev;
286
287 286
288 if (ev->ev_events & EV_SIGNAL) 287 if (ev->ev_events & EV_SIGNAL)
289 { 288 {
290 /* sig */ 289 /* sig */
291 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))
… …
301 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))
302 { 301 {
303 revents |= EV_TIMEOUT; 302 revents |= EV_TIMEOUT;
304 303
305 if (tv) 304 if (tv)
306 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 :) */
307 } 306 }
308 307
309 return events & revents; 308 return events & revents;
310} 309}
311 310
312int event_priority_init (int npri) 311int event_priority_init (int npri)
313{ 312{
314 return event_base_priority_init (x_cur, npri); 313 return event_base_priority_init (ev_x_cur, npri);
315} 314}
316 315
317int event_priority_set (struct event *ev, int pri) 316int event_priority_set (struct event *ev, int pri)
318{ 317{
319 ev->ev_pri = pri; 318 ev->ev_pri = pri;
… …
341{ 340{
342 return event_base_loop (base, 0); 341 return event_base_loop (base, 0);
343} 342}
344 343
345static void 344static void
346x_loopexit_cb (int revents, void *base) 345ev_x_loopexit_cb (int revents, void *base)
347{ 346{
348 dLOOPbase; 347 dLOOPbase;
349 348
350 ev_unloop (EV_A_ EVUNLOOP_ONE); 349 ev_unloop (EV_A_ EVUNLOOP_ONE);
351} 350}
352 351
353int event_base_loopexit (struct event_base *base, struct timeval *tv) 352int event_base_loopexit (struct event_base *base, struct timeval *tv)
354{ 353{
355 ev_tstamp after = tv_get (tv); 354 ev_tstamp after = ev_tv_get (tv);
356 dLOOPbase; 355 dLOOPbase;
357 356
358 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);
359 358
360 return -1; 359 return 0;
361} 360}
362 361
363struct x_once 362struct ev_x_once
364{ 363{
365 int fd; 364 int fd;
366 void (*cb)(int, short, void *); 365 void (*cb)(int, short, void *);
367 void *arg; 366 void *arg;
368}; 367};
369 368
370static void 369static void
371x_once_cb (int revents, void *arg) 370ev_x_once_cb (int revents, void *arg)
372{ 371{
373 struct x_once *once = (struct x_once *)arg; 372 struct ev_x_once *once = (struct ev_x_once *)arg;
374 373
375 once->cb (once->fd, (short)revents, once->arg); 374 once->cb (once->fd, (short)revents, once->arg);
376 free (once); 375 free (once);
377} 376}
378 377
379int 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)
380{ 379{
381 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));
382 dLOOPbase; 381 dLOOPbase;
383 382
384 if (!once) 383 if (!once)
385 return -1; 384 return -1;
386 385
387 once->fd = fd; 386 once->fd = fd;
388 once->cb = cb; 387 once->cb = cb;
389 once->arg = arg; 388 once->arg = arg;
390 389
391 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);
392 391
393 return 0; 392 return 0;
394} 393}
395 394
396int 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