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

Comparing libev/ev.c (file contents):
Revision 1.258 by root, Sun Sep 7 18:15:12 2008 UTC vs.
Revision 1.317 by root, Sat Nov 14 00:15:21 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
116# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
117# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
118# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY 1
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
121# endif 143# endif
122# endif 144# endif
123 145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
225
169#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
172# else 229# else
173# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
174# endif 231# endif
175#endif 232#endif
176 233
177#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 236#endif
180 237
181#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
244# else 301# else
245# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
246# endif 303# endif
247#endif 304#endif
248 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
249#if 0 /* debugging */ 314#if 0 /* debugging */
250# define EV_VERIFY 3 315# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
253#endif 318#endif
… …
262 327
263#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 330#endif
266 331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
344#endif
345
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 347
269#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 365# include <sys/select.h>
287# endif 366# endif
288#endif 367#endif
289 368
290#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
291# include <sys/inotify.h> 372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
292#endif 378#endif
293 379
294#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 381# include <winsock.h>
296#endif 382#endif
297 383
298#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
301# ifdef __cplusplus 397# ifdef __cplusplus
302extern "C" { 398extern "C" {
303# endif 399# endif
304int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
305# ifdef __cplusplus 401# ifdef __cplusplus
306} 402}
307# endif 403# endif
308#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
309 434
310/**/ 435/**/
311 436
312#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
325 */ 450 */
326#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
327 452
328#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
329#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
330/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
331 455
332#if __GNUC__ >= 4 456#if __GNUC__ >= 4
333# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
334# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
335#else 459#else
… …
348# define inline_speed static noinline 472# define inline_speed static noinline
349#else 473#else
350# define inline_speed static inline 474# define inline_speed static inline
351#endif 475#endif
352 476
353#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478
479#if EV_MINPRI == EV_MAXPRI
480# define ABSPRI(w) (((W)w), 0)
481#else
354#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
355 484
356#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
357#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
358 487
359typedef ev_watcher *W; 488typedef ev_watcher *W;
… …
361typedef ev_watcher_time *WT; 490typedef ev_watcher_time *WT;
362 491
363#define ev_active(w) ((W)(w))->active 492#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 493#define ev_at(w) ((WT)(w))->at
365 494
366#if EV_USE_MONOTONIC 495#if EV_USE_REALTIME
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 496/* sig_atomic_t is used to avoid per-thread variables or locking but still */
368/* giving it a reasonably high chance of working on typical architetcures */ 497/* giving it a reasonably high chance of working on typical architetcures */
498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
499#endif
500
501#if EV_USE_MONOTONIC
369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
503#endif
504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
370#endif 513#endif
371 514
372#ifdef _WIN32 515#ifdef _WIN32
373# include "ev_win32.c" 516# include "ev_win32.c"
374#endif 517#endif
… …
382{ 525{
383 syserr_cb = cb; 526 syserr_cb = cb;
384} 527}
385 528
386static void noinline 529static void noinline
387syserr (const char *msg) 530ev_syserr (const char *msg)
388{ 531{
389 if (!msg) 532 if (!msg)
390 msg = "(libev) system error"; 533 msg = "(libev) system error";
391 534
392 if (syserr_cb) 535 if (syserr_cb)
… …
438#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
439#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
440 583
441/*****************************************************************************/ 584/*****************************************************************************/
442 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
589/* file descriptor info structure */
443typedef struct 590typedef struct
444{ 591{
445 WL head; 592 WL head;
446 unsigned char events; 593 unsigned char events; /* the events watched for */
594 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
447 unsigned char reify; 596 unsigned char unused;
597#if EV_USE_EPOLL
598 unsigned int egen; /* generation counter to counter epoll bugs */
599#endif
448#if EV_SELECT_IS_WINSOCKET 600#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 601 SOCKET handle;
450#endif 602#endif
451} ANFD; 603} ANFD;
452 604
605/* stores the pending event set for a given watcher */
453typedef struct 606typedef struct
454{ 607{
455 W w; 608 W w;
456 int events; 609 int events; /* the pending event set for the given watcher */
457} ANPENDING; 610} ANPENDING;
458 611
459#if EV_USE_INOTIFY 612#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */ 613/* hash table entry per inotify-id */
461typedef struct 614typedef struct
… …
464} ANFS; 617} ANFS;
465#endif 618#endif
466 619
467/* Heap Entry */ 620/* Heap Entry */
468#if EV_HEAP_CACHE_AT 621#if EV_HEAP_CACHE_AT
622 /* a heap element */
469 typedef struct { 623 typedef struct {
470 ev_tstamp at; 624 ev_tstamp at;
471 WT w; 625 WT w;
472 } ANHE; 626 } ANHE;
473 627
474 #define ANHE_w(he) (he).w /* access watcher, read-write */ 628 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */ 629 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 630 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else 631#else
632 /* a heap element */
478 typedef WT ANHE; 633 typedef WT ANHE;
479 634
480 #define ANHE_w(he) (he) 635 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at 636 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he) 637 #define ANHE_at_cache(he)
… …
506 661
507 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
508 663
509#endif 664#endif
510 665
666#if EV_MINIMAL < 2
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else
671# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif
675
676#define EVUNLOOP_RECURSE 0x80
677
511/*****************************************************************************/ 678/*****************************************************************************/
512 679
680#ifndef EV_HAVE_EV_TIME
513ev_tstamp 681ev_tstamp
514ev_time (void) 682ev_time (void)
515{ 683{
516#if EV_USE_REALTIME 684#if EV_USE_REALTIME
685 if (expect_true (have_realtime))
686 {
517 struct timespec ts; 687 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 688 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 689 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 690 }
691#endif
692
521 struct timeval tv; 693 struct timeval tv;
522 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 696}
697#endif
526 698
527ev_tstamp inline_size 699inline_size ev_tstamp
528get_clock (void) 700get_clock (void)
529{ 701{
530#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
531 if (expect_true (have_monotonic)) 703 if (expect_true (have_monotonic))
532 { 704 {
… …
566 738
567 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569 741
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */ 744 /* by older ones */
573 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
574#endif 746#endif
575 } 747 }
576} 748}
577 749
578/*****************************************************************************/ 750/*****************************************************************************/
579 751
580#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 752#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
581 753
582int inline_size 754/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */
756inline_size int
583array_nextsize (int elem, int cur, int cnt) 757array_nextsize (int elem, int cur, int cnt)
584{ 758{
585 int ncur = cur + 1; 759 int ncur = cur + 1;
586 760
587 do 761 do
… …
604array_realloc (int elem, void *base, int *cur, int cnt) 778array_realloc (int elem, void *base, int *cur, int cnt)
605{ 779{
606 *cur = array_nextsize (elem, *cur, cnt); 780 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 781 return ev_realloc (base, elem * *cur);
608} 782}
783
784#define array_init_zero(base,count) \
785 memset ((void *)(base), 0, sizeof (*(base)) * (count))
609 786
610#define array_needsize(type,base,cur,cnt,init) \ 787#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 788 if (expect_false ((cnt) > (cur))) \
612 { \ 789 { \
613 int ocur_ = (cur); \ 790 int ocur_ = (cur); \
… …
625 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 802 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
626 } 803 }
627#endif 804#endif
628 805
629#define array_free(stem, idx) \ 806#define array_free(stem, idx) \
630 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 807 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
631 808
632/*****************************************************************************/ 809/*****************************************************************************/
810
811/* dummy callback for pending events */
812static void noinline
813pendingcb (EV_P_ ev_prepare *w, int revents)
814{
815}
633 816
634void noinline 817void noinline
635ev_feed_event (EV_P_ void *w, int revents) 818ev_feed_event (EV_P_ void *w, int revents)
636{ 819{
637 W w_ = (W)w; 820 W w_ = (W)w;
… …
646 pendings [pri][w_->pending - 1].w = w_; 829 pendings [pri][w_->pending - 1].w = w_;
647 pendings [pri][w_->pending - 1].events = revents; 830 pendings [pri][w_->pending - 1].events = revents;
648 } 831 }
649} 832}
650 833
651void inline_speed 834inline_speed void
835feed_reverse (EV_P_ W w)
836{
837 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
838 rfeeds [rfeedcnt++] = w;
839}
840
841inline_size void
842feed_reverse_done (EV_P_ int revents)
843{
844 do
845 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
846 while (rfeedcnt);
847}
848
849inline_speed void
652queue_events (EV_P_ W *events, int eventcnt, int type) 850queue_events (EV_P_ W *events, int eventcnt, int type)
653{ 851{
654 int i; 852 int i;
655 853
656 for (i = 0; i < eventcnt; ++i) 854 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 855 ev_feed_event (EV_A_ events [i], type);
658} 856}
659 857
660/*****************************************************************************/ 858/*****************************************************************************/
661 859
662void inline_size 860inline_speed void
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674
675void inline_speed
676fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
677{ 862{
678 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
679 ev_io *w; 864 ev_io *w;
680 865
681 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
685 if (ev) 870 if (ev)
686 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
687 } 872 }
688} 873}
689 874
875/* do not submit kernel events for fds that have reify set */
876/* because that means they changed while we were polling for new events */
877inline_speed void
878fd_event (EV_P_ int fd, int revents)
879{
880 ANFD *anfd = anfds + fd;
881
882 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents);
884}
885
690void 886void
691ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
692{ 888{
693 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
694 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
695} 891}
696 892
697void inline_size 893/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */
895inline_size void
698fd_reify (EV_P) 896fd_reify (EV_P)
699{ 897{
700 int i; 898 int i;
701 899
702 for (i = 0; i < fdchangecnt; ++i) 900 for (i = 0; i < fdchangecnt; ++i)
… …
712 910
713#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
714 if (events) 912 if (events)
715 { 913 {
716 unsigned long arg; 914 unsigned long arg;
717 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else
720 anfd->handle = _get_osfhandle (fd);
721 #endif
722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
723 } 917 }
724#endif 918#endif
725 919
726 { 920 {
727 unsigned char o_events = anfd->events; 921 unsigned char o_events = anfd->events;
728 unsigned char o_reify = anfd->reify; 922 unsigned char o_reify = anfd->reify;
729 923
730 anfd->reify = 0; 924 anfd->reify = 0;
731 anfd->events = events; 925 anfd->events = events;
732 926
733 if (o_events != events || o_reify & EV_IOFDSET) 927 if (o_events != events || o_reify & EV__IOFDSET)
734 backend_modify (EV_A_ fd, o_events, events); 928 backend_modify (EV_A_ fd, o_events, events);
735 } 929 }
736 } 930 }
737 931
738 fdchangecnt = 0; 932 fdchangecnt = 0;
739} 933}
740 934
741void inline_size 935/* something about the given fd changed */
936inline_size void
742fd_change (EV_P_ int fd, int flags) 937fd_change (EV_P_ int fd, int flags)
743{ 938{
744 unsigned char reify = anfds [fd].reify; 939 unsigned char reify = anfds [fd].reify;
745 anfds [fd].reify |= flags; 940 anfds [fd].reify |= flags;
746 941
… …
750 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 945 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
751 fdchanges [fdchangecnt - 1] = fd; 946 fdchanges [fdchangecnt - 1] = fd;
752 } 947 }
753} 948}
754 949
755void inline_speed 950/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
951inline_speed void
756fd_kill (EV_P_ int fd) 952fd_kill (EV_P_ int fd)
757{ 953{
758 ev_io *w; 954 ev_io *w;
759 955
760 while ((w = (ev_io *)anfds [fd].head)) 956 while ((w = (ev_io *)anfds [fd].head))
… …
762 ev_io_stop (EV_A_ w); 958 ev_io_stop (EV_A_ w);
763 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 959 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
764 } 960 }
765} 961}
766 962
767int inline_size 963/* check whether the given fd is atcually valid, for error recovery */
964inline_size int
768fd_valid (int fd) 965fd_valid (int fd)
769{ 966{
770#ifdef _WIN32 967#ifdef _WIN32
771 return _get_osfhandle (fd) != -1; 968 return _get_osfhandle (fd) != -1;
772#else 969#else
… …
794 991
795 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
796 if (anfds [fd].events) 993 if (anfds [fd].events)
797 { 994 {
798 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
799 return; 996 break;
800 } 997 }
801} 998}
802 999
803/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
804static void noinline 1001static void noinline
… …
808 1005
809 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 1007 if (anfds [fd].events)
811 { 1008 {
812 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
1010 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
814 } 1012 }
815} 1013}
816 1014
817/*****************************************************************************/ 1015/*****************************************************************************/
818 1016
… …
834#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1032#define HEAP0 (DHEAP - 1) /* index of first element in heap */
835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1033#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
836#define UPHEAP_DONE(p,k) ((p) == (k)) 1034#define UPHEAP_DONE(p,k) ((p) == (k))
837 1035
838/* away from the root */ 1036/* away from the root */
839void inline_speed 1037inline_speed void
840downheap (ANHE *heap, int N, int k) 1038downheap (ANHE *heap, int N, int k)
841{ 1039{
842 ANHE he = heap [k]; 1040 ANHE he = heap [k];
843 ANHE *E = heap + N + HEAP0; 1041 ANHE *E = heap + N + HEAP0;
844 1042
… …
884#define HEAP0 1 1082#define HEAP0 1
885#define HPARENT(k) ((k) >> 1) 1083#define HPARENT(k) ((k) >> 1)
886#define UPHEAP_DONE(p,k) (!(p)) 1084#define UPHEAP_DONE(p,k) (!(p))
887 1085
888/* away from the root */ 1086/* away from the root */
889void inline_speed 1087inline_speed void
890downheap (ANHE *heap, int N, int k) 1088downheap (ANHE *heap, int N, int k)
891{ 1089{
892 ANHE he = heap [k]; 1090 ANHE he = heap [k];
893 1091
894 for (;;) 1092 for (;;)
895 { 1093 {
896 int c = k << 1; 1094 int c = k << 1;
897 1095
898 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
899 break; 1097 break;
900 1098
901 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
902 ? 1 : 0; 1100 ? 1 : 0;
903 1101
… …
914 ev_active (ANHE_w (he)) = k; 1112 ev_active (ANHE_w (he)) = k;
915} 1113}
916#endif 1114#endif
917 1115
918/* towards the root */ 1116/* towards the root */
919void inline_speed 1117inline_speed void
920upheap (ANHE *heap, int k) 1118upheap (ANHE *heap, int k)
921{ 1119{
922 ANHE he = heap [k]; 1120 ANHE he = heap [k];
923 1121
924 for (;;) 1122 for (;;)
… …
935 1133
936 heap [k] = he; 1134 heap [k] = he;
937 ev_active (ANHE_w (he)) = k; 1135 ev_active (ANHE_w (he)) = k;
938} 1136}
939 1137
940void inline_size 1138/* move an element suitably so it is in a correct place */
1139inline_size void
941adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
942{ 1141{
943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
944 upheap (heap, k); 1143 upheap (heap, k);
945 else 1144 else
946 downheap (heap, N, k); 1145 downheap (heap, N, k);
947} 1146}
948 1147
949/* rebuild the heap: this function is used only once and executed rarely */ 1148/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size 1149inline_size void
951reheap (ANHE *heap, int N) 1150reheap (ANHE *heap, int N)
952{ 1151{
953 int i; 1152 int i;
954 1153
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1154 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
958 upheap (heap, i + HEAP0); 1157 upheap (heap, i + HEAP0);
959} 1158}
960 1159
961/*****************************************************************************/ 1160/*****************************************************************************/
962 1161
1162/* associate signal watchers to a signal signal */
963typedef struct 1163typedef struct
964{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
965 WL head; 1169 WL head;
966 EV_ATOMIC_T gotsig;
967} ANSIG; 1170} ANSIG;
968 1171
969static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
970static int signalmax;
971
972static EV_ATOMIC_T gotsig;
973
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985 1173
986/*****************************************************************************/ 1174/*****************************************************************************/
987 1175
988void inline_speed 1176/* used to prepare libev internal fd's */
1177/* this is not fork-safe */
1178inline_speed void
989fd_intern (int fd) 1179fd_intern (int fd)
990{ 1180{
991#ifdef _WIN32 1181#ifdef _WIN32
992 unsigned long arg = 1; 1182 unsigned long arg = 1;
993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
998} 1188}
999 1189
1000static void noinline 1190static void noinline
1001evpipe_init (EV_P) 1191evpipe_init (EV_P)
1002{ 1192{
1003 if (!ev_is_active (&pipeev)) 1193 if (!ev_is_active (&pipe_w))
1004 { 1194 {
1005#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1006 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1007 { 1201 {
1008 evpipe [0] = -1; 1202 evpipe [0] = -1;
1009 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1010 ev_io_set (&pipeev, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1011 } 1205 }
1012 else 1206 else
1013#endif 1207#endif
1014 { 1208 {
1015 while (pipe (evpipe)) 1209 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1210 ev_syserr ("(libev) error creating signal/async pipe");
1017 1211
1018 fd_intern (evpipe [0]); 1212 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1213 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1214 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1021 } 1215 }
1022 1216
1023 ev_io_start (EV_A_ &pipeev); 1217 ev_io_start (EV_A_ &pipe_w);
1024 ev_unref (EV_A); /* watcher should not keep loop alive */ 1218 ev_unref (EV_A); /* watcher should not keep loop alive */
1025 } 1219 }
1026} 1220}
1027 1221
1028void inline_size 1222inline_size void
1029evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1223evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1030{ 1224{
1031 if (!*flag) 1225 if (!*flag)
1032 { 1226 {
1033 int old_errno = errno; /* save errno because write might clobber it */ 1227 int old_errno = errno; /* save errno because write might clobber it */
… …
1046 1240
1047 errno = old_errno; 1241 errno = old_errno;
1048 } 1242 }
1049} 1243}
1050 1244
1245/* called whenever the libev signal pipe */
1246/* got some events (signal, async) */
1051static void 1247static void
1052pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1053{ 1249{
1250 int i;
1251
1054#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1055 if (evfd >= 0) 1253 if (evfd >= 0)
1056 { 1254 {
1057 uint64_t counter; 1255 uint64_t counter;
1058 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1062 { 1260 {
1063 char dummy; 1261 char dummy;
1064 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1065 } 1263 }
1066 1264
1067 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1068 { 1266 {
1069 int signum; 1267 sig_pending = 0;
1070 gotsig = 0;
1071 1268
1072 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1073 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1074 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1075 } 1272 }
1076 1273
1077#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1078 if (gotasync) 1275 if (async_pending)
1079 { 1276 {
1080 int i; 1277 async_pending = 0;
1081 gotasync = 0;
1082 1278
1083 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1084 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1085 { 1281 {
1086 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1094 1290
1095static void 1291static void
1096ev_sighandler (int signum) 1292ev_sighandler (int signum)
1097{ 1293{
1098#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1099 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1100#endif 1296#endif
1101 1297
1102#if _WIN32 1298#if _WIN32
1103 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1104#endif 1300#endif
1105 1301
1106 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1107 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1108} 1304}
1109 1305
1110void noinline 1306void noinline
1111ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1112{ 1308{
1113 WL w; 1309 WL w;
1114 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1115#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1117#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1118 1319
1119 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1120
1121 if (signum < 0 || signum >= signalmax)
1122 return; 1321 return;
1322#endif
1123 1323
1124 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1125 1325
1126 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1127 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1128} 1328}
1129 1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1349
1130/*****************************************************************************/ 1350/*****************************************************************************/
1131 1351
1132static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1133 1353
1134#ifndef _WIN32 1354#ifndef _WIN32
… …
1137 1357
1138#ifndef WIFCONTINUED 1358#ifndef WIFCONTINUED
1139# define WIFCONTINUED(status) 0 1359# define WIFCONTINUED(status) 0
1140#endif 1360#endif
1141 1361
1142void inline_speed 1362/* handle a single child status event */
1363inline_speed void
1143child_reap (EV_P_ int chain, int pid, int status) 1364child_reap (EV_P_ int chain, int pid, int status)
1144{ 1365{
1145 ev_child *w; 1366 ev_child *w;
1146 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1147 1368
… …
1160 1381
1161#ifndef WCONTINUED 1382#ifndef WCONTINUED
1162# define WCONTINUED 0 1383# define WCONTINUED 0
1163#endif 1384#endif
1164 1385
1386/* called on sigchld etc., calls waitpid */
1165static void 1387static void
1166childcb (EV_P_ ev_signal *sw, int revents) 1388childcb (EV_P_ ev_signal *sw, int revents)
1167{ 1389{
1168 int pid, status; 1390 int pid, status;
1169 1391
… …
1250 /* kqueue is borked on everything but netbsd apparently */ 1472 /* kqueue is borked on everything but netbsd apparently */
1251 /* it usually doesn't work correctly on anything but sockets and pipes */ 1473 /* it usually doesn't work correctly on anything but sockets and pipes */
1252 flags &= ~EVBACKEND_KQUEUE; 1474 flags &= ~EVBACKEND_KQUEUE;
1253#endif 1475#endif
1254#ifdef __APPLE__ 1476#ifdef __APPLE__
1255 // flags &= ~EVBACKEND_KQUEUE; for documentation 1477 /* only select works correctly on that "unix-certified" platform */
1256 flags &= ~EVBACKEND_POLL; 1478 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1479 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1257#endif 1480#endif
1258 1481
1259 return flags; 1482 return flags;
1260} 1483}
1261 1484
… …
1275ev_backend (EV_P) 1498ev_backend (EV_P)
1276{ 1499{
1277 return backend; 1500 return backend;
1278} 1501}
1279 1502
1503#if EV_MINIMAL < 2
1280unsigned int 1504unsigned int
1281ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1282{ 1506{
1283 return loop_count; 1507 return loop_count;
1284} 1508}
1285 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1286void 1516void
1287ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1288{ 1518{
1289 io_blocktime = interval; 1519 io_blocktime = interval;
1290} 1520}
… …
1293ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1524{
1295 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1296} 1526}
1297 1527
1528void
1529ev_set_userdata (EV_P_ void *data)
1530{
1531 userdata = data;
1532}
1533
1534void *
1535ev_userdata (EV_P)
1536{
1537 return userdata;
1538}
1539
1540void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1541{
1542 invoke_cb = invoke_pending_cb;
1543}
1544
1545void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1546{
1547 release_cb = release;
1548 acquire_cb = acquire;
1549}
1550#endif
1551
1552/* initialise a loop structure, must be zero-initialised */
1298static void noinline 1553static void noinline
1299loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1300{ 1555{
1301 if (!backend) 1556 if (!backend)
1302 { 1557 {
1558#if EV_USE_REALTIME
1559 if (!have_realtime)
1560 {
1561 struct timespec ts;
1562
1563 if (!clock_gettime (CLOCK_REALTIME, &ts))
1564 have_realtime = 1;
1565 }
1566#endif
1567
1303#if EV_USE_MONOTONIC 1568#if EV_USE_MONOTONIC
1569 if (!have_monotonic)
1304 { 1570 {
1305 struct timespec ts; 1571 struct timespec ts;
1572
1306 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1307 have_monotonic = 1; 1574 have_monotonic = 1;
1308 } 1575 }
1309#endif 1576#endif
1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1310 1588
1311 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1312 mn_now = get_clock (); 1590 mn_now = get_clock ();
1313 now_floor = mn_now; 1591 now_floor = mn_now;
1314 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2
1594 invoke_cb = ev_invoke_pending;
1595#endif
1315 1596
1316 io_blocktime = 0.; 1597 io_blocktime = 0.;
1317 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1318 backend = 0; 1599 backend = 0;
1319 backend_fd = -1; 1600 backend_fd = -1;
1320 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1321#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1322 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1323#endif 1607#endif
1324 1608#if EV_USE_SIGNALFD
1325 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1326#ifndef _WIN32
1327 if (flags & EVFLAG_FORKCHECK)
1328 curpid = getpid ();
1329#endif 1610#endif
1330
1331 if (!(flags & EVFLAG_NOENV)
1332 && !enable_secure ()
1333 && getenv ("LIBEV_FLAGS"))
1334 flags = atoi (getenv ("LIBEV_FLAGS"));
1335 1611
1336 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1337 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1338 1614
1339#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1350#endif 1626#endif
1351#if EV_USE_SELECT 1627#if EV_USE_SELECT
1352 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1353#endif 1629#endif
1354 1630
1631 ev_prepare_init (&pending_w, pendingcb);
1632
1355 ev_init (&pipeev, pipecb); 1633 ev_init (&pipe_w, pipecb);
1356 ev_set_priority (&pipeev, EV_MAXPRI); 1634 ev_set_priority (&pipe_w, EV_MAXPRI);
1357 } 1635 }
1358} 1636}
1359 1637
1638/* free up a loop structure */
1360static void noinline 1639static void noinline
1361loop_destroy (EV_P) 1640loop_destroy (EV_P)
1362{ 1641{
1363 int i; 1642 int i;
1364 1643
1365 if (ev_is_active (&pipeev)) 1644 if (ev_is_active (&pipe_w))
1366 { 1645 {
1367 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1368 ev_io_stop (EV_A_ &pipeev); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1369 1648
1370#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1371 if (evfd >= 0) 1650 if (evfd >= 0)
1372 close (evfd); 1651 close (evfd);
1373#endif 1652#endif
1374 1653
1375 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1376 { 1655 {
1377 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1378 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1379 } 1658 }
1380 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 close (sigfd);
1664#endif
1381 1665
1382#if EV_USE_INOTIFY 1666#if EV_USE_INOTIFY
1383 if (fs_fd >= 0) 1667 if (fs_fd >= 0)
1384 close (fs_fd); 1668 close (fs_fd);
1385#endif 1669#endif
… …
1409#if EV_IDLE_ENABLE 1693#if EV_IDLE_ENABLE
1410 array_free (idle, [i]); 1694 array_free (idle, [i]);
1411#endif 1695#endif
1412 } 1696 }
1413 1697
1414 ev_free (anfds); anfdmax = 0; 1698 ev_free (anfds); anfds = 0; anfdmax = 0;
1415 1699
1416 /* have to use the microsoft-never-gets-it-right macro */ 1700 /* have to use the microsoft-never-gets-it-right macro */
1701 array_free (rfeed, EMPTY);
1417 array_free (fdchange, EMPTY); 1702 array_free (fdchange, EMPTY);
1418 array_free (timer, EMPTY); 1703 array_free (timer, EMPTY);
1419#if EV_PERIODIC_ENABLE 1704#if EV_PERIODIC_ENABLE
1420 array_free (periodic, EMPTY); 1705 array_free (periodic, EMPTY);
1421#endif 1706#endif
… …
1430 1715
1431 backend = 0; 1716 backend = 0;
1432} 1717}
1433 1718
1434#if EV_USE_INOTIFY 1719#if EV_USE_INOTIFY
1435void inline_size infy_fork (EV_P); 1720inline_size void infy_fork (EV_P);
1436#endif 1721#endif
1437 1722
1438void inline_size 1723inline_size void
1439loop_fork (EV_P) 1724loop_fork (EV_P)
1440{ 1725{
1441#if EV_USE_PORT 1726#if EV_USE_PORT
1442 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1727 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1443#endif 1728#endif
… …
1449#endif 1734#endif
1450#if EV_USE_INOTIFY 1735#if EV_USE_INOTIFY
1451 infy_fork (EV_A); 1736 infy_fork (EV_A);
1452#endif 1737#endif
1453 1738
1454 if (ev_is_active (&pipeev)) 1739 if (ev_is_active (&pipe_w))
1455 { 1740 {
1456 /* this "locks" the handlers against writing to the pipe */ 1741 /* this "locks" the handlers against writing to the pipe */
1457 /* while we modify the fd vars */ 1742 /* while we modify the fd vars */
1458 gotsig = 1; 1743 sig_pending = 1;
1459#if EV_ASYNC_ENABLE 1744#if EV_ASYNC_ENABLE
1460 gotasync = 1; 1745 async_pending = 1;
1461#endif 1746#endif
1462 1747
1463 ev_ref (EV_A); 1748 ev_ref (EV_A);
1464 ev_io_stop (EV_A_ &pipeev); 1749 ev_io_stop (EV_A_ &pipe_w);
1465 1750
1466#if EV_USE_EVENTFD 1751#if EV_USE_EVENTFD
1467 if (evfd >= 0) 1752 if (evfd >= 0)
1468 close (evfd); 1753 close (evfd);
1469#endif 1754#endif
1470 1755
1471 if (evpipe [0] >= 0) 1756 if (evpipe [0] >= 0)
1472 { 1757 {
1473 close (evpipe [0]); 1758 EV_WIN32_CLOSE_FD (evpipe [0]);
1474 close (evpipe [1]); 1759 EV_WIN32_CLOSE_FD (evpipe [1]);
1475 } 1760 }
1476 1761
1477 evpipe_init (EV_A); 1762 evpipe_init (EV_A);
1478 /* now iterate over everything, in case we missed something */ 1763 /* now iterate over everything, in case we missed something */
1479 pipecb (EV_A_ &pipeev, EV_READ); 1764 pipecb (EV_A_ &pipe_w, EV_READ);
1480 } 1765 }
1481 1766
1482 postfork = 0; 1767 postfork = 0;
1483} 1768}
1484 1769
1485#if EV_MULTIPLICITY 1770#if EV_MULTIPLICITY
1486 1771
1487struct ev_loop * 1772struct ev_loop *
1488ev_loop_new (unsigned int flags) 1773ev_loop_new (unsigned int flags)
1489{ 1774{
1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1775 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1491 1776
1492 memset (loop, 0, sizeof (struct ev_loop)); 1777 memset (EV_A, 0, sizeof (struct ev_loop));
1493
1494 loop_init (EV_A_ flags); 1778 loop_init (EV_A_ flags);
1495 1779
1496 if (ev_backend (EV_A)) 1780 if (ev_backend (EV_A))
1497 return loop; 1781 return EV_A;
1498 1782
1499 return 0; 1783 return 0;
1500} 1784}
1501 1785
1502void 1786void
… …
1509void 1793void
1510ev_loop_fork (EV_P) 1794ev_loop_fork (EV_P)
1511{ 1795{
1512 postfork = 1; /* must be in line with ev_default_fork */ 1796 postfork = 1; /* must be in line with ev_default_fork */
1513} 1797}
1798#endif /* multiplicity */
1514 1799
1515#if EV_VERIFY 1800#if EV_VERIFY
1516static void noinline 1801static void noinline
1517verify_watcher (EV_P_ W w) 1802verify_watcher (EV_P_ W w)
1518{ 1803{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1804 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520 1805
1521 if (w->pending) 1806 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1807 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523} 1808}
1524 1809
1525static void noinline 1810static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N) 1811verify_heap (EV_P_ ANHE *heap, int N)
1527{ 1812{
1528 int i; 1813 int i;
1529 1814
1530 for (i = HEAP0; i < N + HEAP0; ++i) 1815 for (i = HEAP0; i < N + HEAP0; ++i)
1531 { 1816 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1817 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1818 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1819 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535 1820
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1821 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 } 1822 }
1538} 1823}
1539 1824
1540static void noinline 1825static void noinline
1541array_verify (EV_P_ W *ws, int cnt) 1826array_verify (EV_P_ W *ws, int cnt)
1542{ 1827{
1543 while (cnt--) 1828 while (cnt--)
1544 { 1829 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1830 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]); 1831 verify_watcher (EV_A_ ws [cnt]);
1547 } 1832 }
1548} 1833}
1549#endif 1834#endif
1550 1835
1836#if EV_MINIMAL < 2
1551void 1837void
1552ev_loop_verify (EV_P) 1838ev_loop_verify (EV_P)
1553{ 1839{
1554#if EV_VERIFY 1840#if EV_VERIFY
1555 int i; 1841 int i;
… …
1557 1843
1558 assert (activecnt >= -1); 1844 assert (activecnt >= -1);
1559 1845
1560 assert (fdchangemax >= fdchangecnt); 1846 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i) 1847 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1848 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1563 1849
1564 assert (anfdmax >= 0); 1850 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i) 1851 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next) 1852 for (w = anfds [i].head; w; w = w->next)
1567 { 1853 {
1568 verify_watcher (EV_A_ (W)w); 1854 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1855 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1856 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 } 1857 }
1572 1858
1573 assert (timermax >= timercnt); 1859 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt); 1860 verify_heap (EV_A_ timers, timercnt);
1575 1861
… …
1604 assert (checkmax >= checkcnt); 1890 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt); 1891 array_verify (EV_A_ (W *)checks, checkcnt);
1606 1892
1607# if 0 1893# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1894 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1895 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1610# endif
1611#endif 1896# endif
1897#endif
1612} 1898}
1613 1899#endif
1614#endif /* multiplicity */
1615 1900
1616#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1617struct ev_loop * 1902struct ev_loop *
1618ev_default_loop_init (unsigned int flags) 1903ev_default_loop_init (unsigned int flags)
1619#else 1904#else
… …
1622#endif 1907#endif
1623{ 1908{
1624 if (!ev_default_loop_ptr) 1909 if (!ev_default_loop_ptr)
1625 { 1910 {
1626#if EV_MULTIPLICITY 1911#if EV_MULTIPLICITY
1627 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1912 EV_P = ev_default_loop_ptr = &default_loop_struct;
1628#else 1913#else
1629 ev_default_loop_ptr = 1; 1914 ev_default_loop_ptr = 1;
1630#endif 1915#endif
1631 1916
1632 loop_init (EV_A_ flags); 1917 loop_init (EV_A_ flags);
… …
1649 1934
1650void 1935void
1651ev_default_destroy (void) 1936ev_default_destroy (void)
1652{ 1937{
1653#if EV_MULTIPLICITY 1938#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1939 EV_P = ev_default_loop_ptr;
1655#endif 1940#endif
1941
1942 ev_default_loop_ptr = 0;
1656 1943
1657#ifndef _WIN32 1944#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1945 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1946 ev_signal_stop (EV_A_ &childev);
1660#endif 1947#endif
… …
1664 1951
1665void 1952void
1666ev_default_fork (void) 1953ev_default_fork (void)
1667{ 1954{
1668#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1956 EV_P = ev_default_loop_ptr;
1670#endif 1957#endif
1671 1958
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1959 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1960}
1675 1961
1676/*****************************************************************************/ 1962/*****************************************************************************/
1677 1963
1678void 1964void
1679ev_invoke (EV_P_ void *w, int revents) 1965ev_invoke (EV_P_ void *w, int revents)
1680{ 1966{
1681 EV_CB_INVOKE ((W)w, revents); 1967 EV_CB_INVOKE ((W)w, revents);
1682} 1968}
1683 1969
1684void inline_speed 1970unsigned int
1685call_pending (EV_P) 1971ev_pending_count (EV_P)
1972{
1973 int pri;
1974 unsigned int count = 0;
1975
1976 for (pri = NUMPRI; pri--; )
1977 count += pendingcnt [pri];
1978
1979 return count;
1980}
1981
1982void noinline
1983ev_invoke_pending (EV_P)
1686{ 1984{
1687 int pri; 1985 int pri;
1688 1986
1689 for (pri = NUMPRI; pri--; ) 1987 for (pri = NUMPRI; pri--; )
1690 while (pendingcnt [pri]) 1988 while (pendingcnt [pri])
1691 { 1989 {
1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1990 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1693 1991
1694 if (expect_true (p->w))
1695 {
1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1992 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1993 /* ^ this is no longer true, as pending_w could be here */
1697 1994
1698 p->w->pending = 0; 1995 p->w->pending = 0;
1699 EV_CB_INVOKE (p->w, p->events); 1996 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK; 1997 EV_FREQUENT_CHECK;
1701 }
1702 } 1998 }
1703} 1999}
1704 2000
1705#if EV_IDLE_ENABLE 2001#if EV_IDLE_ENABLE
1706void inline_size 2002/* make idle watchers pending. this handles the "call-idle */
2003/* only when higher priorities are idle" logic */
2004inline_size void
1707idle_reify (EV_P) 2005idle_reify (EV_P)
1708{ 2006{
1709 if (expect_false (idleall)) 2007 if (expect_false (idleall))
1710 { 2008 {
1711 int pri; 2009 int pri;
… …
1723 } 2021 }
1724 } 2022 }
1725} 2023}
1726#endif 2024#endif
1727 2025
1728void inline_size 2026/* make timers pending */
2027inline_size void
1729timers_reify (EV_P) 2028timers_reify (EV_P)
1730{ 2029{
1731 EV_FREQUENT_CHECK; 2030 EV_FREQUENT_CHECK;
1732 2031
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2032 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 { 2033 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2034 do
1736
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1738
1739 /* first reschedule or stop timer */
1740 if (w->repeat)
1741 { 2035 {
2036 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2037
2038 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2039
2040 /* first reschedule or stop timer */
2041 if (w->repeat)
2042 {
1742 ev_at (w) += w->repeat; 2043 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now) 2044 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now; 2045 ev_at (w) = mn_now;
1745 2046
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2047 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747 2048
1748 ANHE_at_cache (timers [HEAP0]); 2049 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0); 2050 downheap (timers, timercnt, HEAP0);
2051 }
2052 else
2053 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2054
2055 EV_FREQUENT_CHECK;
2056 feed_reverse (EV_A_ (W)w);
1750 } 2057 }
1751 else 2058 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1753 2059
1754 EV_FREQUENT_CHECK;
1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2060 feed_reverse_done (EV_A_ EV_TIMEOUT);
1756 } 2061 }
1757} 2062}
1758 2063
1759#if EV_PERIODIC_ENABLE 2064#if EV_PERIODIC_ENABLE
1760void inline_size 2065/* make periodics pending */
2066inline_size void
1761periodics_reify (EV_P) 2067periodics_reify (EV_P)
1762{ 2068{
1763 EV_FREQUENT_CHECK; 2069 EV_FREQUENT_CHECK;
1764 2070
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2071 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 { 2072 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2073 int feed_count = 0;
1768 2074
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2075 do
1770
1771 /* first reschedule or stop timer */
1772 if (w->reschedule_cb)
1773 { 2076 {
2077 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2078
2079 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2080
2081 /* first reschedule or stop timer */
2082 if (w->reschedule_cb)
2083 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2084 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775 2085
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2086 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777 2087
1778 ANHE_at_cache (periodics [HEAP0]); 2088 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0); 2089 downheap (periodics, periodiccnt, HEAP0);
2090 }
2091 else if (w->interval)
2092 {
2093 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2094 /* if next trigger time is not sufficiently in the future, put it there */
2095 /* this might happen because of floating point inexactness */
2096 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2097 {
2098 ev_at (w) += w->interval;
2099
2100 /* if interval is unreasonably low we might still have a time in the past */
2101 /* so correct this. this will make the periodic very inexact, but the user */
2102 /* has effectively asked to get triggered more often than possible */
2103 if (ev_at (w) < ev_rt_now)
2104 ev_at (w) = ev_rt_now;
2105 }
2106
2107 ANHE_at_cache (periodics [HEAP0]);
2108 downheap (periodics, periodiccnt, HEAP0);
2109 }
2110 else
2111 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2112
2113 EV_FREQUENT_CHECK;
2114 feed_reverse (EV_A_ (W)w);
1780 } 2115 }
1781 else if (w->interval) 2116 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1782 {
1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1784 /* if next trigger time is not sufficiently in the future, put it there */
1785 /* this might happen because of floating point inexactness */
1786 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1787 {
1788 ev_at (w) += w->interval;
1789 2117
1790 /* if interval is unreasonably low we might still have a time in the past */
1791 /* so correct this. this will make the periodic very inexact, but the user */
1792 /* has effectively asked to get triggered more often than possible */
1793 if (ev_at (w) < ev_rt_now)
1794 ev_at (w) = ev_rt_now;
1795 }
1796
1797 ANHE_at_cache (periodics [HEAP0]);
1798 downheap (periodics, periodiccnt, HEAP0);
1799 }
1800 else
1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1802
1803 EV_FREQUENT_CHECK;
1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2118 feed_reverse_done (EV_A_ EV_PERIODIC);
1805 } 2119 }
1806} 2120}
1807 2121
2122/* simply recalculate all periodics */
2123/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1808static void noinline 2124static void noinline
1809periodics_reschedule (EV_P) 2125periodics_reschedule (EV_P)
1810{ 2126{
1811 int i; 2127 int i;
1812 2128
… …
1825 2141
1826 reheap (periodics, periodiccnt); 2142 reheap (periodics, periodiccnt);
1827} 2143}
1828#endif 2144#endif
1829 2145
1830void inline_speed 2146/* adjust all timers by a given offset */
2147static void noinline
2148timers_reschedule (EV_P_ ev_tstamp adjust)
2149{
2150 int i;
2151
2152 for (i = 0; i < timercnt; ++i)
2153 {
2154 ANHE *he = timers + i + HEAP0;
2155 ANHE_w (*he)->at += adjust;
2156 ANHE_at_cache (*he);
2157 }
2158}
2159
2160/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */
2162inline_speed void
1831time_update (EV_P_ ev_tstamp max_block) 2163time_update (EV_P_ ev_tstamp max_block)
1832{ 2164{
1833 int i;
1834
1835#if EV_USE_MONOTONIC 2165#if EV_USE_MONOTONIC
1836 if (expect_true (have_monotonic)) 2166 if (expect_true (have_monotonic))
1837 { 2167 {
2168 int i;
1838 ev_tstamp odiff = rtmn_diff; 2169 ev_tstamp odiff = rtmn_diff;
1839 2170
1840 mn_now = get_clock (); 2171 mn_now = get_clock ();
1841 2172
1842 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2173 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1868 ev_rt_now = ev_time (); 2199 ev_rt_now = ev_time ();
1869 mn_now = get_clock (); 2200 mn_now = get_clock ();
1870 now_floor = mn_now; 2201 now_floor = mn_now;
1871 } 2202 }
1872 2203
2204 /* no timer adjustment, as the monotonic clock doesn't jump */
2205 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1873# if EV_PERIODIC_ENABLE 2206# if EV_PERIODIC_ENABLE
1874 periodics_reschedule (EV_A); 2207 periodics_reschedule (EV_A);
1875# endif 2208# endif
1876 /* no timer adjustment, as the monotonic clock doesn't jump */
1877 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878 } 2209 }
1879 else 2210 else
1880#endif 2211#endif
1881 { 2212 {
1882 ev_rt_now = ev_time (); 2213 ev_rt_now = ev_time ();
1883 2214
1884 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2215 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1885 { 2216 {
2217 /* adjust timers. this is easy, as the offset is the same for all of them */
2218 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1886#if EV_PERIODIC_ENABLE 2219#if EV_PERIODIC_ENABLE
1887 periodics_reschedule (EV_A); 2220 periodics_reschedule (EV_A);
1888#endif 2221#endif
1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1890 for (i = 0; i < timercnt; ++i)
1891 {
1892 ANHE *he = timers + i + HEAP0;
1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1894 ANHE_at_cache (*he);
1895 }
1896 } 2222 }
1897 2223
1898 mn_now = ev_rt_now; 2224 mn_now = ev_rt_now;
1899 } 2225 }
1900} 2226}
1901 2227
1902void 2228void
1903ev_ref (EV_P)
1904{
1905 ++activecnt;
1906}
1907
1908void
1909ev_unref (EV_P)
1910{
1911 --activecnt;
1912}
1913
1914static int loop_done;
1915
1916void
1917ev_loop (EV_P_ int flags) 2229ev_loop (EV_P_ int flags)
1918{ 2230{
2231#if EV_MINIMAL < 2
2232 ++loop_depth;
2233#endif
2234
2235 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2236
1919 loop_done = EVUNLOOP_CANCEL; 2237 loop_done = EVUNLOOP_CANCEL;
1920 2238
1921 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2239 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1922 2240
1923 do 2241 do
1924 { 2242 {
1925#if EV_VERIFY >= 2 2243#if EV_VERIFY >= 2
1926 ev_loop_verify (EV_A); 2244 ev_loop_verify (EV_A);
… …
1939 /* we might have forked, so queue fork handlers */ 2257 /* we might have forked, so queue fork handlers */
1940 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1941 if (forkcnt) 2259 if (forkcnt)
1942 { 2260 {
1943 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2261 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1944 call_pending (EV_A); 2262 EV_INVOKE_PENDING;
1945 } 2263 }
1946#endif 2264#endif
1947 2265
1948 /* queue prepare watchers (and execute them) */ 2266 /* queue prepare watchers (and execute them) */
1949 if (expect_false (preparecnt)) 2267 if (expect_false (preparecnt))
1950 { 2268 {
1951 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2269 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1952 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
1953 } 2271 }
1954 2272
1955 if (expect_false (!activecnt)) 2273 if (expect_false (loop_done))
1956 break; 2274 break;
1957 2275
1958 /* we might have forked, so reify kernel state if necessary */ 2276 /* we might have forked, so reify kernel state if necessary */
1959 if (expect_false (postfork)) 2277 if (expect_false (postfork))
1960 loop_fork (EV_A); 2278 loop_fork (EV_A);
… …
1967 ev_tstamp waittime = 0.; 2285 ev_tstamp waittime = 0.;
1968 ev_tstamp sleeptime = 0.; 2286 ev_tstamp sleeptime = 0.;
1969 2287
1970 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2288 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1971 { 2289 {
2290 /* remember old timestamp for io_blocktime calculation */
2291 ev_tstamp prev_mn_now = mn_now;
2292
1972 /* update time to cancel out callback processing overhead */ 2293 /* update time to cancel out callback processing overhead */
1973 time_update (EV_A_ 1e100); 2294 time_update (EV_A_ 1e100);
1974 2295
1975 waittime = MAX_BLOCKTIME; 2296 waittime = MAX_BLOCKTIME;
1976 2297
… …
1986 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2307 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1987 if (waittime > to) waittime = to; 2308 if (waittime > to) waittime = to;
1988 } 2309 }
1989#endif 2310#endif
1990 2311
2312 /* don't let timeouts decrease the waittime below timeout_blocktime */
1991 if (expect_false (waittime < timeout_blocktime)) 2313 if (expect_false (waittime < timeout_blocktime))
1992 waittime = timeout_blocktime; 2314 waittime = timeout_blocktime;
1993 2315
1994 sleeptime = waittime - backend_fudge; 2316 /* extra check because io_blocktime is commonly 0 */
1995
1996 if (expect_true (sleeptime > io_blocktime)) 2317 if (expect_false (io_blocktime))
1997 sleeptime = io_blocktime;
1998
1999 if (sleeptime)
2000 { 2318 {
2319 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2320
2321 if (sleeptime > waittime - backend_fudge)
2322 sleeptime = waittime - backend_fudge;
2323
2324 if (expect_true (sleeptime > 0.))
2325 {
2001 ev_sleep (sleeptime); 2326 ev_sleep (sleeptime);
2002 waittime -= sleeptime; 2327 waittime -= sleeptime;
2328 }
2003 } 2329 }
2004 } 2330 }
2005 2331
2332#if EV_MINIMAL < 2
2006 ++loop_count; 2333 ++loop_count;
2334#endif
2335 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2007 backend_poll (EV_A_ waittime); 2336 backend_poll (EV_A_ waittime);
2337 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2008 2338
2009 /* update ev_rt_now, do magic */ 2339 /* update ev_rt_now, do magic */
2010 time_update (EV_A_ waittime + sleeptime); 2340 time_update (EV_A_ waittime + sleeptime);
2011 } 2341 }
2012 2342
… …
2023 2353
2024 /* queue check watchers, to be executed first */ 2354 /* queue check watchers, to be executed first */
2025 if (expect_false (checkcnt)) 2355 if (expect_false (checkcnt))
2026 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2356 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2027 2357
2028 call_pending (EV_A); 2358 EV_INVOKE_PENDING;
2029 } 2359 }
2030 while (expect_true ( 2360 while (expect_true (
2031 activecnt 2361 activecnt
2032 && !loop_done 2362 && !loop_done
2033 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2363 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2034 )); 2364 ));
2035 2365
2036 if (loop_done == EVUNLOOP_ONE) 2366 if (loop_done == EVUNLOOP_ONE)
2037 loop_done = EVUNLOOP_CANCEL; 2367 loop_done = EVUNLOOP_CANCEL;
2368
2369#if EV_MINIMAL < 2
2370 --loop_depth;
2371#endif
2038} 2372}
2039 2373
2040void 2374void
2041ev_unloop (EV_P_ int how) 2375ev_unloop (EV_P_ int how)
2042{ 2376{
2043 loop_done = how; 2377 loop_done = how;
2044} 2378}
2045 2379
2380void
2381ev_ref (EV_P)
2382{
2383 ++activecnt;
2384}
2385
2386void
2387ev_unref (EV_P)
2388{
2389 --activecnt;
2390}
2391
2392void
2393ev_now_update (EV_P)
2394{
2395 time_update (EV_A_ 1e100);
2396}
2397
2398void
2399ev_suspend (EV_P)
2400{
2401 ev_now_update (EV_A);
2402}
2403
2404void
2405ev_resume (EV_P)
2406{
2407 ev_tstamp mn_prev = mn_now;
2408
2409 ev_now_update (EV_A);
2410 timers_reschedule (EV_A_ mn_now - mn_prev);
2411#if EV_PERIODIC_ENABLE
2412 /* TODO: really do this? */
2413 periodics_reschedule (EV_A);
2414#endif
2415}
2416
2046/*****************************************************************************/ 2417/*****************************************************************************/
2418/* singly-linked list management, used when the expected list length is short */
2047 2419
2048void inline_size 2420inline_size void
2049wlist_add (WL *head, WL elem) 2421wlist_add (WL *head, WL elem)
2050{ 2422{
2051 elem->next = *head; 2423 elem->next = *head;
2052 *head = elem; 2424 *head = elem;
2053} 2425}
2054 2426
2055void inline_size 2427inline_size void
2056wlist_del (WL *head, WL elem) 2428wlist_del (WL *head, WL elem)
2057{ 2429{
2058 while (*head) 2430 while (*head)
2059 { 2431 {
2060 if (*head == elem) 2432 if (expect_true (*head == elem))
2061 { 2433 {
2062 *head = elem->next; 2434 *head = elem->next;
2063 return; 2435 break;
2064 } 2436 }
2065 2437
2066 head = &(*head)->next; 2438 head = &(*head)->next;
2067 } 2439 }
2068} 2440}
2069 2441
2070void inline_speed 2442/* internal, faster, version of ev_clear_pending */
2443inline_speed void
2071clear_pending (EV_P_ W w) 2444clear_pending (EV_P_ W w)
2072{ 2445{
2073 if (w->pending) 2446 if (w->pending)
2074 { 2447 {
2075 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2448 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2076 w->pending = 0; 2449 w->pending = 0;
2077 } 2450 }
2078} 2451}
2079 2452
2080int 2453int
… …
2084 int pending = w_->pending; 2457 int pending = w_->pending;
2085 2458
2086 if (expect_true (pending)) 2459 if (expect_true (pending))
2087 { 2460 {
2088 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2461 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2462 p->w = (W)&pending_w;
2089 w_->pending = 0; 2463 w_->pending = 0;
2090 p->w = 0;
2091 return p->events; 2464 return p->events;
2092 } 2465 }
2093 else 2466 else
2094 return 0; 2467 return 0;
2095} 2468}
2096 2469
2097void inline_size 2470inline_size void
2098pri_adjust (EV_P_ W w) 2471pri_adjust (EV_P_ W w)
2099{ 2472{
2100 int pri = w->priority; 2473 int pri = ev_priority (w);
2101 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2474 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2102 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2475 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2103 w->priority = pri; 2476 ev_set_priority (w, pri);
2104} 2477}
2105 2478
2106void inline_speed 2479inline_speed void
2107ev_start (EV_P_ W w, int active) 2480ev_start (EV_P_ W w, int active)
2108{ 2481{
2109 pri_adjust (EV_A_ w); 2482 pri_adjust (EV_A_ w);
2110 w->active = active; 2483 w->active = active;
2111 ev_ref (EV_A); 2484 ev_ref (EV_A);
2112} 2485}
2113 2486
2114void inline_size 2487inline_size void
2115ev_stop (EV_P_ W w) 2488ev_stop (EV_P_ W w)
2116{ 2489{
2117 ev_unref (EV_A); 2490 ev_unref (EV_A);
2118 w->active = 0; 2491 w->active = 0;
2119} 2492}
… …
2126 int fd = w->fd; 2499 int fd = w->fd;
2127 2500
2128 if (expect_false (ev_is_active (w))) 2501 if (expect_false (ev_is_active (w)))
2129 return; 2502 return;
2130 2503
2131 assert (("ev_io_start called with negative fd", fd >= 0)); 2504 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2132 2506
2133 EV_FREQUENT_CHECK; 2507 EV_FREQUENT_CHECK;
2134 2508
2135 ev_start (EV_A_ (W)w, 1); 2509 ev_start (EV_A_ (W)w, 1);
2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137 wlist_add (&anfds[fd].head, (WL)w); 2511 wlist_add (&anfds[fd].head, (WL)w);
2138 2512
2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2513 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2140 w->events &= ~EV_IOFDSET; 2514 w->events &= ~EV__IOFDSET;
2141 2515
2142 EV_FREQUENT_CHECK; 2516 EV_FREQUENT_CHECK;
2143} 2517}
2144 2518
2145void noinline 2519void noinline
… …
2147{ 2521{
2148 clear_pending (EV_A_ (W)w); 2522 clear_pending (EV_A_ (W)w);
2149 if (expect_false (!ev_is_active (w))) 2523 if (expect_false (!ev_is_active (w)))
2150 return; 2524 return;
2151 2525
2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2526 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2153 2527
2154 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2155 2529
2156 wlist_del (&anfds[w->fd].head, (WL)w); 2530 wlist_del (&anfds[w->fd].head, (WL)w);
2157 ev_stop (EV_A_ (W)w); 2531 ev_stop (EV_A_ (W)w);
… …
2167 if (expect_false (ev_is_active (w))) 2541 if (expect_false (ev_is_active (w)))
2168 return; 2542 return;
2169 2543
2170 ev_at (w) += mn_now; 2544 ev_at (w) += mn_now;
2171 2545
2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2546 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2173 2547
2174 EV_FREQUENT_CHECK; 2548 EV_FREQUENT_CHECK;
2175 2549
2176 ++timercnt; 2550 ++timercnt;
2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2551 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2180 ANHE_at_cache (timers [ev_active (w)]); 2554 ANHE_at_cache (timers [ev_active (w)]);
2181 upheap (timers, ev_active (w)); 2555 upheap (timers, ev_active (w));
2182 2556
2183 EV_FREQUENT_CHECK; 2557 EV_FREQUENT_CHECK;
2184 2558
2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2559 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2186} 2560}
2187 2561
2188void noinline 2562void noinline
2189ev_timer_stop (EV_P_ ev_timer *w) 2563ev_timer_stop (EV_P_ ev_timer *w)
2190{ 2564{
… …
2195 EV_FREQUENT_CHECK; 2569 EV_FREQUENT_CHECK;
2196 2570
2197 { 2571 {
2198 int active = ev_active (w); 2572 int active = ev_active (w);
2199 2573
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2574 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201 2575
2202 --timercnt; 2576 --timercnt;
2203 2577
2204 if (expect_true (active < timercnt + HEAP0)) 2578 if (expect_true (active < timercnt + HEAP0))
2205 { 2579 {
… …
2238 } 2612 }
2239 2613
2240 EV_FREQUENT_CHECK; 2614 EV_FREQUENT_CHECK;
2241} 2615}
2242 2616
2617ev_tstamp
2618ev_timer_remaining (EV_P_ ev_timer *w)
2619{
2620 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2621}
2622
2243#if EV_PERIODIC_ENABLE 2623#if EV_PERIODIC_ENABLE
2244void noinline 2624void noinline
2245ev_periodic_start (EV_P_ ev_periodic *w) 2625ev_periodic_start (EV_P_ ev_periodic *w)
2246{ 2626{
2247 if (expect_false (ev_is_active (w))) 2627 if (expect_false (ev_is_active (w)))
… …
2249 2629
2250 if (w->reschedule_cb) 2630 if (w->reschedule_cb)
2251 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2631 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2252 else if (w->interval) 2632 else if (w->interval)
2253 { 2633 {
2254 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2634 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2255 /* this formula differs from the one in periodic_reify because we do not always round up */ 2635 /* this formula differs from the one in periodic_reify because we do not always round up */
2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2636 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2257 } 2637 }
2258 else 2638 else
2259 ev_at (w) = w->offset; 2639 ev_at (w) = w->offset;
… …
2267 ANHE_at_cache (periodics [ev_active (w)]); 2647 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w)); 2648 upheap (periodics, ev_active (w));
2269 2649
2270 EV_FREQUENT_CHECK; 2650 EV_FREQUENT_CHECK;
2271 2651
2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2652 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2273} 2653}
2274 2654
2275void noinline 2655void noinline
2276ev_periodic_stop (EV_P_ ev_periodic *w) 2656ev_periodic_stop (EV_P_ ev_periodic *w)
2277{ 2657{
… …
2282 EV_FREQUENT_CHECK; 2662 EV_FREQUENT_CHECK;
2283 2663
2284 { 2664 {
2285 int active = ev_active (w); 2665 int active = ev_active (w);
2286 2666
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2667 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288 2668
2289 --periodiccnt; 2669 --periodiccnt;
2290 2670
2291 if (expect_true (active < periodiccnt + HEAP0)) 2671 if (expect_true (active < periodiccnt + HEAP0))
2292 { 2672 {
… …
2314#endif 2694#endif
2315 2695
2316void noinline 2696void noinline
2317ev_signal_start (EV_P_ ev_signal *w) 2697ev_signal_start (EV_P_ ev_signal *w)
2318{ 2698{
2319#if EV_MULTIPLICITY
2320 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2321#endif
2322 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2323 return; 2700 return;
2324 2701
2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2702 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2326 2703
2327 evpipe_init (EV_A); 2704#if EV_MULTIPLICITY
2705 assert (("libev: a signal must not be attached to two different loops",
2706 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2328 2707
2329 EV_FREQUENT_CHECK; 2708 signals [w->signum - 1].loop = EV_A;
2709#endif
2330 2710
2711 EV_FREQUENT_CHECK;
2712
2713#if EV_USE_SIGNALFD
2714 if (sigfd == -2)
2331 { 2715 {
2332#ifndef _WIN32 2716 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2333 sigset_t full, prev; 2717 if (sigfd < 0 && errno == EINVAL)
2334 sigfillset (&full); 2718 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2335 sigprocmask (SIG_SETMASK, &full, &prev);
2336#endif
2337 2719
2338 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2720 if (sigfd >= 0)
2721 {
2722 fd_intern (sigfd); /* doing it twice will not hurt */
2339 2723
2340#ifndef _WIN32 2724 sigemptyset (&sigfd_set);
2341 sigprocmask (SIG_SETMASK, &prev, 0); 2725
2342#endif 2726 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2727 ev_set_priority (&sigfd_w, EV_MAXPRI);
2728 ev_io_start (EV_A_ &sigfd_w);
2729 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2730 }
2343 } 2731 }
2732
2733 if (sigfd >= 0)
2734 {
2735 /* TODO: check .head */
2736 sigaddset (&sigfd_set, w->signum);
2737 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2738
2739 signalfd (sigfd, &sigfd_set, 0);
2740 }
2741#endif
2344 2742
2345 ev_start (EV_A_ (W)w, 1); 2743 ev_start (EV_A_ (W)w, 1);
2346 wlist_add (&signals [w->signum - 1].head, (WL)w); 2744 wlist_add (&signals [w->signum - 1].head, (WL)w);
2347 2745
2348 if (!((WL)w)->next) 2746 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/
2749# endif
2349 { 2750 {
2350#if _WIN32 2751# if _WIN32
2752 evpipe_init (EV_A);
2753
2351 signal (w->signum, ev_sighandler); 2754 signal (w->signum, ev_sighandler);
2352#else 2755# else
2353 struct sigaction sa; 2756 struct sigaction sa;
2757
2758 evpipe_init (EV_A);
2759
2354 sa.sa_handler = ev_sighandler; 2760 sa.sa_handler = ev_sighandler;
2355 sigfillset (&sa.sa_mask); 2761 sigfillset (&sa.sa_mask);
2356 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2762 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2357 sigaction (w->signum, &sa, 0); 2763 sigaction (w->signum, &sa, 0);
2764
2765 sigemptyset (&sa.sa_mask);
2766 sigaddset (&sa.sa_mask, w->signum);
2767 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2358#endif 2768#endif
2359 } 2769 }
2360 2770
2361 EV_FREQUENT_CHECK; 2771 EV_FREQUENT_CHECK;
2362} 2772}
2363 2773
2364void noinline 2774void noinline
… …
2372 2782
2373 wlist_del (&signals [w->signum - 1].head, (WL)w); 2783 wlist_del (&signals [w->signum - 1].head, (WL)w);
2374 ev_stop (EV_A_ (W)w); 2784 ev_stop (EV_A_ (W)w);
2375 2785
2376 if (!signals [w->signum - 1].head) 2786 if (!signals [w->signum - 1].head)
2787 {
2788#if EV_MULTIPLICITY
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif
2791#if EV_USE_SIGNALFD
2792 if (sigfd >= 0)
2793 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2795 sigdelset (&sigfd_set, w->signum);
2796 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2798 /*TODO: maybe unblock signal? */
2799 }
2800 else
2801#endif
2377 signal (w->signum, SIG_DFL); 2802 signal (w->signum, SIG_DFL);
2803 }
2378 2804
2379 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2380} 2806}
2381 2807
2382void 2808void
2383ev_child_start (EV_P_ ev_child *w) 2809ev_child_start (EV_P_ ev_child *w)
2384{ 2810{
2385#if EV_MULTIPLICITY 2811#if EV_MULTIPLICITY
2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2812 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2387#endif 2813#endif
2388 if (expect_false (ev_is_active (w))) 2814 if (expect_false (ev_is_active (w)))
2389 return; 2815 return;
2390 2816
2391 EV_FREQUENT_CHECK; 2817 EV_FREQUENT_CHECK;
… …
2416# ifdef _WIN32 2842# ifdef _WIN32
2417# undef lstat 2843# undef lstat
2418# define lstat(a,b) _stati64 (a,b) 2844# define lstat(a,b) _stati64 (a,b)
2419# endif 2845# endif
2420 2846
2421#define DEF_STAT_INTERVAL 5.0074891 2847#define DEF_STAT_INTERVAL 5.0074891
2848#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2422#define MIN_STAT_INTERVAL 0.1074891 2849#define MIN_STAT_INTERVAL 0.1074891
2423 2850
2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2851static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2425 2852
2426#if EV_USE_INOTIFY 2853#if EV_USE_INOTIFY
2427# define EV_INOTIFY_BUFSIZE 8192 2854# define EV_INOTIFY_BUFSIZE 8192
… …
2431{ 2858{
2432 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); 2859 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);
2433 2860
2434 if (w->wd < 0) 2861 if (w->wd < 0)
2435 { 2862 {
2863 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2864 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2437 2865
2438 /* monitor some parent directory for speedup hints */ 2866 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2867 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2440 /* but an efficiency issue only */ 2868 /* but an efficiency issue only */
2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2869 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2442 { 2870 {
2443 char path [4096]; 2871 char path [4096];
2444 strcpy (path, w->path); 2872 strcpy (path, w->path);
… …
2448 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2876 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2449 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2877 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2450 2878
2451 char *pend = strrchr (path, '/'); 2879 char *pend = strrchr (path, '/');
2452 2880
2453 if (!pend) 2881 if (!pend || pend == path)
2454 break; /* whoops, no '/', complain to your admin */ 2882 break;
2455 2883
2456 *pend = 0; 2884 *pend = 0;
2457 w->wd = inotify_add_watch (fs_fd, path, mask); 2885 w->wd = inotify_add_watch (fs_fd, path, mask);
2458 } 2886 }
2459 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2887 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2460 } 2888 }
2461 } 2889 }
2462 else
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2890
2465 if (w->wd >= 0) 2891 if (w->wd >= 0)
2892 {
2893 struct statfs sfs;
2894
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2895 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2896
2897 /* now local changes will be tracked by inotify, but remote changes won't */
2898 /* unless the filesystem is known to be local, we therefore still poll */
2899 /* also do poll on <2.6.25, but with normal frequency */
2900
2901 if (fs_2625 && !statfs (w->path, &sfs))
2902 if (sfs.f_type == 0x1373 /* devfs */
2903 || sfs.f_type == 0xEF53 /* ext2/3 */
2904 || sfs.f_type == 0x3153464a /* jfs */
2905 || sfs.f_type == 0x52654973 /* reiser3 */
2906 || sfs.f_type == 0x01021994 /* tempfs */
2907 || sfs.f_type == 0x58465342 /* xfs */)
2908 return;
2909
2910 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2911 ev_timer_again (EV_A_ &w->timer);
2912 }
2467} 2913}
2468 2914
2469static void noinline 2915static void noinline
2470infy_del (EV_P_ ev_stat *w) 2916infy_del (EV_P_ ev_stat *w)
2471{ 2917{
… …
2485 2931
2486static void noinline 2932static void noinline
2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2933infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2488{ 2934{
2489 if (slot < 0) 2935 if (slot < 0)
2490 /* overflow, need to check for all hahs slots */ 2936 /* overflow, need to check for all hash slots */
2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2937 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492 infy_wd (EV_A_ slot, wd, ev); 2938 infy_wd (EV_A_ slot, wd, ev);
2493 else 2939 else
2494 { 2940 {
2495 WL w_; 2941 WL w_;
… …
2501 2947
2502 if (w->wd == wd || wd == -1) 2948 if (w->wd == wd || wd == -1)
2503 { 2949 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2950 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2951 {
2952 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2953 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2954 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2955 }
2509 2956
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2957 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2523 2970
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2971 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2972 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2973}
2527 2974
2528void inline_size 2975inline_size void
2976check_2625 (EV_P)
2977{
2978 /* kernels < 2.6.25 are borked
2979 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2980 */
2981 struct utsname buf;
2982 int major, minor, micro;
2983
2984 if (uname (&buf))
2985 return;
2986
2987 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2988 return;
2989
2990 if (major < 2
2991 || (major == 2 && minor < 6)
2992 || (major == 2 && minor == 6 && micro < 25))
2993 return;
2994
2995 fs_2625 = 1;
2996}
2997
2998inline_size int
2999infy_newfd (void)
3000{
3001#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3002 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3003 if (fd >= 0)
3004 return fd;
3005#endif
3006 return inotify_init ();
3007}
3008
3009inline_size void
2529infy_init (EV_P) 3010infy_init (EV_P)
2530{ 3011{
2531 if (fs_fd != -2) 3012 if (fs_fd != -2)
2532 return; 3013 return;
2533 3014
3015 fs_fd = -1;
3016
3017 check_2625 (EV_A);
3018
2534 fs_fd = inotify_init (); 3019 fs_fd = infy_newfd ();
2535 3020
2536 if (fs_fd >= 0) 3021 if (fs_fd >= 0)
2537 { 3022 {
3023 fd_intern (fs_fd);
2538 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3024 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2539 ev_set_priority (&fs_w, EV_MAXPRI); 3025 ev_set_priority (&fs_w, EV_MAXPRI);
2540 ev_io_start (EV_A_ &fs_w); 3026 ev_io_start (EV_A_ &fs_w);
3027 ev_unref (EV_A);
2541 } 3028 }
2542} 3029}
2543 3030
2544void inline_size 3031inline_size void
2545infy_fork (EV_P) 3032infy_fork (EV_P)
2546{ 3033{
2547 int slot; 3034 int slot;
2548 3035
2549 if (fs_fd < 0) 3036 if (fs_fd < 0)
2550 return; 3037 return;
2551 3038
3039 ev_ref (EV_A);
3040 ev_io_stop (EV_A_ &fs_w);
2552 close (fs_fd); 3041 close (fs_fd);
2553 fs_fd = inotify_init (); 3042 fs_fd = infy_newfd ();
3043
3044 if (fs_fd >= 0)
3045 {
3046 fd_intern (fs_fd);
3047 ev_io_set (&fs_w, fs_fd, EV_READ);
3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
3050 }
2554 3051
2555 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2556 { 3053 {
2557 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2558 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
… …
2565 w->wd = -1; 3062 w->wd = -1;
2566 3063
2567 if (fs_fd >= 0) 3064 if (fs_fd >= 0)
2568 infy_add (EV_A_ w); /* re-add, no matter what */ 3065 infy_add (EV_A_ w); /* re-add, no matter what */
2569 else 3066 else
2570 ev_timer_start (EV_A_ &w->timer); 3067 ev_timer_again (EV_A_ &w->timer);
2571 } 3068 }
2572
2573 } 3069 }
2574} 3070}
2575 3071
2576#endif 3072#endif
2577 3073
… …
2613 || w->prev.st_atime != w->attr.st_atime 3109 || w->prev.st_atime != w->attr.st_atime
2614 || w->prev.st_mtime != w->attr.st_mtime 3110 || w->prev.st_mtime != w->attr.st_mtime
2615 || w->prev.st_ctime != w->attr.st_ctime 3111 || w->prev.st_ctime != w->attr.st_ctime
2616 ) { 3112 ) {
2617 #if EV_USE_INOTIFY 3113 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0)
3115 {
2618 infy_del (EV_A_ w); 3116 infy_del (EV_A_ w);
2619 infy_add (EV_A_ w); 3117 infy_add (EV_A_ w);
2620 ev_stat_stat (EV_A_ w); /* avoid race... */ 3118 ev_stat_stat (EV_A_ w); /* avoid race... */
3119 }
2621 #endif 3120 #endif
2622 3121
2623 ev_feed_event (EV_A_ w, EV_STAT); 3122 ev_feed_event (EV_A_ w, EV_STAT);
2624 } 3123 }
2625} 3124}
… …
2628ev_stat_start (EV_P_ ev_stat *w) 3127ev_stat_start (EV_P_ ev_stat *w)
2629{ 3128{
2630 if (expect_false (ev_is_active (w))) 3129 if (expect_false (ev_is_active (w)))
2631 return; 3130 return;
2632 3131
2633 /* since we use memcmp, we need to clear any padding data etc. */
2634 memset (&w->prev, 0, sizeof (ev_statdata));
2635 memset (&w->attr, 0, sizeof (ev_statdata));
2636
2637 ev_stat_stat (EV_A_ w); 3132 ev_stat_stat (EV_A_ w);
2638 3133
3134 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2639 if (w->interval < MIN_STAT_INTERVAL) 3135 w->interval = MIN_STAT_INTERVAL;
2640 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2641 3136
2642 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3137 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2643 ev_set_priority (&w->timer, ev_priority (w)); 3138 ev_set_priority (&w->timer, ev_priority (w));
2644 3139
2645#if EV_USE_INOTIFY 3140#if EV_USE_INOTIFY
2646 infy_init (EV_A); 3141 infy_init (EV_A);
2647 3142
2648 if (fs_fd >= 0) 3143 if (fs_fd >= 0)
2649 infy_add (EV_A_ w); 3144 infy_add (EV_A_ w);
2650 else 3145 else
2651#endif 3146#endif
2652 ev_timer_start (EV_A_ &w->timer); 3147 ev_timer_again (EV_A_ &w->timer);
2653 3148
2654 ev_start (EV_A_ (W)w, 1); 3149 ev_start (EV_A_ (W)w, 1);
2655 3150
2656 EV_FREQUENT_CHECK; 3151 EV_FREQUENT_CHECK;
2657} 3152}
… …
2817embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2818{ 3313{
2819 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2820 3315
2821 { 3316 {
2822 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
2823 3318
2824 while (fdchangecnt) 3319 while (fdchangecnt)
2825 { 3320 {
2826 fd_reify (EV_A); 3321 fd_reify (EV_A);
2827 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828 } 3323 }
2829 } 3324 }
2830} 3325}
2831 3326
3327static void
3328embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3329{
3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3331
3332 ev_embed_stop (EV_A_ w);
3333
3334 {
3335 EV_P = w->other;
3336
3337 ev_loop_fork (EV_A);
3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3339 }
3340
3341 ev_embed_start (EV_A_ w);
3342}
3343
2832#if 0 3344#if 0
2833static void 3345static void
2834embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3346embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835{ 3347{
2836 ev_idle_stop (EV_A_ idle); 3348 ev_idle_stop (EV_A_ idle);
… …
2842{ 3354{
2843 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
2844 return; 3356 return;
2845 3357
2846 { 3358 {
2847 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2850 } 3362 }
2851 3363
2852 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
2853 3365
… …
2856 3368
2857 ev_prepare_init (&w->prepare, embed_prepare_cb); 3369 ev_prepare_init (&w->prepare, embed_prepare_cb);
2858 ev_set_priority (&w->prepare, EV_MINPRI); 3370 ev_set_priority (&w->prepare, EV_MINPRI);
2859 ev_prepare_start (EV_A_ &w->prepare); 3371 ev_prepare_start (EV_A_ &w->prepare);
2860 3372
3373 ev_fork_init (&w->fork, embed_fork_cb);
3374 ev_fork_start (EV_A_ &w->fork);
3375
2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3376 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2862 3377
2863 ev_start (EV_A_ (W)w, 1); 3378 ev_start (EV_A_ (W)w, 1);
2864 3379
2865 EV_FREQUENT_CHECK; 3380 EV_FREQUENT_CHECK;
… …
2872 if (expect_false (!ev_is_active (w))) 3387 if (expect_false (!ev_is_active (w)))
2873 return; 3388 return;
2874 3389
2875 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
2876 3391
2877 ev_io_stop (EV_A_ &w->io); 3392 ev_io_stop (EV_A_ &w->io);
2878 ev_prepare_stop (EV_A_ &w->prepare); 3393 ev_prepare_stop (EV_A_ &w->prepare);
2879 3394 ev_fork_stop (EV_A_ &w->fork);
2880 ev_stop (EV_A_ (W)w);
2881 3395
2882 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
2883} 3397}
2884#endif 3398#endif
2885 3399
… …
2962 3476
2963void 3477void
2964ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
2965{ 3479{
2966 w->sent = 1; 3480 w->sent = 1;
2967 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
2968} 3482}
2969#endif 3483#endif
2970 3484
2971/*****************************************************************************/ 3485/*****************************************************************************/
2972 3486
… …
2982once_cb (EV_P_ struct ev_once *once, int revents) 3496once_cb (EV_P_ struct ev_once *once, int revents)
2983{ 3497{
2984 void (*cb)(int revents, void *arg) = once->cb; 3498 void (*cb)(int revents, void *arg) = once->cb;
2985 void *arg = once->arg; 3499 void *arg = once->arg;
2986 3500
2987 ev_io_stop (EV_A_ &once->io); 3501 ev_io_stop (EV_A_ &once->io);
2988 ev_timer_stop (EV_A_ &once->to); 3502 ev_timer_stop (EV_A_ &once->to);
2989 ev_free (once); 3503 ev_free (once);
2990 3504
2991 cb (revents, arg); 3505 cb (revents, arg);
2992} 3506}
2993 3507
2994static void 3508static void
2995once_cb_io (EV_P_ ev_io *w, int revents) 3509once_cb_io (EV_P_ ev_io *w, int revents)
2996{ 3510{
2997 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3511 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3512
3513 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2998} 3514}
2999 3515
3000static void 3516static void
3001once_cb_to (EV_P_ ev_timer *w, int revents) 3517once_cb_to (EV_P_ ev_timer *w, int revents)
3002{ 3518{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3519 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3520
3521 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3004} 3522}
3005 3523
3006void 3524void
3007ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3525ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3008{ 3526{
… …
3030 ev_timer_set (&once->to, timeout, 0.); 3548 ev_timer_set (&once->to, timeout, 0.);
3031 ev_timer_start (EV_A_ &once->to); 3549 ev_timer_start (EV_A_ &once->to);
3032 } 3550 }
3033} 3551}
3034 3552
3553/*****************************************************************************/
3554
3555#if EV_WALK_ENABLE
3556void
3557ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3558{
3559 int i, j;
3560 ev_watcher_list *wl, *wn;
3561
3562 if (types & (EV_IO | EV_EMBED))
3563 for (i = 0; i < anfdmax; ++i)
3564 for (wl = anfds [i].head; wl; )
3565 {
3566 wn = wl->next;
3567
3568#if EV_EMBED_ENABLE
3569 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3570 {
3571 if (types & EV_EMBED)
3572 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3573 }
3574 else
3575#endif
3576#if EV_USE_INOTIFY
3577 if (ev_cb ((ev_io *)wl) == infy_cb)
3578 ;
3579 else
3580#endif
3581 if ((ev_io *)wl != &pipe_w)
3582 if (types & EV_IO)
3583 cb (EV_A_ EV_IO, wl);
3584
3585 wl = wn;
3586 }
3587
3588 if (types & (EV_TIMER | EV_STAT))
3589 for (i = timercnt + HEAP0; i-- > HEAP0; )
3590#if EV_STAT_ENABLE
3591 /*TODO: timer is not always active*/
3592 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3593 {
3594 if (types & EV_STAT)
3595 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3596 }
3597 else
3598#endif
3599 if (types & EV_TIMER)
3600 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3601
3602#if EV_PERIODIC_ENABLE
3603 if (types & EV_PERIODIC)
3604 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3605 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3606#endif
3607
3608#if EV_IDLE_ENABLE
3609 if (types & EV_IDLE)
3610 for (j = NUMPRI; i--; )
3611 for (i = idlecnt [j]; i--; )
3612 cb (EV_A_ EV_IDLE, idles [j][i]);
3613#endif
3614
3615#if EV_FORK_ENABLE
3616 if (types & EV_FORK)
3617 for (i = forkcnt; i--; )
3618 if (ev_cb (forks [i]) != embed_fork_cb)
3619 cb (EV_A_ EV_FORK, forks [i]);
3620#endif
3621
3622#if EV_ASYNC_ENABLE
3623 if (types & EV_ASYNC)
3624 for (i = asynccnt; i--; )
3625 cb (EV_A_ EV_ASYNC, asyncs [i]);
3626#endif
3627
3628 if (types & EV_PREPARE)
3629 for (i = preparecnt; i--; )
3630#if EV_EMBED_ENABLE
3631 if (ev_cb (prepares [i]) != embed_prepare_cb)
3632#endif
3633 cb (EV_A_ EV_PREPARE, prepares [i]);
3634
3635 if (types & EV_CHECK)
3636 for (i = checkcnt; i--; )
3637 cb (EV_A_ EV_CHECK, checks [i]);
3638
3639 if (types & EV_SIGNAL)
3640 for (i = 0; i < EV_NSIG - 1; ++i)
3641 for (wl = signals [i].head; wl; )
3642 {
3643 wn = wl->next;
3644 cb (EV_A_ EV_SIGNAL, wl);
3645 wl = wn;
3646 }
3647
3648 if (types & EV_CHILD)
3649 for (i = EV_PID_HASHSIZE; i--; )
3650 for (wl = childs [i]; wl; )
3651 {
3652 wn = wl->next;
3653 cb (EV_A_ EV_CHILD, wl);
3654 wl = wn;
3655 }
3656/* EV_STAT 0x00001000 /* stat data changed */
3657/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3658}
3659#endif
3660
3035#if EV_MULTIPLICITY 3661#if EV_MULTIPLICITY
3036 #include "ev_wrap.h" 3662 #include "ev_wrap.h"
3037#endif 3663#endif
3038 3664
3039#ifdef __cplusplus 3665#ifdef __cplusplus

Diff Legend

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