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

Comparing libev/ev.c (file contents):
Revision 1.286 by root, Wed Apr 15 19:37:15 2009 UTC vs.
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
176# endif 186# endif
177#endif 187#endif
178 188
179/* 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 */
180 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
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 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
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
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
285#endif 344#endif
286 345
287/* 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 */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* 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 */
336# 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
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
344#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
345 434
346/**/ 435/**/
347 436
348#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 450 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 452
364#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) */
365#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) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 455
368#if __GNUC__ >= 4 456#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
371#else 459#else
384# define inline_speed static noinline 472# define inline_speed static noinline
385#else 473#else
386# define inline_speed static inline 474# define inline_speed static inline
387#endif 475#endif
388 476
389#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
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
391 484
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
394 487
395typedef ev_watcher *W; 488typedef ev_watcher *W;
407 500
408#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 503#endif
411 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)
513#endif
514
412#ifdef _WIN32 515#ifdef _WIN32
413# include "ev_win32.c" 516# include "ev_win32.c"
414#endif 517#endif
415 518
416/*****************************************************************************/ 519/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
480 583
481/*****************************************************************************/ 584/*****************************************************************************/
482 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
589/* file descriptor info structure */
483typedef struct 590typedef struct
484{ 591{
485 WL head; 592 WL head;
486 unsigned char events; 593 unsigned char events; /* the events watched for */
487 unsigned char reify; 594 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 596 unsigned char unused;
490#if EV_USE_EPOLL 597#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 598 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 599#endif
493#if EV_SELECT_IS_WINSOCKET 600#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 601 SOCKET handle;
495#endif 602#endif
496} ANFD; 603} ANFD;
497 604
605/* stores the pending event set for a given watcher */
498typedef struct 606typedef struct
499{ 607{
500 W w; 608 W w;
501 int events; 609 int events; /* the pending event set for the given watcher */
502} ANPENDING; 610} ANPENDING;
503 611
504#if EV_USE_INOTIFY 612#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 613/* hash table entry per inotify-id */
506typedef struct 614typedef struct
509} ANFS; 617} ANFS;
510#endif 618#endif
511 619
512/* Heap Entry */ 620/* Heap Entry */
513#if EV_HEAP_CACHE_AT 621#if EV_HEAP_CACHE_AT
622 /* a heap element */
514 typedef struct { 623 typedef struct {
515 ev_tstamp at; 624 ev_tstamp at;
516 WT w; 625 WT w;
517 } ANHE; 626 } ANHE;
518 627
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 628 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 629 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #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 */
522#else 631#else
632 /* a heap element */
523 typedef WT ANHE; 633 typedef WT ANHE;
524 634
525 #define ANHE_w(he) (he) 635 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 636 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 637 #define ANHE_at_cache(he)
551 661
552 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
553 663
554#endif 664#endif
555 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
556/*****************************************************************************/ 678/*****************************************************************************/
557 679
680#ifndef EV_HAVE_EV_TIME
558ev_tstamp 681ev_tstamp
559ev_time (void) 682ev_time (void)
560{ 683{
561#if EV_USE_REALTIME 684#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 685 if (expect_true (have_realtime))
569 692
570 struct timeval tv; 693 struct timeval tv;
571 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 696}
697#endif
574 698
575inline_size ev_tstamp 699inline_size ev_tstamp
576get_clock (void) 700get_clock (void)
577{ 701{
578#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
614 738
615 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 741
618 /* 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 */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 744 /* by older ones */
621 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
622#endif 746#endif
623 } 747 }
624} 748}
625 749
626/*****************************************************************************/ 750/*****************************************************************************/
627 751
628#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 */
629 753
754/* find a suitable new size for the given array, */
755/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 756inline_size int
631array_nextsize (int elem, int cur, int cnt) 757array_nextsize (int elem, int cur, int cnt)
632{ 758{
633 int ncur = cur + 1; 759 int ncur = cur + 1;
634 760
680#define array_free(stem, idx) \ 806#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 807 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 808
683/*****************************************************************************/ 809/*****************************************************************************/
684 810
811/* dummy callback for pending events */
812static void noinline
813pendingcb (EV_P_ ev_prepare *w, int revents)
814{
815}
816
685void noinline 817void noinline
686ev_feed_event (EV_P_ void *w, int revents) 818ev_feed_event (EV_P_ void *w, int revents)
687{ 819{
688 W w_ = (W)w; 820 W w_ = (W)w;
689 int pri = ABSPRI (w_); 821 int pri = ABSPRI (w_);
724} 856}
725 857
726/*****************************************************************************/ 858/*****************************************************************************/
727 859
728inline_speed void 860inline_speed void
729fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
730{ 862{
731 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
732 ev_io *w; 864 ev_io *w;
733 865
734 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)
738 if (ev) 870 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
740 } 872 }
741} 873}
742 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
743void 886void
744ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 888{
746 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
748} 891}
749 892
893/* make sure the external fd watch events are in-sync */
894/* with the kernel/libev internal state */
750inline_size void 895inline_size void
751fd_reify (EV_P) 896fd_reify (EV_P)
752{ 897{
753 int i; 898 int i;
754 899
765 910
766#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
767 if (events) 912 if (events)
768 { 913 {
769 unsigned long arg; 914 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported 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));
776 } 917 }
777#endif 918#endif
778 919
779 { 920 {
789 } 930 }
790 931
791 fdchangecnt = 0; 932 fdchangecnt = 0;
792} 933}
793 934
935/* something about the given fd changed */
794inline_size void 936inline_size void
795fd_change (EV_P_ int fd, int flags) 937fd_change (EV_P_ int fd, int flags)
796{ 938{
797 unsigned char reify = anfds [fd].reify; 939 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 940 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 945 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 946 fdchanges [fdchangecnt - 1] = fd;
805 } 947 }
806} 948}
807 949
950/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 951inline_speed void
809fd_kill (EV_P_ int fd) 952fd_kill (EV_P_ int fd)
810{ 953{
811 ev_io *w; 954 ev_io *w;
812 955
815 ev_io_stop (EV_A_ w); 958 ev_io_stop (EV_A_ w);
816 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);
817 } 960 }
818} 961}
819 962
963/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 964inline_size int
821fd_valid (int fd) 965fd_valid (int fd)
822{ 966{
823#ifdef _WIN32 967#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 968 return _get_osfhandle (fd) != -1;
847 991
848 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 993 if (anfds [fd].events)
850 { 994 {
851 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
852 return; 996 break;
853 } 997 }
854} 998}
855 999
856/* 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 */
857static void noinline 1001static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1007 if (anfds [fd].events)
864 { 1008 {
865 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1010 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1012 }
869} 1013}
870 1014
871/*****************************************************************************/ 1015/*****************************************************************************/
872 1016
947 1091
948 for (;;) 1092 for (;;)
949 { 1093 {
950 int c = k << 1; 1094 int c = k << 1;
951 1095
952 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
953 break; 1097 break;
954 1098
955 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])
956 ? 1 : 0; 1100 ? 1 : 0;
957 1101
989 1133
990 heap [k] = he; 1134 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1135 ev_active (ANHE_w (he)) = k;
992} 1136}
993 1137
1138/* move an element suitably so it is in a correct place */
994inline_size void 1139inline_size void
995adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
996{ 1141{
997 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)]))
998 upheap (heap, k); 1143 upheap (heap, k);
999 else 1144 else
1000 downheap (heap, N, k); 1145 downheap (heap, N, k);
1001} 1146}
1002 1147
1012 upheap (heap, i + HEAP0); 1157 upheap (heap, i + HEAP0);
1013} 1158}
1014 1159
1015/*****************************************************************************/ 1160/*****************************************************************************/
1016 1161
1162/* associate signal watchers to a signal signal */
1017typedef struct 1163typedef struct
1018{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1019 WL head; 1169 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1170} ANSIG;
1022 1171
1023static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1173
1028/*****************************************************************************/ 1174/*****************************************************************************/
1029 1175
1176/* used to prepare libev internal fd's */
1177/* this is not fork-safe */
1030inline_speed void 1178inline_speed void
1031fd_intern (int fd) 1179fd_intern (int fd)
1032{ 1180{
1033#ifdef _WIN32 1181#ifdef _WIN32
1034 unsigned long arg = 1; 1182 unsigned long arg = 1;
1040} 1188}
1041 1189
1042static void noinline 1190static void noinline
1043evpipe_init (EV_P) 1191evpipe_init (EV_P)
1044{ 1192{
1045 if (!ev_is_active (&pipeev)) 1193 if (!ev_is_active (&pipe_w))
1046 { 1194 {
1047#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1049 { 1201 {
1050 evpipe [0] = -1; 1202 evpipe [0] = -1;
1051 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1205 }
1054 else 1206 else
1055#endif 1207#endif
1056 { 1208 {
1057 while (pipe (evpipe)) 1209 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1210 ev_syserr ("(libev) error creating signal/async pipe");
1059 1211
1060 fd_intern (evpipe [0]); 1212 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1213 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1214 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1215 }
1064 1216
1065 ev_io_start (EV_A_ &pipeev); 1217 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1218 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1219 }
1068} 1220}
1069 1221
1070inline_size void 1222inline_size void
1088 1240
1089 errno = old_errno; 1241 errno = old_errno;
1090 } 1242 }
1091} 1243}
1092 1244
1245/* called whenever the libev signal pipe */
1246/* got some events (signal, async) */
1093static void 1247static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1249{
1250 int i;
1251
1096#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1253 if (evfd >= 0)
1098 { 1254 {
1099 uint64_t counter; 1255 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
1104 { 1260 {
1105 char dummy; 1261 char dummy;
1106 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1107 } 1263 }
1108 1264
1109 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1110 { 1266 {
1111 int signum; 1267 sig_pending = 0;
1112 gotsig = 0;
1113 1268
1114 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1272 }
1118 1273
1119#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1120 if (gotasync) 1275 if (async_pending)
1121 { 1276 {
1122 int i; 1277 async_pending = 0;
1123 gotasync = 0;
1124 1278
1125 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1127 { 1281 {
1128 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
1136 1290
1137static void 1291static void
1138ev_sighandler (int signum) 1292ev_sighandler (int signum)
1139{ 1293{
1140#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1142#endif 1296#endif
1143 1297
1144#if _WIN32 1298#if _WIN32
1145 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1146#endif 1300#endif
1147 1301
1148 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1150} 1304}
1151 1305
1152void noinline 1306void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1154{ 1308{
1155 WL w; 1309 WL w;
1156 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1157#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1158 assert (("libev: 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 */
1159#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1319
1161 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1321 return;
1322#endif
1165 1323
1166 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1167 1325
1168 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1328}
1171 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
1172/*****************************************************************************/ 1350/*****************************************************************************/
1173 1351
1174static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1175 1353
1176#ifndef _WIN32 1354#ifndef _WIN32
1179 1357
1180#ifndef WIFCONTINUED 1358#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1359# define WIFCONTINUED(status) 0
1182#endif 1360#endif
1183 1361
1362/* handle a single child status event */
1184inline_speed void 1363inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1364child_reap (EV_P_ int chain, int pid, int status)
1186{ 1365{
1187 ev_child *w; 1366 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1367 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1381
1203#ifndef WCONTINUED 1382#ifndef WCONTINUED
1204# define WCONTINUED 0 1383# define WCONTINUED 0
1205#endif 1384#endif
1206 1385
1386/* called on sigchld etc., calls waitpid */
1207static void 1387static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1388childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1389{
1210 int pid, status; 1390 int pid, status;
1211 1391
1318ev_backend (EV_P) 1498ev_backend (EV_P)
1319{ 1499{
1320 return backend; 1500 return backend;
1321} 1501}
1322 1502
1503#if EV_MINIMAL < 2
1323unsigned int 1504unsigned int
1324ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1325{ 1506{
1326 return loop_count; 1507 return loop_count;
1327} 1508}
1328 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1329void 1516void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1518{
1332 io_blocktime = interval; 1519 io_blocktime = interval;
1333} 1520}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1524{
1338 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1339} 1526}
1340 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 */
1341static void noinline 1553static void noinline
1342loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1343{ 1555{
1344 if (!backend) 1556 if (!backend)
1345 { 1557 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1574 have_monotonic = 1;
1363 } 1575 }
1364#endif 1576#endif
1365 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"));
1588
1366 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1590 mn_now = get_clock ();
1368 now_floor = mn_now; 1591 now_floor = mn_now;
1369 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
1370 1596
1371 io_blocktime = 0.; 1597 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1373 backend = 0; 1599 backend = 0;
1374 backend_fd = -1; 1600 backend_fd = -1;
1375 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1376#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1377 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1607#endif
1379 1608#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1610#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1611
1391 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1393 1614
1394#if EV_USE_PORT 1615#if EV_USE_PORT
1405#endif 1626#endif
1406#if EV_USE_SELECT 1627#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1628 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1629#endif
1409 1630
1631 ev_prepare_init (&pending_w, pendingcb);
1632
1410 ev_init (&pipeev, pipecb); 1633 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1634 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1635 }
1413} 1636}
1414 1637
1638/* free up a loop structure */
1415static void noinline 1639static void noinline
1416loop_destroy (EV_P) 1640loop_destroy (EV_P)
1417{ 1641{
1418 int i; 1642 int i;
1419 1643
1420 if (ev_is_active (&pipeev)) 1644 if (ev_is_active (&pipe_w))
1421 { 1645 {
1422 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1648
1425#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1650 if (evfd >= 0)
1427 close (evfd); 1651 close (evfd);
1428#endif 1652#endif
1429 1653
1430 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1431 { 1655 {
1432 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1658 }
1435 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd);
1668 }
1669#endif
1436 1670
1437#if EV_USE_INOTIFY 1671#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1672 if (fs_fd >= 0)
1439 close (fs_fd); 1673 close (fs_fd);
1440#endif 1674#endif
1464#if EV_IDLE_ENABLE 1698#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1699 array_free (idle, [i]);
1466#endif 1700#endif
1467 } 1701 }
1468 1702
1469 ev_free (anfds); anfdmax = 0; 1703 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1704
1471 /* have to use the microsoft-never-gets-it-right macro */ 1705 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1706 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1707 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1708 array_free (timer, EMPTY);
1505#endif 1739#endif
1506#if EV_USE_INOTIFY 1740#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1741 infy_fork (EV_A);
1508#endif 1742#endif
1509 1743
1510 if (ev_is_active (&pipeev)) 1744 if (ev_is_active (&pipe_w))
1511 { 1745 {
1512 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1514 gotsig = 1; 1748 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1750 async_pending = 1;
1517#endif 1751#endif
1518 1752
1519 ev_ref (EV_A); 1753 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1754 ev_io_stop (EV_A_ &pipe_w);
1521 1755
1522#if EV_USE_EVENTFD 1756#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1757 if (evfd >= 0)
1524 close (evfd); 1758 close (evfd);
1525#endif 1759#endif
1526 1760
1527 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1528 { 1762 {
1529 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1765 }
1532 1766
1533 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1770 }
1537 1771
1538 postfork = 0; 1772 postfork = 0;
1539} 1773}
1540 1774
1541#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1542 1776
1543struct ev_loop * 1777struct ev_loop *
1544ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1545{ 1779{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1781
1548 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1551 1784
1552 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1553 return loop; 1786 return EV_A;
1554 1787
1555 return 0; 1788 return 0;
1556} 1789}
1557 1790
1558void 1791void
1565void 1798void
1566ev_loop_fork (EV_P) 1799ev_loop_fork (EV_P)
1567{ 1800{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1801 postfork = 1; /* must be in line with ev_default_fork */
1569} 1802}
1803#endif /* multiplicity */
1570 1804
1571#if EV_VERIFY 1805#if EV_VERIFY
1572static void noinline 1806static void noinline
1573verify_watcher (EV_P_ W w) 1807verify_watcher (EV_P_ W w)
1574{ 1808{
1602 verify_watcher (EV_A_ ws [cnt]); 1836 verify_watcher (EV_A_ ws [cnt]);
1603 } 1837 }
1604} 1838}
1605#endif 1839#endif
1606 1840
1841#if EV_MINIMAL < 2
1607void 1842void
1608ev_loop_verify (EV_P) 1843ev_loop_verify (EV_P)
1609{ 1844{
1610#if EV_VERIFY 1845#if EV_VERIFY
1611 int i; 1846 int i;
1660 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1897
1663# if 0 1898# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1901# endif
1902#endif
1668} 1903}
1669 1904#endif
1670#endif /* multiplicity */
1671 1905
1672#if EV_MULTIPLICITY 1906#if EV_MULTIPLICITY
1673struct ev_loop * 1907struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1908ev_default_loop_init (unsigned int flags)
1675#else 1909#else
1678#endif 1912#endif
1679{ 1913{
1680 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1681 { 1915 {
1682#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1918#else
1685 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1686#endif 1920#endif
1687 1921
1688 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
1705 1939
1706void 1940void
1707ev_default_destroy (void) 1941ev_default_destroy (void)
1708{ 1942{
1709#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1711#endif 1945#endif
1712 1946
1713 ev_default_loop_ptr = 0; 1947 ev_default_loop_ptr = 0;
1714 1948
1715#ifndef _WIN32 1949#ifndef _WIN32
1722 1956
1723void 1957void
1724ev_default_fork (void) 1958ev_default_fork (void)
1725{ 1959{
1726#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1728#endif 1962#endif
1729 1963
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1965}
1732 1966
1736ev_invoke (EV_P_ void *w, int revents) 1970ev_invoke (EV_P_ void *w, int revents)
1737{ 1971{
1738 EV_CB_INVOKE ((W)w, revents); 1972 EV_CB_INVOKE ((W)w, revents);
1739} 1973}
1740 1974
1741inline_speed void 1975unsigned int
1742call_pending (EV_P) 1976ev_pending_count (EV_P)
1977{
1978 int pri;
1979 unsigned int count = 0;
1980
1981 for (pri = NUMPRI; pri--; )
1982 count += pendingcnt [pri];
1983
1984 return count;
1985}
1986
1987void noinline
1988ev_invoke_pending (EV_P)
1743{ 1989{
1744 int pri; 1990 int pri;
1745 1991
1746 for (pri = NUMPRI; pri--; ) 1992 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1993 while (pendingcnt [pri])
1748 { 1994 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1995 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1996
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1997 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1998 /* ^ this is no longer true, as pending_w could be here */
1754 1999
1755 p->w->pending = 0; 2000 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2001 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2002 EV_FREQUENT_CHECK;
1758 }
1759 } 2003 }
1760} 2004}
1761 2005
1762#if EV_IDLE_ENABLE 2006#if EV_IDLE_ENABLE
2007/* make idle watchers pending. this handles the "call-idle */
2008/* only when higher priorities are idle" logic */
1763inline_size void 2009inline_size void
1764idle_reify (EV_P) 2010idle_reify (EV_P)
1765{ 2011{
1766 if (expect_false (idleall)) 2012 if (expect_false (idleall))
1767 { 2013 {
1780 } 2026 }
1781 } 2027 }
1782} 2028}
1783#endif 2029#endif
1784 2030
2031/* make timers pending */
1785inline_size void 2032inline_size void
1786timers_reify (EV_P) 2033timers_reify (EV_P)
1787{ 2034{
1788 EV_FREQUENT_CHECK; 2035 EV_FREQUENT_CHECK;
1789 2036
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2065 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2066 }
1820} 2067}
1821 2068
1822#if EV_PERIODIC_ENABLE 2069#if EV_PERIODIC_ENABLE
2070/* make periodics pending */
1823inline_size void 2071inline_size void
1824periodics_reify (EV_P) 2072periodics_reify (EV_P)
1825{ 2073{
1826 EV_FREQUENT_CHECK; 2074 EV_FREQUENT_CHECK;
1827 2075
1874 2122
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2123 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2124 }
1877} 2125}
1878 2126
2127/* simply recalculate all periodics */
2128/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2129static void noinline
1880periodics_reschedule (EV_P) 2130periodics_reschedule (EV_P)
1881{ 2131{
1882 int i; 2132 int i;
1883 2133
1896 2146
1897 reheap (periodics, periodiccnt); 2147 reheap (periodics, periodiccnt);
1898} 2148}
1899#endif 2149#endif
1900 2150
2151/* adjust all timers by a given offset */
1901static void noinline 2152static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2153timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2154{
1904 int i; 2155 int i;
1905 2156
1909 ANHE_w (*he)->at += adjust; 2160 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2161 ANHE_at_cache (*he);
1911 } 2162 }
1912} 2163}
1913 2164
2165/* fetch new monotonic and realtime times from the kernel */
2166/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2167inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2168time_update (EV_P_ ev_tstamp max_block)
1916{ 2169{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2170#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2171 if (expect_true (have_monotonic))
1921 { 2172 {
2173 int i;
1922 ev_tstamp odiff = rtmn_diff; 2174 ev_tstamp odiff = rtmn_diff;
1923 2175
1924 mn_now = get_clock (); 2176 mn_now = get_clock ();
1925 2177
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2178 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2228
1977 mn_now = ev_rt_now; 2229 mn_now = ev_rt_now;
1978 } 2230 }
1979} 2231}
1980 2232
1981static int loop_done;
1982
1983void 2233void
1984ev_loop (EV_P_ int flags) 2234ev_loop (EV_P_ int flags)
1985{ 2235{
2236#if EV_MINIMAL < 2
2237 ++loop_depth;
2238#endif
2239
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2241
1986 loop_done = EVUNLOOP_CANCEL; 2242 loop_done = EVUNLOOP_CANCEL;
1987 2243
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2245
1990 do 2246 do
1991 { 2247 {
1992#if EV_VERIFY >= 2 2248#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2249 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2262 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2263 if (expect_false (postfork))
2008 if (forkcnt) 2264 if (forkcnt)
2009 { 2265 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2267 EV_INVOKE_PENDING;
2012 } 2268 }
2013#endif 2269#endif
2014 2270
2015 /* queue prepare watchers (and execute them) */ 2271 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2272 if (expect_false (preparecnt))
2017 { 2273 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2275 EV_INVOKE_PENDING;
2020 } 2276 }
2277
2278 if (expect_false (loop_done))
2279 break;
2021 2280
2022 /* we might have forked, so reify kernel state if necessary */ 2281 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2282 if (expect_false (postfork))
2024 loop_fork (EV_A); 2283 loop_fork (EV_A);
2025 2284
2031 ev_tstamp waittime = 0.; 2290 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2291 ev_tstamp sleeptime = 0.;
2033 2292
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2293 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2294 {
2295 /* remember old timestamp for io_blocktime calculation */
2296 ev_tstamp prev_mn_now = mn_now;
2297
2036 /* update time to cancel out callback processing overhead */ 2298 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2299 time_update (EV_A_ 1e100);
2300
2301 waittime = MAX_BLOCKTIME;
2038 2302
2039 if (timercnt) 2303 if (timercnt)
2040 { 2304 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2305 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2306 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2312 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2313 if (waittime > to) waittime = to;
2050 } 2314 }
2051#endif 2315#endif
2052 2316
2317 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2318 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2319 waittime = timeout_blocktime;
2055 2320
2056 sleeptime = waittime - backend_fudge; 2321 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2322 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2323 {
2324 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2325
2326 if (sleeptime > waittime - backend_fudge)
2327 sleeptime = waittime - backend_fudge;
2328
2329 if (expect_true (sleeptime > 0.))
2330 {
2063 ev_sleep (sleeptime); 2331 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2332 waittime -= sleeptime;
2333 }
2065 } 2334 }
2066 } 2335 }
2067 2336
2337#if EV_MINIMAL < 2
2068 ++loop_count; 2338 ++loop_count;
2339#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2341 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2343
2071 /* update ev_rt_now, do magic */ 2344 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2345 time_update (EV_A_ waittime + sleeptime);
2073 } 2346 }
2074 2347
2085 2358
2086 /* queue check watchers, to be executed first */ 2359 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2360 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2362
2090 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2091 } 2364 }
2092 while (expect_true ( 2365 while (expect_true (
2093 activecnt 2366 activecnt
2094 && !loop_done 2367 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2369 ));
2097 2370
2098 if (loop_done == EVUNLOOP_ONE) 2371 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2372 loop_done = EVUNLOOP_CANCEL;
2373
2374#if EV_MINIMAL < 2
2375 --loop_depth;
2376#endif
2100} 2377}
2101 2378
2102void 2379void
2103ev_unloop (EV_P_ int how) 2380ev_unloop (EV_P_ int how)
2104{ 2381{
2135 ev_tstamp mn_prev = mn_now; 2412 ev_tstamp mn_prev = mn_now;
2136 2413
2137 ev_now_update (EV_A); 2414 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2415 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2416#if EV_PERIODIC_ENABLE
2417 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2418 periodics_reschedule (EV_A);
2141#endif 2419#endif
2142} 2420}
2143 2421
2144/*****************************************************************************/ 2422/*****************************************************************************/
2423/* singly-linked list management, used when the expected list length is short */
2145 2424
2146inline_size void 2425inline_size void
2147wlist_add (WL *head, WL elem) 2426wlist_add (WL *head, WL elem)
2148{ 2427{
2149 elem->next = *head; 2428 elem->next = *head;
2153inline_size void 2432inline_size void
2154wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2155{ 2434{
2156 while (*head) 2435 while (*head)
2157 { 2436 {
2158 if (*head == elem) 2437 if (expect_true (*head == elem))
2159 { 2438 {
2160 *head = elem->next; 2439 *head = elem->next;
2161 return; 2440 break;
2162 } 2441 }
2163 2442
2164 head = &(*head)->next; 2443 head = &(*head)->next;
2165 } 2444 }
2166} 2445}
2167 2446
2447/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2448inline_speed void
2169clear_pending (EV_P_ W w) 2449clear_pending (EV_P_ W w)
2170{ 2450{
2171 if (w->pending) 2451 if (w->pending)
2172 { 2452 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2453 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2454 w->pending = 0;
2175 } 2455 }
2176} 2456}
2177 2457
2178int 2458int
2182 int pending = w_->pending; 2462 int pending = w_->pending;
2183 2463
2184 if (expect_true (pending)) 2464 if (expect_true (pending))
2185 { 2465 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2466 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2467 p->w = (W)&pending_w;
2187 w_->pending = 0; 2468 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2469 return p->events;
2190 } 2470 }
2191 else 2471 else
2192 return 0; 2472 return 0;
2193} 2473}
2194 2474
2195inline_size void 2475inline_size void
2196pri_adjust (EV_P_ W w) 2476pri_adjust (EV_P_ W w)
2197{ 2477{
2198 int pri = w->priority; 2478 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2479 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2480 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2481 ev_set_priority (w, pri);
2202} 2482}
2203 2483
2204inline_speed void 2484inline_speed void
2205ev_start (EV_P_ W w, int active) 2485ev_start (EV_P_ W w, int active)
2206{ 2486{
2233 2513
2234 ev_start (EV_A_ (W)w, 1); 2514 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2516 wlist_add (&anfds[fd].head, (WL)w);
2237 2517
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2518 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2519 w->events &= ~EV__IOFDSET;
2240 2520
2241 EV_FREQUENT_CHECK; 2521 EV_FREQUENT_CHECK;
2242} 2522}
2243 2523
2337 } 2617 }
2338 2618
2339 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2340} 2620}
2341 2621
2622ev_tstamp
2623ev_timer_remaining (EV_P_ ev_timer *w)
2624{
2625 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2626}
2627
2342#if EV_PERIODIC_ENABLE 2628#if EV_PERIODIC_ENABLE
2343void noinline 2629void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2630ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2631{
2346 if (expect_false (ev_is_active (w))) 2632 if (expect_false (ev_is_active (w)))
2413#endif 2699#endif
2414 2700
2415void noinline 2701void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2417{ 2703{
2418#if EV_MULTIPLICITY
2419 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2420#endif
2421 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2422 return; 2705 return;
2423 2706
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2708
2426 evpipe_init (EV_A); 2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2712
2428 EV_FREQUENT_CHECK; 2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2429 2715
2716 EV_FREQUENT_CHECK;
2717
2718#if EV_USE_SIGNALFD
2719 if (sigfd == -2)
2430 { 2720 {
2431#ifndef _WIN32 2721 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2722 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2723 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2724
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2725 if (sigfd >= 0)
2726 {
2727 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2728
2439#ifndef _WIN32 2729 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2730
2441#endif 2731 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2732 ev_set_priority (&sigfd_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &sigfd_w);
2734 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2735 }
2442 } 2736 }
2737
2738 if (sigfd >= 0)
2739 {
2740 /* TODO: check .head */
2741 sigaddset (&sigfd_set, w->signum);
2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2743
2744 signalfd (sigfd, &sigfd_set, 0);
2745 }
2746#endif
2443 2747
2444 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2750
2447 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/
2754# endif
2448 { 2755 {
2449#if _WIN32 2756# if _WIN32
2450 signal (w->signum, ev_sighandler); 2757 signal (w->signum, ev_sighandler);
2451#else 2758# else
2452 struct sigaction sa; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2453 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2457#endif 2771#endif
2458 } 2772 }
2459 2773
2460 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2461} 2775}
2462 2776
2463void noinline 2777void noinline
2471 2785
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2474 2788
2475 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2794#if EV_USE_SIGNALFD
2795 if (sigfd >= 0)
2796 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2798 sigdelset (&sigfd_set, w->signum);
2799 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2801 /*TODO: maybe unblock signal? */
2802 }
2803 else
2804#endif
2476 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2477 2807
2478 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2479} 2809}
2480 2810
2481void 2811void
2561 } 2891 }
2562 } 2892 }
2563 2893
2564 if (w->wd >= 0) 2894 if (w->wd >= 0)
2565 { 2895 {
2896 struct statfs sfs;
2897
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2567 2899
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 2900 /* now local changes will be tracked by inotify, but remote changes won't */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 2901 /* unless the filesystem it known to be local, we therefore still poll */
2570 /* also do poll on <2.6.25, but with normal frequency */ 2902 /* also do poll on <2.6.25, but with normal frequency */
2571 struct statfs sfs;
2572 2903
2573 if (fs_2625 && !statfs (w->path, &sfs)) 2904 if (fs_2625 && !statfs (w->path, &sfs))
2574 if (sfs.f_type == 0x1373 /* devfs */ 2905 if (sfs.f_type == 0x1373 /* devfs */
2575 || sfs.f_type == 0xEF53 /* ext2/3 */ 2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2576 || sfs.f_type == 0x3153464a /* jfs */ 2907 || sfs.f_type == 0x3153464a /* jfs */
2665 return; 2996 return;
2666 2997
2667 fs_2625 = 1; 2998 fs_2625 = 1;
2668} 2999}
2669 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2670inline_size void 3012inline_size void
2671infy_init (EV_P) 3013infy_init (EV_P)
2672{ 3014{
2673 if (fs_fd != -2) 3015 if (fs_fd != -2)
2674 return; 3016 return;
2675 3017
2676 fs_fd = -1; 3018 fs_fd = -1;
2677 3019
2678 check_2625 (EV_A); 3020 check_2625 (EV_A);
2679 3021
2680 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2681 3023
2682 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2683 { 3025 {
3026 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2687 } 3030 }
2688} 3031}
2693 int slot; 3036 int slot;
2694 3037
2695 if (fs_fd < 0) 3038 if (fs_fd < 0)
2696 return; 3039 return;
2697 3040
3041 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3042 close (fs_fd);
2699 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
2700 3051
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2702 { 3053 {
2703 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3313{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3315
2965 { 3316 {
2966 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
2967 3318
2968 while (fdchangecnt) 3319 while (fdchangecnt)
2969 { 3320 {
2970 fd_reify (EV_A); 3321 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3331
2981 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
2982 3333
2983 { 3334 {
2984 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
2985 3336
2986 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2988 } 3339 }
2989 3340
3003{ 3354{
3004 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3005 return; 3356 return;
3006 3357
3007 { 3358 {
3008 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3009 assert (("libev: 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 ()));
3010 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);
3011 } 3362 }
3012 3363
3013 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
3125 3476
3126void 3477void
3127ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3128{ 3479{
3129 w->sent = 1; 3480 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3131} 3482}
3132#endif 3483#endif
3133 3484
3134/*****************************************************************************/ 3485/*****************************************************************************/
3135 3486
3199 } 3550 }
3200} 3551}
3201 3552
3202/*****************************************************************************/ 3553/*****************************************************************************/
3203 3554
3204#if 0 3555#if EV_WALK_ENABLE
3205void 3556void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3557ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3558{
3208 int i, j; 3559 int i, j;
3209 ev_watcher_list *wl, *wn; 3560 ev_watcher_list *wl, *wn;
3225#if EV_USE_INOTIFY 3576#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3577 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3578 ;
3228 else 3579 else
3229#endif 3580#endif
3230 if ((ev_io *)wl != &pipeev) 3581 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3582 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3583 cb (EV_A_ EV_IO, wl);
3233 3584
3234 wl = wn; 3585 wl = wn;
3235 } 3586 }
3284 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3287 3638
3288 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3291 { 3642 {
3292 wn = wl->next; 3643 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3645 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines