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

Comparing libev/ev.c (file contents):
Revision 1.279 by root, Fri Feb 6 20:17:43 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
575ev_tstamp inline_size 706inline_size ev_tstamp
576get_clock (void) 707get_clock (void)
577{ 708{
578#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 710 if (expect_true (have_monotonic))
580 { 711 {
… …
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
630int inline_size 761/* find a suitable new size for the given array, */
762/* hopefully by rounding to a ncie-to-malloc size */
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
635 do 768 do
… …
676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 809 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
677 } 810 }
678#endif 811#endif
679 812
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; 814 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 815
683/*****************************************************************************/ 816/*****************************************************************************/
817
818/* dummy callback for pending events */
819static void noinline
820pendingcb (EV_P_ ev_prepare *w, int revents)
821{
822}
684 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;
… …
697 pendings [pri][w_->pending - 1].w = w_; 836 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 837 pendings [pri][w_->pending - 1].events = revents;
699 } 838 }
700} 839}
701 840
702void inline_speed 841inline_speed void
842feed_reverse (EV_P_ W w)
843{
844 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
845 rfeeds [rfeedcnt++] = w;
846}
847
848inline_size void
849feed_reverse_done (EV_P_ int revents)
850{
851 do
852 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
853 while (rfeedcnt);
854}
855
856inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 857queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 858{
705 int i; 859 int i;
706 860
707 for (i = 0; i < eventcnt; ++i) 861 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 862 ev_feed_event (EV_A_ events [i], type);
709} 863}
710 864
711/*****************************************************************************/ 865/*****************************************************************************/
712 866
713void inline_speed 867inline_speed void
714fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
715{ 869{
716 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
717 ev_io *w; 871 ev_io *w;
718 872
719 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)
… …
723 if (ev) 877 if (ev)
724 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
725 } 879 }
726} 880}
727 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
728void 893void
729ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
730{ 895{
731 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
733} 898}
734 899
735void inline_size 900/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */
902inline_size void
736fd_reify (EV_P) 903fd_reify (EV_P)
737{ 904{
738 int i; 905 int i;
739 906
740 for (i = 0; i < fdchangecnt; ++i) 907 for (i = 0; i < fdchangecnt; ++i)
… …
750 917
751#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
752 if (events) 919 if (events)
753 { 920 {
754 unsigned long arg; 921 unsigned long arg;
755 #ifdef EV_FD_TO_WIN32_HANDLE
756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
757 #else
758 anfd->handle = _get_osfhandle (fd);
759 #endif
760 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));
761 } 924 }
762#endif 925#endif
763 926
764 { 927 {
… …
766 unsigned char o_reify = anfd->reify; 929 unsigned char o_reify = anfd->reify;
767 930
768 anfd->reify = 0; 931 anfd->reify = 0;
769 anfd->events = events; 932 anfd->events = events;
770 933
771 if (o_events != events || o_reify & EV_IOFDSET) 934 if (o_events != events || o_reify & EV__IOFDSET)
772 backend_modify (EV_A_ fd, o_events, events); 935 backend_modify (EV_A_ fd, o_events, events);
773 } 936 }
774 } 937 }
775 938
776 fdchangecnt = 0; 939 fdchangecnt = 0;
777} 940}
778 941
779void inline_size 942/* something about the given fd changed */
943inline_size void
780fd_change (EV_P_ int fd, int flags) 944fd_change (EV_P_ int fd, int flags)
781{ 945{
782 unsigned char reify = anfds [fd].reify; 946 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 947 anfds [fd].reify |= flags;
784 948
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 952 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 953 fdchanges [fdchangecnt - 1] = fd;
790 } 954 }
791} 955}
792 956
793void inline_speed 957/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
958inline_speed void
794fd_kill (EV_P_ int fd) 959fd_kill (EV_P_ int fd)
795{ 960{
796 ev_io *w; 961 ev_io *w;
797 962
798 while ((w = (ev_io *)anfds [fd].head)) 963 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 965 ev_io_stop (EV_A_ w);
801 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);
802 } 967 }
803} 968}
804 969
805int inline_size 970/* check whether the given fd is atcually valid, for error recovery */
971inline_size int
806fd_valid (int fd) 972fd_valid (int fd)
807{ 973{
808#ifdef _WIN32 974#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
810#else 976#else
811 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
812#endif 978#endif
813} 979}
814 980
… …
832 998
833 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
834 if (anfds [fd].events) 1000 if (anfds [fd].events)
835 { 1001 {
836 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
837 return; 1003 break;
838 } 1004 }
839} 1005}
840 1006
841/* 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 */
842static void noinline 1008static void noinline
… …
847 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 1014 if (anfds [fd].events)
849 { 1015 {
850 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 1017 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
853 } 1019 }
854} 1020}
855 1021
856/*****************************************************************************/ 1022/*****************************************************************************/
857 1023
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1039#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1040#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 1041#define UPHEAP_DONE(p,k) ((p) == (k))
876 1042
877/* away from the root */ 1043/* away from the root */
878void inline_speed 1044inline_speed void
879downheap (ANHE *heap, int N, int k) 1045downheap (ANHE *heap, int N, int k)
880{ 1046{
881 ANHE he = heap [k]; 1047 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 1048 ANHE *E = heap + N + HEAP0;
883 1049
… …
923#define HEAP0 1 1089#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 1090#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 1091#define UPHEAP_DONE(p,k) (!(p))
926 1092
927/* away from the root */ 1093/* away from the root */
928void inline_speed 1094inline_speed void
929downheap (ANHE *heap, int N, int k) 1095downheap (ANHE *heap, int N, int k)
930{ 1096{
931 ANHE he = heap [k]; 1097 ANHE he = heap [k];
932 1098
933 for (;;) 1099 for (;;)
934 { 1100 {
935 int c = k << 1; 1101 int c = k << 1;
936 1102
937 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
938 break; 1104 break;
939 1105
940 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])
941 ? 1 : 0; 1107 ? 1 : 0;
942 1108
… …
953 ev_active (ANHE_w (he)) = k; 1119 ev_active (ANHE_w (he)) = k;
954} 1120}
955#endif 1121#endif
956 1122
957/* towards the root */ 1123/* towards the root */
958void inline_speed 1124inline_speed void
959upheap (ANHE *heap, int k) 1125upheap (ANHE *heap, int k)
960{ 1126{
961 ANHE he = heap [k]; 1127 ANHE he = heap [k];
962 1128
963 for (;;) 1129 for (;;)
… …
974 1140
975 heap [k] = he; 1141 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1142 ev_active (ANHE_w (he)) = k;
977} 1143}
978 1144
979void inline_size 1145/* move an element suitably so it is in a correct place */
1146inline_size void
980adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
981{ 1148{
982 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)]))
983 upheap (heap, k); 1150 upheap (heap, k);
984 else 1151 else
985 downheap (heap, N, k); 1152 downheap (heap, N, k);
986} 1153}
987 1154
988/* rebuild the heap: this function is used only once and executed rarely */ 1155/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1156inline_size void
990reheap (ANHE *heap, int N) 1157reheap (ANHE *heap, int N)
991{ 1158{
992 int i; 1159 int i;
993 1160
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1161 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1164 upheap (heap, i + HEAP0);
998} 1165}
999 1166
1000/*****************************************************************************/ 1167/*****************************************************************************/
1001 1168
1169/* associate signal watchers to a signal signal */
1002typedef struct 1170typedef struct
1003{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1004 WL head; 1176 WL head;
1005 EV_ATOMIC_T gotsig;
1006} ANSIG; 1177} ANSIG;
1007 1178
1008static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1009static int signalmax;
1010
1011static EV_ATOMIC_T gotsig;
1012 1180
1013/*****************************************************************************/ 1181/*****************************************************************************/
1014 1182
1015void inline_speed 1183/* used to prepare libev internal fd's */
1184/* this is not fork-safe */
1185inline_speed void
1016fd_intern (int fd) 1186fd_intern (int fd)
1017{ 1187{
1018#ifdef _WIN32 1188#ifdef _WIN32
1019 unsigned long arg = 1; 1189 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1021#else 1191#else
1022 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1023 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1024#endif 1194#endif
1025} 1195}
1026 1196
1027static void noinline 1197static void noinline
1028evpipe_init (EV_P) 1198evpipe_init (EV_P)
1029{ 1199{
1030 if (!ev_is_active (&pipeev)) 1200 if (!ev_is_active (&pipe_w))
1031 { 1201 {
1032#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1033 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1034 { 1208 {
1035 evpipe [0] = -1; 1209 evpipe [0] = -1;
1036 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1037 ev_io_set (&pipeev, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1212 }
1039 else 1213 else
1040#endif 1214#endif
1041 { 1215 {
1042 while (pipe (evpipe)) 1216 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1217 ev_syserr ("(libev) error creating signal/async pipe");
1044 1218
1045 fd_intern (evpipe [0]); 1219 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1220 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1221 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1222 }
1049 1223
1050 ev_io_start (EV_A_ &pipeev); 1224 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1225 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1226 }
1053} 1227}
1054 1228
1055void inline_size 1229inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1230evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1231{
1058 if (!*flag) 1232 if (!*flag)
1059 { 1233 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1234 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1247
1074 errno = old_errno; 1248 errno = old_errno;
1075 } 1249 }
1076} 1250}
1077 1251
1252/* called whenever the libev signal pipe */
1253/* got some events (signal, async) */
1078static void 1254static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1256{
1257 int i;
1258
1081#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1260 if (evfd >= 0)
1083 { 1261 {
1084 uint64_t counter; 1262 uint64_t counter;
1085 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1089 { 1267 {
1090 char dummy; 1268 char dummy;
1091 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1092 } 1270 }
1093 1271
1094 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1095 { 1273 {
1096 int signum; 1274 sig_pending = 0;
1097 gotsig = 0;
1098 1275
1099 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1100 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1101 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1102 } 1279 }
1103 1280
1104#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1105 if (gotasync) 1282 if (async_pending)
1106 { 1283 {
1107 int i; 1284 async_pending = 0;
1108 gotasync = 0;
1109 1285
1110 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1111 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1112 { 1288 {
1113 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1121 1297
1122static void 1298static void
1123ev_sighandler (int signum) 1299ev_sighandler (int signum)
1124{ 1300{
1125#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1126 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1127#endif 1303#endif
1128 1304
1129#if _WIN32 1305#ifdef _WIN32
1130 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1131#endif 1307#endif
1132 1308
1133 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1134 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1135} 1311}
1136 1312
1137void noinline 1313void noinline
1138ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1139{ 1315{
1140 WL w; 1316 WL w;
1141 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1142#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1143 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 */
1144#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1145 1326
1146 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1147
1148 if (signum < 0 || signum >= signalmax)
1149 return; 1328 return;
1329#endif
1150 1330
1151 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1152 1332
1153 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1154 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1155} 1335}
1156 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
1157/*****************************************************************************/ 1357/*****************************************************************************/
1158 1358
1159static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1160 1360
1161#ifndef _WIN32 1361#ifndef _WIN32
… …
1164 1364
1165#ifndef WIFCONTINUED 1365#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1366# define WIFCONTINUED(status) 0
1167#endif 1367#endif
1168 1368
1169void inline_speed 1369/* handle a single child status event */
1370inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1371child_reap (EV_P_ int chain, int pid, int status)
1171{ 1372{
1172 ev_child *w; 1373 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1375
… …
1187 1388
1188#ifndef WCONTINUED 1389#ifndef WCONTINUED
1189# define WCONTINUED 0 1390# define WCONTINUED 0
1190#endif 1391#endif
1191 1392
1393/* called on sigchld etc., calls waitpid */
1192static void 1394static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1395childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1396{
1195 int pid, status; 1397 int pid, status;
1196 1398
… …
1303ev_backend (EV_P) 1505ev_backend (EV_P)
1304{ 1506{
1305 return backend; 1507 return backend;
1306} 1508}
1307 1509
1510#if EV_MINIMAL < 2
1308unsigned int 1511unsigned int
1309ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1310{ 1513{
1311 return loop_count; 1514 return loop_count;
1312} 1515}
1313 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1314void 1523void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1525{
1317 io_blocktime = interval; 1526 io_blocktime = interval;
1318} 1527}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1531{
1323 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1324} 1533}
1325 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 */
1326static void noinline 1560static void noinline
1327loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1328{ 1562{
1329 if (!backend) 1563 if (!backend)
1330 { 1564 {
… …
1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1347 have_monotonic = 1; 1581 have_monotonic = 1;
1348 } 1582 }
1349#endif 1583#endif
1350 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
1351 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1597 mn_now = get_clock ();
1353 now_floor = mn_now; 1598 now_floor = mn_now;
1354 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
1355 1603
1356 io_blocktime = 0.; 1604 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1358 backend = 0; 1606 backend = 0;
1359 backend_fd = -1; 1607 backend_fd = -1;
1360 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1361#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1362 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1363#endif 1614#endif
1364 1615#if EV_USE_SIGNALFD
1365 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1366#ifndef _WIN32
1367 if (flags & EVFLAG_FORKCHECK)
1368 curpid = getpid ();
1369#endif 1617#endif
1370
1371 if (!(flags & EVFLAG_NOENV)
1372 && !enable_secure ()
1373 && getenv ("LIBEV_FLAGS"))
1374 flags = atoi (getenv ("LIBEV_FLAGS"));
1375 1618
1376 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1377 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1378 1621
1379#if EV_USE_PORT 1622#if EV_USE_PORT
… …
1390#endif 1633#endif
1391#if EV_USE_SELECT 1634#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1636#endif
1394 1637
1638 ev_prepare_init (&pending_w, pendingcb);
1639
1395 ev_init (&pipeev, pipecb); 1640 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1641 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1642 }
1398} 1643}
1399 1644
1645/* free up a loop structure */
1400static void noinline 1646static void noinline
1401loop_destroy (EV_P) 1647loop_destroy (EV_P)
1402{ 1648{
1403 int i; 1649 int i;
1404 1650
1405 if (ev_is_active (&pipeev)) 1651 if (ev_is_active (&pipe_w))
1406 { 1652 {
1407 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1408 ev_io_stop (EV_A_ &pipeev); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1409 1655
1410#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1657 if (evfd >= 0)
1412 close (evfd); 1658 close (evfd);
1413#endif 1659#endif
1414 1660
1415 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1416 { 1662 {
1417 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1418 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1419 } 1665 }
1420 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1421 1672
1422#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1423 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1424 close (fs_fd); 1675 close (fs_fd);
1425#endif 1676#endif
… …
1449#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1450 array_free (idle, [i]); 1701 array_free (idle, [i]);
1451#endif 1702#endif
1452 } 1703 }
1453 1704
1454 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1455 1706
1456 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1708 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1712 array_free (periodic, EMPTY);
1461#endif 1713#endif
… …
1470 1722
1471 backend = 0; 1723 backend = 0;
1472} 1724}
1473 1725
1474#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1727inline_size void infy_fork (EV_P);
1476#endif 1728#endif
1477 1729
1478void inline_size 1730inline_size void
1479loop_fork (EV_P) 1731loop_fork (EV_P)
1480{ 1732{
1481#if EV_USE_PORT 1733#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1734 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1735#endif
… …
1489#endif 1741#endif
1490#if EV_USE_INOTIFY 1742#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1743 infy_fork (EV_A);
1492#endif 1744#endif
1493 1745
1494 if (ev_is_active (&pipeev)) 1746 if (ev_is_active (&pipe_w))
1495 { 1747 {
1496 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1498 gotsig = 1; 1750 sig_pending = 1;
1499#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1752 async_pending = 1;
1501#endif 1753#endif
1502 1754
1503 ev_ref (EV_A); 1755 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1756 ev_io_stop (EV_A_ &pipe_w);
1505 1757
1506#if EV_USE_EVENTFD 1758#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1759 if (evfd >= 0)
1508 close (evfd); 1760 close (evfd);
1509#endif 1761#endif
1510 1762
1511 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1512 { 1764 {
1513 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1514 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1515 } 1767 }
1516 1768
1517 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1772 }
1521 1773
1522 postfork = 0; 1774 postfork = 0;
1523} 1775}
1524 1776
1525#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1526 1778
1527struct ev_loop * 1779struct ev_loop *
1528ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1529{ 1781{
1530 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));
1531 1783
1532 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1533
1534 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1535 1786
1536 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1537 return loop; 1788 return EV_A;
1538 1789
1539 return 0; 1790 return 0;
1540} 1791}
1541 1792
1542void 1793void
… …
1549void 1800void
1550ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1551{ 1802{
1552 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1553} 1804}
1805#endif /* multiplicity */
1554 1806
1555#if EV_VERIFY 1807#if EV_VERIFY
1556static void noinline 1808static void noinline
1557verify_watcher (EV_P_ W w) 1809verify_watcher (EV_P_ W w)
1558{ 1810{
… …
1586 verify_watcher (EV_A_ ws [cnt]); 1838 verify_watcher (EV_A_ ws [cnt]);
1587 } 1839 }
1588} 1840}
1589#endif 1841#endif
1590 1842
1843#if EV_MINIMAL < 2
1591void 1844void
1592ev_loop_verify (EV_P) 1845ev_loop_verify (EV_P)
1593{ 1846{
1594#if EV_VERIFY 1847#if EV_VERIFY
1595 int i; 1848 int i;
… …
1644 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1646 1899
1647# if 0 1900# if 0
1648 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)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1650# endif
1651#endif 1903# endif
1904#endif
1652} 1905}
1653 1906#endif
1654#endif /* multiplicity */
1655 1907
1656#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1657struct ev_loop * 1909struct ev_loop *
1658ev_default_loop_init (unsigned int flags) 1910ev_default_loop_init (unsigned int flags)
1659#else 1911#else
… …
1662#endif 1914#endif
1663{ 1915{
1664 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1665 { 1917 {
1666#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1667 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1668#else 1920#else
1669 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1670#endif 1922#endif
1671 1923
1672 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
… …
1689 1941
1690void 1942void
1691ev_default_destroy (void) 1943ev_default_destroy (void)
1692{ 1944{
1693#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1694 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1695#endif 1947#endif
1696 1948
1697 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1698 1950
1699#ifndef _WIN32 1951#ifndef _WIN32
… …
1706 1958
1707void 1959void
1708ev_default_fork (void) 1960ev_default_fork (void)
1709{ 1961{
1710#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1711 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1712#endif 1964#endif
1713 1965
1714 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1715} 1967}
1716 1968
… …
1720ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1721{ 1973{
1722 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1723} 1975}
1724 1976
1725void inline_speed 1977unsigned int
1726call_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)
1727{ 1991{
1728 int pri; 1992 int pri;
1729 1993
1730 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1732 { 1996 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1997 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 1998
1735 if (expect_true (p->w))
1736 {
1737 /*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 */
1738 2001
1739 p->w->pending = 0; 2002 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 2003 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 2004 EV_FREQUENT_CHECK;
1742 }
1743 } 2005 }
1744} 2006}
1745 2007
1746#if EV_IDLE_ENABLE 2008#if EV_IDLE_ENABLE
1747void inline_size 2009/* make idle watchers pending. this handles the "call-idle */
2010/* only when higher priorities are idle" logic */
2011inline_size void
1748idle_reify (EV_P) 2012idle_reify (EV_P)
1749{ 2013{
1750 if (expect_false (idleall)) 2014 if (expect_false (idleall))
1751 { 2015 {
1752 int pri; 2016 int pri;
… …
1764 } 2028 }
1765 } 2029 }
1766} 2030}
1767#endif 2031#endif
1768 2032
1769void inline_size 2033/* make timers pending */
2034inline_size void
1770timers_reify (EV_P) 2035timers_reify (EV_P)
1771{ 2036{
1772 EV_FREQUENT_CHECK; 2037 EV_FREQUENT_CHECK;
1773 2038
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2039 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 2040 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2041 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 2042 {
2043 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2044
2045 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2046
2047 /* first reschedule or stop timer */
2048 if (w->repeat)
2049 {
1783 ev_at (w) += w->repeat; 2050 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 2051 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 2052 ev_at (w) = mn_now;
1786 2053
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2054 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 2055
1789 ANHE_at_cache (timers [HEAP0]); 2056 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 2057 downheap (timers, timercnt, HEAP0);
2058 }
2059 else
2060 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2061
2062 EV_FREQUENT_CHECK;
2063 feed_reverse (EV_A_ (W)w);
1791 } 2064 }
1792 else 2065 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 2066
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2067 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 2068 }
1798} 2069}
1799 2070
1800#if EV_PERIODIC_ENABLE 2071#if EV_PERIODIC_ENABLE
1801void inline_size 2072/* make periodics pending */
2073inline_size void
1802periodics_reify (EV_P) 2074periodics_reify (EV_P)
1803{ 2075{
1804 EV_FREQUENT_CHECK; 2076 EV_FREQUENT_CHECK;
1805 2077
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2078 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 2079 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2080 int feed_count = 0;
1809 2081
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2082 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 2083 {
2084 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2085
2086 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2087
2088 /* first reschedule or stop timer */
2089 if (w->reschedule_cb)
2090 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2091 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 2092
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2093 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 2094
1819 ANHE_at_cache (periodics [HEAP0]); 2095 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 2096 downheap (periodics, periodiccnt, HEAP0);
2097 }
2098 else if (w->interval)
2099 {
2100 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2101 /* if next trigger time is not sufficiently in the future, put it there */
2102 /* this might happen because of floating point inexactness */
2103 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2104 {
2105 ev_at (w) += w->interval;
2106
2107 /* if interval is unreasonably low we might still have a time in the past */
2108 /* so correct this. this will make the periodic very inexact, but the user */
2109 /* has effectively asked to get triggered more often than possible */
2110 if (ev_at (w) < ev_rt_now)
2111 ev_at (w) = ev_rt_now;
2112 }
2113
2114 ANHE_at_cache (periodics [HEAP0]);
2115 downheap (periodics, periodiccnt, HEAP0);
2116 }
2117 else
2118 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2119
2120 EV_FREQUENT_CHECK;
2121 feed_reverse (EV_A_ (W)w);
1821 } 2122 }
1822 else if (w->interval) 2123 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 2124
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2125 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 2126 }
1847} 2127}
1848 2128
2129/* simply recalculate all periodics */
2130/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 2131static void noinline
1850periodics_reschedule (EV_P) 2132periodics_reschedule (EV_P)
1851{ 2133{
1852 int i; 2134 int i;
1853 2135
… …
1866 2148
1867 reheap (periodics, periodiccnt); 2149 reheap (periodics, periodiccnt);
1868} 2150}
1869#endif 2151#endif
1870 2152
1871void inline_speed 2153/* adjust all timers by a given offset */
2154static void noinline
2155timers_reschedule (EV_P_ ev_tstamp adjust)
2156{
2157 int i;
2158
2159 for (i = 0; i < timercnt; ++i)
2160 {
2161 ANHE *he = timers + i + HEAP0;
2162 ANHE_w (*he)->at += adjust;
2163 ANHE_at_cache (*he);
2164 }
2165}
2166
2167/* fetch new monotonic and realtime times from the kernel */
2168/* also detect if there was a timejump, and act accordingly */
2169inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1873{ 2171{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
1878 { 2174 {
2175 int i;
1879 ev_tstamp odiff = rtmn_diff; 2176 ev_tstamp odiff = rtmn_diff;
1880 2177
1881 mn_now = get_clock (); 2178 mn_now = get_clock ();
1882 2179
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2180 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2206 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2207 mn_now = get_clock ();
1911 now_floor = mn_now; 2208 now_floor = mn_now;
1912 } 2209 }
1913 2210
2211 /* no timer adjustment, as the monotonic clock doesn't jump */
2212 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2213# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2214 periodics_reschedule (EV_A);
1916# endif 2215# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2216 }
1920 else 2217 else
1921#endif 2218#endif
1922 { 2219 {
1923 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1924 2221
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2222 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2223 {
2224 /* adjust timers. this is easy, as the offset is the same for all of them */
2225 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2226#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2227 periodics_reschedule (EV_A);
1929#endif 2228#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2229 }
1938 2230
1939 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
1940 } 2232 }
1941} 2233}
1942 2234
1943void 2235void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
1965{ 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
1966 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
1967 2245
1968 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 */
1969 2247
1970 do 2248 do
1971 { 2249 {
1972#if EV_VERIFY >= 2 2250#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2251 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2265 if (expect_false (postfork))
1988 if (forkcnt) 2266 if (forkcnt)
1989 { 2267 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
1992 } 2270 }
1993#endif 2271#endif
1994 2272
1995 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
1997 { 2275 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
2000 } 2278 }
2001 2279
2002 if (expect_false (!activecnt)) 2280 if (expect_false (loop_done))
2003 break; 2281 break;
2004 2282
2005 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
2006 if (expect_false (postfork)) 2284 if (expect_false (postfork))
2007 loop_fork (EV_A); 2285 loop_fork (EV_A);
… …
2014 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
2015 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
2016 2294
2017 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2018 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
2019 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
2020 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
2021 2302
2022 waittime = MAX_BLOCKTIME; 2303 waittime = MAX_BLOCKTIME;
2023 2304
… …
2033 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;
2034 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
2035 } 2316 }
2036#endif 2317#endif
2037 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
2038 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
2039 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
2040 2322
2041 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
2042
2043 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
2044 sleeptime = io_blocktime;
2045
2046 if (sleeptime)
2047 { 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 {
2048 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
2049 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
2050 } 2336 }
2051 } 2337 }
2052 2338
2339#if EV_MINIMAL < 2
2053 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2054 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2055 2345
2056 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2057 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2058 } 2348 }
2059 2349
… …
2070 2360
2071 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
2072 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
2073 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2074 2364
2075 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
2076 } 2366 }
2077 while (expect_true ( 2367 while (expect_true (
2078 activecnt 2368 activecnt
2079 && !loop_done 2369 && !loop_done
2080 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2081 )); 2371 ));
2082 2372
2083 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
2084 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
2085} 2379}
2086 2380
2087void 2381void
2088ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
2089{ 2383{
2090 loop_done = how; 2384 loop_done = how;
2091} 2385}
2092 2386
2387void
2388ev_ref (EV_P)
2389{
2390 ++activecnt;
2391}
2392
2393void
2394ev_unref (EV_P)
2395{
2396 --activecnt;
2397}
2398
2399void
2400ev_now_update (EV_P)
2401{
2402 time_update (EV_A_ 1e100);
2403}
2404
2405void
2406ev_suspend (EV_P)
2407{
2408 ev_now_update (EV_A);
2409}
2410
2411void
2412ev_resume (EV_P)
2413{
2414 ev_tstamp mn_prev = mn_now;
2415
2416 ev_now_update (EV_A);
2417 timers_reschedule (EV_A_ mn_now - mn_prev);
2418#if EV_PERIODIC_ENABLE
2419 /* TODO: really do this? */
2420 periodics_reschedule (EV_A);
2421#endif
2422}
2423
2093/*****************************************************************************/ 2424/*****************************************************************************/
2425/* singly-linked list management, used when the expected list length is short */
2094 2426
2095void inline_size 2427inline_size void
2096wlist_add (WL *head, WL elem) 2428wlist_add (WL *head, WL elem)
2097{ 2429{
2098 elem->next = *head; 2430 elem->next = *head;
2099 *head = elem; 2431 *head = elem;
2100} 2432}
2101 2433
2102void inline_size 2434inline_size void
2103wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2104{ 2436{
2105 while (*head) 2437 while (*head)
2106 { 2438 {
2107 if (*head == elem) 2439 if (expect_true (*head == elem))
2108 { 2440 {
2109 *head = elem->next; 2441 *head = elem->next;
2110 return; 2442 break;
2111 } 2443 }
2112 2444
2113 head = &(*head)->next; 2445 head = &(*head)->next;
2114 } 2446 }
2115} 2447}
2116 2448
2117void inline_speed 2449/* internal, faster, version of ev_clear_pending */
2450inline_speed void
2118clear_pending (EV_P_ W w) 2451clear_pending (EV_P_ W w)
2119{ 2452{
2120 if (w->pending) 2453 if (w->pending)
2121 { 2454 {
2122 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2455 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2123 w->pending = 0; 2456 w->pending = 0;
2124 } 2457 }
2125} 2458}
2126 2459
2127int 2460int
… …
2131 int pending = w_->pending; 2464 int pending = w_->pending;
2132 2465
2133 if (expect_true (pending)) 2466 if (expect_true (pending))
2134 { 2467 {
2135 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2468 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2469 p->w = (W)&pending_w;
2136 w_->pending = 0; 2470 w_->pending = 0;
2137 p->w = 0;
2138 return p->events; 2471 return p->events;
2139 } 2472 }
2140 else 2473 else
2141 return 0; 2474 return 0;
2142} 2475}
2143 2476
2144void inline_size 2477inline_size void
2145pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
2146{ 2479{
2147 int pri = w->priority; 2480 int pri = ev_priority (w);
2148 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2149 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2150 w->priority = pri; 2483 ev_set_priority (w, pri);
2151} 2484}
2152 2485
2153void inline_speed 2486inline_speed void
2154ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
2155{ 2488{
2156 pri_adjust (EV_A_ w); 2489 pri_adjust (EV_A_ w);
2157 w->active = active; 2490 w->active = active;
2158 ev_ref (EV_A); 2491 ev_ref (EV_A);
2159} 2492}
2160 2493
2161void inline_size 2494inline_size void
2162ev_stop (EV_P_ W w) 2495ev_stop (EV_P_ W w)
2163{ 2496{
2164 ev_unref (EV_A); 2497 ev_unref (EV_A);
2165 w->active = 0; 2498 w->active = 0;
2166} 2499}
… …
2174 2507
2175 if (expect_false (ev_is_active (w))) 2508 if (expect_false (ev_is_active (w)))
2176 return; 2509 return;
2177 2510
2178 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2511 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2512 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2180 2513
2181 EV_FREQUENT_CHECK; 2514 EV_FREQUENT_CHECK;
2182 2515
2183 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2185 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2186 2519
2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2188 w->events &= ~EV_IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2189 2522
2190 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2191} 2524}
2192 2525
2193void noinline 2526void noinline
… …
2286 } 2619 }
2287 2620
2288 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2289} 2622}
2290 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
2291#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2292void noinline 2631void noinline
2293ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2294{ 2633{
2295 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
… …
2362#endif 2701#endif
2363 2702
2364void noinline 2703void noinline
2365ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2366{ 2705{
2367#if EV_MULTIPLICITY
2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2369#endif
2370 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2371 return; 2707 return;
2372 2708
2373 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));
2374 2710
2375 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));
2376 2714
2377 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2378 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2379 { 2722 {
2380#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2381 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2382 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2383 sigprocmask (SIG_SETMASK, &full, &prev);
2384#endif
2385 2726
2386 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 */
2387 2730
2388#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2389 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2390#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 }
2391 } 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
2392 2749
2393 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2394 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2395 2752
2396 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2397 { 2757 {
2398#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2399 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2400#else 2762# else
2401 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2402 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2403 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2404 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 */
2405 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);
2406#endif 2775#endif
2407 } 2776 }
2408 2777
2409 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2410} 2779}
2411 2780
2412void noinline 2781void noinline
… …
2420 2789
2421 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2422 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2423 2792
2424 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
2425 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2426 2814
2427 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2428} 2816}
2429 2817
2430void 2818void
… …
2478static void noinline 2866static void noinline
2479infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2480{ 2868{
2481 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);
2482 2870
2483 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 */
2484 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2487 2896
2488 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2489 /* 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, */
2490 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2492 { 2901 {
2493 char path [4096]; 2902 char path [4096];
… …
2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2510 } 2919 }
2511 } 2920 }
2512 2921
2513 if (w->wd >= 0) 2922 if (w->wd >= 0)
2514 {
2515 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);
2516 2924
2517 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2518 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2533 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2534} 2929}
2535 2930
2536static void noinline 2931static void noinline
2537infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2538{ 2933{
… …
2591 2986
2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2987 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2593 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2988 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2594} 2989}
2595 2990
2596void inline_size 2991inline_size void
2597check_2625 (EV_P) 2992check_2625 (EV_P)
2598{ 2993{
2599 /* kernels < 2.6.25 are borked 2994 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2995 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */ 2996 */
… …
2614 return; 3009 return;
2615 3010
2616 fs_2625 = 1; 3011 fs_2625 = 1;
2617} 3012}
2618 3013
2619void inline_size 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
3025inline_size void
2620infy_init (EV_P) 3026infy_init (EV_P)
2621{ 3027{
2622 if (fs_fd != -2) 3028 if (fs_fd != -2)
2623 return; 3029 return;
2624 3030
2625 fs_fd = -1; 3031 fs_fd = -1;
2626 3032
2627 check_2625 (EV_A); 3033 check_2625 (EV_A);
2628 3034
2629 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2630 3036
2631 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2632 { 3038 {
3039 fd_intern (fs_fd);
2633 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2634 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2635 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2636 } 3044 }
2637} 3045}
2638 3046
2639void inline_size 3047inline_size void
2640infy_fork (EV_P) 3048infy_fork (EV_P)
2641{ 3049{
2642 int slot; 3050 int slot;
2643 3051
2644 if (fs_fd < 0) 3052 if (fs_fd < 0)
2645 return; 3053 return;
2646 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2647 close (fs_fd); 3057 close (fs_fd);
2648 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 }
2649 3067
2650 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2651 { 3069 {
2652 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2653 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
2660 w->wd = -1; 3078 w->wd = -1;
2661 3079
2662 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2663 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2664 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);
2665 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 }
2666 } 3089 }
2667 } 3090 }
2668} 3091}
2669 3092
2670#endif 3093#endif
… …
2687static void noinline 3110static void noinline
2688stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2689{ 3112{
2690 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2691 3114
2692 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2693 /* prev has the old value when the callback gets invoked */
2694 w->prev = w->attr;
2695 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2696 3117
2697 /* 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 */
2698 if ( 3119 if (
2699 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2700 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2701 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2702 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2703 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2704 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2705 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2706 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2707 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2708 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2709 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2710 ) { 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
2711 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2713 { 3139 {
2714 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2715 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
2740 3166
2741 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2742 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2743 else 3169 else
2744#endif 3170#endif
3171 {
2745 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2746 3175
2747 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2748 3177
2749 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2750} 3179}
… …
2759 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2760 3189
2761#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2762 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2763#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2764 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2765 3199
2766 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2767 3201
2768 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2769} 3203}
… …
2910embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2911{ 3345{
2912 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2913 3347
2914 { 3348 {
2915 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
2916 3350
2917 while (fdchangecnt) 3351 while (fdchangecnt)
2918 { 3352 {
2919 fd_reify (EV_A); 3353 fd_reify (EV_A);
2920 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2928 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));
2929 3363
2930 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
2931 3365
2932 { 3366 {
2933 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
2934 3368
2935 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2937 } 3371 }
2938 3372
… …
2952{ 3386{
2953 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2954 return; 3388 return;
2955 3389
2956 { 3390 {
2957 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
2958 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 ()));
2959 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);
2960 } 3394 }
2961 3395
2962 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
… …
3074 3508
3075void 3509void
3076ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3077{ 3511{
3078 w->sent = 1; 3512 w->sent = 1;
3079 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3080} 3514}
3081#endif 3515#endif
3082 3516
3083/*****************************************************************************/ 3517/*****************************************************************************/
3084 3518
… …
3146 ev_timer_set (&once->to, timeout, 0.); 3580 ev_timer_set (&once->to, timeout, 0.);
3147 ev_timer_start (EV_A_ &once->to); 3581 ev_timer_start (EV_A_ &once->to);
3148 } 3582 }
3149} 3583}
3150 3584
3585/*****************************************************************************/
3586
3587#if EV_WALK_ENABLE
3588void
3589ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3590{
3591 int i, j;
3592 ev_watcher_list *wl, *wn;
3593
3594 if (types & (EV_IO | EV_EMBED))
3595 for (i = 0; i < anfdmax; ++i)
3596 for (wl = anfds [i].head; wl; )
3597 {
3598 wn = wl->next;
3599
3600#if EV_EMBED_ENABLE
3601 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3602 {
3603 if (types & EV_EMBED)
3604 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3605 }
3606 else
3607#endif
3608#if EV_USE_INOTIFY
3609 if (ev_cb ((ev_io *)wl) == infy_cb)
3610 ;
3611 else
3612#endif
3613 if ((ev_io *)wl != &pipe_w)
3614 if (types & EV_IO)
3615 cb (EV_A_ EV_IO, wl);
3616
3617 wl = wn;
3618 }
3619
3620 if (types & (EV_TIMER | EV_STAT))
3621 for (i = timercnt + HEAP0; i-- > HEAP0; )
3622#if EV_STAT_ENABLE
3623 /*TODO: timer is not always active*/
3624 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3625 {
3626 if (types & EV_STAT)
3627 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3628 }
3629 else
3630#endif
3631 if (types & EV_TIMER)
3632 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3633
3634#if EV_PERIODIC_ENABLE
3635 if (types & EV_PERIODIC)
3636 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3637 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3638#endif
3639
3640#if EV_IDLE_ENABLE
3641 if (types & EV_IDLE)
3642 for (j = NUMPRI; i--; )
3643 for (i = idlecnt [j]; i--; )
3644 cb (EV_A_ EV_IDLE, idles [j][i]);
3645#endif
3646
3647#if EV_FORK_ENABLE
3648 if (types & EV_FORK)
3649 for (i = forkcnt; i--; )
3650 if (ev_cb (forks [i]) != embed_fork_cb)
3651 cb (EV_A_ EV_FORK, forks [i]);
3652#endif
3653
3654#if EV_ASYNC_ENABLE
3655 if (types & EV_ASYNC)
3656 for (i = asynccnt; i--; )
3657 cb (EV_A_ EV_ASYNC, asyncs [i]);
3658#endif
3659
3660 if (types & EV_PREPARE)
3661 for (i = preparecnt; i--; )
3662#if EV_EMBED_ENABLE
3663 if (ev_cb (prepares [i]) != embed_prepare_cb)
3664#endif
3665 cb (EV_A_ EV_PREPARE, prepares [i]);
3666
3667 if (types & EV_CHECK)
3668 for (i = checkcnt; i--; )
3669 cb (EV_A_ EV_CHECK, checks [i]);
3670
3671 if (types & EV_SIGNAL)
3672 for (i = 0; i < EV_NSIG - 1; ++i)
3673 for (wl = signals [i].head; wl; )
3674 {
3675 wn = wl->next;
3676 cb (EV_A_ EV_SIGNAL, wl);
3677 wl = wn;
3678 }
3679
3680 if (types & EV_CHILD)
3681 for (i = EV_PID_HASHSIZE; i--; )
3682 for (wl = childs [i]; wl; )
3683 {
3684 wn = wl->next;
3685 cb (EV_A_ EV_CHILD, wl);
3686 wl = wn;
3687 }
3688/* EV_STAT 0x00001000 /* stat data changed */
3689/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3690}
3691#endif
3692
3151#if EV_MULTIPLICITY 3693#if EV_MULTIPLICITY
3152 #include "ev_wrap.h" 3694 #include "ev_wrap.h"
3153#endif 3695#endif
3154 3696
3155#ifdef __cplusplus 3697#ifdef __cplusplus

Diff Legend

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