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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
53# endif 105# endif
54 106
55#endif 107#endif
56 108
57#include <math.h> 109#include <math.h>
58#include <stdlib.h> 110#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 111#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 112#include <stddef.h>
63 113
64#include <stdio.h> 114#include <stdio.h>
65 115
66#include <assert.h> 116#include <assert.h>
67#include <errno.h> 117#include <errno.h>
68#include <sys/types.h> 118#include <sys/types.h>
119#include <time.h>
120
121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
69#ifndef WIN32 129#ifndef _WIN32
130# include <sys/time.h>
70# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
133#else
134# define WIN32_LEAN_AND_MEAN
135# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1
71#endif 138# endif
72#include <sys/time.h> 139#endif
73#include <time.h>
74 140
75/**/ 141/**/
76 142
77#ifndef EV_USE_MONOTONIC 143#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 144# define EV_USE_MONOTONIC 0
145#endif
146
147#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0
79#endif 149#endif
80 150
81#ifndef EV_USE_SELECT 151#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 152# define EV_USE_SELECT 1
83#endif 153#endif
84 154
85#ifndef EV_USE_POLL 155#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 156# ifdef _WIN32
157# define EV_USE_POLL 0
158# else
159# define EV_USE_POLL 1
160# endif
87#endif 161#endif
88 162
89#ifndef EV_USE_EPOLL 163#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 164# define EV_USE_EPOLL 0
91#endif 165#endif
92 166
93#ifndef EV_USE_KQUEUE 167#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 168# define EV_USE_KQUEUE 0
95#endif 169#endif
96 170
171#ifndef EV_USE_PORT
172# define EV_USE_PORT 0
173#endif
174
97#ifndef EV_USE_WIN32 175#ifndef EV_USE_INOTIFY
98# ifdef WIN32 176# define EV_USE_INOTIFY 0
99# define EV_USE_WIN32 1 177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
100# else 182# else
101# define EV_USE_WIN32 0 183# define EV_PID_HASHSIZE 16
102# endif 184# endif
103#endif 185#endif
104 186
105#ifndef EV_USE_REALTIME 187#ifndef EV_INOTIFY_HASHSIZE
106# define EV_USE_REALTIME 1 188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
107#endif 193#endif
108 194
109/**/ 195/**/
110 196
111#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
119#endif 205#endif
120 206
207#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
121/**/ 219/**/
122 220
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127
128#include "ev.h"
129 224
130#if __GNUC__ >= 3 225#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
132# define inline inline 229# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
133#else 235#else
134# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
135# define inline static 238# define inline_size static
239# define noinline
136#endif 240#endif
137 241
138#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
139#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
140 244
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
144typedef struct ev_watcher *W; 251typedef ev_watcher *W;
145typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
147 254
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 256
150#if WIN32 257#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 258# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 259#endif
155 260
156/*****************************************************************************/ 261/*****************************************************************************/
157 262
263static void (*syserr_cb)(const char *msg);
264
265void
266ev_set_syserr_cb (void (*cb)(const char *msg))
267{
268 syserr_cb = cb;
269}
270
271static void noinline
272syserr (const char *msg)
273{
274 if (!msg)
275 msg = "(libev) system error";
276
277 if (syserr_cb)
278 syserr_cb (msg);
279 else
280 {
281 perror (msg);
282 abort ();
283 }
284}
285
286static void *(*alloc)(void *ptr, size_t size) = realloc;
287
288void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size))
290{
291 alloc = cb;
292}
293
294inline_speed void *
295ev_realloc (void *ptr, size_t size)
296{
297 ptr = alloc (ptr, size);
298
299 if (!ptr && size)
300 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
302 abort ();
303 }
304
305 return ptr;
306}
307
308#define ev_malloc(size) ev_realloc (0, (size))
309#define ev_free(ptr) ev_realloc ((ptr), 0)
310
311/*****************************************************************************/
312
158typedef struct 313typedef struct
159{ 314{
160 struct ev_watcher_list *head; 315 WL head;
161 unsigned char events; 316 unsigned char events;
162 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
163} ANFD; 321} ANFD;
164 322
165typedef struct 323typedef struct
166{ 324{
167 W w; 325 W w;
168 int events; 326 int events;
169} ANPENDING; 327} ANPENDING;
170 328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
335
171#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
172 337
173struct ev_loop 338 struct ev_loop
174{ 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
175# define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
176# include "ev_vars.h" 343 #include "ev_vars.h"
177};
178# undef VAR 344 #undef VAR
345 };
179# include "ev_wrap.h" 346 #include "ev_wrap.h"
347
348 static struct ev_loop default_loop_struct;
349 struct ev_loop *ev_default_loop_ptr;
180 350
181#else 351#else
182 352
353 ev_tstamp ev_rt_now;
183# define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
184# include "ev_vars.h" 355 #include "ev_vars.h"
185# undef VAR 356 #undef VAR
357
358 static int ev_default_loop_ptr;
186 359
187#endif 360#endif
188 361
189/*****************************************************************************/ 362/*****************************************************************************/
190 363
191inline ev_tstamp 364ev_tstamp
192ev_time (void) 365ev_time (void)
193{ 366{
194#if EV_USE_REALTIME 367#if EV_USE_REALTIME
195 struct timespec ts; 368 struct timespec ts;
196 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
200 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
201 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
202#endif 375#endif
203} 376}
204 377
205inline ev_tstamp 378ev_tstamp inline_size
206get_clock (void) 379get_clock (void)
207{ 380{
208#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
209 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
210 { 383 {
215#endif 388#endif
216 389
217 return ev_time (); 390 return ev_time ();
218} 391}
219 392
393#if EV_MULTIPLICITY
220ev_tstamp 394ev_tstamp
221ev_now (EV_P) 395ev_now (EV_P)
222{ 396{
223 return rt_now; 397 return ev_rt_now;
224} 398}
399#endif
225 400
226#define array_roundsize(base,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
227 402
228#define array_needsize(base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
230 { \ 405 { \
231 int newcnt = cur; \ 406 int newcnt = cur; \
232 do \ 407 do \
233 { \ 408 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 409 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 410 } \
236 while ((cnt) > newcnt); \ 411 while ((cnt) > newcnt); \
237 \ 412 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 414 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 415 cur = newcnt; \
241 } 416 }
242 417
243#define array_slim(stem) \ 418#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 420 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 421 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 424 }
250 425
251#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 428
254/*****************************************************************************/ 429/*****************************************************************************/
255 430
256static void 431void noinline
432ev_feed_event (EV_P_ void *w, int revents)
433{
434 W w_ = (W)w;
435
436 if (expect_false (w_->pending))
437 {
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
439 return;
440 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446}
447
448void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type)
450{
451 int i;
452
453 for (i = 0; i < eventcnt; ++i)
454 ev_feed_event (EV_A_ events [i], type);
455}
456
457/*****************************************************************************/
458
459void inline_size
257anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
258{ 461{
259 while (count--) 462 while (count--)
260 { 463 {
261 base->head = 0; 464 base->head = 0;
264 467
265 ++base; 468 ++base;
266 } 469 }
267} 470}
268 471
269static void 472void inline_speed
270event (EV_P_ W w, int events)
271{
272 if (w->pending)
273 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events;
275 return;
276 }
277
278 w->pending = ++pendingcnt [ABSPRI (w)];
279 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
280 pendings [ABSPRI (w)][w->pending - 1].w = w;
281 pendings [ABSPRI (w)][w->pending - 1].events = events;
282}
283
284static void
285queue_events (EV_P_ W *events, int eventcnt, int type)
286{
287 int i;
288
289 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type);
291}
292
293static void
294fd_event (EV_P_ int fd, int events) 473fd_event (EV_P_ int fd, int revents)
295{ 474{
296 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 476 ev_io *w;
298 477
299 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 478 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
300 { 479 {
301 int ev = w->events & events; 480 int ev = w->events & revents;
302 481
303 if (ev) 482 if (ev)
304 event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
305 } 484 }
306} 485}
307 486
308/*****************************************************************************/ 487void
488ev_feed_fd_event (EV_P_ int fd, int revents)
489{
490 fd_event (EV_A_ fd, revents);
491}
309 492
310static void 493void inline_size
311fd_reify (EV_P) 494fd_reify (EV_P)
312{ 495{
313 int i; 496 int i;
314 497
315 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
316 { 499 {
317 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
318 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
319 struct ev_io *w; 502 ev_io *w;
320 503
321 int events = 0; 504 int events = 0;
322 505
323 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
324 events |= w->events; 507 events |= w->events;
325 508
509#if EV_SELECT_IS_WINSOCKET
510 if (events)
511 {
512 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 }
516#endif
517
326 anfd->reify = 0; 518 anfd->reify = 0;
327 519
328 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
329 anfd->events = events; 521 anfd->events = events;
330 } 522 }
331 523
332 fdchangecnt = 0; 524 fdchangecnt = 0;
333} 525}
334 526
335static void 527void inline_size
336fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
337{ 529{
338 if (anfds [fd].reify || fdchangecnt < 0) 530 if (expect_false (anfds [fd].reify))
339 return; 531 return;
340 532
341 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
342 534
343 ++fdchangecnt; 535 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
345 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
346} 538}
347 539
348static void 540void inline_speed
349fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
350{ 542{
351 struct ev_io *w; 543 ev_io *w;
352 544
353 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
354 { 546 {
355 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 548 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 549 }
550}
551
552int inline_size
553fd_valid (int fd)
554{
555#ifdef _WIN32
556 return _get_osfhandle (fd) != -1;
557#else
558 return fcntl (fd, F_GETFD) != -1;
559#endif
358} 560}
359 561
360/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
361static void 563static void noinline
362fd_ebadf (EV_P) 564fd_ebadf (EV_P)
363{ 565{
364 int fd; 566 int fd;
365 567
366 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 569 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
370} 572}
371 573
372/* called on ENOMEM in select/poll to kill some fds and retry */ 574/* called on ENOMEM in select/poll to kill some fds and retry */
373static void 575static void noinline
374fd_enomem (EV_P) 576fd_enomem (EV_P)
375{ 577{
376 int fd; 578 int fd;
377 579
378 for (fd = anfdmax; fd--; ) 580 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 581 if (anfds [fd].events)
380 { 582 {
381 close (fd);
382 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
383 return; 584 return;
384 } 585 }
385} 586}
386 587
387/* susually called after fork if method needs to re-arm all fds from scratch */ 588/* usually called after fork if backend needs to re-arm all fds from scratch */
388static void 589static void noinline
389fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
390{ 591{
391 int fd; 592 int fd;
392 593
393 /* this should be highly optimised to not do anything but set a flag */ 594 /* this should be highly optimised to not do anything but set a flag */
399 } 600 }
400} 601}
401 602
402/*****************************************************************************/ 603/*****************************************************************************/
403 604
404static void 605void inline_speed
405upheap (WT *heap, int k) 606upheap (WT *heap, int k)
406{ 607{
407 WT w = heap [k]; 608 WT w = heap [k];
408 609
409 while (k && heap [k >> 1]->at > w->at) 610 while (k && heap [k >> 1]->at > w->at)
416 heap [k] = w; 617 heap [k] = w;
417 ((W)heap [k])->active = k + 1; 618 ((W)heap [k])->active = k + 1;
418 619
419} 620}
420 621
421static void 622void inline_speed
422downheap (WT *heap, int N, int k) 623downheap (WT *heap, int N, int k)
423{ 624{
424 WT w = heap [k]; 625 WT w = heap [k];
425 626
426 while (k < (N >> 1)) 627 while (k < (N >> 1))
440 641
441 heap [k] = w; 642 heap [k] = w;
442 ((W)heap [k])->active = k + 1; 643 ((W)heap [k])->active = k + 1;
443} 644}
444 645
646void inline_size
647adjustheap (WT *heap, int N, int k)
648{
649 upheap (heap, k);
650 downheap (heap, N, k);
651}
652
445/*****************************************************************************/ 653/*****************************************************************************/
446 654
447typedef struct 655typedef struct
448{ 656{
449 struct ev_watcher_list *head; 657 WL head;
450 sig_atomic_t volatile gotsig; 658 sig_atomic_t volatile gotsig;
451} ANSIG; 659} ANSIG;
452 660
453static ANSIG *signals; 661static ANSIG *signals;
454static int signalmax; 662static int signalmax;
455 663
456static int sigpipe [2]; 664static int sigpipe [2];
457static sig_atomic_t volatile gotsig; 665static sig_atomic_t volatile gotsig;
458static struct ev_io sigev; 666static ev_io sigev;
459 667
460static void 668void inline_size
461signals_init (ANSIG *base, int count) 669signals_init (ANSIG *base, int count)
462{ 670{
463 while (count--) 671 while (count--)
464 { 672 {
465 base->head = 0; 673 base->head = 0;
470} 678}
471 679
472static void 680static void
473sighandler (int signum) 681sighandler (int signum)
474{ 682{
475#if WIN32 683#if _WIN32
476 signal (signum, sighandler); 684 signal (signum, sighandler);
477#endif 685#endif
478 686
479 signals [signum - 1].gotsig = 1; 687 signals [signum - 1].gotsig = 1;
480 688
485 write (sigpipe [1], &signum, 1); 693 write (sigpipe [1], &signum, 1);
486 errno = old_errno; 694 errno = old_errno;
487 } 695 }
488} 696}
489 697
698void noinline
699ev_feed_signal_event (EV_P_ int signum)
700{
701 WL w;
702
703#if EV_MULTIPLICITY
704 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
705#endif
706
707 --signum;
708
709 if (signum < 0 || signum >= signalmax)
710 return;
711
712 signals [signum].gotsig = 0;
713
714 for (w = signals [signum].head; w; w = w->next)
715 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
716}
717
490static void 718static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 719sigcb (EV_P_ ev_io *iow, int revents)
492{ 720{
493 struct ev_watcher_list *w;
494 int signum; 721 int signum;
495 722
496 read (sigpipe [0], &revents, 1); 723 read (sigpipe [0], &revents, 1);
497 gotsig = 0; 724 gotsig = 0;
498 725
499 for (signum = signalmax; signum--; ) 726 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 727 if (signals [signum].gotsig)
501 { 728 ev_feed_signal_event (EV_A_ signum + 1);
502 signals [signum].gotsig = 0;
503
504 for (w = signals [signum].head; w; w = w->next)
505 event (EV_A_ (W)w, EV_SIGNAL);
506 }
507} 729}
508 730
509static void 731void inline_size
732fd_intern (int fd)
733{
734#ifdef _WIN32
735 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
737#else
738 fcntl (fd, F_SETFD, FD_CLOEXEC);
739 fcntl (fd, F_SETFL, O_NONBLOCK);
740#endif
741}
742
743static void noinline
510siginit (EV_P) 744siginit (EV_P)
511{ 745{
512#ifndef WIN32 746 fd_intern (sigpipe [0]);
513 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 747 fd_intern (sigpipe [1]);
514 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
515
516 /* rather than sort out wether we really need nb, set it */
517 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
518 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
519#endif
520 748
521 ev_io_set (&sigev, sigpipe [0], EV_READ); 749 ev_io_set (&sigev, sigpipe [0], EV_READ);
522 ev_io_start (EV_A_ &sigev); 750 ev_io_start (EV_A_ &sigev);
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 752}
525 753
526/*****************************************************************************/ 754/*****************************************************************************/
527 755
756static ev_child *childs [EV_PID_HASHSIZE];
757
528#ifndef WIN32 758#ifndef _WIN32
529 759
530static struct ev_child *childs [PID_HASHSIZE];
531static struct ev_signal childev; 760static ev_signal childev;
532 761
533#ifndef WCONTINUED 762void inline_speed
534# define WCONTINUED 0
535#endif
536
537static void
538child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
539{ 764{
540 struct ev_child *w; 765 ev_child *w;
541 766
542 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
543 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
544 { 769 {
545 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
546 w->rpid = pid; 771 w->rpid = pid;
547 w->rstatus = status; 772 w->rstatus = status;
548 event (EV_A_ (W)w, EV_CHILD); 773 ev_feed_event (EV_A_ (W)w, EV_CHILD);
549 } 774 }
550} 775}
551 776
777#ifndef WCONTINUED
778# define WCONTINUED 0
779#endif
780
552static void 781static void
553childcb (EV_P_ struct ev_signal *sw, int revents) 782childcb (EV_P_ ev_signal *sw, int revents)
554{ 783{
555 int pid, status; 784 int pid, status;
556 785
786 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
557 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 787 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
558 { 788 if (!WCONTINUED
789 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return;
792
559 /* make sure we are called again until all childs have been reaped */ 793 /* make sure we are called again until all childs have been reaped */
794 /* we need to do it this way so that the callback gets called before we continue */
560 event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
561 796
562 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
563 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 799 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
564 }
565} 800}
566 801
567#endif 802#endif
568 803
569/*****************************************************************************/ 804/*****************************************************************************/
570 805
806#if EV_USE_PORT
807# include "ev_port.c"
808#endif
571#if EV_USE_KQUEUE 809#if EV_USE_KQUEUE
572# include "ev_kqueue.c" 810# include "ev_kqueue.c"
573#endif 811#endif
574#if EV_USE_EPOLL 812#if EV_USE_EPOLL
575# include "ev_epoll.c" 813# include "ev_epoll.c"
592{ 830{
593 return EV_VERSION_MINOR; 831 return EV_VERSION_MINOR;
594} 832}
595 833
596/* return true if we are running with elevated privileges and should ignore env variables */ 834/* return true if we are running with elevated privileges and should ignore env variables */
597static int 835int inline_size
598enable_secure (void) 836enable_secure (void)
599{ 837{
600#ifdef WIN32 838#ifdef _WIN32
601 return 0; 839 return 0;
602#else 840#else
603 return getuid () != geteuid () 841 return getuid () != geteuid ()
604 || getgid () != getegid (); 842 || getgid () != getegid ();
605#endif 843#endif
606} 844}
607 845
608int 846unsigned int
609ev_method (EV_P) 847ev_supported_backends (void)
610{ 848{
611 return method; 849 unsigned int flags = 0;
612}
613 850
614static void 851 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
615loop_init (EV_P_ int methods) 852 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
853 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
854 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
855 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
856
857 return flags;
858}
859
860unsigned int
861ev_recommended_backends (void)
616{ 862{
617 if (!method) 863 unsigned int flags = ev_supported_backends ();
864
865#ifndef __NetBSD__
866 /* kqueue is borked on everything but netbsd apparently */
867 /* it usually doesn't work correctly on anything but sockets and pipes */
868 flags &= ~EVBACKEND_KQUEUE;
869#endif
870#ifdef __APPLE__
871 // flags &= ~EVBACKEND_KQUEUE; for documentation
872 flags &= ~EVBACKEND_POLL;
873#endif
874
875 return flags;
876}
877
878unsigned int
879ev_embeddable_backends (void)
880{
881 return EVBACKEND_EPOLL
882 | EVBACKEND_KQUEUE
883 | EVBACKEND_PORT;
884}
885
886unsigned int
887ev_backend (EV_P)
888{
889 return backend;
890}
891
892static void noinline
893loop_init (EV_P_ unsigned int flags)
894{
895 if (!backend)
618 { 896 {
619#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
620 { 898 {
621 struct timespec ts; 899 struct timespec ts;
622 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 900 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
623 have_monotonic = 1; 901 have_monotonic = 1;
624 } 902 }
625#endif 903#endif
626 904
627 rt_now = ev_time (); 905 ev_rt_now = ev_time ();
628 mn_now = get_clock (); 906 mn_now = get_clock ();
629 now_floor = mn_now; 907 now_floor = mn_now;
630 rtmn_diff = rt_now - mn_now; 908 rtmn_diff = ev_rt_now - mn_now;
631 909
632 if (methods == EVMETHOD_AUTO) 910 if (!(flags & EVFLAG_NOENV)
633 if (!enable_secure () && getenv ("LIBEV_METHODS")) 911 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS"))
634 methods = atoi (getenv ("LIBEV_METHODS")); 913 flags = atoi (getenv ("LIBEV_FLAGS"));
635 else
636 methods = EVMETHOD_ANY;
637 914
638 method = 0; 915 if (!(flags & 0x0000ffffUL))
916 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
639#if EV_USE_WIN32 920#if EV_USE_INOTIFY
640 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 921 fs_fd = -2;
922#endif
923
924#if EV_USE_PORT
925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
641#endif 926#endif
642#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
643 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
644#endif 929#endif
645#if EV_USE_EPOLL 930#if EV_USE_EPOLL
646 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 931 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
647#endif 932#endif
648#if EV_USE_POLL 933#if EV_USE_POLL
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 934 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
650#endif 935#endif
651#if EV_USE_SELECT 936#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
653#endif 938#endif
654 }
655}
656 939
657void 940 ev_init (&sigev, sigcb);
941 ev_set_priority (&sigev, EV_MAXPRI);
942 }
943}
944
945static void noinline
658loop_destroy (EV_P) 946loop_destroy (EV_P)
659{ 947{
660 int i; 948 int i;
661 949
662#if EV_USE_WIN32 950#if EV_USE_INOTIFY
663 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 951 if (fs_fd >= 0)
952 close (fs_fd);
953#endif
954
955 if (backend_fd >= 0)
956 close (backend_fd);
957
958#if EV_USE_PORT
959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
664#endif 960#endif
665#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
666 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 962 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
667#endif 963#endif
668#if EV_USE_EPOLL 964#if EV_USE_EPOLL
669 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 965 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
670#endif 966#endif
671#if EV_USE_POLL 967#if EV_USE_POLL
672 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 968 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
673#endif 969#endif
674#if EV_USE_SELECT 970#if EV_USE_SELECT
675 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
676#endif 972#endif
677 973
678 for (i = NUMPRI; i--; ) 974 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 975 array_free (pending, [i]);
680 976
977 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 978 array_free (fdchange, EMPTY0);
682 array_free (timer, ); 979 array_free (timer, EMPTY0);
980#if EV_PERIODIC_ENABLE
683 array_free (periodic, ); 981 array_free (periodic, EMPTY0);
982#endif
684 array_free (idle, ); 983 array_free (idle, EMPTY0);
685 array_free (prepare, ); 984 array_free (prepare, EMPTY0);
686 array_free (check, ); 985 array_free (check, EMPTY0);
687 986
688 method = 0; 987 backend = 0;
689 /*TODO*/
690} 988}
691 989
692void 990void inline_size
693loop_fork (EV_P) 991loop_fork (EV_P)
694{ 992{
695 /*TODO*/ 993#if EV_USE_PORT
994 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
995#endif
996#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif
696#if EV_USE_EPOLL 999#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
698#endif 1001#endif
699#if EV_USE_KQUEUE 1002
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1003 if (ev_is_active (&sigev))
701#endif 1004 {
1005 /* default loop */
1006
1007 ev_ref (EV_A);
1008 ev_io_stop (EV_A_ &sigev);
1009 close (sigpipe [0]);
1010 close (sigpipe [1]);
1011
1012 while (pipe (sigpipe))
1013 syserr ("(libev) error creating pipe");
1014
1015 siginit (EV_A);
1016 }
1017
1018 postfork = 0;
702} 1019}
703 1020
704#if EV_MULTIPLICITY 1021#if EV_MULTIPLICITY
705struct ev_loop * 1022struct ev_loop *
706ev_loop_new (int methods) 1023ev_loop_new (unsigned int flags)
707{ 1024{
708 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 1025 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
709 1026
1027 memset (loop, 0, sizeof (struct ev_loop));
1028
710 loop_init (EV_A_ methods); 1029 loop_init (EV_A_ flags);
711 1030
712 if (ev_method (EV_A)) 1031 if (ev_backend (EV_A))
713 return loop; 1032 return loop;
714 1033
715 return 0; 1034 return 0;
716} 1035}
717 1036
718void 1037void
719ev_loop_destroy (EV_P) 1038ev_loop_destroy (EV_P)
720{ 1039{
721 loop_destroy (EV_A); 1040 loop_destroy (EV_A);
722 free (loop); 1041 ev_free (loop);
723} 1042}
724 1043
725void 1044void
726ev_loop_fork (EV_P) 1045ev_loop_fork (EV_P)
727{ 1046{
728 loop_fork (EV_A); 1047 postfork = 1;
729} 1048}
730 1049
731#endif 1050#endif
732 1051
733#if EV_MULTIPLICITY 1052#if EV_MULTIPLICITY
734struct ev_loop default_loop_struct;
735static struct ev_loop *default_loop;
736
737struct ev_loop * 1053struct ev_loop *
1054ev_default_loop_init (unsigned int flags)
738#else 1055#else
739static int default_loop;
740
741int 1056int
1057ev_default_loop (unsigned int flags)
742#endif 1058#endif
743ev_default_loop (int methods)
744{ 1059{
745 if (sigpipe [0] == sigpipe [1]) 1060 if (sigpipe [0] == sigpipe [1])
746 if (pipe (sigpipe)) 1061 if (pipe (sigpipe))
747 return 0; 1062 return 0;
748 1063
749 if (!default_loop) 1064 if (!ev_default_loop_ptr)
750 { 1065 {
751#if EV_MULTIPLICITY 1066#if EV_MULTIPLICITY
752 struct ev_loop *loop = default_loop = &default_loop_struct; 1067 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
753#else 1068#else
754 default_loop = 1; 1069 ev_default_loop_ptr = 1;
755#endif 1070#endif
756 1071
757 loop_init (EV_A_ methods); 1072 loop_init (EV_A_ flags);
758 1073
759 if (ev_method (EV_A)) 1074 if (ev_backend (EV_A))
760 { 1075 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 1076 siginit (EV_A);
764 1077
765#ifndef WIN32 1078#ifndef _WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 1079 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 1080 ev_set_priority (&childev, EV_MAXPRI);
768 ev_signal_start (EV_A_ &childev); 1081 ev_signal_start (EV_A_ &childev);
769 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1082 ev_unref (EV_A); /* child watcher should not keep loop alive */
770#endif 1083#endif
771 } 1084 }
772 else 1085 else
773 default_loop = 0; 1086 ev_default_loop_ptr = 0;
774 } 1087 }
775 1088
776 return default_loop; 1089 return ev_default_loop_ptr;
777} 1090}
778 1091
779void 1092void
780ev_default_destroy (void) 1093ev_default_destroy (void)
781{ 1094{
782#if EV_MULTIPLICITY 1095#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 1096 struct ev_loop *loop = ev_default_loop_ptr;
784#endif 1097#endif
785 1098
1099#ifndef _WIN32
786 ev_ref (EV_A); /* child watcher */ 1100 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 1101 ev_signal_stop (EV_A_ &childev);
1102#endif
788 1103
789 ev_ref (EV_A); /* signal watcher */ 1104 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 1105 ev_io_stop (EV_A_ &sigev);
791 1106
792 close (sigpipe [0]); sigpipe [0] = 0; 1107 close (sigpipe [0]); sigpipe [0] = 0;
797 1112
798void 1113void
799ev_default_fork (void) 1114ev_default_fork (void)
800{ 1115{
801#if EV_MULTIPLICITY 1116#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 1117 struct ev_loop *loop = ev_default_loop_ptr;
803#endif 1118#endif
804 1119
805 loop_fork (EV_A); 1120 if (backend)
806 1121 postfork = 1;
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810 pipe (sigpipe);
811
812 ev_ref (EV_A); /* signal watcher */
813 siginit (EV_A);
814} 1122}
815 1123
816/*****************************************************************************/ 1124/*****************************************************************************/
817 1125
818static void 1126int inline_size
1127any_pending (EV_P)
1128{
1129 int pri;
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136}
1137
1138void inline_speed
819call_pending (EV_P) 1139call_pending (EV_P)
820{ 1140{
821 int pri; 1141 int pri;
822 1142
823 for (pri = NUMPRI; pri--; ) 1143 for (pri = NUMPRI; pri--; )
824 while (pendingcnt [pri]) 1144 while (pendingcnt [pri])
825 { 1145 {
826 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1146 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
827 1147
828 if (p->w) 1148 if (expect_true (p->w))
829 { 1149 {
1150 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1151
830 p->w->pending = 0; 1152 p->w->pending = 0;
831 p->w->cb (EV_A_ p->w, p->events); 1153 EV_CB_INVOKE (p->w, p->events);
832 } 1154 }
833 } 1155 }
834} 1156}
835 1157
836static void 1158void inline_size
837timers_reify (EV_P) 1159timers_reify (EV_P)
838{ 1160{
839 while (timercnt && ((WT)timers [0])->at <= mn_now) 1161 while (timercnt && ((WT)timers [0])->at <= mn_now)
840 { 1162 {
841 struct ev_timer *w = timers [0]; 1163 ev_timer *w = timers [0];
842 1164
843 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
844 1166
845 /* first reschedule or stop timer */ 1167 /* first reschedule or stop timer */
846 if (w->repeat) 1168 if (w->repeat)
847 { 1169 {
848 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1170 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1171
849 ((WT)w)->at = mn_now + w->repeat; 1172 ((WT)w)->at += w->repeat;
1173 if (((WT)w)->at < mn_now)
1174 ((WT)w)->at = mn_now;
1175
850 downheap ((WT *)timers, timercnt, 0); 1176 downheap ((WT *)timers, timercnt, 0);
851 } 1177 }
852 else 1178 else
853 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1179 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
854 1180
855 event (EV_A_ (W)w, EV_TIMEOUT); 1181 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
856 } 1182 }
857} 1183}
858 1184
859static void 1185#if EV_PERIODIC_ENABLE
1186void inline_size
860periodics_reify (EV_P) 1187periodics_reify (EV_P)
861{ 1188{
862 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
863 { 1190 {
864 struct ev_periodic *w = periodics [0]; 1191 ev_periodic *w = periodics [0];
865 1192
866 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
867 1194
868 /* first reschedule or stop timer */ 1195 /* first reschedule or stop timer */
869 if (w->interval) 1196 if (w->reschedule_cb)
870 { 1197 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0);
1201 }
1202 else if (w->interval)
1203 {
871 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
872 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
873 downheap ((WT *)periodics, periodiccnt, 0); 1206 downheap ((WT *)periodics, periodiccnt, 0);
874 } 1207 }
875 else 1208 else
876 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
877 1210
878 event (EV_A_ (W)w, EV_PERIODIC); 1211 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
879 } 1212 }
880} 1213}
881 1214
882static void 1215static void noinline
883periodics_reschedule (EV_P) 1216periodics_reschedule (EV_P)
884{ 1217{
885 int i; 1218 int i;
886 1219
887 /* adjust periodics after time jump */ 1220 /* adjust periodics after time jump */
888 for (i = 0; i < periodiccnt; ++i) 1221 for (i = 0; i < periodiccnt; ++i)
889 { 1222 {
890 struct ev_periodic *w = periodics [i]; 1223 ev_periodic *w = periodics [i];
891 1224
1225 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
892 if (w->interval) 1227 else if (w->interval)
893 {
894 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
895
896 if (fabs (diff) >= 1e-4)
897 {
898 ev_periodic_stop (EV_A_ w);
899 ev_periodic_start (EV_A_ w);
900
901 i = 0; /* restart loop, inefficient, but time jumps should be rare */
902 }
903 }
904 } 1229 }
905}
906 1230
907inline int 1231 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i);
1234}
1235#endif
1236
1237int inline_size
908time_update_monotonic (EV_P) 1238time_update_monotonic (EV_P)
909{ 1239{
910 mn_now = get_clock (); 1240 mn_now = get_clock ();
911 1241
912 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
913 { 1243 {
914 rt_now = rtmn_diff + mn_now; 1244 ev_rt_now = rtmn_diff + mn_now;
915 return 0; 1245 return 0;
916 } 1246 }
917 else 1247 else
918 { 1248 {
919 now_floor = mn_now; 1249 now_floor = mn_now;
920 rt_now = ev_time (); 1250 ev_rt_now = ev_time ();
921 return 1; 1251 return 1;
922 } 1252 }
923} 1253}
924 1254
925static void 1255void inline_size
926time_update (EV_P) 1256time_update (EV_P)
927{ 1257{
928 int i; 1258 int i;
929 1259
930#if EV_USE_MONOTONIC 1260#if EV_USE_MONOTONIC
932 { 1262 {
933 if (time_update_monotonic (EV_A)) 1263 if (time_update_monotonic (EV_A))
934 { 1264 {
935 ev_tstamp odiff = rtmn_diff; 1265 ev_tstamp odiff = rtmn_diff;
936 1266
937 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
938 { 1276 {
939 rtmn_diff = rt_now - mn_now; 1277 rtmn_diff = ev_rt_now - mn_now;
940 1278
941 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
942 return; /* all is well */ 1280 return; /* all is well */
943 1281
944 rt_now = ev_time (); 1282 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1283 mn_now = get_clock ();
946 now_floor = mn_now; 1284 now_floor = mn_now;
947 } 1285 }
948 1286
1287# if EV_PERIODIC_ENABLE
949 periodics_reschedule (EV_A); 1288 periodics_reschedule (EV_A);
1289# endif
950 /* no timer adjustment, as the monotonic clock doesn't jump */ 1290 /* no timer adjustment, as the monotonic clock doesn't jump */
951 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
952 } 1292 }
953 } 1293 }
954 else 1294 else
955#endif 1295#endif
956 { 1296 {
957 rt_now = ev_time (); 1297 ev_rt_now = ev_time ();
958 1298
959 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1299 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
960 { 1300 {
1301#if EV_PERIODIC_ENABLE
961 periodics_reschedule (EV_A); 1302 periodics_reschedule (EV_A);
1303#endif
962 1304
963 /* adjust timers. this is easy, as the offset is the same for all */ 1305 /* adjust timers. this is easy, as the offset is the same for all */
964 for (i = 0; i < timercnt; ++i) 1306 for (i = 0; i < timercnt; ++i)
965 ((WT)timers [i])->at += rt_now - mn_now; 1307 ((WT)timers [i])->at += ev_rt_now - mn_now;
966 } 1308 }
967 1309
968 mn_now = rt_now; 1310 mn_now = ev_rt_now;
969 } 1311 }
970} 1312}
971 1313
972void 1314void
973ev_ref (EV_P) 1315ev_ref (EV_P)
984static int loop_done; 1326static int loop_done;
985 1327
986void 1328void
987ev_loop (EV_P_ int flags) 1329ev_loop (EV_P_ int flags)
988{ 1330{
989 double block;
990 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL;
991 1334
992 do 1335 while (activecnt)
993 { 1336 {
1337 /* we might have forked, so reify kernel state if necessary */
1338 #if EV_FORK_ENABLE
1339 if (expect_false (postfork))
1340 if (forkcnt)
1341 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A);
1344 }
1345 #endif
1346
994 /* queue check watchers (and execute them) */ 1347 /* queue check watchers (and execute them) */
995 if (expect_false (preparecnt)) 1348 if (expect_false (preparecnt))
996 { 1349 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1351 call_pending (EV_A);
999 } 1352 }
1000 1353
1354 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork))
1356 loop_fork (EV_A);
1357
1001 /* update fd-related kernel structures */ 1358 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1359 fd_reify (EV_A);
1003 1360
1004 /* calculate blocking time */ 1361 /* calculate blocking time */
1362 {
1363 double block;
1005 1364
1006 /* we only need this for !monotonic clockor timers, but as we basically 1365 if (flags & EVLOOP_NONBLOCK || idlecnt)
1007 always have timers, we just calculate it always */ 1366 block = 0.; /* do not block at all */
1367 else
1368 {
1369 /* update time to cancel out callback processing overhead */
1008#if EV_USE_MONOTONIC 1370#if EV_USE_MONOTONIC
1009 if (expect_true (have_monotonic)) 1371 if (expect_true (have_monotonic))
1010 time_update_monotonic (EV_A); 1372 time_update_monotonic (EV_A);
1011 else 1373 else
1012#endif 1374#endif
1013 { 1375 {
1014 rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1015 mn_now = rt_now; 1377 mn_now = ev_rt_now;
1016 } 1378 }
1017 1379
1018 if (flags & EVLOOP_NONBLOCK || idlecnt)
1019 block = 0.;
1020 else
1021 {
1022 block = MAX_BLOCKTIME; 1380 block = MAX_BLOCKTIME;
1023 1381
1024 if (timercnt) 1382 if (timercnt)
1025 { 1383 {
1026 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1384 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1027 if (block > to) block = to; 1385 if (block > to) block = to;
1028 } 1386 }
1029 1387
1388#if EV_PERIODIC_ENABLE
1030 if (periodiccnt) 1389 if (periodiccnt)
1031 { 1390 {
1032 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1391 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1033 if (block > to) block = to; 1392 if (block > to) block = to;
1034 } 1393 }
1394#endif
1035 1395
1036 if (block < 0.) block = 0.; 1396 if (expect_false (block < 0.)) block = 0.;
1037 } 1397 }
1038 1398
1039 method_poll (EV_A_ block); 1399 backend_poll (EV_A_ block);
1400 }
1040 1401
1041 /* update rt_now, do magic */ 1402 /* update ev_rt_now, do magic */
1042 time_update (EV_A); 1403 time_update (EV_A);
1043 1404
1044 /* queue pending timers and reschedule them */ 1405 /* queue pending timers and reschedule them */
1045 timers_reify (EV_A); /* relative timers called last */ 1406 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE
1046 periodics_reify (EV_A); /* absolute timers called first */ 1408 periodics_reify (EV_A); /* absolute timers called first */
1409#endif
1047 1410
1048 /* queue idle watchers unless io or timers are pending */ 1411 /* queue idle watchers unless other events are pending */
1049 if (!pendingcnt) 1412 if (idlecnt && !any_pending (EV_A))
1050 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1051 1414
1052 /* queue check watchers, to be executed first */ 1415 /* queue check watchers, to be executed first */
1053 if (checkcnt) 1416 if (expect_false (checkcnt))
1054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1055 1418
1056 call_pending (EV_A); 1419 call_pending (EV_A);
1057 }
1058 while (activecnt && !loop_done);
1059 1420
1060 if (loop_done != 2) 1421 if (expect_false (loop_done))
1061 loop_done = 0; 1422 break;
1423 }
1424
1425 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL;
1062} 1427}
1063 1428
1064void 1429void
1065ev_unloop (EV_P_ int how) 1430ev_unloop (EV_P_ int how)
1066{ 1431{
1067 loop_done = how; 1432 loop_done = how;
1068} 1433}
1069 1434
1070/*****************************************************************************/ 1435/*****************************************************************************/
1071 1436
1072inline void 1437void inline_size
1073wlist_add (WL *head, WL elem) 1438wlist_add (WL *head, WL elem)
1074{ 1439{
1075 elem->next = *head; 1440 elem->next = *head;
1076 *head = elem; 1441 *head = elem;
1077} 1442}
1078 1443
1079inline void 1444void inline_size
1080wlist_del (WL *head, WL elem) 1445wlist_del (WL *head, WL elem)
1081{ 1446{
1082 while (*head) 1447 while (*head)
1083 { 1448 {
1084 if (*head == elem) 1449 if (*head == elem)
1089 1454
1090 head = &(*head)->next; 1455 head = &(*head)->next;
1091 } 1456 }
1092} 1457}
1093 1458
1094inline void 1459void inline_speed
1095ev_clear_pending (EV_P_ W w) 1460ev_clear_pending (EV_P_ W w)
1096{ 1461{
1097 if (w->pending) 1462 if (w->pending)
1098 { 1463 {
1099 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1464 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1100 w->pending = 0; 1465 w->pending = 0;
1101 } 1466 }
1102} 1467}
1103 1468
1104inline void 1469void inline_speed
1105ev_start (EV_P_ W w, int active) 1470ev_start (EV_P_ W w, int active)
1106{ 1471{
1107 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1108 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1109 1474
1110 w->active = active; 1475 w->active = active;
1111 ev_ref (EV_A); 1476 ev_ref (EV_A);
1112} 1477}
1113 1478
1114inline void 1479void inline_size
1115ev_stop (EV_P_ W w) 1480ev_stop (EV_P_ W w)
1116{ 1481{
1117 ev_unref (EV_A); 1482 ev_unref (EV_A);
1118 w->active = 0; 1483 w->active = 0;
1119} 1484}
1120 1485
1121/*****************************************************************************/ 1486/*****************************************************************************/
1122 1487
1123void 1488void
1124ev_io_start (EV_P_ struct ev_io *w) 1489ev_io_start (EV_P_ ev_io *w)
1125{ 1490{
1126 int fd = w->fd; 1491 int fd = w->fd;
1127 1492
1128 if (ev_is_active (w)) 1493 if (expect_false (ev_is_active (w)))
1129 return; 1494 return;
1130 1495
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1496 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1497
1133 ev_start (EV_A_ (W)w, 1); 1498 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1499 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1500 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1501
1137 fd_change (EV_A_ fd); 1502 fd_change (EV_A_ fd);
1138} 1503}
1139 1504
1140void 1505void
1141ev_io_stop (EV_P_ struct ev_io *w) 1506ev_io_stop (EV_P_ ev_io *w)
1142{ 1507{
1143 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1144 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1145 return; 1510 return;
1511
1512 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1146 1513
1147 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1514 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1148 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1149 1516
1150 fd_change (EV_A_ w->fd); 1517 fd_change (EV_A_ w->fd);
1151} 1518}
1152 1519
1153void 1520void
1154ev_timer_start (EV_P_ struct ev_timer *w) 1521ev_timer_start (EV_P_ ev_timer *w)
1155{ 1522{
1156 if (ev_is_active (w)) 1523 if (expect_false (ev_is_active (w)))
1157 return; 1524 return;
1158 1525
1159 ((WT)w)->at += mn_now; 1526 ((WT)w)->at += mn_now;
1160 1527
1161 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1528 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1162 1529
1163 ev_start (EV_A_ (W)w, ++timercnt); 1530 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1165 timers [timercnt - 1] = w; 1532 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1533 upheap ((WT *)timers, timercnt - 1);
1167 1534
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536}
1537
1538void
1539ev_timer_stop (EV_P_ ev_timer *w)
1540{
1541 ev_clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w)))
1543 return;
1544
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169}
1170 1546
1171void 1547 {
1172ev_timer_stop (EV_P_ struct ev_timer *w) 1548 int active = ((W)w)->active;
1173{
1174 ev_clear_pending (EV_A_ (W)w);
1175 if (!ev_is_active (w))
1176 return;
1177 1549
1178 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 if (expect_true (--active < --timercnt))
1179
1180 if (((W)w)->active < timercnt--)
1181 { 1551 {
1182 timers [((W)w)->active - 1] = timers [timercnt]; 1552 timers [active] = timers [timercnt];
1183 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1553 adjustheap ((WT *)timers, timercnt, active);
1184 } 1554 }
1555 }
1185 1556
1186 ((WT)w)->at = w->repeat; 1557 ((WT)w)->at -= mn_now;
1187 1558
1188 ev_stop (EV_A_ (W)w); 1559 ev_stop (EV_A_ (W)w);
1189} 1560}
1190 1561
1191void 1562void
1192ev_timer_again (EV_P_ struct ev_timer *w) 1563ev_timer_again (EV_P_ ev_timer *w)
1193{ 1564{
1194 if (ev_is_active (w)) 1565 if (ev_is_active (w))
1195 { 1566 {
1196 if (w->repeat) 1567 if (w->repeat)
1197 { 1568 {
1198 ((WT)w)->at = mn_now + w->repeat; 1569 ((WT)w)->at = mn_now + w->repeat;
1199 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1570 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1200 } 1571 }
1201 else 1572 else
1202 ev_timer_stop (EV_A_ w); 1573 ev_timer_stop (EV_A_ w);
1203 } 1574 }
1204 else if (w->repeat) 1575 else if (w->repeat)
1576 {
1577 w->at = w->repeat;
1205 ev_timer_start (EV_A_ w); 1578 ev_timer_start (EV_A_ w);
1579 }
1206} 1580}
1207 1581
1582#if EV_PERIODIC_ENABLE
1208void 1583void
1209ev_periodic_start (EV_P_ struct ev_periodic *w) 1584ev_periodic_start (EV_P_ ev_periodic *w)
1210{ 1585{
1211 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1212 return; 1587 return;
1213 1588
1589 if (w->reschedule_cb)
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval)
1592 {
1214 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1593 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1215
1216 /* this formula differs from the one in periodic_reify because we do not always round up */ 1594 /* this formula differs from the one in periodic_reify because we do not always round up */
1217 if (w->interval)
1218 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1595 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1596 }
1219 1597
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1598 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1222 periodics [periodiccnt - 1] = w; 1600 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1601 upheap ((WT *)periodics, periodiccnt - 1);
1224 1602
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604}
1605
1606void
1607ev_periodic_stop (EV_P_ ev_periodic *w)
1608{
1609 ev_clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w)))
1611 return;
1612
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226}
1227 1614
1228void 1615 {
1229ev_periodic_stop (EV_P_ struct ev_periodic *w) 1616 int active = ((W)w)->active;
1230{
1231 ev_clear_pending (EV_A_ (W)w);
1232 if (!ev_is_active (w))
1233 return;
1234 1617
1235 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 if (expect_true (--active < --periodiccnt))
1236
1237 if (((W)w)->active < periodiccnt--)
1238 { 1619 {
1239 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1620 periodics [active] = periodics [periodiccnt];
1240 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1621 adjustheap ((WT *)periodics, periodiccnt, active);
1241 } 1622 }
1623 }
1242 1624
1243 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1244} 1626}
1245 1627
1246void 1628void
1247ev_idle_start (EV_P_ struct ev_idle *w) 1629ev_periodic_again (EV_P_ ev_periodic *w)
1248{ 1630{
1249 if (ev_is_active (w)) 1631 /* TODO: use adjustheap and recalculation */
1250 return;
1251
1252 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, );
1254 idles [idlecnt - 1] = w;
1255}
1256
1257void
1258ev_idle_stop (EV_P_ struct ev_idle *w)
1259{
1260 ev_clear_pending (EV_A_ (W)w);
1261 if (ev_is_active (w))
1262 return;
1263
1264 idles [((W)w)->active - 1] = idles [--idlecnt];
1265 ev_stop (EV_A_ (W)w); 1632 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w);
1266} 1634}
1267 1635#endif
1268void
1269ev_prepare_start (EV_P_ struct ev_prepare *w)
1270{
1271 if (ev_is_active (w))
1272 return;
1273
1274 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, );
1276 prepares [preparecnt - 1] = w;
1277}
1278
1279void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w)
1281{
1282 ev_clear_pending (EV_A_ (W)w);
1283 if (ev_is_active (w))
1284 return;
1285
1286 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1287 ev_stop (EV_A_ (W)w);
1288}
1289
1290void
1291ev_check_start (EV_P_ struct ev_check *w)
1292{
1293 if (ev_is_active (w))
1294 return;
1295
1296 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, );
1298 checks [checkcnt - 1] = w;
1299}
1300
1301void
1302ev_check_stop (EV_P_ struct ev_check *w)
1303{
1304 ev_clear_pending (EV_A_ (W)w);
1305 if (ev_is_active (w))
1306 return;
1307
1308 checks [((W)w)->active - 1] = checks [--checkcnt];
1309 ev_stop (EV_A_ (W)w);
1310}
1311 1636
1312#ifndef SA_RESTART 1637#ifndef SA_RESTART
1313# define SA_RESTART 0 1638# define SA_RESTART 0
1314#endif 1639#endif
1315 1640
1316void 1641void
1317ev_signal_start (EV_P_ struct ev_signal *w) 1642ev_signal_start (EV_P_ ev_signal *w)
1318{ 1643{
1319#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1320 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1645 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1321#endif 1646#endif
1322 if (ev_is_active (w)) 1647 if (expect_false (ev_is_active (w)))
1323 return; 1648 return;
1324 1649
1325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1650 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1326 1651
1327 ev_start (EV_A_ (W)w, 1); 1652 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1653 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1654 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1655
1331 if (!((WL)w)->next) 1656 if (!((WL)w)->next)
1332 { 1657 {
1333#if WIN32 1658#if _WIN32
1334 signal (w->signum, sighandler); 1659 signal (w->signum, sighandler);
1335#else 1660#else
1336 struct sigaction sa; 1661 struct sigaction sa;
1337 sa.sa_handler = sighandler; 1662 sa.sa_handler = sighandler;
1338 sigfillset (&sa.sa_mask); 1663 sigfillset (&sa.sa_mask);
1341#endif 1666#endif
1342 } 1667 }
1343} 1668}
1344 1669
1345void 1670void
1346ev_signal_stop (EV_P_ struct ev_signal *w) 1671ev_signal_stop (EV_P_ ev_signal *w)
1347{ 1672{
1348 ev_clear_pending (EV_A_ (W)w); 1673 ev_clear_pending (EV_A_ (W)w);
1349 if (!ev_is_active (w)) 1674 if (expect_false (!ev_is_active (w)))
1350 return; 1675 return;
1351 1676
1352 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1353 ev_stop (EV_A_ (W)w); 1678 ev_stop (EV_A_ (W)w);
1354 1679
1355 if (!signals [w->signum - 1].head) 1680 if (!signals [w->signum - 1].head)
1356 signal (w->signum, SIG_DFL); 1681 signal (w->signum, SIG_DFL);
1357} 1682}
1358 1683
1359void 1684void
1360ev_child_start (EV_P_ struct ev_child *w) 1685ev_child_start (EV_P_ ev_child *w)
1361{ 1686{
1362#if EV_MULTIPLICITY 1687#if EV_MULTIPLICITY
1363 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1688 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1364#endif 1689#endif
1365 if (ev_is_active (w)) 1690 if (expect_false (ev_is_active (w)))
1366 return; 1691 return;
1367 1692
1368 ev_start (EV_A_ (W)w, 1); 1693 ev_start (EV_A_ (W)w, 1);
1369 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1370} 1695}
1371 1696
1372void 1697void
1373ev_child_stop (EV_P_ struct ev_child *w) 1698ev_child_stop (EV_P_ ev_child *w)
1374{ 1699{
1375 ev_clear_pending (EV_A_ (W)w); 1700 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1701 if (expect_false (!ev_is_active (w)))
1377 return; 1702 return;
1378 1703
1379 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1380 ev_stop (EV_A_ (W)w); 1705 ev_stop (EV_A_ (W)w);
1381} 1706}
1382 1707
1708#if EV_STAT_ENABLE
1709
1710# ifdef _WIN32
1711# undef lstat
1712# define lstat(a,b) _stati64 (a,b)
1713# endif
1714
1715#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891
1717
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719
1720#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048)
1722
1723static void noinline
1724infy_add (EV_P_ ev_stat *w)
1725{
1726 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1727
1728 if (w->wd < 0)
1729 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731
1732 /* monitor some parent directory for speedup hints */
1733 if (errno == ENOENT || errno == EACCES)
1734 {
1735 char path [PATH_MAX];
1736 strcpy (path, w->path);
1737
1738 do
1739 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1741 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1742
1743 char *pend = strrchr (path, '/');
1744
1745 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */
1747
1748 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD);
1750 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 }
1753 }
1754 else
1755 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1756
1757 if (w->wd >= 0)
1758 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1759}
1760
1761static void noinline
1762infy_del (EV_P_ ev_stat *w)
1763{
1764 WL w_;
1765 int slot;
1766 int wd = w->wd;
1767
1768 if (wd < 0)
1769 return;
1770
1771 w->wd = -2;
1772 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1773 wlist_del (&fs_hash [slot].head, (WL)w);
1774
1775 /* remove this watcher, if others are watching it, they will rearm */
1776 inotify_rm_watch (fs_fd, wd);
1777}
1778
1779static void noinline
1780infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1781{
1782 if (slot < 0)
1783 /* overflow, need to check for all hahs slots */
1784 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1785 infy_wd (EV_A_ slot, wd, ev);
1786 else
1787 {
1788 WL w_;
1789
1790 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1791 {
1792 ev_stat *w = (ev_stat *)w_;
1793 w_ = w_->next; /* lets us remove this watcher and all before it */
1794
1795 if (w->wd == wd || wd == -1)
1796 {
1797 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1798 {
1799 w->wd = -1;
1800 infy_add (EV_A_ w); /* re-add, no matter what */
1801 }
1802
1803 stat_timer_cb (EV_P_ &w->timer, 0);
1804 }
1805 }
1806 }
1807}
1808
1809static void
1810infy_cb (EV_P_ ev_io *w, int revents)
1811{
1812 char buf [EV_INOTIFY_BUFSIZE];
1813 struct inotify_event *ev = (struct inotify_event *)buf;
1814 int ofs;
1815 int len = read (fs_fd, buf, sizeof (buf));
1816
1817 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1818 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1819}
1820
1821void inline_size
1822infy_init (EV_P)
1823{
1824 if (fs_fd != -2)
1825 return;
1826
1827 fs_fd = inotify_init ();
1828
1829 if (fs_fd >= 0)
1830 {
1831 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1832 ev_set_priority (&fs_w, EV_MAXPRI);
1833 ev_io_start (EV_A_ &fs_w);
1834 }
1835}
1836
1837#endif
1838
1839void
1840ev_stat_stat (EV_P_ ev_stat *w)
1841{
1842 if (lstat (w->path, &w->attr) < 0)
1843 w->attr.st_nlink = 0;
1844 else if (!w->attr.st_nlink)
1845 w->attr.st_nlink = 1;
1846}
1847
1848void noinline
1849stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1850{
1851 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1852
1853 /* we copy this here each the time so that */
1854 /* prev has the old value when the callback gets invoked */
1855 w->prev = w->attr;
1856 ev_stat_stat (EV_A_ w);
1857
1858 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1859 {
1860 #if EV_USE_INOTIFY
1861 infy_del (EV_A_ w);
1862 infy_add (EV_A_ w);
1863 ev_stat_stat (EV_A_ w); /* avoid race... */
1864 #endif
1865
1866 ev_feed_event (EV_A_ w, EV_STAT);
1867 }
1868}
1869
1870void
1871ev_stat_start (EV_P_ ev_stat *w)
1872{
1873 if (expect_false (ev_is_active (w)))
1874 return;
1875
1876 /* since we use memcmp, we need to clear any padding data etc. */
1877 memset (&w->prev, 0, sizeof (ev_statdata));
1878 memset (&w->attr, 0, sizeof (ev_statdata));
1879
1880 ev_stat_stat (EV_A_ w);
1881
1882 if (w->interval < MIN_STAT_INTERVAL)
1883 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1884
1885 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1886 ev_set_priority (&w->timer, ev_priority (w));
1887
1888#if EV_USE_INOTIFY
1889 infy_init (EV_A);
1890
1891 if (fs_fd >= 0)
1892 infy_add (EV_A_ w);
1893 else
1894#endif
1895 ev_timer_start (EV_A_ &w->timer);
1896
1897 ev_start (EV_A_ (W)w, 1);
1898}
1899
1900void
1901ev_stat_stop (EV_P_ ev_stat *w)
1902{
1903 ev_clear_pending (EV_A_ (W)w);
1904 if (expect_false (!ev_is_active (w)))
1905 return;
1906
1907#if EV_USE_INOTIFY
1908 infy_del (EV_A_ w);
1909#endif
1910 ev_timer_stop (EV_A_ &w->timer);
1911
1912 ev_stop (EV_A_ (W)w);
1913}
1914#endif
1915
1916void
1917ev_idle_start (EV_P_ ev_idle *w)
1918{
1919 if (expect_false (ev_is_active (w)))
1920 return;
1921
1922 ev_start (EV_A_ (W)w, ++idlecnt);
1923 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1924 idles [idlecnt - 1] = w;
1925}
1926
1927void
1928ev_idle_stop (EV_P_ ev_idle *w)
1929{
1930 ev_clear_pending (EV_A_ (W)w);
1931 if (expect_false (!ev_is_active (w)))
1932 return;
1933
1934 {
1935 int active = ((W)w)->active;
1936 idles [active - 1] = idles [--idlecnt];
1937 ((W)idles [active - 1])->active = active;
1938 }
1939
1940 ev_stop (EV_A_ (W)w);
1941}
1942
1943void
1944ev_prepare_start (EV_P_ ev_prepare *w)
1945{
1946 if (expect_false (ev_is_active (w)))
1947 return;
1948
1949 ev_start (EV_A_ (W)w, ++preparecnt);
1950 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1951 prepares [preparecnt - 1] = w;
1952}
1953
1954void
1955ev_prepare_stop (EV_P_ ev_prepare *w)
1956{
1957 ev_clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w)))
1959 return;
1960
1961 {
1962 int active = ((W)w)->active;
1963 prepares [active - 1] = prepares [--preparecnt];
1964 ((W)prepares [active - 1])->active = active;
1965 }
1966
1967 ev_stop (EV_A_ (W)w);
1968}
1969
1970void
1971ev_check_start (EV_P_ ev_check *w)
1972{
1973 if (expect_false (ev_is_active (w)))
1974 return;
1975
1976 ev_start (EV_A_ (W)w, ++checkcnt);
1977 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1978 checks [checkcnt - 1] = w;
1979}
1980
1981void
1982ev_check_stop (EV_P_ ev_check *w)
1983{
1984 ev_clear_pending (EV_A_ (W)w);
1985 if (expect_false (!ev_is_active (w)))
1986 return;
1987
1988 {
1989 int active = ((W)w)->active;
1990 checks [active - 1] = checks [--checkcnt];
1991 ((W)checks [active - 1])->active = active;
1992 }
1993
1994 ev_stop (EV_A_ (W)w);
1995}
1996
1997#if EV_EMBED_ENABLE
1998void noinline
1999ev_embed_sweep (EV_P_ ev_embed *w)
2000{
2001 ev_loop (w->loop, EVLOOP_NONBLOCK);
2002}
2003
2004static void
2005embed_cb (EV_P_ ev_io *io, int revents)
2006{
2007 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2008
2009 if (ev_cb (w))
2010 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2011 else
2012 ev_embed_sweep (loop, w);
2013}
2014
2015void
2016ev_embed_start (EV_P_ ev_embed *w)
2017{
2018 if (expect_false (ev_is_active (w)))
2019 return;
2020
2021 {
2022 struct ev_loop *loop = w->loop;
2023 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2024 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2025 }
2026
2027 ev_set_priority (&w->io, ev_priority (w));
2028 ev_io_start (EV_A_ &w->io);
2029
2030 ev_start (EV_A_ (W)w, 1);
2031}
2032
2033void
2034ev_embed_stop (EV_P_ ev_embed *w)
2035{
2036 ev_clear_pending (EV_A_ (W)w);
2037 if (expect_false (!ev_is_active (w)))
2038 return;
2039
2040 ev_io_stop (EV_A_ &w->io);
2041
2042 ev_stop (EV_A_ (W)w);
2043}
2044#endif
2045
2046#if EV_FORK_ENABLE
2047void
2048ev_fork_start (EV_P_ ev_fork *w)
2049{
2050 if (expect_false (ev_is_active (w)))
2051 return;
2052
2053 ev_start (EV_A_ (W)w, ++forkcnt);
2054 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2055 forks [forkcnt - 1] = w;
2056}
2057
2058void
2059ev_fork_stop (EV_P_ ev_fork *w)
2060{
2061 ev_clear_pending (EV_A_ (W)w);
2062 if (expect_false (!ev_is_active (w)))
2063 return;
2064
2065 {
2066 int active = ((W)w)->active;
2067 forks [active - 1] = forks [--forkcnt];
2068 ((W)forks [active - 1])->active = active;
2069 }
2070
2071 ev_stop (EV_A_ (W)w);
2072}
2073#endif
2074
1383/*****************************************************************************/ 2075/*****************************************************************************/
1384 2076
1385struct ev_once 2077struct ev_once
1386{ 2078{
1387 struct ev_io io; 2079 ev_io io;
1388 struct ev_timer to; 2080 ev_timer to;
1389 void (*cb)(int revents, void *arg); 2081 void (*cb)(int revents, void *arg);
1390 void *arg; 2082 void *arg;
1391}; 2083};
1392 2084
1393static void 2085static void
1396 void (*cb)(int revents, void *arg) = once->cb; 2088 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 2089 void *arg = once->arg;
1398 2090
1399 ev_io_stop (EV_A_ &once->io); 2091 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 2092 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 2093 ev_free (once);
1402 2094
1403 cb (revents, arg); 2095 cb (revents, arg);
1404} 2096}
1405 2097
1406static void 2098static void
1407once_cb_io (EV_P_ struct ev_io *w, int revents) 2099once_cb_io (EV_P_ ev_io *w, int revents)
1408{ 2100{
1409 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2101 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1410} 2102}
1411 2103
1412static void 2104static void
1413once_cb_to (EV_P_ struct ev_timer *w, int revents) 2105once_cb_to (EV_P_ ev_timer *w, int revents)
1414{ 2106{
1415 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2107 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1416} 2108}
1417 2109
1418void 2110void
1419ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2111ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1420{ 2112{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 2113 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 2114
1423 if (!once) 2115 if (expect_false (!once))
2116 {
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2117 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 2118 return;
1426 { 2119 }
2120
1427 once->cb = cb; 2121 once->cb = cb;
1428 once->arg = arg; 2122 once->arg = arg;
1429 2123
1430 ev_watcher_init (&once->io, once_cb_io); 2124 ev_init (&once->io, once_cb_io);
1431 if (fd >= 0) 2125 if (fd >= 0)
1432 { 2126 {
1433 ev_io_set (&once->io, fd, events); 2127 ev_io_set (&once->io, fd, events);
1434 ev_io_start (EV_A_ &once->io); 2128 ev_io_start (EV_A_ &once->io);
1435 } 2129 }
1436 2130
1437 ev_watcher_init (&once->to, once_cb_to); 2131 ev_init (&once->to, once_cb_to);
1438 if (timeout >= 0.) 2132 if (timeout >= 0.)
1439 { 2133 {
1440 ev_timer_set (&once->to, timeout, 0.); 2134 ev_timer_set (&once->to, timeout, 0.);
1441 ev_timer_start (EV_A_ &once->to); 2135 ev_timer_start (EV_A_ &once->to);
1442 }
1443 } 2136 }
1444} 2137}
1445 2138
2139#ifdef __cplusplus
2140}
2141#endif
2142

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines