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

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

Diff Legend

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