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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48: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# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
344#endif 408#endif
345 409
346/**/ 410/**/
347 411
348#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
384# define inline_speed static noinline 448# define inline_speed static noinline
385#else 449#else
386# define inline_speed static inline 450# define inline_speed static inline
387#endif 451#endif
388 452
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
391 460
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
394 463
395typedef ev_watcher *W; 464typedef ev_watcher *W;
478#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
480 549
481/*****************************************************************************/ 550/*****************************************************************************/
482 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
555/* file descriptor info structure */
483typedef struct 556typedef struct
484{ 557{
485 WL head; 558 WL head;
486 unsigned char events; 559 unsigned char events; /* the events watched for */
487 unsigned char reify; 560 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 */ 561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 562 unsigned char unused;
490#if EV_USE_EPOLL 563#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 565#endif
493#if EV_SELECT_IS_WINSOCKET 566#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 567 SOCKET handle;
495#endif 568#endif
496} ANFD; 569} ANFD;
497 570
571/* stores the pending event set for a given watcher */
498typedef struct 572typedef struct
499{ 573{
500 W w; 574 W w;
501 int events; 575 int events; /* the pending event set for the given watcher */
502} ANPENDING; 576} ANPENDING;
503 577
504#if EV_USE_INOTIFY 578#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 579/* hash table entry per inotify-id */
506typedef struct 580typedef struct
509} ANFS; 583} ANFS;
510#endif 584#endif
511 585
512/* Heap Entry */ 586/* Heap Entry */
513#if EV_HEAP_CACHE_AT 587#if EV_HEAP_CACHE_AT
588 /* a heap element */
514 typedef struct { 589 typedef struct {
515 ev_tstamp at; 590 ev_tstamp at;
516 WT w; 591 WT w;
517 } ANHE; 592 } ANHE;
518 593
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 594 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 595 #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 */ 596 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 597#else
598 /* a heap element */
523 typedef WT ANHE; 599 typedef WT ANHE;
524 600
525 #define ANHE_w(he) (he) 601 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 602 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 603 #define ANHE_at_cache(he)
551 627
552 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
553 629
554#endif 630#endif
555 631
632#if EV_MINIMAL < 2
633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
635# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else
637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif
641
642#define EVUNLOOP_RECURSE 0x80
643
556/*****************************************************************************/ 644/*****************************************************************************/
557 645
646#ifndef EV_HAVE_EV_TIME
558ev_tstamp 647ev_tstamp
559ev_time (void) 648ev_time (void)
560{ 649{
561#if EV_USE_REALTIME 650#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 651 if (expect_true (have_realtime))
569 658
570 struct timeval tv; 659 struct timeval tv;
571 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 662}
663#endif
574 664
575inline_size ev_tstamp 665inline_size ev_tstamp
576get_clock (void) 666get_clock (void)
577{ 667{
578#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
614 704
615 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 707
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 710 /* by older ones */
621 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
622#endif 712#endif
623 } 713 }
624} 714}
625 715
626/*****************************************************************************/ 716/*****************************************************************************/
627 717
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 718#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 719
720/* find a suitable new size for the given array, */
721/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 722inline_size int
631array_nextsize (int elem, int cur, int cnt) 723array_nextsize (int elem, int cur, int cnt)
632{ 724{
633 int ncur = cur + 1; 725 int ncur = cur + 1;
634 726
680#define array_free(stem, idx) \ 772#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 773 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 774
683/*****************************************************************************/ 775/*****************************************************************************/
684 776
777/* dummy callback for pending events */
778static void noinline
779pendingcb (EV_P_ ev_prepare *w, int revents)
780{
781}
782
685void noinline 783void noinline
686ev_feed_event (EV_P_ void *w, int revents) 784ev_feed_event (EV_P_ void *w, int revents)
687{ 785{
688 W w_ = (W)w; 786 W w_ = (W)w;
689 int pri = ABSPRI (w_); 787 int pri = ABSPRI (w_);
724} 822}
725 823
726/*****************************************************************************/ 824/*****************************************************************************/
727 825
728inline_speed void 826inline_speed void
729fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
730{ 828{
731 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
732 ev_io *w; 830 ev_io *w;
733 831
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 836 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
740 } 838 }
741} 839}
742 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
743void 852void
744ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 854{
746 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
748} 857}
749 858
859/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */
750inline_size void 861inline_size void
751fd_reify (EV_P) 862fd_reify (EV_P)
752{ 863{
753 int i; 864 int i;
754 865
789 } 900 }
790 901
791 fdchangecnt = 0; 902 fdchangecnt = 0;
792} 903}
793 904
905/* something about the given fd changed */
794inline_size void 906inline_size void
795fd_change (EV_P_ int fd, int flags) 907fd_change (EV_P_ int fd, int flags)
796{ 908{
797 unsigned char reify = anfds [fd].reify; 909 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 910 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 915 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 916 fdchanges [fdchangecnt - 1] = fd;
805 } 917 }
806} 918}
807 919
920/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 921inline_speed void
809fd_kill (EV_P_ int fd) 922fd_kill (EV_P_ int fd)
810{ 923{
811 ev_io *w; 924 ev_io *w;
812 925
815 ev_io_stop (EV_A_ w); 928 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 929 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 930 }
818} 931}
819 932
933/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 934inline_size int
821fd_valid (int fd) 935fd_valid (int fd)
822{ 936{
823#ifdef _WIN32 937#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 938 return _get_osfhandle (fd) != -1;
847 961
848 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 963 if (anfds [fd].events)
850 { 964 {
851 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
852 return; 966 break;
853 } 967 }
854} 968}
855 969
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 971static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 977 if (anfds [fd].events)
864 { 978 {
865 anfds [fd].events = 0; 979 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 982 }
869} 983}
870 984
871/*****************************************************************************/ 985/*****************************************************************************/
872 986
947 1061
948 for (;;) 1062 for (;;)
949 { 1063 {
950 int c = k << 1; 1064 int c = k << 1;
951 1065
952 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
953 break; 1067 break;
954 1068
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1070 ? 1 : 0;
957 1071
989 1103
990 heap [k] = he; 1104 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1105 ev_active (ANHE_w (he)) = k;
992} 1106}
993 1107
1108/* move an element suitably so it is in a correct place */
994inline_size void 1109inline_size void
995adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
996{ 1111{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1113 upheap (heap, k);
999 else 1114 else
1000 downheap (heap, N, k); 1115 downheap (heap, N, k);
1001} 1116}
1002 1117
1012 upheap (heap, i + HEAP0); 1127 upheap (heap, i + HEAP0);
1013} 1128}
1014 1129
1015/*****************************************************************************/ 1130/*****************************************************************************/
1016 1131
1132/* associate signal watchers to a signal signal */
1017typedef struct 1133typedef struct
1018{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1019 WL head; 1139 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1140} ANSIG;
1022 1141
1023static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1143
1028/*****************************************************************************/ 1144/*****************************************************************************/
1029 1145
1146/* used to prepare libev internal fd's */
1147/* this is not fork-safe */
1030inline_speed void 1148inline_speed void
1031fd_intern (int fd) 1149fd_intern (int fd)
1032{ 1150{
1033#ifdef _WIN32 1151#ifdef _WIN32
1034 unsigned long arg = 1; 1152 unsigned long arg = 1;
1040} 1158}
1041 1159
1042static void noinline 1160static void noinline
1043evpipe_init (EV_P) 1161evpipe_init (EV_P)
1044{ 1162{
1045 if (!ev_is_active (&pipeev)) 1163 if (!ev_is_active (&pipe_w))
1046 { 1164 {
1047#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1049 { 1171 {
1050 evpipe [0] = -1; 1172 evpipe [0] = -1;
1051 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1175 }
1054 else 1176 else
1055#endif 1177#endif
1056 { 1178 {
1057 while (pipe (evpipe)) 1179 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1180 ev_syserr ("(libev) error creating signal/async pipe");
1059 1181
1060 fd_intern (evpipe [0]); 1182 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1183 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1184 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1185 }
1064 1186
1065 ev_io_start (EV_A_ &pipeev); 1187 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1188 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1189 }
1068} 1190}
1069 1191
1070inline_size void 1192inline_size void
1088 1210
1089 errno = old_errno; 1211 errno = old_errno;
1090 } 1212 }
1091} 1213}
1092 1214
1215/* called whenever the libev signal pipe */
1216/* got some events (signal, async) */
1093static void 1217static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1219{
1220 int i;
1221
1096#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1223 if (evfd >= 0)
1098 { 1224 {
1099 uint64_t counter; 1225 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
1104 { 1230 {
1105 char dummy; 1231 char dummy;
1106 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1107 } 1233 }
1108 1234
1109 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1110 { 1236 {
1111 int signum; 1237 sig_pending = 0;
1112 gotsig = 0;
1113 1238
1114 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1242 }
1118 1243
1119#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1120 if (gotasync) 1245 if (async_pending)
1121 { 1246 {
1122 int i; 1247 async_pending = 0;
1123 gotasync = 0;
1124 1248
1125 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1127 { 1251 {
1128 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
1136 1260
1137static void 1261static void
1138ev_sighandler (int signum) 1262ev_sighandler (int signum)
1139{ 1263{
1140#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1142#endif 1266#endif
1143 1267
1144#if _WIN32 1268#if _WIN32
1145 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1146#endif 1270#endif
1147 1271
1148 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1150} 1274}
1151 1275
1152void noinline 1276void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1154{ 1278{
1155 WL w; 1279 WL w;
1156 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1157#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1289
1161 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1291 return;
1292#endif
1165 1293
1166 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1167 1295
1168 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1298}
1171 1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1319
1172/*****************************************************************************/ 1320/*****************************************************************************/
1173 1321
1174static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1175 1323
1176#ifndef _WIN32 1324#ifndef _WIN32
1179 1327
1180#ifndef WIFCONTINUED 1328#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1329# define WIFCONTINUED(status) 0
1182#endif 1330#endif
1183 1331
1332/* handle a single child status event */
1184inline_speed void 1333inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1334child_reap (EV_P_ int chain, int pid, int status)
1186{ 1335{
1187 ev_child *w; 1336 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1351
1203#ifndef WCONTINUED 1352#ifndef WCONTINUED
1204# define WCONTINUED 0 1353# define WCONTINUED 0
1205#endif 1354#endif
1206 1355
1356/* called on sigchld etc., calls waitpid */
1207static void 1357static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1358childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1359{
1210 int pid, status; 1360 int pid, status;
1211 1361
1318ev_backend (EV_P) 1468ev_backend (EV_P)
1319{ 1469{
1320 return backend; 1470 return backend;
1321} 1471}
1322 1472
1473#if EV_MINIMAL < 2
1323unsigned int 1474unsigned int
1324ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1325{ 1476{
1326 return loop_count; 1477 return loop_count;
1327} 1478}
1328 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1329void 1486void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1488{
1332 io_blocktime = interval; 1489 io_blocktime = interval;
1333} 1490}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1494{
1338 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1339} 1496}
1340 1497
1498void
1499ev_set_userdata (EV_P_ void *data)
1500{
1501 userdata = data;
1502}
1503
1504void *
1505ev_userdata (EV_P)
1506{
1507 return userdata;
1508}
1509
1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1511{
1512 invoke_cb = invoke_pending_cb;
1513}
1514
1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1516{
1517 release_cb = release;
1518 acquire_cb = acquire;
1519}
1520#endif
1521
1522/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1523static void noinline
1342loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1343{ 1525{
1344 if (!backend) 1526 if (!backend)
1345 { 1527 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1544 have_monotonic = 1;
1363 } 1545 }
1364#endif 1546#endif
1365 1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1558
1366 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1560 mn_now = get_clock ();
1368 now_floor = mn_now; 1561 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2
1564 invoke_cb = ev_invoke_pending;
1565#endif
1370 1566
1371 io_blocktime = 0.; 1567 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1373 backend = 0; 1569 backend = 0;
1374 backend_fd = -1; 1570 backend_fd = -1;
1375 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1376#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1377 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1577#endif
1379 1578#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1580#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1581
1391 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1393 1584
1394#if EV_USE_PORT 1585#if EV_USE_PORT
1405#endif 1596#endif
1406#if EV_USE_SELECT 1597#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1599#endif
1409 1600
1601 ev_prepare_init (&pending_w, pendingcb);
1602
1410 ev_init (&pipeev, pipecb); 1603 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1604 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1605 }
1413} 1606}
1414 1607
1608/* free up a loop structure */
1415static void noinline 1609static void noinline
1416loop_destroy (EV_P) 1610loop_destroy (EV_P)
1417{ 1611{
1418 int i; 1612 int i;
1419 1613
1420 if (ev_is_active (&pipeev)) 1614 if (ev_is_active (&pipe_w))
1421 { 1615 {
1422 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1618
1425#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1620 if (evfd >= 0)
1427 close (evfd); 1621 close (evfd);
1428#endif 1622#endif
1432 close (evpipe [0]); 1626 close (evpipe [0]);
1433 close (evpipe [1]); 1627 close (evpipe [1]);
1434 } 1628 }
1435 } 1629 }
1436 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1437#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1439 close (fs_fd); 1643 close (fs_fd);
1440#endif 1644#endif
1441 1645
1464#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1669 array_free (idle, [i]);
1466#endif 1670#endif
1467 } 1671 }
1468 1672
1469 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1674
1471 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
1505#endif 1709#endif
1506#if EV_USE_INOTIFY 1710#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1711 infy_fork (EV_A);
1508#endif 1712#endif
1509 1713
1510 if (ev_is_active (&pipeev)) 1714 if (ev_is_active (&pipe_w))
1511 { 1715 {
1512 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1514 gotsig = 1; 1718 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1720 async_pending = 1;
1517#endif 1721#endif
1518 1722
1519 ev_ref (EV_A); 1723 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1724 ev_io_stop (EV_A_ &pipe_w);
1521 1725
1522#if EV_USE_EVENTFD 1726#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1727 if (evfd >= 0)
1524 close (evfd); 1728 close (evfd);
1525#endif 1729#endif
1530 close (evpipe [1]); 1734 close (evpipe [1]);
1531 } 1735 }
1532 1736
1533 evpipe_init (EV_A); 1737 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1738 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1739 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1740 }
1537 1741
1538 postfork = 0; 1742 postfork = 0;
1539} 1743}
1540 1744
1541#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1542 1746
1543struct ev_loop * 1747struct ev_loop *
1544ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1545{ 1749{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1751
1548 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1551 1754
1552 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1553 return loop; 1756 return EV_A;
1554 1757
1555 return 0; 1758 return 0;
1556} 1759}
1557 1760
1558void 1761void
1565void 1768void
1566ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1567{ 1770{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1569} 1772}
1773#endif /* multiplicity */
1570 1774
1571#if EV_VERIFY 1775#if EV_VERIFY
1572static void noinline 1776static void noinline
1573verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1574{ 1778{
1602 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1603 } 1807 }
1604} 1808}
1605#endif 1809#endif
1606 1810
1811#if EV_MINIMAL < 2
1607void 1812void
1608ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1609{ 1814{
1610#if EV_VERIFY 1815#if EV_VERIFY
1611 int i; 1816 int i;
1660 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1867
1663# if 0 1868# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 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) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif 1871# endif
1667#endif 1872#endif
1668} 1873}
1669 1874#endif
1670#endif /* multiplicity */
1671 1875
1672#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1673struct ev_loop * 1877struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1675#else 1879#else
1678#endif 1882#endif
1679{ 1883{
1680 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1681 { 1885 {
1682#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1888#else
1685 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1686#endif 1890#endif
1687 1891
1688 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
1705 1909
1706void 1910void
1707ev_default_destroy (void) 1911ev_default_destroy (void)
1708{ 1912{
1709#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1711#endif 1915#endif
1712 1916
1713 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1714 1918
1715#ifndef _WIN32 1919#ifndef _WIN32
1722 1926
1723void 1927void
1724ev_default_fork (void) 1928ev_default_fork (void)
1725{ 1929{
1726#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1728#endif 1932#endif
1729 1933
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1935}
1732 1936
1736ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1737{ 1941{
1738 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1739} 1943}
1740 1944
1741inline_speed void 1945unsigned int
1742call_pending (EV_P) 1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1955}
1956
1957void noinline
1958ev_invoke_pending (EV_P)
1743{ 1959{
1744 int pri; 1960 int pri;
1745 1961
1746 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
1748 { 1964 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1965 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1966
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1967 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1968 /* ^ this is no longer true, as pending_w could be here */
1754 1969
1755 p->w->pending = 0; 1970 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 1971 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 1972 EV_FREQUENT_CHECK;
1758 }
1759 } 1973 }
1760} 1974}
1761 1975
1762#if EV_IDLE_ENABLE 1976#if EV_IDLE_ENABLE
1977/* make idle watchers pending. this handles the "call-idle */
1978/* only when higher priorities are idle" logic */
1763inline_size void 1979inline_size void
1764idle_reify (EV_P) 1980idle_reify (EV_P)
1765{ 1981{
1766 if (expect_false (idleall)) 1982 if (expect_false (idleall))
1767 { 1983 {
1780 } 1996 }
1781 } 1997 }
1782} 1998}
1783#endif 1999#endif
1784 2000
2001/* make timers pending */
1785inline_size void 2002inline_size void
1786timers_reify (EV_P) 2003timers_reify (EV_P)
1787{ 2004{
1788 EV_FREQUENT_CHECK; 2005 EV_FREQUENT_CHECK;
1789 2006
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2035 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2036 }
1820} 2037}
1821 2038
1822#if EV_PERIODIC_ENABLE 2039#if EV_PERIODIC_ENABLE
2040/* make periodics pending */
1823inline_size void 2041inline_size void
1824periodics_reify (EV_P) 2042periodics_reify (EV_P)
1825{ 2043{
1826 EV_FREQUENT_CHECK; 2044 EV_FREQUENT_CHECK;
1827 2045
1874 2092
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2093 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2094 }
1877} 2095}
1878 2096
2097/* simply recalculate all periodics */
2098/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2099static void noinline
1880periodics_reschedule (EV_P) 2100periodics_reschedule (EV_P)
1881{ 2101{
1882 int i; 2102 int i;
1883 2103
1896 2116
1897 reheap (periodics, periodiccnt); 2117 reheap (periodics, periodiccnt);
1898} 2118}
1899#endif 2119#endif
1900 2120
2121/* adjust all timers by a given offset */
1901static void noinline 2122static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2123timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2124{
1904 int i; 2125 int i;
1905 2126
1909 ANHE_w (*he)->at += adjust; 2130 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2131 ANHE_at_cache (*he);
1911 } 2132 }
1912} 2133}
1913 2134
2135/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2137inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2138time_update (EV_P_ ev_tstamp max_block)
1916{ 2139{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2140#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2141 if (expect_true (have_monotonic))
1921 { 2142 {
2143 int i;
1922 ev_tstamp odiff = rtmn_diff; 2144 ev_tstamp odiff = rtmn_diff;
1923 2145
1924 mn_now = get_clock (); 2146 mn_now = get_clock ();
1925 2147
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2148 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2198
1977 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
1978 } 2200 }
1979} 2201}
1980 2202
1981static int loop_done;
1982
1983void 2203void
1984ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
1985{ 2205{
2206#if EV_MINIMAL < 2
2207 ++loop_depth;
2208#endif
2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2211
1986 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
1987 2213
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2215
1990 do 2216 do
1991 { 2217 {
1992#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2233 if (expect_false (postfork))
2008 if (forkcnt) 2234 if (forkcnt)
2009 { 2235 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
2012 } 2238 }
2013#endif 2239#endif
2014 2240
2015 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
2017 { 2243 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
2020 } 2246 }
2247
2248 if (expect_false (loop_done))
2249 break;
2021 2250
2022 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2252 if (expect_false (postfork))
2024 loop_fork (EV_A); 2253 loop_fork (EV_A);
2025 2254
2031 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
2033 2262
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
2036 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
2270
2271 waittime = MAX_BLOCKTIME;
2038 2272
2039 if (timercnt) 2273 if (timercnt)
2040 { 2274 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2275 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2276 if (waittime > to) waittime = to;
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2282 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
2050 } 2284 }
2051#endif 2285#endif
2052 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
2055 2290
2056 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2293 {
2294 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2295
2296 if (sleeptime > waittime - backend_fudge)
2297 sleeptime = waittime - backend_fudge;
2298
2299 if (expect_true (sleeptime > 0.))
2300 {
2063 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2065 } 2304 }
2066 } 2305 }
2067 2306
2307#if EV_MINIMAL < 2
2068 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2313
2071 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2073 } 2316 }
2074 2317
2085 2328
2086 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2089 2332
2090 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2091 } 2334 }
2092 while (expect_true ( 2335 while (expect_true (
2093 activecnt 2336 activecnt
2094 && !loop_done 2337 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2339 ));
2097 2340
2098 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2100} 2347}
2101 2348
2102void 2349void
2103ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2104{ 2351{
2133ev_resume (EV_P) 2380ev_resume (EV_P)
2134{ 2381{
2135 ev_tstamp mn_prev = mn_now; 2382 ev_tstamp mn_prev = mn_now;
2136 2383
2137 ev_now_update (EV_A); 2384 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2385 timers_reschedule (EV_A_ mn_now - mn_prev);
2386#if EV_PERIODIC_ENABLE
2387 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2388 periodics_reschedule (EV_A);
2389#endif
2141} 2390}
2142 2391
2143/*****************************************************************************/ 2392/*****************************************************************************/
2393/* singly-linked list management, used when the expected list length is short */
2144 2394
2145inline_size void 2395inline_size void
2146wlist_add (WL *head, WL elem) 2396wlist_add (WL *head, WL elem)
2147{ 2397{
2148 elem->next = *head; 2398 elem->next = *head;
2152inline_size void 2402inline_size void
2153wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2154{ 2404{
2155 while (*head) 2405 while (*head)
2156 { 2406 {
2157 if (*head == elem) 2407 if (expect_true (*head == elem))
2158 { 2408 {
2159 *head = elem->next; 2409 *head = elem->next;
2160 return; 2410 break;
2161 } 2411 }
2162 2412
2163 head = &(*head)->next; 2413 head = &(*head)->next;
2164 } 2414 }
2165} 2415}
2166 2416
2417/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2418inline_speed void
2168clear_pending (EV_P_ W w) 2419clear_pending (EV_P_ W w)
2169{ 2420{
2170 if (w->pending) 2421 if (w->pending)
2171 { 2422 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2423 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2424 w->pending = 0;
2174 } 2425 }
2175} 2426}
2176 2427
2177int 2428int
2181 int pending = w_->pending; 2432 int pending = w_->pending;
2182 2433
2183 if (expect_true (pending)) 2434 if (expect_true (pending))
2184 { 2435 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2436 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2437 p->w = (W)&pending_w;
2186 w_->pending = 0; 2438 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2439 return p->events;
2189 } 2440 }
2190 else 2441 else
2191 return 0; 2442 return 0;
2192} 2443}
2193 2444
2194inline_size void 2445inline_size void
2195pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2196{ 2447{
2197 int pri = w->priority; 2448 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2451 ev_set_priority (w, pri);
2201} 2452}
2202 2453
2203inline_speed void 2454inline_speed void
2204ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2205{ 2456{
2232 2483
2233 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2236 2487
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2239 2490
2240 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2241} 2492}
2242 2493
2336 } 2587 }
2337 2588
2338 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2339} 2590}
2340 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2341#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2342void noinline 2599void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2601{
2345 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
2412#endif 2669#endif
2413 2670
2414void noinline 2671void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2416{ 2673{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2421 return; 2675 return;
2422 2676
2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2424 2678
2425 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2426 2682
2427 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2428 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2429 { 2690 {
2430#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2694
2436 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2437 2698
2438#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2440#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2441 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2442 2717
2443 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2720
2446 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2447 { 2725 {
2448#if _WIN32 2726# if _WIN32
2449 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2450#else 2728# else
2451 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2452 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2455 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2456#endif 2741#endif
2457 } 2742 }
2458 2743
2459 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2460} 2745}
2461 2746
2462void noinline 2747void noinline
2470 2755
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2473 2758
2474 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2475 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2476 2777
2477 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2478} 2779}
2479 2780
2480void 2781void
2560 } 2861 }
2561 } 2862 }
2562 2863
2563 if (w->wd >= 0) 2864 if (w->wd >= 0)
2564 { 2865 {
2866 struct statfs sfs;
2867
2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2566 2869
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 2870 /* now local changes will be tracked by inotify, but remote changes won't */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 2871 /* unless the filesystem it known to be local, we therefore still poll */
2569 /* also do poll on <2.6.25, but with normal frequency */ 2872 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571 2873
2572 if (fs_2625 && !statfs (w->path, &sfs)) 2874 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */ 2875 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */ 2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */ 2877 || sfs.f_type == 0x3153464a /* jfs */
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3262embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3263{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3264 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3265
2964 { 3266 {
2965 struct ev_loop *loop = w->other; 3267 EV_P = w->other;
2966 3268
2967 while (fdchangecnt) 3269 while (fdchangecnt)
2968 { 3270 {
2969 fd_reify (EV_A); 3271 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3272 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3280 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2979 3281
2980 ev_embed_stop (EV_A_ w); 3282 ev_embed_stop (EV_A_ w);
2981 3283
2982 { 3284 {
2983 struct ev_loop *loop = w->other; 3285 EV_P = w->other;
2984 3286
2985 ev_loop_fork (EV_A); 3287 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3288 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3289 }
2988 3290
3002{ 3304{
3003 if (expect_false (ev_is_active (w))) 3305 if (expect_false (ev_is_active (w)))
3004 return; 3306 return;
3005 3307
3006 { 3308 {
3007 struct ev_loop *loop = w->other; 3309 EV_P = w->other;
3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3310 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3010 } 3312 }
3011 3313
3012 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
3124 3426
3125void 3427void
3126ev_async_send (EV_P_ ev_async *w) 3428ev_async_send (EV_P_ ev_async *w)
3127{ 3429{
3128 w->sent = 1; 3430 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3431 evpipe_write (EV_A_ &async_pending);
3130} 3432}
3131#endif 3433#endif
3132 3434
3133/*****************************************************************************/ 3435/*****************************************************************************/
3134 3436
3198 } 3500 }
3199} 3501}
3200 3502
3201/*****************************************************************************/ 3503/*****************************************************************************/
3202 3504
3203#if 0 3505#if EV_WALK_ENABLE
3204void 3506void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3507ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3508{
3207 int i, j; 3509 int i, j;
3208 ev_watcher_list *wl, *wn; 3510 ev_watcher_list *wl, *wn;
3224#if EV_USE_INOTIFY 3526#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3527 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3528 ;
3227 else 3529 else
3228#endif 3530#endif
3229 if ((ev_io *)wl != &pipeev) 3531 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3532 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3533 cb (EV_A_ EV_IO, wl);
3232 3534
3233 wl = wn; 3535 wl = wn;
3234 } 3536 }
3283 if (types & EV_CHECK) 3585 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3586 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3587 cb (EV_A_ EV_CHECK, checks [i]);
3286 3588
3287 if (types & EV_SIGNAL) 3589 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3590 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3591 for (wl = signals [i].head; wl; )
3290 { 3592 {
3291 wn = wl->next; 3593 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3594 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3595 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines