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.325 by root, Sun Jan 24 12:31:55 2010 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
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
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
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
285#endif 331#endif
286 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
345#endif
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 */
348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
288 354
289#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
292#endif 358#endif
320 386
321#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 388# include <winsock.h>
323#endif 389#endif
324 390
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 391#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
403# endif
337# ifdef __cplusplus 404# ifdef __cplusplus
338extern "C" { 405extern "C" {
339# endif 406# endif
340int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 408# ifdef __cplusplus
342} 409}
343# endif 410# endif
344#endif 411#endif
412
413#if EV_USE_SIGNALFD
414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
345 441
346/**/ 442/**/
347 443
348#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 457 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 459
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#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) */ 461#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 462
368#if __GNUC__ >= 4 463#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
371#else 466#else
384# define inline_speed static noinline 479# define inline_speed static noinline
385#else 480#else
386# define inline_speed static inline 481# define inline_speed static inline
387#endif 482#endif
388 483
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
488#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
391 491
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
394 494
395typedef ev_watcher *W; 495typedef ev_watcher *W;
407 507
408#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 510#endif
411 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
412#ifdef _WIN32 522#ifdef _WIN32
413# include "ev_win32.c" 523# include "ev_win32.c"
414#endif 524#endif
415 525
416/*****************************************************************************/ 526/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
480 590
481/*****************************************************************************/ 591/*****************************************************************************/
482 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
596/* file descriptor info structure */
483typedef struct 597typedef struct
484{ 598{
485 WL head; 599 WL head;
486 unsigned char events; 600 unsigned char events; /* the events watched for */
487 unsigned char reify; 601 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 */ 602 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 603 unsigned char unused;
490#if EV_USE_EPOLL 604#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 605 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 606#endif
493#if EV_SELECT_IS_WINSOCKET 607#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 608 SOCKET handle;
495#endif 609#endif
496} ANFD; 610} ANFD;
497 611
612/* stores the pending event set for a given watcher */
498typedef struct 613typedef struct
499{ 614{
500 W w; 615 W w;
501 int events; 616 int events; /* the pending event set for the given watcher */
502} ANPENDING; 617} ANPENDING;
503 618
504#if EV_USE_INOTIFY 619#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 620/* hash table entry per inotify-id */
506typedef struct 621typedef struct
509} ANFS; 624} ANFS;
510#endif 625#endif
511 626
512/* Heap Entry */ 627/* Heap Entry */
513#if EV_HEAP_CACHE_AT 628#if EV_HEAP_CACHE_AT
629 /* a heap element */
514 typedef struct { 630 typedef struct {
515 ev_tstamp at; 631 ev_tstamp at;
516 WT w; 632 WT w;
517 } ANHE; 633 } ANHE;
518 634
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 635 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 636 #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 */ 637 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 638#else
639 /* a heap element */
523 typedef WT ANHE; 640 typedef WT ANHE;
524 641
525 #define ANHE_w(he) (he) 642 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 643 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 644 #define ANHE_at_cache(he)
551 668
552 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
553 670
554#endif 671#endif
555 672
673#if EV_MINIMAL < 2
674# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
675# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
676# define EV_INVOKE_PENDING invoke_cb (EV_A)
677#else
678# define EV_RELEASE_CB (void)0
679# define EV_ACQUIRE_CB (void)0
680# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
681#endif
682
683#define EVUNLOOP_RECURSE 0x80
684
556/*****************************************************************************/ 685/*****************************************************************************/
557 686
687#ifndef EV_HAVE_EV_TIME
558ev_tstamp 688ev_tstamp
559ev_time (void) 689ev_time (void)
560{ 690{
561#if EV_USE_REALTIME 691#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 692 if (expect_true (have_realtime))
569 699
570 struct timeval tv; 700 struct timeval tv;
571 gettimeofday (&tv, 0); 701 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 702 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 703}
704#endif
574 705
575inline_size ev_tstamp 706inline_size ev_tstamp
576get_clock (void) 707get_clock (void)
577{ 708{
578#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
614 745
615 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 748
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 749 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 750 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 751 /* by older ones */
621 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
622#endif 753#endif
623 } 754 }
624} 755}
625 756
626/*****************************************************************************/ 757/*****************************************************************************/
627 758
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 759#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 760
761/* find a suitable new size for the given array, */
762/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 763inline_size int
631array_nextsize (int elem, int cur, int cnt) 764array_nextsize (int elem, int cur, int cnt)
632{ 765{
633 int ncur = cur + 1; 766 int ncur = cur + 1;
634 767
680#define array_free(stem, idx) \ 813#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 814 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 815
683/*****************************************************************************/ 816/*****************************************************************************/
684 817
818/* dummy callback for pending events */
819static void noinline
820pendingcb (EV_P_ ev_prepare *w, int revents)
821{
822}
823
685void noinline 824void noinline
686ev_feed_event (EV_P_ void *w, int revents) 825ev_feed_event (EV_P_ void *w, int revents)
687{ 826{
688 W w_ = (W)w; 827 W w_ = (W)w;
689 int pri = ABSPRI (w_); 828 int pri = ABSPRI (w_);
724} 863}
725 864
726/*****************************************************************************/ 865/*****************************************************************************/
727 866
728inline_speed void 867inline_speed void
729fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
730{ 869{
731 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
732 ev_io *w; 871 ev_io *w;
733 872
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 873 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 877 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
740 } 879 }
741} 880}
742 881
882/* do not submit kernel events for fds that have reify set */
883/* because that means they changed while we were polling for new events */
884inline_speed void
885fd_event (EV_P_ int fd, int revents)
886{
887 ANFD *anfd = anfds + fd;
888
889 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents);
891}
892
743void 893void
744ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 895{
746 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
748} 898}
749 899
900/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */
750inline_size void 902inline_size void
751fd_reify (EV_P) 903fd_reify (EV_P)
752{ 904{
753 int i; 905 int i;
754 906
765 917
766#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
767 if (events) 919 if (events)
768 { 920 {
769 unsigned long arg; 921 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 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)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 924 }
777#endif 925#endif
778 926
779 { 927 {
789 } 937 }
790 938
791 fdchangecnt = 0; 939 fdchangecnt = 0;
792} 940}
793 941
942/* something about the given fd changed */
794inline_size void 943inline_size void
795fd_change (EV_P_ int fd, int flags) 944fd_change (EV_P_ int fd, int flags)
796{ 945{
797 unsigned char reify = anfds [fd].reify; 946 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 947 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 952 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 953 fdchanges [fdchangecnt - 1] = fd;
805 } 954 }
806} 955}
807 956
957/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 958inline_speed void
809fd_kill (EV_P_ int fd) 959fd_kill (EV_P_ int fd)
810{ 960{
811 ev_io *w; 961 ev_io *w;
812 962
815 ev_io_stop (EV_A_ w); 965 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 966 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 967 }
818} 968}
819 969
970/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 971inline_size int
821fd_valid (int fd) 972fd_valid (int fd)
822{ 973{
823#ifdef _WIN32 974#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 976#else
826 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
827#endif 978#endif
828} 979}
829 980
847 998
848 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1000 if (anfds [fd].events)
850 { 1001 {
851 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
852 return; 1003 break;
853 } 1004 }
854} 1005}
855 1006
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1008static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1014 if (anfds [fd].events)
864 { 1015 {
865 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1017 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1019 }
869} 1020}
870 1021
871/*****************************************************************************/ 1022/*****************************************************************************/
872 1023
947 1098
948 for (;;) 1099 for (;;)
949 { 1100 {
950 int c = k << 1; 1101 int c = k << 1;
951 1102
952 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
953 break; 1104 break;
954 1105
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1107 ? 1 : 0;
957 1108
989 1140
990 heap [k] = he; 1141 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1142 ev_active (ANHE_w (he)) = k;
992} 1143}
993 1144
1145/* move an element suitably so it is in a correct place */
994inline_size void 1146inline_size void
995adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
996{ 1148{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1150 upheap (heap, k);
999 else 1151 else
1000 downheap (heap, N, k); 1152 downheap (heap, N, k);
1001} 1153}
1002 1154
1012 upheap (heap, i + HEAP0); 1164 upheap (heap, i + HEAP0);
1013} 1165}
1014 1166
1015/*****************************************************************************/ 1167/*****************************************************************************/
1016 1168
1169/* associate signal watchers to a signal signal */
1017typedef struct 1170typedef struct
1018{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1019 WL head; 1176 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1177} ANSIG;
1022 1178
1023static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1180
1028/*****************************************************************************/ 1181/*****************************************************************************/
1029 1182
1183/* used to prepare libev internal fd's */
1184/* this is not fork-safe */
1030inline_speed void 1185inline_speed void
1031fd_intern (int fd) 1186fd_intern (int fd)
1032{ 1187{
1033#ifdef _WIN32 1188#ifdef _WIN32
1034 unsigned long arg = 1; 1189 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1036#else 1191#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif 1194#endif
1040} 1195}
1041 1196
1042static void noinline 1197static void noinline
1043evpipe_init (EV_P) 1198evpipe_init (EV_P)
1044{ 1199{
1045 if (!ev_is_active (&pipeev)) 1200 if (!ev_is_active (&pipe_w))
1046 { 1201 {
1047#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1049 { 1208 {
1050 evpipe [0] = -1; 1209 evpipe [0] = -1;
1051 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1212 }
1054 else 1213 else
1055#endif 1214#endif
1056 { 1215 {
1057 while (pipe (evpipe)) 1216 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1217 ev_syserr ("(libev) error creating signal/async pipe");
1059 1218
1060 fd_intern (evpipe [0]); 1219 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1220 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1221 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1222 }
1064 1223
1065 ev_io_start (EV_A_ &pipeev); 1224 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1225 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1226 }
1068} 1227}
1069 1228
1070inline_size void 1229inline_size void
1088 1247
1089 errno = old_errno; 1248 errno = old_errno;
1090 } 1249 }
1091} 1250}
1092 1251
1252/* called whenever the libev signal pipe */
1253/* got some events (signal, async) */
1093static void 1254static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1256{
1257 int i;
1258
1096#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1260 if (evfd >= 0)
1098 { 1261 {
1099 uint64_t counter; 1262 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
1104 { 1267 {
1105 char dummy; 1268 char dummy;
1106 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1107 } 1270 }
1108 1271
1109 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1110 { 1273 {
1111 int signum; 1274 sig_pending = 0;
1112 gotsig = 0;
1113 1275
1114 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1279 }
1118 1280
1119#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1120 if (gotasync) 1282 if (async_pending)
1121 { 1283 {
1122 int i; 1284 async_pending = 0;
1123 gotasync = 0;
1124 1285
1125 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1127 { 1288 {
1128 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
1136 1297
1137static void 1298static void
1138ev_sighandler (int signum) 1299ev_sighandler (int signum)
1139{ 1300{
1140#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1142#endif 1303#endif
1143 1304
1144#if _WIN32 1305#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1146#endif 1307#endif
1147 1308
1148 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1150} 1311}
1151 1312
1152void noinline 1313void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1154{ 1315{
1155 WL w; 1316 WL w;
1156 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1157#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1326
1161 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1328 return;
1329#endif
1165 1330
1166 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1167 1332
1168 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1335}
1171 1336
1337#if EV_USE_SIGNALFD
1338static void
1339sigfdcb (EV_P_ ev_io *iow, int revents)
1340{
1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1342
1343 for (;;)
1344 {
1345 ssize_t res = read (sigfd, si, sizeof (si));
1346
1347 /* not ISO-C, as res might be -1, but works with SuS */
1348 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1349 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1350
1351 if (res < (ssize_t)sizeof (si))
1352 break;
1353 }
1354}
1355#endif
1356
1172/*****************************************************************************/ 1357/*****************************************************************************/
1173 1358
1174static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1175 1360
1176#ifndef _WIN32 1361#ifndef _WIN32
1179 1364
1180#ifndef WIFCONTINUED 1365#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1366# define WIFCONTINUED(status) 0
1182#endif 1367#endif
1183 1368
1369/* handle a single child status event */
1184inline_speed void 1370inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1371child_reap (EV_P_ int chain, int pid, int status)
1186{ 1372{
1187 ev_child *w; 1373 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1388
1203#ifndef WCONTINUED 1389#ifndef WCONTINUED
1204# define WCONTINUED 0 1390# define WCONTINUED 0
1205#endif 1391#endif
1206 1392
1393/* called on sigchld etc., calls waitpid */
1207static void 1394static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1395childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1396{
1210 int pid, status; 1397 int pid, status;
1211 1398
1318ev_backend (EV_P) 1505ev_backend (EV_P)
1319{ 1506{
1320 return backend; 1507 return backend;
1321} 1508}
1322 1509
1510#if EV_MINIMAL < 2
1323unsigned int 1511unsigned int
1324ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1325{ 1513{
1326 return loop_count; 1514 return loop_count;
1327} 1515}
1328 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1329void 1523void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1525{
1332 io_blocktime = interval; 1526 io_blocktime = interval;
1333} 1527}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1531{
1338 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1339} 1533}
1340 1534
1535void
1536ev_set_userdata (EV_P_ void *data)
1537{
1538 userdata = data;
1539}
1540
1541void *
1542ev_userdata (EV_P)
1543{
1544 return userdata;
1545}
1546
1547void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1548{
1549 invoke_cb = invoke_pending_cb;
1550}
1551
1552void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1553{
1554 release_cb = release;
1555 acquire_cb = acquire;
1556}
1557#endif
1558
1559/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1560static void noinline
1342loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1343{ 1562{
1344 if (!backend) 1563 if (!backend)
1345 { 1564 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1581 have_monotonic = 1;
1363 } 1582 }
1364#endif 1583#endif
1365 1584
1585 /* pid check not overridable via env */
1586#ifndef _WIN32
1587 if (flags & EVFLAG_FORKCHECK)
1588 curpid = getpid ();
1589#endif
1590
1591 if (!(flags & EVFLAG_NOENV)
1592 && !enable_secure ()
1593 && getenv ("LIBEV_FLAGS"))
1594 flags = atoi (getenv ("LIBEV_FLAGS"));
1595
1366 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1597 mn_now = get_clock ();
1368 now_floor = mn_now; 1598 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1600#if EV_MINIMAL < 2
1601 invoke_cb = ev_invoke_pending;
1602#endif
1370 1603
1371 io_blocktime = 0.; 1604 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1373 backend = 0; 1606 backend = 0;
1374 backend_fd = -1; 1607 backend_fd = -1;
1375 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1376#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1377 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1614#endif
1379 1615#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1617#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1618
1391 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1393 1621
1394#if EV_USE_PORT 1622#if EV_USE_PORT
1405#endif 1633#endif
1406#if EV_USE_SELECT 1634#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1636#endif
1409 1637
1638 ev_prepare_init (&pending_w, pendingcb);
1639
1410 ev_init (&pipeev, pipecb); 1640 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1641 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1642 }
1413} 1643}
1414 1644
1645/* free up a loop structure */
1415static void noinline 1646static void noinline
1416loop_destroy (EV_P) 1647loop_destroy (EV_P)
1417{ 1648{
1418 int i; 1649 int i;
1419 1650
1420 if (ev_is_active (&pipeev)) 1651 if (ev_is_active (&pipe_w))
1421 { 1652 {
1422 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1655
1425#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1657 if (evfd >= 0)
1427 close (evfd); 1658 close (evfd);
1428#endif 1659#endif
1429 1660
1430 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1431 { 1662 {
1432 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1665 }
1435 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1436 1672
1437#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1439 close (fs_fd); 1675 close (fs_fd);
1440#endif 1676#endif
1464#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1701 array_free (idle, [i]);
1466#endif 1702#endif
1467 } 1703 }
1468 1704
1469 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1706
1471 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1505#endif 1741#endif
1506#if EV_USE_INOTIFY 1742#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1743 infy_fork (EV_A);
1508#endif 1744#endif
1509 1745
1510 if (ev_is_active (&pipeev)) 1746 if (ev_is_active (&pipe_w))
1511 { 1747 {
1512 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1514 gotsig = 1; 1750 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1752 async_pending = 1;
1517#endif 1753#endif
1518 1754
1519 ev_ref (EV_A); 1755 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1756 ev_io_stop (EV_A_ &pipe_w);
1521 1757
1522#if EV_USE_EVENTFD 1758#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1759 if (evfd >= 0)
1524 close (evfd); 1760 close (evfd);
1525#endif 1761#endif
1526 1762
1527 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1528 { 1764 {
1529 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1767 }
1532 1768
1533 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1772 }
1537 1773
1538 postfork = 0; 1774 postfork = 0;
1539} 1775}
1540 1776
1541#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1542 1778
1543struct ev_loop * 1779struct ev_loop *
1544ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1545{ 1781{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1782 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1783
1548 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1551 1786
1552 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1553 return loop; 1788 return EV_A;
1554 1789
1555 return 0; 1790 return 0;
1556} 1791}
1557 1792
1558void 1793void
1565void 1800void
1566ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1567{ 1802{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1569} 1804}
1805#endif /* multiplicity */
1570 1806
1571#if EV_VERIFY 1807#if EV_VERIFY
1572static void noinline 1808static void noinline
1573verify_watcher (EV_P_ W w) 1809verify_watcher (EV_P_ W w)
1574{ 1810{
1602 verify_watcher (EV_A_ ws [cnt]); 1838 verify_watcher (EV_A_ ws [cnt]);
1603 } 1839 }
1604} 1840}
1605#endif 1841#endif
1606 1842
1843#if EV_MINIMAL < 2
1607void 1844void
1608ev_loop_verify (EV_P) 1845ev_loop_verify (EV_P)
1609{ 1846{
1610#if EV_VERIFY 1847#if EV_VERIFY
1611 int i; 1848 int i;
1660 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1899
1663# if 0 1900# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 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) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1903# endif
1904#endif
1668} 1905}
1669 1906#endif
1670#endif /* multiplicity */
1671 1907
1672#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1673struct ev_loop * 1909struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1910ev_default_loop_init (unsigned int flags)
1675#else 1911#else
1678#endif 1914#endif
1679{ 1915{
1680 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1681 { 1917 {
1682#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1920#else
1685 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1686#endif 1922#endif
1687 1923
1688 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1705 1941
1706void 1942void
1707ev_default_destroy (void) 1943ev_default_destroy (void)
1708{ 1944{
1709#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1711#endif 1947#endif
1712 1948
1713 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1714 1950
1715#ifndef _WIN32 1951#ifndef _WIN32
1722 1958
1723void 1959void
1724ev_default_fork (void) 1960ev_default_fork (void)
1725{ 1961{
1726#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1728#endif 1964#endif
1729 1965
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1967}
1732 1968
1736ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1737{ 1973{
1738 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1739} 1975}
1740 1976
1741inline_speed void 1977unsigned int
1742call_pending (EV_P) 1978ev_pending_count (EV_P)
1979{
1980 int pri;
1981 unsigned int count = 0;
1982
1983 for (pri = NUMPRI; pri--; )
1984 count += pendingcnt [pri];
1985
1986 return count;
1987}
1988
1989void noinline
1990ev_invoke_pending (EV_P)
1743{ 1991{
1744 int pri; 1992 int pri;
1745 1993
1746 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1748 { 1996 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1997 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1998
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1999 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2000 /* ^ this is no longer true, as pending_w could be here */
1754 2001
1755 p->w->pending = 0; 2002 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2003 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2004 EV_FREQUENT_CHECK;
1758 }
1759 } 2005 }
1760} 2006}
1761 2007
1762#if EV_IDLE_ENABLE 2008#if EV_IDLE_ENABLE
2009/* make idle watchers pending. this handles the "call-idle */
2010/* only when higher priorities are idle" logic */
1763inline_size void 2011inline_size void
1764idle_reify (EV_P) 2012idle_reify (EV_P)
1765{ 2013{
1766 if (expect_false (idleall)) 2014 if (expect_false (idleall))
1767 { 2015 {
1780 } 2028 }
1781 } 2029 }
1782} 2030}
1783#endif 2031#endif
1784 2032
2033/* make timers pending */
1785inline_size void 2034inline_size void
1786timers_reify (EV_P) 2035timers_reify (EV_P)
1787{ 2036{
1788 EV_FREQUENT_CHECK; 2037 EV_FREQUENT_CHECK;
1789 2038
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2067 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2068 }
1820} 2069}
1821 2070
1822#if EV_PERIODIC_ENABLE 2071#if EV_PERIODIC_ENABLE
2072/* make periodics pending */
1823inline_size void 2073inline_size void
1824periodics_reify (EV_P) 2074periodics_reify (EV_P)
1825{ 2075{
1826 EV_FREQUENT_CHECK; 2076 EV_FREQUENT_CHECK;
1827 2077
1874 2124
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2125 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2126 }
1877} 2127}
1878 2128
2129/* simply recalculate all periodics */
2130/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2131static void noinline
1880periodics_reschedule (EV_P) 2132periodics_reschedule (EV_P)
1881{ 2133{
1882 int i; 2134 int i;
1883 2135
1896 2148
1897 reheap (periodics, periodiccnt); 2149 reheap (periodics, periodiccnt);
1898} 2150}
1899#endif 2151#endif
1900 2152
2153/* adjust all timers by a given offset */
1901static void noinline 2154static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2155timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2156{
1904 int i; 2157 int i;
1905 2158
1909 ANHE_w (*he)->at += adjust; 2162 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
1911 } 2164 }
1912} 2165}
1913 2166
2167/* fetch new monotonic and realtime times from the kernel */
2168/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2169inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1916{ 2171{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
1921 { 2174 {
2175 int i;
1922 ev_tstamp odiff = rtmn_diff; 2176 ev_tstamp odiff = rtmn_diff;
1923 2177
1924 mn_now = get_clock (); 2178 mn_now = get_clock ();
1925 2179
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2180 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2230
1977 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
1978 } 2232 }
1979} 2233}
1980 2234
1981static int loop_done;
1982
1983void 2235void
1984ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
1985{ 2237{
2238#if EV_MINIMAL < 2
2239 ++loop_depth;
2240#endif
2241
2242 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2243
1986 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
1987 2245
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2246 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2247
1990 do 2248 do
1991 { 2249 {
1992#if EV_VERIFY >= 2 2250#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2251 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2265 if (expect_false (postfork))
2008 if (forkcnt) 2266 if (forkcnt)
2009 { 2267 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
2012 } 2270 }
2013#endif 2271#endif
2014 2272
2015 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
2017 { 2275 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
2020 } 2278 }
2279
2280 if (expect_false (loop_done))
2281 break;
2021 2282
2022 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2284 if (expect_false (postfork))
2024 loop_fork (EV_A); 2285 loop_fork (EV_A);
2025 2286
2031 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
2033 2294
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
2036 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
2302
2303 waittime = MAX_BLOCKTIME;
2038 2304
2039 if (timercnt) 2305 if (timercnt)
2040 { 2306 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2307 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2308 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2314 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
2050 } 2316 }
2051#endif 2317#endif
2052 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
2055 2322
2056 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2325 {
2326 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2327
2328 if (sleeptime > waittime - backend_fudge)
2329 sleeptime = waittime - backend_fudge;
2330
2331 if (expect_true (sleeptime > 0.))
2332 {
2063 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
2065 } 2336 }
2066 } 2337 }
2067 2338
2339#if EV_MINIMAL < 2
2068 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2345
2071 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2073 } 2348 }
2074 2349
2085 2360
2086 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2364
2090 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
2091 } 2366 }
2092 while (expect_true ( 2367 while (expect_true (
2093 activecnt 2368 activecnt
2094 && !loop_done 2369 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2371 ));
2097 2372
2098 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
2100} 2379}
2101 2380
2102void 2381void
2103ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
2104{ 2383{
2135 ev_tstamp mn_prev = mn_now; 2414 ev_tstamp mn_prev = mn_now;
2136 2415
2137 ev_now_update (EV_A); 2416 ev_now_update (EV_A);
2138 timers_reschedule (EV_A_ mn_now - mn_prev); 2417 timers_reschedule (EV_A_ mn_now - mn_prev);
2139#if EV_PERIODIC_ENABLE 2418#if EV_PERIODIC_ENABLE
2419 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2420 periodics_reschedule (EV_A);
2141#endif 2421#endif
2142} 2422}
2143 2423
2144/*****************************************************************************/ 2424/*****************************************************************************/
2425/* singly-linked list management, used when the expected list length is short */
2145 2426
2146inline_size void 2427inline_size void
2147wlist_add (WL *head, WL elem) 2428wlist_add (WL *head, WL elem)
2148{ 2429{
2149 elem->next = *head; 2430 elem->next = *head;
2153inline_size void 2434inline_size void
2154wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2155{ 2436{
2156 while (*head) 2437 while (*head)
2157 { 2438 {
2158 if (*head == elem) 2439 if (expect_true (*head == elem))
2159 { 2440 {
2160 *head = elem->next; 2441 *head = elem->next;
2161 return; 2442 break;
2162 } 2443 }
2163 2444
2164 head = &(*head)->next; 2445 head = &(*head)->next;
2165 } 2446 }
2166} 2447}
2167 2448
2449/* internal, faster, version of ev_clear_pending */
2168inline_speed void 2450inline_speed void
2169clear_pending (EV_P_ W w) 2451clear_pending (EV_P_ W w)
2170{ 2452{
2171 if (w->pending) 2453 if (w->pending)
2172 { 2454 {
2173 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2455 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2174 w->pending = 0; 2456 w->pending = 0;
2175 } 2457 }
2176} 2458}
2177 2459
2178int 2460int
2182 int pending = w_->pending; 2464 int pending = w_->pending;
2183 2465
2184 if (expect_true (pending)) 2466 if (expect_true (pending))
2185 { 2467 {
2186 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2468 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2469 p->w = (W)&pending_w;
2187 w_->pending = 0; 2470 w_->pending = 0;
2188 p->w = 0;
2189 return p->events; 2471 return p->events;
2190 } 2472 }
2191 else 2473 else
2192 return 0; 2474 return 0;
2193} 2475}
2194 2476
2195inline_size void 2477inline_size void
2196pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
2197{ 2479{
2198 int pri = w->priority; 2480 int pri = ev_priority (w);
2199 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2200 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2201 w->priority = pri; 2483 ev_set_priority (w, pri);
2202} 2484}
2203 2485
2204inline_speed void 2486inline_speed void
2205ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
2206{ 2488{
2233 2515
2234 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2235 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2236 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2237 2519
2238 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2239 w->events &= ~EV__IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2240 2522
2241 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2242} 2524}
2243 2525
2337 } 2619 }
2338 2620
2339 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2340} 2622}
2341 2623
2624ev_tstamp
2625ev_timer_remaining (EV_P_ ev_timer *w)
2626{
2627 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2628}
2629
2342#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2343void noinline 2631void noinline
2344ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2345{ 2633{
2346 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2413#endif 2701#endif
2414 2702
2415void noinline 2703void noinline
2416ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2417{ 2705{
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))) 2706 if (expect_false (ev_is_active (w)))
2422 return; 2707 return;
2423 2708
2424 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2425 2710
2426 evpipe_init (EV_A); 2711#if EV_MULTIPLICITY
2712 assert (("libev: a signal must not be attached to two different loops",
2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2427 2714
2428 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2429 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2430 { 2722 {
2431#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2432 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2433 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2434 sigprocmask (SIG_SETMASK, &full, &prev);
2435#endif
2436 2726
2437 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2438 2730
2439#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2440 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2441#endif 2733 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2734 ev_set_priority (&sigfd_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &sigfd_w);
2736 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2737 }
2442 } 2738 }
2739
2740 if (sigfd >= 0)
2741 {
2742 /* TODO: check .head */
2743 sigaddset (&sigfd_set, w->signum);
2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2745
2746 signalfd (sigfd, &sigfd_set, 0);
2747 }
2748#endif
2443 2749
2444 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2445 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2446 2752
2447 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2448 { 2757 {
2449#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2450 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2451#else 2762# else
2452 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2453 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2454 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2455 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2456 sigaction (w->signum, &sa, 0); 2770 sigaction (w->signum, &sa, 0);
2771
2772 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2457#endif 2775#endif
2458 } 2776 }
2459 2777
2460 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2461} 2779}
2462 2780
2463void noinline 2781void noinline
2471 2789
2472 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2473 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2474 2792
2475 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2794 {
2795#if EV_MULTIPLICITY
2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2797#endif
2798#if EV_USE_SIGNALFD
2799 if (sigfd >= 0)
2800 {
2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2805 sigdelset (&sigfd_set, w->signum);
2806
2807 signalfd (sigfd, &sigfd_set, 0);
2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2809 }
2810 else
2811#endif
2476 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2477 2814
2478 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2479} 2816}
2480 2817
2481void 2818void
2529static void noinline 2866static void noinline
2530infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2531{ 2868{
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); 2869 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 2870
2534 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2535 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2536 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 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 2896
2539 /* monitor some parent directory for speedup hints */ 2897 /* 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, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2541 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2542 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2543 { 2901 {
2544 char path [4096]; 2902 char path [4096];
2560 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2561 } 2919 }
2562 } 2920 }
2563 2921
2564 if (w->wd >= 0) 2922 if (w->wd >= 0)
2565 {
2566 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2567 2924
2568 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2569 /* unless the filesystem it known to be local, we therefore still poll */ 2926 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); 2927 ev_timer_again (EV_A_ &w->timer);
2584 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2585} 2929}
2586 2930
2587static void noinline 2931static void noinline
2588infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2589{ 2933{
2665 return; 3009 return;
2666 3010
2667 fs_2625 = 1; 3011 fs_2625 = 1;
2668} 3012}
2669 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2670inline_size void 3025inline_size void
2671infy_init (EV_P) 3026infy_init (EV_P)
2672{ 3027{
2673 if (fs_fd != -2) 3028 if (fs_fd != -2)
2674 return; 3029 return;
2675 3030
2676 fs_fd = -1; 3031 fs_fd = -1;
2677 3032
2678 check_2625 (EV_A); 3033 check_2625 (EV_A);
2679 3034
2680 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2681 3036
2682 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2683 { 3038 {
3039 fd_intern (fs_fd);
2684 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2685 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2686 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2687 } 3044 }
2688} 3045}
2689 3046
2690inline_size void 3047inline_size void
2691infy_fork (EV_P) 3048infy_fork (EV_P)
2693 int slot; 3050 int slot;
2694 3051
2695 if (fs_fd < 0) 3052 if (fs_fd < 0)
2696 return; 3053 return;
2697 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2698 close (fs_fd); 3057 close (fs_fd);
2699 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2700 3067
2701 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2702 { 3069 {
2703 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2704 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
2711 w->wd = -1; 3078 w->wd = -1;
2712 3079
2713 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2714 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2715 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2716 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
2717 } 3089 }
2718 } 3090 }
2719} 3091}
2720 3092
2721#endif 3093#endif
2738static void noinline 3110static void noinline
2739stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2740{ 3112{
2741 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2742 3114
2743 /* we copy this here each the time so that */ 3115 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); 3116 ev_stat_stat (EV_A_ w);
2747 3117
2748 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2749 if ( 3119 if (
2750 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2751 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2752 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2753 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2754 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2755 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2756 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2757 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2758 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2759 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2760 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2761 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
2762 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2763 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2764 { 3139 {
2765 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2766 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2791 3166
2792 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2793 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2794 else 3169 else
2795#endif 3170#endif
3171 {
2796 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2797 3175
2798 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2799 3177
2800 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2801} 3179}
2810 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2811 3189
2812#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2813 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2814#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2815 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2816 3199
2817 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2818 3201
2819 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2820} 3203}
2961embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2962{ 3345{
2963 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2964 3347
2965 { 3348 {
2966 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
2967 3350
2968 while (fdchangecnt) 3351 while (fdchangecnt)
2969 { 3352 {
2970 fd_reify (EV_A); 3353 fd_reify (EV_A);
2971 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2979 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2980 3363
2981 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
2982 3365
2983 { 3366 {
2984 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
2985 3368
2986 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
2987 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2988 } 3371 }
2989 3372
3003{ 3386{
3004 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3005 return; 3388 return;
3006 3389
3007 { 3390 {
3008 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3009 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3392 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); 3393 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3011 } 3394 }
3012 3395
3013 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
3125 3508
3126void 3509void
3127ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3128{ 3511{
3129 w->sent = 1; 3512 w->sent = 1;
3130 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3131} 3514}
3132#endif 3515#endif
3133 3516
3134/*****************************************************************************/ 3517/*****************************************************************************/
3135 3518
3199 } 3582 }
3200} 3583}
3201 3584
3202/*****************************************************************************/ 3585/*****************************************************************************/
3203 3586
3204#if 0 3587#if EV_WALK_ENABLE
3205void 3588void
3206ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3589ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3207{ 3590{
3208 int i, j; 3591 int i, j;
3209 ev_watcher_list *wl, *wn; 3592 ev_watcher_list *wl, *wn;
3225#if EV_USE_INOTIFY 3608#if EV_USE_INOTIFY
3226 if (ev_cb ((ev_io *)wl) == infy_cb) 3609 if (ev_cb ((ev_io *)wl) == infy_cb)
3227 ; 3610 ;
3228 else 3611 else
3229#endif 3612#endif
3230 if ((ev_io *)wl != &pipeev) 3613 if ((ev_io *)wl != &pipe_w)
3231 if (types & EV_IO) 3614 if (types & EV_IO)
3232 cb (EV_A_ EV_IO, wl); 3615 cb (EV_A_ EV_IO, wl);
3233 3616
3234 wl = wn; 3617 wl = wn;
3235 } 3618 }
3284 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3285 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3286 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3287 3670
3288 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3289 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3290 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3291 { 3674 {
3292 wn = wl->next; 3675 wn = wl->next;
3293 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3294 wl = wn; 3677 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines