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

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

Diff Legend

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