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

Comparing libev/event.c (file contents):
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC vs.
Revision 1.51 by root, Mon Apr 2 20:12:16 2012 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,2012 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:
10 * 9 *
11 * * Redistributions of source code must retain the above copyright 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
12 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
13 * 16 *
14 * * Redistributions in binary form must reproduce the above 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
15 * copyright notice, this list of conditions and the following 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
16 * disclaimer in the documentation and/or other materials provided 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 * with the distribution. 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
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 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL.
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> 42#include <assert.h>
35 43
44#ifdef EV_EVENT_H
45# include EV_EVENT_H
46#else
36#include "event.h" 47# include "event.h"
48#endif
37 49
38#if EV_MULTIPLICITY 50#if EV_MULTIPLICITY
39# 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
40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 52# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else 53#else
… …
47struct event_base 59struct event_base
48{ 60{
49 int dummy; 61 int dummy;
50}; 62};
51 63
52static struct event_base x_base, *x_cur; 64static struct event_base *ev_x_cur;
53
54static void
55tv_set (struct timeval *tv, ev_tstamp at)
56{
57 tv->tv_sec = (long)at;
58 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
59}
60 65
61static ev_tstamp 66static ev_tstamp
62tv_get (struct timeval *tv) 67ev_tv_get (struct timeval *tv)
63{ 68{
64 if (tv) 69 if (tv)
70 {
65 return tv->tv_sec + tv->tv_usec * 1e-6; 71 ev_tstamp after = tv->tv_sec + tv->tv_usec * 1e-6;
72 return after ? after : 1e-6;
73 }
66 else 74 else
67 return -1.; 75 return -1.;
68} 76}
69 77
70#define EVENT_VERSION(a,b) # a "." # b 78#define EVENT_STRINGIFY(s) # s
79#define EVENT_VERSION(a,b) EVENT_STRINGIFY (a) "." EVENT_STRINGIFY (b)
71 80
72const char *event_get_version (void) 81const char *event_get_version (void)
73{ 82{
83 /* returns ABI, not API or library, version */
74 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR); 84 return EVENT_VERSION (EV_VERSION_MAJOR, EV_VERSION_MINOR);
75} 85}
76 86
77const char *event_get_method (void) 87const char *event_get_method (void)
78{ 88{
… …
80} 90}
81 91
82void *event_init (void) 92void *event_init (void)
83{ 93{
84#if EV_MULTIPLICITY 94#if EV_MULTIPLICITY
95 if (ev_x_cur)
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 96 ev_x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
97 else
98 ev_x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
86#else 99#else
87 x_cur = &x_base; 100 assert (("libev: multiple event bases not supported when not compiled with EV_MULTIPLICITY", !ev_x_cur));
101
102 ev_x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
88#endif 103#endif
89 104
90 return x_cur; 105 return ev_x_cur;
91} 106}
92 107
93void event_base_free (struct event_base *base) 108void event_base_free (struct event_base *base)
94{ 109{
95 dLOOPbase; 110 dLOOPbase;
96 111
97#if EV_MULTIPLICITY 112#if EV_MULTIPLICITY
113 if (!ev_is_default_loop (loop))
98 ev_loop_delete (loop); 114 ev_loop_destroy (loop);
99#endif 115#endif
100} 116}
101 117
102int event_dispatch (void) 118int event_dispatch (void)
103{ 119{
104 return event_base_dispatch (x_cur); 120 return event_base_dispatch (ev_x_cur);
105} 121}
106 122
107#ifdef EV_STANDALONE 123#ifdef EV_STANDALONE
108void event_set_log_callback (event_log_cb cb) 124void event_set_log_callback (event_log_cb cb)
109{ 125{
… …
111} 127}
112#endif 128#endif
113 129
114int event_loop (int flags) 130int event_loop (int flags)
115{ 131{
116 return event_base_loop (x_cur, flags); 132 return event_base_loop (ev_x_cur, flags);
117} 133}
118 134
119int event_loopexit (struct timeval *tv) 135int event_loopexit (struct timeval *tv)
120{ 136{
121 return event_base_loopexit (x_cur, tv); 137 return event_base_loopexit (ev_x_cur, tv);
122} 138}
123 139
124static void 140static void
125x_cb (struct event *ev, int revents) 141ev_x_cb (struct event *ev, int revents)
126{ 142{
127 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 143 revents &= EV_READ | EV_WRITE | EV_TIMER | EV_SIGNAL;
128 144
129 ev->ev_res = revents; 145 ev->ev_res = revents;
130 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 146 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
131} 147}
132 148
133static void 149static void
134x_cb_sig (EV_P_ struct ev_signal *w, int revents) 150ev_x_cb_sig (EV_P_ struct ev_signal *w, int revents)
135{ 151{
136 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 152 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
137}
138 153
154 if (revents & EV_ERROR)
155 event_del (ev);
156
157 ev_x_cb (ev, revents);
158}
159
139static void 160static void
140x_cb_io (EV_P_ struct ev_io *w, int revents) 161ev_x_cb_io (EV_P_ struct ev_io *w, int revents)
141{ 162{
142 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 163 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
143 164
144 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
145 ev_io_stop (EV_A_ w); 166 event_del (ev);
146 167
147 x_cb (ev, revents); 168 ev_x_cb (ev, revents);
148} 169}
149 170
150static void 171static void
151x_cb_to (EV_P_ struct ev_timer *w, int revents) 172ev_x_cb_to (EV_P_ struct ev_timer *w, int revents)
152{ 173{
153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 174 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
175
176 event_del (ev);
177
178 ev_x_cb (ev, revents);
154} 179}
155 180
156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
157{ 182{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
162 if (events & EV_SIGNAL) 183 if (events & EV_SIGNAL)
163 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 184 ev_init (&ev->iosig.sig, ev_x_cb_sig);
164 else 185 else
165 ev_watcher_init (&ev->iosig.io, x_cb_io); 186 ev_init (&ev->iosig.io, ev_x_cb_io);
166 187
167 ev_watcher_init (&ev->to, x_cb_to); 188 ev_init (&ev->to, ev_x_cb_to);
168 }
169 189
170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 190 ev->ev_base = ev_x_cur; /* not threadsafe, but it's how libevent works */
171 ev->ev_fd = fd; 191 ev->ev_fd = fd;
172 ev->ev_events = events; 192 ev->ev_events = events;
173 ev->ev_pri = 0; 193 ev->ev_pri = 0;
174 ev->ev_callback = cb; 194 ev->ev_callback = cb;
175 ev->ev_arg = arg; 195 ev->ev_arg = arg;
176 ev->ev_res = 0; 196 ev->ev_res = 0;
197 ev->ev_flags = EVLIST_INIT;
177} 198}
178 199
179int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 200int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
180{ 201{
181 return event_base_once (x_cur, fd, events, cb, arg, tv); 202 return event_base_once (ev_x_cur, fd, events, cb, arg, tv);
182} 203}
183 204
184int event_add (struct event *ev, struct timeval *tv) 205int event_add (struct event *ev, struct timeval *tv)
185{ 206{
186 dLOOPev; 207 dLOOPev;
187 208
188 /* disable all watchers */
189 event_del (ev);
190
191 if (ev->ev_events & EV_SIGNAL) 209 if (ev->ev_events & EV_SIGNAL)
192 { 210 {
211 if (!ev_is_active (&ev->iosig.sig))
212 {
193 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 213 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
194 ev_signal_start (EV_A_ &ev->iosig.sig); 214 ev_signal_start (EV_A_ &ev->iosig.sig);
215
216 ev->ev_flags |= EVLIST_SIGNAL;
217 }
195 } 218 }
196 else if (ev->ev_events & (EV_READ | EV_WRITE)) 219 else if (ev->ev_events & (EV_READ | EV_WRITE))
197 { 220 {
221 if (!ev_is_active (&ev->iosig.io))
222 {
198 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 223 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
199 ev_io_start (EV_A_ &ev->iosig.io); 224 ev_io_start (EV_A_ &ev->iosig.io);
225
226 ev->ev_flags |= EVLIST_INSERTED;
227 }
200 } 228 }
201 229
202 if (tv) 230 if (tv)
203 { 231 {
204 ev_timer_set (&ev->to, tv_get (tv), 0.); 232 ev->to.repeat = ev_tv_get (tv);
233 ev_timer_again (EV_A_ &ev->to);
234 ev->ev_flags |= EVLIST_TIMEOUT;
235 }
236 else
237 {
205 ev_timer_start (EV_A_ &ev->to); 238 ev_timer_stop (EV_A_ &ev->to);
239 ev->ev_flags &= ~EVLIST_TIMEOUT;
206 } 240 }
241
242 ev->ev_flags |= EVLIST_ACTIVE;
207 243
208 return 0; 244 return 0;
209} 245}
210 246
211int event_del (struct event *ev) 247int event_del (struct event *ev)
212{ 248{
213 dLOOPev; 249 dLOOPev;
214 250
215 if (ev->ev_events & EV_SIGNAL) 251 if (ev->ev_events & EV_SIGNAL)
216 {
217 /* sig */
218 if (ev_is_active (&ev->iosig.sig))
219 ev_signal_stop (EV_A_ &ev->iosig.sig); 252 ev_signal_stop (EV_A_ &ev->iosig.sig);
220 } 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
221 else
222 {
223 /* io */
224 if (ev_is_active (&ev->iosig.io))
225 ev_io_stop (EV_A_ &ev->iosig.io); 254 ev_io_stop (EV_A_ &ev->iosig.io);
226 }
227 255
228 if (ev_is_active (&ev->to)) 256 if (ev_is_active (&ev->to))
229 ev_timer_stop (EV_A_ &ev->to); 257 ev_timer_stop (EV_A_ &ev->to);
230 258
259 ev->ev_flags = EVLIST_INIT;
260
231 return 0; 261 return 0;
262}
263
264void event_active (struct event *ev, int res, short ncalls)
265{
266 dLOOPev;
267
268 if (res & EV_TIMEOUT)
269 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
270
271 if (res & EV_SIGNAL)
272 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
273
274 if (res & (EV_READ | EV_WRITE))
275 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
232} 276}
233 277
234int event_pending (struct event *ev, short events, struct timeval *tv) 278int event_pending (struct event *ev, short events, struct timeval *tv)
235{ 279{
280 short revents = 0;
236 dLOOPev; 281 dLOOPev;
237 282
238 short revents = 0;
239
240 if (ev->ev_events & EV_SIGNAL) 283 if (ev->ev_events & EV_SIGNAL)
241 { 284 {
242 /* sig */ 285 /* sig */
243 if (ev->iosig.sig.pending) 286 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
244 revents |= EV_SIGNAL; 287 revents |= EV_SIGNAL;
245 } 288 }
246 else 289 else if (ev->ev_events & (EV_READ | EV_WRITE))
247 { 290 {
248 /* io */ 291 /* io */
249 if (ev->iosig.io.pending) 292 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
250 revents |= ev->ev_events & (EV_READ | EV_WRITE); 293 revents |= ev->ev_events & (EV_READ | EV_WRITE);
251 } 294 }
252 295
253 if (ev->to.pending) 296 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
254 { 297 {
255 revents |= EV_TIMEOUT; 298 revents |= EV_TIMEOUT;
256 299
257 if (tv) 300 if (tv)
258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 301 {
302 ev_tstamp at = ev_now (EV_A);
303
304 tv->tv_sec = (long)at;
305 tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
306 }
259 } 307 }
260 308
261 return events & revents; 309 return events & revents;
262} 310}
263 311
264int event_priority_init (int npri) 312int event_priority_init (int npri)
265{ 313{
266 return event_base_priority_init (x_cur, npri); 314 return event_base_priority_init (ev_x_cur, npri);
267} 315}
268 316
269int event_priority_set (struct event *ev, int pri) 317int event_priority_set (struct event *ev, int pri)
270{ 318{
271 ev->ev_pri = pri; 319 ev->ev_pri = pri;
… …
282 330
283int event_base_loop (struct event_base *base, int flags) 331int event_base_loop (struct event_base *base, int flags)
284{ 332{
285 dLOOPbase; 333 dLOOPbase;
286 334
287 ev_loop (EV_A_ flags); 335 ev_run (EV_A_ flags);
288 336
289 return 0; 337 return 0;
290} 338}
291 339
292int event_base_dispatch (struct event_base *base) 340int event_base_dispatch (struct event_base *base)
293{ 341{
294 return event_base_loop (base, 0); 342 return event_base_loop (base, 0);
295} 343}
296 344
297static void 345static void
298x_loopexit_cb (int revents, void *base) 346ev_x_loopexit_cb (int revents, void *base)
299{ 347{
300 dLOOPbase; 348 dLOOPbase;
301 349
302 ev_unloop (EV_A_ EVUNLOOP_ONCE); 350 ev_break (EV_A_ EVBREAK_ONE);
303} 351}
304 352
305int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
306{ 354{
355 ev_tstamp after = ev_tv_get (tv);
307 dLOOPbase; 356 dLOOPbase;
308 ev_tstamp after = tv_get (tv);
309 357
310 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 358 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., ev_x_loopexit_cb, (void *)base);
311 359
312 return -1; 360 return 0;
313} 361}
314 362
315struct x_once 363struct ev_x_once
316{ 364{
317 int fd; 365 int fd;
318 void (*cb)(int, short, void *); 366 void (*cb)(int, short, void *);
319 void *arg; 367 void *arg;
320}; 368};
321 369
322static void 370static void
323x_once_cb (int revents, void *arg) 371ev_x_once_cb (int revents, void *arg)
324{ 372{
325 struct x_once *once = arg; 373 struct ev_x_once *once = (struct ev_x_once *)arg;
326 374
327 once->cb (once->fd, revents, once->arg); 375 once->cb (once->fd, (short)revents, once->arg);
328 free (once); 376 free (once);
329} 377}
330 378
331int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 379int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
332{ 380{
381 struct ev_x_once *once = (struct ev_x_once *)malloc (sizeof (struct ev_x_once));
333 dLOOPbase; 382 dLOOPbase;
334 struct x_once *once = malloc (sizeof (struct x_once));
335 383
336 if (!once) 384 if (!once)
337 return -1; 385 return -1;
338 386
339 once->fd = fd; 387 once->fd = fd;
340 once->cb = cb; 388 once->cb = cb;
341 once->arg = arg; 389 once->arg = arg;
342 390
343 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 391 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), ev_tv_get (tv), ev_x_once_cb, (void *)once);
344 392
345 return 0; 393 return 0;
346} 394}
347 395
348int event_base_priority_init (struct event_base *base, int npri) 396int event_base_priority_init (struct event_base *base, int npri)
349{ 397{
350 dLOOPbase; 398 /*dLOOPbase;*/
351 399
352 return 0; 400 return 0;
353} 401}
354 402

Diff Legend

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