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

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