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

Comparing libev/ev.c (file contents):
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
176# endif 186# endif
177#endif 187#endif
178 188
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
180 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC
392# endif
337# ifdef __cplusplus 393# ifdef __cplusplus
338extern "C" { 394extern "C" {
339# endif 395# endif
340int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 397# ifdef __cplusplus
342} 398}
343# endif 399# endif
400#endif
401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
344#endif 404#endif
345 405
346/**/ 406/**/
347 407
348#if EV_VERIFY >= 3 408#if EV_VERIFY >= 3
384# define inline_speed static noinline 444# define inline_speed static noinline
385#else 445#else
386# define inline_speed static inline 446# define inline_speed static inline
387#endif 447#endif
388 448
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450
451#if EV_MINPRI == EV_MAXPRI
452# define ABSPRI(w) (((W)w), 0)
453#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 454# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
455#endif
391 456
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 457#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 458#define EMPTY2(a,b) /* used to suppress some warnings */
394 459
395typedef ev_watcher *W; 460typedef ev_watcher *W;
478#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
480 545
481/*****************************************************************************/ 546/*****************************************************************************/
482 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
551/* file descriptor info structure */
483typedef struct 552typedef struct
484{ 553{
485 WL head; 554 WL head;
486 unsigned char events; 555 unsigned char events; /* the events watched for */
487 unsigned char reify; 556 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 */ 557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 558 unsigned char unused;
490#if EV_USE_EPOLL 559#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 560 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 561#endif
493#if EV_SELECT_IS_WINSOCKET 562#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 563 SOCKET handle;
495#endif 564#endif
496} ANFD; 565} ANFD;
497 566
567/* stores the pending event set for a given watcher */
498typedef struct 568typedef struct
499{ 569{
500 W w; 570 W w;
501 int events; 571 int events; /* the pending event set for the given watcher */
502} ANPENDING; 572} ANPENDING;
503 573
504#if EV_USE_INOTIFY 574#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 575/* hash table entry per inotify-id */
506typedef struct 576typedef struct
509} ANFS; 579} ANFS;
510#endif 580#endif
511 581
512/* Heap Entry */ 582/* Heap Entry */
513#if EV_HEAP_CACHE_AT 583#if EV_HEAP_CACHE_AT
584 /* a heap element */
514 typedef struct { 585 typedef struct {
515 ev_tstamp at; 586 ev_tstamp at;
516 WT w; 587 WT w;
517 } ANHE; 588 } ANHE;
518 589
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 590 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 591 #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 */ 592 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 593#else
594 /* a heap element */
523 typedef WT ANHE; 595 typedef WT ANHE;
524 596
525 #define ANHE_w(he) (he) 597 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 598 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 599 #define ANHE_at_cache(he)
551 623
552 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
553 625
554#endif 626#endif
555 627
628#if EV_MINIMAL < 2
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else
633# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif
637
638#define EVUNLOOP_RECURSE 0x80
639
556/*****************************************************************************/ 640/*****************************************************************************/
557 641
642#ifndef EV_HAVE_EV_TIME
558ev_tstamp 643ev_tstamp
559ev_time (void) 644ev_time (void)
560{ 645{
561#if EV_USE_REALTIME 646#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 647 if (expect_true (have_realtime))
569 654
570 struct timeval tv; 655 struct timeval tv;
571 gettimeofday (&tv, 0); 656 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 657 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 658}
659#endif
574 660
575inline_size ev_tstamp 661inline_size ev_tstamp
576get_clock (void) 662get_clock (void)
577{ 663{
578#if EV_USE_MONOTONIC 664#if EV_USE_MONOTONIC
614 700
615 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 703
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 706 /* by older ones */
621 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
622#endif 708#endif
623 } 709 }
624} 710}
625 711
626/*****************************************************************************/ 712/*****************************************************************************/
627 713
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 715
716/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 718inline_size int
631array_nextsize (int elem, int cur, int cnt) 719array_nextsize (int elem, int cur, int cnt)
632{ 720{
633 int ncur = cur + 1; 721 int ncur = cur + 1;
634 722
680#define array_free(stem, idx) \ 768#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 769 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 770
683/*****************************************************************************/ 771/*****************************************************************************/
684 772
773/* dummy callback for pending events */
774static void noinline
775pendingcb (EV_P_ ev_prepare *w, int revents)
776{
777}
778
685void noinline 779void noinline
686ev_feed_event (EV_P_ void *w, int revents) 780ev_feed_event (EV_P_ void *w, int revents)
687{ 781{
688 W w_ = (W)w; 782 W w_ = (W)w;
689 int pri = ABSPRI (w_); 783 int pri = ABSPRI (w_);
724} 818}
725 819
726/*****************************************************************************/ 820/*****************************************************************************/
727 821
728inline_speed void 822inline_speed void
729fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
730{ 824{
731 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
732 ev_io *w; 826 ev_io *w;
733 827
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 832 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
740 } 834 }
741} 835}
742 836
837/* do not submit kernel events for fds that have reify set */
838/* because that means they changed while we were polling for new events */
839inline_speed void
840fd_event (EV_P_ int fd, int revents)
841{
842 ANFD *anfd = anfds + fd;
843
844 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents);
846}
847
743void 848void
744ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 850{
746 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
748} 853}
749 854
855/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */
750inline_size void 857inline_size void
751fd_reify (EV_P) 858fd_reify (EV_P)
752{ 859{
753 int i; 860 int i;
754 861
789 } 896 }
790 897
791 fdchangecnt = 0; 898 fdchangecnt = 0;
792} 899}
793 900
901/* something about the given fd changed */
794inline_size void 902inline_size void
795fd_change (EV_P_ int fd, int flags) 903fd_change (EV_P_ int fd, int flags)
796{ 904{
797 unsigned char reify = anfds [fd].reify; 905 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 906 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 911 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 912 fdchanges [fdchangecnt - 1] = fd;
805 } 913 }
806} 914}
807 915
916/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 917inline_speed void
809fd_kill (EV_P_ int fd) 918fd_kill (EV_P_ int fd)
810{ 919{
811 ev_io *w; 920 ev_io *w;
812 921
815 ev_io_stop (EV_A_ w); 924 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 926 }
818} 927}
819 928
929/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 930inline_size int
821fd_valid (int fd) 931fd_valid (int fd)
822{ 932{
823#ifdef _WIN32 933#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 934 return _get_osfhandle (fd) != -1;
847 957
848 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 959 if (anfds [fd].events)
850 { 960 {
851 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
852 return; 962 break;
853 } 963 }
854} 964}
855 965
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 967static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 973 if (anfds [fd].events)
864 { 974 {
865 anfds [fd].events = 0; 975 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 976 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 978 }
869} 979}
870 980
871/*****************************************************************************/ 981/*****************************************************************************/
872 982
947 1057
948 for (;;) 1058 for (;;)
949 { 1059 {
950 int c = k << 1; 1060 int c = k << 1;
951 1061
952 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
953 break; 1063 break;
954 1064
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1066 ? 1 : 0;
957 1067
989 1099
990 heap [k] = he; 1100 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1101 ev_active (ANHE_w (he)) = k;
992} 1102}
993 1103
1104/* move an element suitably so it is in a correct place */
994inline_size void 1105inline_size void
995adjustheap (ANHE *heap, int N, int k) 1106adjustheap (ANHE *heap, int N, int k)
996{ 1107{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
998 upheap (heap, k); 1109 upheap (heap, k);
1012 upheap (heap, i + HEAP0); 1123 upheap (heap, i + HEAP0);
1013} 1124}
1014 1125
1015/*****************************************************************************/ 1126/*****************************************************************************/
1016 1127
1128/* associate signal watchers to a signal signal */
1017typedef struct 1129typedef struct
1018{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1019 WL head; 1135 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1136} ANSIG;
1022 1137
1023static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1139
1028/*****************************************************************************/ 1140/*****************************************************************************/
1029 1141
1142/* used to prepare libev internal fd's */
1143/* this is not fork-safe */
1030inline_speed void 1144inline_speed void
1031fd_intern (int fd) 1145fd_intern (int fd)
1032{ 1146{
1033#ifdef _WIN32 1147#ifdef _WIN32
1034 unsigned long arg = 1; 1148 unsigned long arg = 1;
1040} 1154}
1041 1155
1042static void noinline 1156static void noinline
1043evpipe_init (EV_P) 1157evpipe_init (EV_P)
1044{ 1158{
1045 if (!ev_is_active (&pipeev)) 1159 if (!ev_is_active (&pipe_w))
1046 { 1160 {
1047#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1049 { 1167 {
1050 evpipe [0] = -1; 1168 evpipe [0] = -1;
1051 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1171 }
1054 else 1172 else
1055#endif 1173#endif
1056 { 1174 {
1057 while (pipe (evpipe)) 1175 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1176 ev_syserr ("(libev) error creating signal/async pipe");
1059 1177
1060 fd_intern (evpipe [0]); 1178 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1179 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1180 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1181 }
1064 1182
1065 ev_io_start (EV_A_ &pipeev); 1183 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1184 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1185 }
1068} 1186}
1069 1187
1070inline_size void 1188inline_size void
1088 1206
1089 errno = old_errno; 1207 errno = old_errno;
1090 } 1208 }
1091} 1209}
1092 1210
1211/* called whenever the libev signal pipe */
1212/* got some events (signal, async) */
1093static void 1213static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1215{
1216 int i;
1217
1096#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1219 if (evfd >= 0)
1098 { 1220 {
1099 uint64_t counter; 1221 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
1104 { 1226 {
1105 char dummy; 1227 char dummy;
1106 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1107 } 1229 }
1108 1230
1109 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1110 { 1232 {
1111 int signum; 1233 sig_pending = 0;
1112 gotsig = 0;
1113 1234
1114 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1238 }
1118 1239
1119#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1120 if (gotasync) 1241 if (async_pending)
1121 { 1242 {
1122 int i; 1243 async_pending = 0;
1123 gotasync = 0;
1124 1244
1125 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1127 { 1247 {
1128 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
1136 1256
1137static void 1257static void
1138ev_sighandler (int signum) 1258ev_sighandler (int signum)
1139{ 1259{
1140#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1142#endif 1262#endif
1143 1263
1144#if _WIN32 1264#if _WIN32
1145 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1146#endif 1266#endif
1147 1267
1148 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1150} 1270}
1151 1271
1152void noinline 1272void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1154{ 1274{
1155 WL w; 1275 WL w;
1156 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1157#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1285
1161 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1287 return;
1288#endif
1165 1289
1166 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1167 1291
1168 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1294}
1171 1295
1296#if EV_USE_SIGNALFD
1297static void
1298sigfdcb (EV_P_ ev_io *iow, int revents)
1299{
1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1301
1302 for (;;)
1303 {
1304 ssize_t res = read (sigfd, si, sizeof (si));
1305
1306 /* not ISO-C, as res might be -1, but works with SuS */
1307 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1308 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1309
1310 if (res < (ssize_t)sizeof (si))
1311 break;
1312 }
1313}
1314#endif
1315
1172/*****************************************************************************/ 1316/*****************************************************************************/
1173 1317
1174static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1175 1319
1176#ifndef _WIN32 1320#ifndef _WIN32
1179 1323
1180#ifndef WIFCONTINUED 1324#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1325# define WIFCONTINUED(status) 0
1182#endif 1326#endif
1183 1327
1328/* handle a single child status event */
1184inline_speed void 1329inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1330child_reap (EV_P_ int chain, int pid, int status)
1186{ 1331{
1187 ev_child *w; 1332 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1347
1203#ifndef WCONTINUED 1348#ifndef WCONTINUED
1204# define WCONTINUED 0 1349# define WCONTINUED 0
1205#endif 1350#endif
1206 1351
1352/* called on sigchld etc., calls waitpid */
1207static void 1353static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1354childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1355{
1210 int pid, status; 1356 int pid, status;
1211 1357
1318ev_backend (EV_P) 1464ev_backend (EV_P)
1319{ 1465{
1320 return backend; 1466 return backend;
1321} 1467}
1322 1468
1469#if EV_MINIMAL < 2
1323unsigned int 1470unsigned int
1324ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1325{ 1472{
1326 return loop_count; 1473 return loop_count;
1327} 1474}
1328 1475
1476unsigned int
1477ev_loop_depth (EV_P)
1478{
1479 return loop_depth;
1480}
1481
1329void 1482void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1483ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1484{
1332 io_blocktime = interval; 1485 io_blocktime = interval;
1333} 1486}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1490{
1338 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1339} 1492}
1340 1493
1494void
1495ev_set_userdata (EV_P_ void *data)
1496{
1497 userdata = data;
1498}
1499
1500void *
1501ev_userdata (EV_P)
1502{
1503 return userdata;
1504}
1505
1506void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1507{
1508 invoke_cb = invoke_pending_cb;
1509}
1510
1511void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1512{
1513 release_cb = release;
1514 acquire_cb = acquire;
1515}
1516#endif
1517
1518/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1519static void noinline
1342loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1343{ 1521{
1344 if (!backend) 1522 if (!backend)
1345 { 1523 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1540 have_monotonic = 1;
1363 } 1541 }
1364#endif 1542#endif
1365 1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1554
1366 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1556 mn_now = get_clock ();
1368 now_floor = mn_now; 1557 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2
1560 invoke_cb = ev_invoke_pending;
1561#endif
1370 1562
1371 io_blocktime = 0.; 1563 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1373 backend = 0; 1565 backend = 0;
1374 backend_fd = -1; 1566 backend_fd = -1;
1375 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1376#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1377 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1573#endif
1379 1574#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1576#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1577
1391 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1393 1580
1394#if EV_USE_PORT 1581#if EV_USE_PORT
1405#endif 1592#endif
1406#if EV_USE_SELECT 1593#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1595#endif
1409 1596
1597 ev_prepare_init (&pending_w, pendingcb);
1598
1410 ev_init (&pipeev, pipecb); 1599 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1600 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1601 }
1413} 1602}
1414 1603
1604/* free up a loop structure */
1415static void noinline 1605static void noinline
1416loop_destroy (EV_P) 1606loop_destroy (EV_P)
1417{ 1607{
1418 int i; 1608 int i;
1419 1609
1420 if (ev_is_active (&pipeev)) 1610 if (ev_is_active (&pipe_w))
1421 { 1611 {
1422 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1614
1425#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1616 if (evfd >= 0)
1427 close (evfd); 1617 close (evfd);
1428#endif 1618#endif
1432 close (evpipe [0]); 1622 close (evpipe [0]);
1433 close (evpipe [1]); 1623 close (evpipe [1]);
1434 } 1624 }
1435 } 1625 }
1436 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1437#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1439 close (fs_fd); 1639 close (fs_fd);
1440#endif 1640#endif
1441 1641
1464#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1665 array_free (idle, [i]);
1466#endif 1666#endif
1467 } 1667 }
1468 1668
1469 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1670
1471 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1505#endif 1705#endif
1506#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1707 infy_fork (EV_A);
1508#endif 1708#endif
1509 1709
1510 if (ev_is_active (&pipeev)) 1710 if (ev_is_active (&pipe_w))
1511 { 1711 {
1512 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1514 gotsig = 1; 1714 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1716 async_pending = 1;
1517#endif 1717#endif
1518 1718
1519 ev_ref (EV_A); 1719 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1720 ev_io_stop (EV_A_ &pipe_w);
1521 1721
1522#if EV_USE_EVENTFD 1722#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1723 if (evfd >= 0)
1524 close (evfd); 1724 close (evfd);
1525#endif 1725#endif
1530 close (evpipe [1]); 1730 close (evpipe [1]);
1531 } 1731 }
1532 1732
1533 evpipe_init (EV_A); 1733 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1734 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1735 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1736 }
1537 1737
1538 postfork = 0; 1738 postfork = 0;
1539} 1739}
1540 1740
1541#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1542 1742
1543struct ev_loop * 1743struct ev_loop *
1544ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1545{ 1745{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1747
1548 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1551 1750
1552 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1553 return loop; 1752 return EV_A;
1554 1753
1555 return 0; 1754 return 0;
1556} 1755}
1557 1756
1558void 1757void
1565void 1764void
1566ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1567{ 1766{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1569} 1768}
1769#endif /* multiplicity */
1570 1770
1571#if EV_VERIFY 1771#if EV_VERIFY
1572static void noinline 1772static void noinline
1573verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1574{ 1774{
1602 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1603 } 1803 }
1604} 1804}
1605#endif 1805#endif
1606 1806
1807#if EV_MINIMAL < 2
1607void 1808void
1608ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1609{ 1810{
1610#if EV_VERIFY 1811#if EV_VERIFY
1611 int i; 1812 int i;
1660 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1863
1663# if 0 1864# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 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) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif 1867# endif
1667#endif 1868#endif
1668} 1869}
1669 1870#endif
1670#endif /* multiplicity */
1671 1871
1672#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1673struct ev_loop * 1873struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1675#else 1875#else
1678#endif 1878#endif
1679{ 1879{
1680 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1681 { 1881 {
1682#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1884#else
1685 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1686#endif 1886#endif
1687 1887
1688 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
1705 1905
1706void 1906void
1707ev_default_destroy (void) 1907ev_default_destroy (void)
1708{ 1908{
1709#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1711#endif 1911#endif
1712 1912
1713 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1714 1914
1715#ifndef _WIN32 1915#ifndef _WIN32
1722 1922
1723void 1923void
1724ev_default_fork (void) 1924ev_default_fork (void)
1725{ 1925{
1726#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1728#endif 1928#endif
1729 1929
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1931}
1732 1932
1736ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1737{ 1937{
1738 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1739} 1939}
1740 1940
1741inline_speed void 1941unsigned int
1742call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1743{ 1955{
1744 int pri; 1956 int pri;
1745 1957
1746 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
1748 { 1960 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1962
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1754 1965
1755 p->w->pending = 0; 1966 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 1967 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 1968 EV_FREQUENT_CHECK;
1758 }
1759 } 1969 }
1760} 1970}
1761 1971
1762#if EV_IDLE_ENABLE 1972#if EV_IDLE_ENABLE
1973/* make idle watchers pending. this handles the "call-idle */
1974/* only when higher priorities are idle" logic */
1763inline_size void 1975inline_size void
1764idle_reify (EV_P) 1976idle_reify (EV_P)
1765{ 1977{
1766 if (expect_false (idleall)) 1978 if (expect_false (idleall))
1767 { 1979 {
1780 } 1992 }
1781 } 1993 }
1782} 1994}
1783#endif 1995#endif
1784 1996
1997/* make timers pending */
1785inline_size void 1998inline_size void
1786timers_reify (EV_P) 1999timers_reify (EV_P)
1787{ 2000{
1788 EV_FREQUENT_CHECK; 2001 EV_FREQUENT_CHECK;
1789 2002
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2031 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2032 }
1820} 2033}
1821 2034
1822#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
2036/* make periodics pending */
1823inline_size void 2037inline_size void
1824periodics_reify (EV_P) 2038periodics_reify (EV_P)
1825{ 2039{
1826 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1827 2041
1874 2088
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2089 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2090 }
1877} 2091}
1878 2092
2093/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2095static void noinline
1880periodics_reschedule (EV_P) 2096periodics_reschedule (EV_P)
1881{ 2097{
1882 int i; 2098 int i;
1883 2099
1896 2112
1897 reheap (periodics, periodiccnt); 2113 reheap (periodics, periodiccnt);
1898} 2114}
1899#endif 2115#endif
1900 2116
2117/* adjust all timers by a given offset */
1901static void noinline 2118static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2119timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2120{
1904 int i; 2121 int i;
1905 2122
1909 ANHE_w (*he)->at += adjust; 2126 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2127 ANHE_at_cache (*he);
1911 } 2128 }
1912} 2129}
1913 2130
2131/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2133inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1916{ 2135{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1921 { 2138 {
2139 int i;
1922 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1923 2141
1924 mn_now = get_clock (); 2142 mn_now = get_clock ();
1925 2143
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2194
1977 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
1978 } 2196 }
1979} 2197}
1980 2198
1981static int loop_done;
1982
1983void 2199void
1984ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
1985{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
1986 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
1987 2209
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2211
1990 do 2212 do
1991 { 2213 {
1992#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2008 if (forkcnt) 2230 if (forkcnt)
2009 { 2231 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2012 } 2234 }
2013#endif 2235#endif
2014 2236
2015 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2017 { 2239 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2020 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2021 2246
2022 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2024 loop_fork (EV_A); 2249 loop_fork (EV_A);
2025 2250
2031 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2033 2258
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2036 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2038 2266
2039 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2040 2268
2050 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2051 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2052 } 2280 }
2053#endif 2281#endif
2054 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2055 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2056 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2057 2286
2058 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2059
2060 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2061 sleeptime = io_blocktime;
2062
2063 if (sleeptime)
2064 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
2065 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2066 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2067 } 2300 }
2068 } 2301 }
2069 2302
2303#if EV_MINIMAL < 2
2070 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2071 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2072 2309
2073 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2074 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2075 } 2312 }
2076 2313
2087 2324
2088 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2089 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2090 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2091 2328
2092 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2093 } 2330 }
2094 while (expect_true ( 2331 while (expect_true (
2095 activecnt 2332 activecnt
2096 && !loop_done 2333 && !loop_done
2097 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2098 )); 2335 ));
2099 2336
2100 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2101 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2102} 2343}
2103 2344
2104void 2345void
2105ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2106{ 2347{
2137 ev_tstamp mn_prev = mn_now; 2378 ev_tstamp mn_prev = mn_now;
2138 2379
2139 ev_now_update (EV_A); 2380 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev); 2381 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE 2382#if EV_PERIODIC_ENABLE
2383 /* TODO: really do this? */
2142 periodics_reschedule (EV_A); 2384 periodics_reschedule (EV_A);
2143#endif 2385#endif
2144} 2386}
2145 2387
2146/*****************************************************************************/ 2388/*****************************************************************************/
2389/* singly-linked list management, used when the expected list length is short */
2147 2390
2148inline_size void 2391inline_size void
2149wlist_add (WL *head, WL elem) 2392wlist_add (WL *head, WL elem)
2150{ 2393{
2151 elem->next = *head; 2394 elem->next = *head;
2155inline_size void 2398inline_size void
2156wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2157{ 2400{
2158 while (*head) 2401 while (*head)
2159 { 2402 {
2160 if (*head == elem) 2403 if (expect_true (*head == elem))
2161 { 2404 {
2162 *head = elem->next; 2405 *head = elem->next;
2163 return; 2406 break;
2164 } 2407 }
2165 2408
2166 head = &(*head)->next; 2409 head = &(*head)->next;
2167 } 2410 }
2168} 2411}
2169 2412
2413/* internal, faster, version of ev_clear_pending */
2170inline_speed void 2414inline_speed void
2171clear_pending (EV_P_ W w) 2415clear_pending (EV_P_ W w)
2172{ 2416{
2173 if (w->pending) 2417 if (w->pending)
2174 { 2418 {
2175 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2419 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2176 w->pending = 0; 2420 w->pending = 0;
2177 } 2421 }
2178} 2422}
2179 2423
2180int 2424int
2184 int pending = w_->pending; 2428 int pending = w_->pending;
2185 2429
2186 if (expect_true (pending)) 2430 if (expect_true (pending))
2187 { 2431 {
2188 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2432 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2433 p->w = (W)&pending_w;
2189 w_->pending = 0; 2434 w_->pending = 0;
2190 p->w = 0;
2191 return p->events; 2435 return p->events;
2192 } 2436 }
2193 else 2437 else
2194 return 0; 2438 return 0;
2195} 2439}
2196 2440
2197inline_size void 2441inline_size void
2198pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2199{ 2443{
2200 int pri = w->priority; 2444 int pri = ev_priority (w);
2201 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2202 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2203 w->priority = pri; 2447 ev_set_priority (w, pri);
2204} 2448}
2205 2449
2206inline_speed void 2450inline_speed void
2207ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2208{ 2452{
2235 2479
2236 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2237 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2238 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2239 2483
2240 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2241 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2242 2486
2243 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2244} 2488}
2245 2489
2339 } 2583 }
2340 2584
2341 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2342} 2586}
2343 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2344#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2345void noinline 2595void noinline
2346ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2347{ 2597{
2348 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
2415#endif 2665#endif
2416 2666
2417void noinline 2667void noinline
2418ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2419{ 2669{
2420#if EV_MULTIPLICITY
2421 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2422#endif
2423 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2424 return; 2671 return;
2425 2672
2426 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2427 2674
2428 evpipe_init (EV_A); 2675#if EV_MULTIPLICITY
2676 assert (("libev: a signal must not be attached to two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2429 2678
2430 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2431 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2432 { 2686 {
2433#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2434 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2435 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2436 sigprocmask (SIG_SETMASK, &full, &prev);
2437#endif
2438 2690
2439 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2691 if (sigfd >= 0)
2692 {
2693 fd_intern (sigfd); /* doing it twice will not hurt */
2440 2694
2441#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2442 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2443#endif 2697 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2698 ev_set_priority (&sigfd_w, EV_MAXPRI);
2699 ev_io_start (EV_A_ &sigfd_w);
2700 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2701 }
2444 } 2702 }
2703
2704 if (sigfd >= 0)
2705 {
2706 /* TODO: check .head */
2707 sigaddset (&sigfd_set, w->signum);
2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2709
2710 signalfd (sigfd, &sigfd_set, 0);
2711 }
2712#endif
2445 2713
2446 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2447 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2448 2716
2449 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2450 { 2721 {
2451#if _WIN32 2722# if _WIN32
2452 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2453#else 2724# else
2454 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2455 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2456 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2457 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2458 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2459#endif 2737#endif
2460 } 2738 }
2461 2739
2462 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2463} 2741}
2464 2742
2465void noinline 2743void noinline
2473 2751
2474 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2475 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2476 2754
2477 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2760#if EV_USE_SIGNALFD
2761 if (sigfd >= 0)
2762 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2764 sigdelset (&sigfd_set, w->signum);
2765 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2767 /*TODO: maybe unblock signal? */
2768 }
2769 else
2770#endif
2478 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2479 2773
2480 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2481} 2775}
2482 2776
2483void 2777void
2963embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2964{ 3258{
2965 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2966 3260
2967 { 3261 {
2968 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
2969 3263
2970 while (fdchangecnt) 3264 while (fdchangecnt)
2971 { 3265 {
2972 fd_reify (EV_A); 3266 fd_reify (EV_A);
2973 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2981 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2982 3276
2983 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
2984 3278
2985 { 3279 {
2986 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
2987 3281
2988 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
2989 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2990 } 3284 }
2991 3285
3005{ 3299{
3006 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3007 return; 3301 return;
3008 3302
3009 { 3303 {
3010 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3011 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3012 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3013 } 3307 }
3014 3308
3015 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
3127 3421
3128void 3422void
3129ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3130{ 3424{
3131 w->sent = 1; 3425 w->sent = 1;
3132 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3133} 3427}
3134#endif 3428#endif
3135 3429
3136/*****************************************************************************/ 3430/*****************************************************************************/
3137 3431
3201 } 3495 }
3202} 3496}
3203 3497
3204/*****************************************************************************/ 3498/*****************************************************************************/
3205 3499
3206#if 0 3500#if EV_WALK_ENABLE
3207void 3501void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3502ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{ 3503{
3210 int i, j; 3504 int i, j;
3211 ev_watcher_list *wl, *wn; 3505 ev_watcher_list *wl, *wn;
3227#if EV_USE_INOTIFY 3521#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb) 3522 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ; 3523 ;
3230 else 3524 else
3231#endif 3525#endif
3232 if ((ev_io *)wl != &pipeev) 3526 if ((ev_io *)wl != &pipe_w)
3233 if (types & EV_IO) 3527 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl); 3528 cb (EV_A_ EV_IO, wl);
3235 3529
3236 wl = wn; 3530 wl = wn;
3237 } 3531 }
3286 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3287 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3288 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3289 3583
3290 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3291 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3292 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3293 { 3587 {
3294 wn = wl->next; 3588 wn = wl->next;
3295 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3296 wl = wn; 3590 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines