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.321 by root, Thu Dec 31 06:50:17 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
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
176# endif 187# endif
177#endif 188#endif
178 189
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
180 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
181#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
184# else 222# else
185# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
264# else 302# else
265# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
266# endif 304# endif
267#endif 305#endif
268 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
269#if 0 /* debugging */ 315#if 0 /* debugging */
270# define EV_VERIFY 3 316# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
273#endif 319#endif
280# define EV_USE_4HEAP !EV_MINIMAL 326# define EV_USE_4HEAP !EV_MINIMAL
281#endif 327#endif
282 328
283#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
331#endif
332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
285#endif 345#endif
286 346
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 348
289#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
320 380
321#if EV_SELECT_IS_WINSOCKET 381#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 382# include <winsock.h>
323#endif 383#endif
324 384
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 385#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
337# ifdef __cplusplus 398# ifdef __cplusplus
338extern "C" { 399extern "C" {
339# endif 400# endif
340int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 402# ifdef __cplusplus
342} 403}
343# endif 404# endif
344#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
345 435
346/**/ 436/**/
347 437
348#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 451 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 453
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
368#if __GNUC__ >= 4 457#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
371#else 460#else
384# define inline_speed static noinline 473# define inline_speed static noinline
385#else 474#else
386# define inline_speed static inline 475# define inline_speed static inline
387#endif 476#endif
388 477
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
391 485
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
394 488
395typedef ev_watcher *W; 489typedef ev_watcher *W;
407 501
408#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 504#endif
411 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
412#ifdef _WIN32 516#ifdef _WIN32
413# include "ev_win32.c" 517# include "ev_win32.c"
414#endif 518#endif
415 519
416/*****************************************************************************/ 520/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
480 584
481/*****************************************************************************/ 585/*****************************************************************************/
482 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
483typedef struct 591typedef struct
484{ 592{
485 WL head; 593 WL head;
486 unsigned char events; 594 unsigned char events; /* the events watched for */
487 unsigned char reify; 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 597 unsigned char unused;
490#if EV_USE_EPOLL 598#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 600#endif
493#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 602 SOCKET handle;
495#endif 603#endif
496} ANFD; 604} ANFD;
497 605
606/* stores the pending event set for a given watcher */
498typedef struct 607typedef struct
499{ 608{
500 W w; 609 W w;
501 int events; 610 int events; /* the pending event set for the given watcher */
502} ANPENDING; 611} ANPENDING;
503 612
504#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
506typedef struct 615typedef struct
509} ANFS; 618} ANFS;
510#endif 619#endif
511 620
512/* Heap Entry */ 621/* Heap Entry */
513#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
514 typedef struct { 624 typedef struct {
515 ev_tstamp at; 625 ev_tstamp at;
516 WT w; 626 WT w;
517 } ANHE; 627 } ANHE;
518 628
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #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 */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 632#else
633 /* a heap element */
523 typedef WT ANHE; 634 typedef WT ANHE;
524 635
525 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
551 662
552 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
553 664
554#endif 665#endif
555 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
556/*****************************************************************************/ 679/*****************************************************************************/
557 680
681#ifndef EV_HAVE_EV_TIME
558ev_tstamp 682ev_tstamp
559ev_time (void) 683ev_time (void)
560{ 684{
561#if EV_USE_REALTIME 685#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 686 if (expect_true (have_realtime))
569 693
570 struct timeval tv; 694 struct timeval tv;
571 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 697}
698#endif
574 699
575inline_size ev_tstamp 700inline_size ev_tstamp
576get_clock (void) 701get_clock (void)
577{ 702{
578#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
614 739
615 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 742
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 745 /* by older ones */
621 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
622#endif 747#endif
623 } 748 }
624} 749}
625 750
626/*****************************************************************************/ 751/*****************************************************************************/
627 752
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 754
755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 757inline_size int
631array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
632{ 759{
633 int ncur = cur + 1; 760 int ncur = cur + 1;
634 761
680#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 809
683/*****************************************************************************/ 810/*****************************************************************************/
684 811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
817
685void noinline 818void noinline
686ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
687{ 820{
688 W w_ = (W)w; 821 W w_ = (W)w;
689 int pri = ABSPRI (w_); 822 int pri = ABSPRI (w_);
724} 857}
725 858
726/*****************************************************************************/ 859/*****************************************************************************/
727 860
728inline_speed void 861inline_speed void
729fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
730{ 863{
731 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
732 ev_io *w; 865 ev_io *w;
733 866
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 871 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
740 } 873 }
741} 874}
742 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
743void 887void
744ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 889{
746 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
748} 892}
749 893
894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
750inline_size void 896inline_size void
751fd_reify (EV_P) 897fd_reify (EV_P)
752{ 898{
753 int i; 899 int i;
754 900
765 911
766#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
767 if (events) 913 if (events)
768 { 914 {
769 unsigned long arg; 915 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 918 }
777#endif 919#endif
778 920
779 { 921 {
789 } 931 }
790 932
791 fdchangecnt = 0; 933 fdchangecnt = 0;
792} 934}
793 935
936/* something about the given fd changed */
794inline_size void 937inline_size void
795fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
796{ 939{
797 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
805 } 948 }
806} 949}
807 950
951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 952inline_speed void
809fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
810{ 954{
811 ev_io *w; 955 ev_io *w;
812 956
815 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 961 }
818} 962}
819 963
964/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 965inline_size int
821fd_valid (int fd) 966fd_valid (int fd)
822{ 967{
823#ifdef _WIN32 968#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
847 992
848 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 994 if (anfds [fd].events)
850 { 995 {
851 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
852 return; 997 break;
853 } 998 }
854} 999}
855 1000
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1002static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1008 if (anfds [fd].events)
864 { 1009 {
865 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1013 }
869} 1014}
870 1015
871/*****************************************************************************/ 1016/*****************************************************************************/
872 1017
947 1092
948 for (;;) 1093 for (;;)
949 { 1094 {
950 int c = k << 1; 1095 int c = k << 1;
951 1096
952 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
953 break; 1098 break;
954 1099
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1101 ? 1 : 0;
957 1102
989 1134
990 heap [k] = he; 1135 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
992} 1137}
993 1138
1139/* move an element suitably so it is in a correct place */
994inline_size void 1140inline_size void
995adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
996{ 1142{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1144 upheap (heap, k);
999 else 1145 else
1000 downheap (heap, N, k); 1146 downheap (heap, N, k);
1001} 1147}
1002 1148
1012 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
1013} 1159}
1014 1160
1015/*****************************************************************************/ 1161/*****************************************************************************/
1016 1162
1163/* associate signal watchers to a signal signal */
1017typedef struct 1164typedef struct
1018{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1019 WL head; 1170 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1171} ANSIG;
1022 1172
1023static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1174
1028/*****************************************************************************/ 1175/*****************************************************************************/
1029 1176
1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1030inline_speed void 1179inline_speed void
1031fd_intern (int fd) 1180fd_intern (int fd)
1032{ 1181{
1033#ifdef _WIN32 1182#ifdef _WIN32
1034 unsigned long arg = 1; 1183 unsigned long arg = 1;
1040} 1189}
1041 1190
1042static void noinline 1191static void noinline
1043evpipe_init (EV_P) 1192evpipe_init (EV_P)
1044{ 1193{
1045 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
1046 { 1195 {
1047#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1049 { 1202 {
1050 evpipe [0] = -1; 1203 evpipe [0] = -1;
1051 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1206 }
1054 else 1207 else
1055#endif 1208#endif
1056 { 1209 {
1057 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1059 1212
1060 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1216 }
1064 1217
1065 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1220 }
1068} 1221}
1069 1222
1070inline_size void 1223inline_size void
1088 1241
1089 errno = old_errno; 1242 errno = old_errno;
1090 } 1243 }
1091} 1244}
1092 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1093static void 1248static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1250{
1251 int i;
1252
1096#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1254 if (evfd >= 0)
1098 { 1255 {
1099 uint64_t counter; 1256 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1104 { 1261 {
1105 char dummy; 1262 char dummy;
1106 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1107 } 1264 }
1108 1265
1109 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1110 { 1267 {
1111 int signum; 1268 sig_pending = 0;
1112 gotsig = 0;
1113 1269
1114 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1273 }
1118 1274
1119#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1120 if (gotasync) 1276 if (async_pending)
1121 { 1277 {
1122 int i; 1278 async_pending = 0;
1123 gotasync = 0;
1124 1279
1125 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1127 { 1282 {
1128 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1136 1291
1137static void 1292static void
1138ev_sighandler (int signum) 1293ev_sighandler (int signum)
1139{ 1294{
1140#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1142#endif 1297#endif
1143 1298
1144#if _WIN32 1299#if _WIN32
1145 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1146#endif 1301#endif
1147 1302
1148 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1150} 1305}
1151 1306
1152void noinline 1307void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1154{ 1309{
1155 WL w; 1310 WL w;
1156 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1157#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1320
1161 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1322 return;
1323#endif
1165 1324
1166 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1167 1326
1168 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1329}
1171 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1172/*****************************************************************************/ 1351/*****************************************************************************/
1173 1352
1174static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1175 1354
1176#ifndef _WIN32 1355#ifndef _WIN32
1179 1358
1180#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1182#endif 1361#endif
1183 1362
1363/* handle a single child status event */
1184inline_speed void 1364inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1186{ 1366{
1187 ev_child *w; 1367 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1382
1203#ifndef WCONTINUED 1383#ifndef WCONTINUED
1204# define WCONTINUED 0 1384# define WCONTINUED 0
1205#endif 1385#endif
1206 1386
1387/* called on sigchld etc., calls waitpid */
1207static void 1388static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1390{
1210 int pid, status; 1391 int pid, status;
1211 1392
1318ev_backend (EV_P) 1499ev_backend (EV_P)
1319{ 1500{
1320 return backend; 1501 return backend;
1321} 1502}
1322 1503
1504#if EV_MINIMAL < 2
1323unsigned int 1505unsigned int
1324ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1325{ 1507{
1326 return loop_count; 1508 return loop_count;
1327} 1509}
1328 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1329void 1517void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1519{
1332 io_blocktime = interval; 1520 io_blocktime = interval;
1333} 1521}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1525{
1338 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1339} 1527}
1340 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1554static void noinline
1342loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1343{ 1556{
1344 if (!backend) 1557 if (!backend)
1345 { 1558 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1575 have_monotonic = 1;
1363 } 1576 }
1364#endif 1577#endif
1365 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1366 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1591 mn_now = get_clock ();
1368 now_floor = mn_now; 1592 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1370 1597
1371 io_blocktime = 0.; 1598 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1373 backend = 0; 1600 backend = 0;
1374 backend_fd = -1; 1601 backend_fd = -1;
1375 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1376#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1377 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1608#endif
1379 1609#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1611#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1612
1391 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1393 1615
1394#if EV_USE_PORT 1616#if EV_USE_PORT
1405#endif 1627#endif
1406#if EV_USE_SELECT 1628#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1630#endif
1409 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1410 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1636 }
1413} 1637}
1414 1638
1639/* free up a loop structure */
1415static void noinline 1640static void noinline
1416loop_destroy (EV_P) 1641loop_destroy (EV_P)
1417{ 1642{
1418 int i; 1643 int i;
1419 1644
1420 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1421 { 1646 {
1422 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1649
1425#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1651 if (evfd >= 0)
1427 close (evfd); 1652 close (evfd);
1428#endif 1653#endif
1429 1654
1430 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1431 { 1656 {
1432 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1659 }
1435 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1436 1666
1437#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1439 close (fs_fd); 1669 close (fs_fd);
1440#endif 1670#endif
1464#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1695 array_free (idle, [i]);
1466#endif 1696#endif
1467 } 1697 }
1468 1698
1469 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1700
1471 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1505#endif 1735#endif
1506#if EV_USE_INOTIFY 1736#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1737 infy_fork (EV_A);
1508#endif 1738#endif
1509 1739
1510 if (ev_is_active (&pipeev)) 1740 if (ev_is_active (&pipe_w))
1511 { 1741 {
1512 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1514 gotsig = 1; 1744 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1746 async_pending = 1;
1517#endif 1747#endif
1518 1748
1519 ev_ref (EV_A); 1749 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1750 ev_io_stop (EV_A_ &pipe_w);
1521 1751
1522#if EV_USE_EVENTFD 1752#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1753 if (evfd >= 0)
1524 close (evfd); 1754 close (evfd);
1525#endif 1755#endif
1526 1756
1527 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1528 { 1758 {
1529 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1761 }
1532 1762
1533 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1766 }
1537 1767
1538 postfork = 0; 1768 postfork = 0;
1539} 1769}
1540 1770
1541#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1542 1772
1543struct ev_loop * 1773struct ev_loop *
1544ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1545{ 1775{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1777
1548 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1551 1780
1552 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1553 return loop; 1782 return EV_A;
1554 1783
1555 return 0; 1784 return 0;
1556} 1785}
1557 1786
1558void 1787void
1565void 1794void
1566ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1567{ 1796{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1569} 1798}
1799#endif /* multiplicity */
1570 1800
1571#if EV_VERIFY 1801#if EV_VERIFY
1572static void noinline 1802static void noinline
1573verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1574{ 1804{
1602 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1603 } 1833 }
1604} 1834}
1605#endif 1835#endif
1606 1836
1837#if EV_MINIMAL < 2
1607void 1838void
1608ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1609{ 1840{
1610#if EV_VERIFY 1841#if EV_VERIFY
1611 int i; 1842 int i;
1660 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1893
1663# if 0 1894# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 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) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1897# endif
1898#endif
1668} 1899}
1669 1900#endif
1670#endif /* multiplicity */
1671 1901
1672#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1673struct ev_loop * 1903struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1675#else 1905#else
1678#endif 1908#endif
1679{ 1909{
1680 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1681 { 1911 {
1682#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1914#else
1685 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1686#endif 1916#endif
1687 1917
1688 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1705 1935
1706void 1936void
1707ev_default_destroy (void) 1937ev_default_destroy (void)
1708{ 1938{
1709#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1711#endif 1941#endif
1712 1942
1713 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1714 1944
1715#ifndef _WIN32 1945#ifndef _WIN32
1722 1952
1723void 1953void
1724ev_default_fork (void) 1954ev_default_fork (void)
1725{ 1955{
1726#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1728#endif 1958#endif
1729 1959
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1961}
1732 1962
1736ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1737{ 1967{
1738 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1739} 1969}
1740 1970
1741inline_speed void 1971unsigned int
1742call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1743{ 1985{
1744 int pri; 1986 int pri;
1745 1987
1746 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
1748 { 1990 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1991 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1992
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1993 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1994 /* ^ this is no longer true, as pending_w could be here */
1754 1995
1755 p->w->pending = 0; 1996 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 1997 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 1998 EV_FREQUENT_CHECK;
1758 }
1759 } 1999 }
1760} 2000}
1761 2001
1762#if EV_IDLE_ENABLE 2002#if EV_IDLE_ENABLE
2003/* make idle watchers pending. this handles the "call-idle */
2004/* only when higher priorities are idle" logic */
1763inline_size void 2005inline_size void
1764idle_reify (EV_P) 2006idle_reify (EV_P)
1765{ 2007{
1766 if (expect_false (idleall)) 2008 if (expect_false (idleall))
1767 { 2009 {
1780 } 2022 }
1781 } 2023 }
1782} 2024}
1783#endif 2025#endif
1784 2026
2027/* make timers pending */
1785inline_size void 2028inline_size void
1786timers_reify (EV_P) 2029timers_reify (EV_P)
1787{ 2030{
1788 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1789 2032
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2061 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2062 }
1820} 2063}
1821 2064
1822#if EV_PERIODIC_ENABLE 2065#if EV_PERIODIC_ENABLE
2066/* make periodics pending */
1823inline_size void 2067inline_size void
1824periodics_reify (EV_P) 2068periodics_reify (EV_P)
1825{ 2069{
1826 EV_FREQUENT_CHECK; 2070 EV_FREQUENT_CHECK;
1827 2071
1874 2118
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2119 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2120 }
1877} 2121}
1878 2122
2123/* simply recalculate all periodics */
2124/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2125static void noinline
1880periodics_reschedule (EV_P) 2126periodics_reschedule (EV_P)
1881{ 2127{
1882 int i; 2128 int i;
1883 2129
1896 2142
1897 reheap (periodics, periodiccnt); 2143 reheap (periodics, periodiccnt);
1898} 2144}
1899#endif 2145#endif
1900 2146
2147/* adjust all timers by a given offset */
1901static void noinline 2148static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2149timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2150{
1904 int i; 2151 int i;
1905 2152
1909 ANHE_w (*he)->at += adjust; 2156 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2157 ANHE_at_cache (*he);
1911 } 2158 }
1912} 2159}
1913 2160
2161/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2163inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
1916{ 2165{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
1921 { 2168 {
2169 int i;
1922 ev_tstamp odiff = rtmn_diff; 2170 ev_tstamp odiff = rtmn_diff;
1923 2171
1924 mn_now = get_clock (); 2172 mn_now = get_clock ();
1925 2173
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2174 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2224
1977 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
1978 } 2226 }
1979} 2227}
1980 2228
1981static int loop_done;
1982
1983void 2229void
1984ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
1985{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
1986 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
1987 2239
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2241
1990 do 2242 do
1991 { 2243 {
1992#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2259 if (expect_false (postfork))
2008 if (forkcnt) 2260 if (forkcnt)
2009 { 2261 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
2012 } 2264 }
2013#endif 2265#endif
2014 2266
2015 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
2017 { 2269 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
2020 } 2272 }
2273
2274 if (expect_false (loop_done))
2275 break;
2021 2276
2022 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2024 loop_fork (EV_A); 2279 loop_fork (EV_A);
2025 2280
2031 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
2033 2288
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
2036 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
2296
2297 waittime = MAX_BLOCKTIME;
2038 2298
2039 if (timercnt) 2299 if (timercnt)
2040 { 2300 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2301 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2302 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
2050 } 2310 }
2051#endif 2311#endif
2052 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
2055 2316
2056 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2319 {
2320 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2321
2322 if (sleeptime > waittime - backend_fudge)
2323 sleeptime = waittime - backend_fudge;
2324
2325 if (expect_true (sleeptime > 0.))
2326 {
2063 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
2065 } 2330 }
2066 } 2331 }
2067 2332
2333#if EV_MINIMAL < 2
2068 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2339
2071 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2073 } 2342 }
2074 2343
2085 2354
2086 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2358
2090 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2091 } 2360 }
2092 while (expect_true ( 2361 while (expect_true (
2093 activecnt 2362 activecnt
2094 && !loop_done 2363 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2365 ));
2097 2366
2098 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2100} 2373}
2101 2374
2102void 2375void
2103ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2104{ 2377{
2135 ev_tstamp mn_prev = mn_now; 2408 ev_tstamp mn_prev = mn_now;
2136 2409
2137 ev_now_update (EV_A); 2410 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2411 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2412#if EV_PERIODIC_ENABLE
2413 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2414 periodics_reschedule (EV_A);
2141#endif 2415#endif
2142} 2416}
2143 2417
2144/*****************************************************************************/ 2418/*****************************************************************************/
2419/* singly-linked list management, used when the expected list length is short */
2145 2420
2146inline_size void 2421inline_size void
2147wlist_add (WL *head, WL elem) 2422wlist_add (WL *head, WL elem)
2148{ 2423{
2149 elem->next = *head; 2424 elem->next = *head;
2153inline_size void 2428inline_size void
2154wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2155{ 2430{
2156 while (*head) 2431 while (*head)
2157 { 2432 {
2158 if (*head == elem) 2433 if (expect_true (*head == elem))
2159 { 2434 {
2160 *head = elem->next; 2435 *head = elem->next;
2161 return; 2436 break;
2162 } 2437 }
2163 2438
2164 head = &(*head)->next; 2439 head = &(*head)->next;
2165 } 2440 }
2166} 2441}
2167 2442
2443/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2444inline_speed void
2169clear_pending (EV_P_ W w) 2445clear_pending (EV_P_ W w)
2170{ 2446{
2171 if (w->pending) 2447 if (w->pending)
2172 { 2448 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2449 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2450 w->pending = 0;
2175 } 2451 }
2176} 2452}
2177 2453
2178int 2454int
2182 int pending = w_->pending; 2458 int pending = w_->pending;
2183 2459
2184 if (expect_true (pending)) 2460 if (expect_true (pending))
2185 { 2461 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2462 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2463 p->w = (W)&pending_w;
2187 w_->pending = 0; 2464 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2465 return p->events;
2190 } 2466 }
2191 else 2467 else
2192 return 0; 2468 return 0;
2193} 2469}
2194 2470
2195inline_size void 2471inline_size void
2196pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2197{ 2473{
2198 int pri = w->priority; 2474 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2477 ev_set_priority (w, pri);
2202} 2478}
2203 2479
2204inline_speed void 2480inline_speed void
2205ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2206{ 2482{
2233 2509
2234 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2237 2513
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2240 2516
2241 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2242} 2518}
2243 2519
2337 } 2613 }
2338 2614
2339 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2340} 2616}
2341 2617
2618ev_tstamp
2619ev_timer_remaining (EV_P_ ev_timer *w)
2620{
2621 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2622}
2623
2342#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2343void noinline 2625void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2627{
2346 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2413#endif 2695#endif
2414 2696
2415void noinline 2697void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2417{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2422 return; 2701 return;
2423 2702
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2704
2426 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2708
2428 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2429 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2430 { 2716 {
2431#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2720
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2724
2439#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2441#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2442 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2443 2743
2444 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2746
2447 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2448 { 2751 {
2449#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2450 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2451#else 2756# else
2452 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2453 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2457#endif 2769#endif
2458 } 2770 }
2459 2771
2460 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2461} 2773}
2462 2774
2463void noinline 2775void noinline
2471 2783
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2474 2786
2475 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum);
2800
2801 signalfd (sigfd, &sigfd_set, 0);
2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2803 }
2804 else
2805#endif
2476 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2477 2808
2478 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2479} 2810}
2480 2811
2481void 2812void
2529static void noinline 2860static void noinline
2530infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2531{ 2862{
2532 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); 2863 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);
2533 2864
2534 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2535 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2537 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2538 2890
2539 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2540 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2541 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 2895 {
2544 char path [4096]; 2896 char path [4096];
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 2913 }
2562 } 2914 }
2563 2915
2564 if (w->wd >= 0) 2916 if (w->wd >= 0)
2565 {
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2567 2918
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2570 /* also do poll on <2.6.25, but with normal frequency */
2571 struct statfs sfs;
2572
2573 if (fs_2625 && !statfs (w->path, &sfs))
2574 if (sfs.f_type == 0x1373 /* devfs */
2575 || sfs.f_type == 0xEF53 /* ext2/3 */
2576 || sfs.f_type == 0x3153464a /* jfs */
2577 || sfs.f_type == 0x52654973 /* reiser3 */
2578 || sfs.f_type == 0x01021994 /* tempfs */
2579 || sfs.f_type == 0x58465342 /* xfs */)
2580 return;
2581
2582 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2583 ev_timer_again (EV_A_ &w->timer); 2921 ev_timer_again (EV_A_ &w->timer);
2584 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 2923}
2586 2924
2587static void noinline 2925static void noinline
2588infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2589{ 2927{
2665 return; 3003 return;
2666 3004
2667 fs_2625 = 1; 3005 fs_2625 = 1;
2668} 3006}
2669 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2670inline_size void 3019inline_size void
2671infy_init (EV_P) 3020infy_init (EV_P)
2672{ 3021{
2673 if (fs_fd != -2) 3022 if (fs_fd != -2)
2674 return; 3023 return;
2675 3024
2676 fs_fd = -1; 3025 fs_fd = -1;
2677 3026
2678 check_2625 (EV_A); 3027 check_2625 (EV_A);
2679 3028
2680 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2681 3030
2682 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2683 { 3032 {
3033 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2687 } 3038 }
2688} 3039}
2689 3040
2690inline_size void 3041inline_size void
2691infy_fork (EV_P) 3042infy_fork (EV_P)
2693 int slot; 3044 int slot;
2694 3045
2695 if (fs_fd < 0) 3046 if (fs_fd < 0)
2696 return; 3047 return;
2697 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3051 close (fs_fd);
2699 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
2700 3061
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2702 { 3063 {
2703 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
2711 w->wd = -1; 3072 w->wd = -1;
2712 3073
2713 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2715 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2716 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
2717 } 3083 }
2718 } 3084 }
2719} 3085}
2720 3086
2721#endif 3087#endif
2738static void noinline 3104static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3106{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3108
2743 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
2744 /* prev has the old value when the callback gets invoked */
2745 w->prev = w->attr;
2746 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
2747 3111
2748 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2749 if ( 3113 if (
2750 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2761 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
2762 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2764 { 3133 {
2765 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2791 3160
2792 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2794 else 3163 else
2795#endif 3164#endif
3165 {
2796 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2797 3169
2798 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2799 3171
2800 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2801} 3173}
2810 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2811 3183
2812#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2814#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2816 3193
2817 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2818 3195
2819 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2820} 3197}
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3339{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3341
2965 { 3342 {
2966 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
2967 3344
2968 while (fdchangecnt) 3345 while (fdchangecnt)
2969 { 3346 {
2970 fd_reify (EV_A); 3347 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3356 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3357
2981 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
2982 3359
2983 { 3360 {
2984 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
2985 3362
2986 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2988 } 3365 }
2989 3366
3003{ 3380{
3004 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3005 return; 3382 return;
3006 3383
3007 { 3384 {
3008 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3386 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); 3387 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3011 } 3388 }
3012 3389
3013 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
3125 3502
3126void 3503void
3127ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3128{ 3505{
3129 w->sent = 1; 3506 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3131} 3508}
3132#endif 3509#endif
3133 3510
3134/*****************************************************************************/ 3511/*****************************************************************************/
3135 3512
3199 } 3576 }
3200} 3577}
3201 3578
3202/*****************************************************************************/ 3579/*****************************************************************************/
3203 3580
3204#if 0 3581#if EV_WALK_ENABLE
3205void 3582void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3583ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3584{
3208 int i, j; 3585 int i, j;
3209 ev_watcher_list *wl, *wn; 3586 ev_watcher_list *wl, *wn;
3225#if EV_USE_INOTIFY 3602#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3603 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3604 ;
3228 else 3605 else
3229#endif 3606#endif
3230 if ((ev_io *)wl != &pipeev) 3607 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3608 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3609 cb (EV_A_ EV_IO, wl);
3233 3610
3234 wl = wn; 3611 wl = wn;
3235 } 3612 }
3284 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3287 3664
3288 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3291 { 3668 {
3292 wn = wl->next; 3669 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3671 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines