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

Comparing libev/ev.c (file contents):
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 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 64
216#endif
217
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
181#ifndef EV_USE_CLOCK_SYSCALL 225#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 226# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 227# define EV_USE_CLOCK_SYSCALL 1
184# else 228# else
185# define EV_USE_CLOCK_SYSCALL 0 229# define EV_USE_CLOCK_SYSCALL 0
… …
264# else 308# else
265# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
266# endif 310# endif
267#endif 311#endif
268 312
313#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
315# define EV_USE_SIGNALFD 1
316# else
317# define EV_USE_SIGNALFD 0
318# endif
319#endif
320
269#if 0 /* debugging */ 321#if 0 /* debugging */
270# define EV_VERIFY 3 322# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 323# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 324# define EV_HEAP_CACHE_AT 1
273#endif 325#endif
… …
280# define EV_USE_4HEAP !EV_MINIMAL 332# define EV_USE_4HEAP !EV_MINIMAL
281#endif 333#endif
282 334
283#ifndef EV_HEAP_CACHE_AT 335#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 336# define EV_HEAP_CACHE_AT !EV_MINIMAL
337#endif
338
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL
342# include <syscall.h>
343# ifdef SYS_clock_gettime
344# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
345# undef EV_USE_MONOTONIC
346# define EV_USE_MONOTONIC 1
347# else
348# undef EV_USE_CLOCK_SYSCALL
349# define EV_USE_CLOCK_SYSCALL 0
350# endif
285#endif 351#endif
286 352
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 353/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 354
289#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
… …
320 386
321#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 388# include <winsock.h>
323#endif 389#endif
324 390
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC
399# endif
337# ifdef __cplusplus 400# ifdef __cplusplus
338extern "C" { 401extern "C" {
339# endif 402# endif
340int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 404# ifdef __cplusplus
342} 405}
343# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
344#endif 411#endif
345 412
346/**/ 413/**/
347 414
348#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
… …
384# define inline_speed static noinline 451# define inline_speed static noinline
385#else 452#else
386# define inline_speed static inline 453# define inline_speed static inline
387#endif 454#endif
388 455
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457
458#if EV_MINPRI == EV_MAXPRI
459# define ABSPRI(w) (((W)w), 0)
460#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 461# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
462#endif
391 463
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 464#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 465#define EMPTY2(a,b) /* used to suppress some warnings */
394 466
395typedef ev_watcher *W; 467typedef ev_watcher *W;
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
480 552
481/*****************************************************************************/ 553/*****************************************************************************/
482 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
558/* file descriptor info structure */
483typedef struct 559typedef struct
484{ 560{
485 WL head; 561 WL head;
486 unsigned char events; 562 unsigned char events; /* the events watched for */
487 unsigned char reify; 563 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 */ 564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 565 unsigned char unused;
490#if EV_USE_EPOLL 566#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 567 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 568#endif
493#if EV_SELECT_IS_WINSOCKET 569#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 570 SOCKET handle;
495#endif 571#endif
496} ANFD; 572} ANFD;
497 573
574/* stores the pending event set for a given watcher */
498typedef struct 575typedef struct
499{ 576{
500 W w; 577 W w;
501 int events; 578 int events; /* the pending event set for the given watcher */
502} ANPENDING; 579} ANPENDING;
503 580
504#if EV_USE_INOTIFY 581#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 582/* hash table entry per inotify-id */
506typedef struct 583typedef struct
… …
509} ANFS; 586} ANFS;
510#endif 587#endif
511 588
512/* Heap Entry */ 589/* Heap Entry */
513#if EV_HEAP_CACHE_AT 590#if EV_HEAP_CACHE_AT
591 /* a heap element */
514 typedef struct { 592 typedef struct {
515 ev_tstamp at; 593 ev_tstamp at;
516 WT w; 594 WT w;
517 } ANHE; 595 } ANHE;
518 596
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 597 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 598 #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 */ 599 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 600#else
601 /* a heap element */
523 typedef WT ANHE; 602 typedef WT ANHE;
524 603
525 #define ANHE_w(he) (he) 604 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 605 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 606 #define ANHE_at_cache(he)
… …
551 630
552 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
553 632
554#endif 633#endif
555 634
635#if EV_MINIMAL < 2
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else
640# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif
644
645#define EVUNLOOP_RECURSE 0x80
646
556/*****************************************************************************/ 647/*****************************************************************************/
557 648
649#ifndef EV_HAVE_EV_TIME
558ev_tstamp 650ev_tstamp
559ev_time (void) 651ev_time (void)
560{ 652{
561#if EV_USE_REALTIME 653#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 654 if (expect_true (have_realtime))
… …
569 661
570 struct timeval tv; 662 struct timeval tv;
571 gettimeofday (&tv, 0); 663 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 664 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 665}
666#endif
574 667
575inline_size ev_tstamp 668inline_size ev_tstamp
576get_clock (void) 669get_clock (void)
577{ 670{
578#if EV_USE_MONOTONIC 671#if EV_USE_MONOTONIC
… …
614 707
615 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 710
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 713 /* by older ones */
621 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
622#endif 715#endif
623 } 716 }
624} 717}
625 718
626/*****************************************************************************/ 719/*****************************************************************************/
627 720
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 721#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 722
723/* find a suitable new size for the given array, */
724/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 725inline_size int
631array_nextsize (int elem, int cur, int cnt) 726array_nextsize (int elem, int cur, int cnt)
632{ 727{
633 int ncur = cur + 1; 728 int ncur = cur + 1;
634 729
… …
680#define array_free(stem, idx) \ 775#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 776 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 777
683/*****************************************************************************/ 778/*****************************************************************************/
684 779
780/* dummy callback for pending events */
781static void noinline
782pendingcb (EV_P_ ev_prepare *w, int revents)
783{
784}
785
685void noinline 786void noinline
686ev_feed_event (EV_P_ void *w, int revents) 787ev_feed_event (EV_P_ void *w, int revents)
687{ 788{
688 W w_ = (W)w; 789 W w_ = (W)w;
689 int pri = ABSPRI (w_); 790 int pri = ABSPRI (w_);
… …
724} 825}
725 826
726/*****************************************************************************/ 827/*****************************************************************************/
727 828
728inline_speed void 829inline_speed void
729fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
730{ 831{
731 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
732 ev_io *w; 833 ev_io *w;
733 834
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
738 if (ev) 839 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
740 } 841 }
741} 842}
742 843
844/* do not submit kernel events for fds that have reify set */
845/* because that means they changed while we were polling for new events */
846inline_speed void
847fd_event (EV_P_ int fd, int revents)
848{
849 ANFD *anfd = anfds + fd;
850
851 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents);
853}
854
743void 855void
744ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 857{
746 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
748} 860}
749 861
862/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */
750inline_size void 864inline_size void
751fd_reify (EV_P) 865fd_reify (EV_P)
752{ 866{
753 int i; 867 int i;
754 868
… …
789 } 903 }
790 904
791 fdchangecnt = 0; 905 fdchangecnt = 0;
792} 906}
793 907
908/* something about the given fd changed */
794inline_size void 909inline_size void
795fd_change (EV_P_ int fd, int flags) 910fd_change (EV_P_ int fd, int flags)
796{ 911{
797 unsigned char reify = anfds [fd].reify; 912 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 913 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 918 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 919 fdchanges [fdchangecnt - 1] = fd;
805 } 920 }
806} 921}
807 922
923/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 924inline_speed void
809fd_kill (EV_P_ int fd) 925fd_kill (EV_P_ int fd)
810{ 926{
811 ev_io *w; 927 ev_io *w;
812 928
… …
815 ev_io_stop (EV_A_ w); 931 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 933 }
818} 934}
819 935
936/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 937inline_size int
821fd_valid (int fd) 938fd_valid (int fd)
822{ 939{
823#ifdef _WIN32 940#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 941 return _get_osfhandle (fd) != -1;
… …
862 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 980 if (anfds [fd].events)
864 { 981 {
865 anfds [fd].events = 0; 982 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 983 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 985 }
869} 986}
870 987
871/*****************************************************************************/ 988/*****************************************************************************/
872 989
… …
989 1106
990 heap [k] = he; 1107 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1108 ev_active (ANHE_w (he)) = k;
992} 1109}
993 1110
1111/* move an element suitably so it is in a correct place */
994inline_size void 1112inline_size void
995adjustheap (ANHE *heap, int N, int k) 1113adjustheap (ANHE *heap, int N, int k)
996{ 1114{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
998 upheap (heap, k); 1116 upheap (heap, k);
… …
1012 upheap (heap, i + HEAP0); 1130 upheap (heap, i + HEAP0);
1013} 1131}
1014 1132
1015/*****************************************************************************/ 1133/*****************************************************************************/
1016 1134
1135/* associate signal watchers to a signal signal */
1017typedef struct 1136typedef struct
1018{ 1137{
1019 WL head; 1138 WL head;
1020 EV_ATOMIC_T gotsig; 1139 EV_ATOMIC_T gotsig;
1021} ANSIG; 1140} ANSIG;
… …
1025 1144
1026static EV_ATOMIC_T gotsig; 1145static EV_ATOMIC_T gotsig;
1027 1146
1028/*****************************************************************************/ 1147/*****************************************************************************/
1029 1148
1149/* used to prepare libev internal fd's */
1150/* this is not fork-safe */
1030inline_speed void 1151inline_speed void
1031fd_intern (int fd) 1152fd_intern (int fd)
1032{ 1153{
1033#ifdef _WIN32 1154#ifdef _WIN32
1034 unsigned long arg = 1; 1155 unsigned long arg = 1;
… …
1040} 1161}
1041 1162
1042static void noinline 1163static void noinline
1043evpipe_init (EV_P) 1164evpipe_init (EV_P)
1044{ 1165{
1045 if (!ev_is_active (&pipeev)) 1166 if (!ev_is_active (&pipe_w))
1046 { 1167 {
1047#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1049 { 1174 {
1050 evpipe [0] = -1; 1175 evpipe [0] = -1;
1051 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1178 }
1054 else 1179 else
1055#endif 1180#endif
1056 { 1181 {
1057 while (pipe (evpipe)) 1182 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1183 ev_syserr ("(libev) error creating signal/async pipe");
1059 1184
1060 fd_intern (evpipe [0]); 1185 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1186 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1187 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1188 }
1064 1189
1065 ev_io_start (EV_A_ &pipeev); 1190 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1191 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1192 }
1068} 1193}
1069 1194
1070inline_size void 1195inline_size void
… …
1088 1213
1089 errno = old_errno; 1214 errno = old_errno;
1090 } 1215 }
1091} 1216}
1092 1217
1218/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */
1093static void 1220static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1221pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1222{
1096#if EV_USE_EVENTFD 1223#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1224 if (evfd >= 0)
… …
1167 1294
1168 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1297}
1171 1298
1299#if EV_USE_SIGNALFD
1300static void
1301sigfdcb (EV_P_ ev_io *iow, int revents)
1302{
1303 struct signalfd_siginfo si[4], *sip;
1304
1305 for (;;)
1306 {
1307 ssize_t res = read (sigfd, si, sizeof (si));
1308
1309 /* not ISO-C, as res might be -1, but works with SuS */
1310 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1311 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1312
1313 if (res < (ssize_t)sizeof (si))
1314 break;
1315 }
1316}
1317#endif
1318
1172/*****************************************************************************/ 1319/*****************************************************************************/
1173 1320
1174static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1175 1322
1176#ifndef _WIN32 1323#ifndef _WIN32
… …
1179 1326
1180#ifndef WIFCONTINUED 1327#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1328# define WIFCONTINUED(status) 0
1182#endif 1329#endif
1183 1330
1331/* handle a single child status event */
1184inline_speed void 1332inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1333child_reap (EV_P_ int chain, int pid, int status)
1186{ 1334{
1187 ev_child *w; 1335 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
… …
1202 1350
1203#ifndef WCONTINUED 1351#ifndef WCONTINUED
1204# define WCONTINUED 0 1352# define WCONTINUED 0
1205#endif 1353#endif
1206 1354
1355/* called on sigchld etc., calls waitpid */
1207static void 1356static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1357childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1358{
1210 int pid, status; 1359 int pid, status;
1211 1360
… …
1318ev_backend (EV_P) 1467ev_backend (EV_P)
1319{ 1468{
1320 return backend; 1469 return backend;
1321} 1470}
1322 1471
1472#if EV_MINIMAL < 2
1323unsigned int 1473unsigned int
1324ev_loop_count (EV_P) 1474ev_loop_count (EV_P)
1325{ 1475{
1326 return loop_count; 1476 return loop_count;
1327} 1477}
1328 1478
1479unsigned int
1480ev_loop_depth (EV_P)
1481{
1482 return loop_depth;
1483}
1484
1329void 1485void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1486ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1487{
1332 io_blocktime = interval; 1488 io_blocktime = interval;
1333} 1489}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1492ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1493{
1338 timeout_blocktime = interval; 1494 timeout_blocktime = interval;
1339} 1495}
1340 1496
1497void
1498ev_set_userdata (EV_P_ void *data)
1499{
1500 userdata = data;
1501}
1502
1503void *
1504ev_userdata (EV_P)
1505{
1506 return userdata;
1507}
1508
1509void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1510{
1511 invoke_cb = invoke_pending_cb;
1512}
1513
1514void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1515{
1516 release_cb = release;
1517 acquire_cb = acquire;
1518}
1519#endif
1520
1521/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1522static void noinline
1342loop_init (EV_P_ unsigned int flags) 1523loop_init (EV_P_ unsigned int flags)
1343{ 1524{
1344 if (!backend) 1525 if (!backend)
1345 { 1526 {
… …
1365 1546
1366 ev_rt_now = ev_time (); 1547 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1548 mn_now = get_clock ();
1368 now_floor = mn_now; 1549 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1550 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2
1552 invoke_cb = ev_invoke_pending;
1553#endif
1370 1554
1371 io_blocktime = 0.; 1555 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1556 timeout_blocktime = 0.;
1373 backend = 0; 1557 backend = 0;
1374 backend_fd = -1; 1558 backend_fd = -1;
1375 gotasync = 0; 1559 gotasync = 0;
1376#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1377 fs_fd = -2; 1561 fs_fd = -2;
1378#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1379 1566
1380 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1381#ifndef _WIN32 1568#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid (); 1570 curpid = getpid ();
… …
1405#endif 1592#endif
1406#if EV_USE_SELECT 1593#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1595#endif
1409 1596
1597 ev_prepare_init (&pending_w, pendingcb);
1598
1410 ev_init (&pipeev, pipecb); 1599 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1600 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1601 }
1413} 1602}
1414 1603
1604/* free up a loop structure */
1415static void noinline 1605static void noinline
1416loop_destroy (EV_P) 1606loop_destroy (EV_P)
1417{ 1607{
1418 int i; 1608 int i;
1419 1609
1420 if (ev_is_active (&pipeev)) 1610 if (ev_is_active (&pipe_w))
1421 { 1611 {
1422 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1614
1425#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1616 if (evfd >= 0)
1427 close (evfd); 1617 close (evfd);
1428#endif 1618#endif
… …
1432 close (evpipe [0]); 1622 close (evpipe [0]);
1433 close (evpipe [1]); 1623 close (evpipe [1]);
1434 } 1624 }
1435 } 1625 }
1436 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1437#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1439 close (fs_fd); 1639 close (fs_fd);
1440#endif 1640#endif
1441 1641
… …
1464#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1665 array_free (idle, [i]);
1466#endif 1666#endif
1467 } 1667 }
1468 1668
1469 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1670
1471 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1505#endif 1705#endif
1506#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1707 infy_fork (EV_A);
1508#endif 1708#endif
1509 1709
1510 if (ev_is_active (&pipeev)) 1710 if (ev_is_active (&pipe_w))
1511 { 1711 {
1512 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1514 gotsig = 1; 1714 gotsig = 1;
1515#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1716 gotasync = 1;
1517#endif 1717#endif
1518 1718
1519 ev_ref (EV_A); 1719 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1720 ev_io_stop (EV_A_ &pipe_w);
1521 1721
1522#if EV_USE_EVENTFD 1722#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1723 if (evfd >= 0)
1524 close (evfd); 1724 close (evfd);
1525#endif 1725#endif
… …
1530 close (evpipe [1]); 1730 close (evpipe [1]);
1531 } 1731 }
1532 1732
1533 evpipe_init (EV_A); 1733 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1734 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1735 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1736 }
1537 1737
1538 postfork = 0; 1738 postfork = 0;
1539} 1739}
1540 1740
… …
1544ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1545{ 1745{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1747
1548 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1551 1750
1552 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1553 return loop; 1752 return loop;
1554 1753
… …
1565void 1764void
1566ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1567{ 1766{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1569} 1768}
1769#endif /* multiplicity */
1570 1770
1571#if EV_VERIFY 1771#if EV_VERIFY
1572static void noinline 1772static void noinline
1573verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1574{ 1774{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1603 } 1803 }
1604} 1804}
1605#endif 1805#endif
1606 1806
1807#if EV_MINIMAL < 2
1607void 1808void
1608ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1609{ 1810{
1610#if EV_VERIFY 1811#if EV_VERIFY
1611 int i; 1812 int i;
… …
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1666# endif 1867# endif
1667#endif 1868#endif
1668} 1869}
1669 1870#endif
1670#endif /* multiplicity */
1671 1871
1672#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1673struct ev_loop * 1873struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1675#else 1875#else
… …
1736ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1737{ 1937{
1738 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1739} 1939}
1740 1940
1741inline_speed void 1941unsigned int
1742call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1743{ 1955{
1744 int pri; 1956 int pri;
1745 1957
1746 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
1748 { 1960 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1962
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1754 1965
1755 p->w->pending = 0; 1966 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 1967 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 1968 EV_FREQUENT_CHECK;
1758 }
1759 } 1969 }
1760} 1970}
1761 1971
1762#if EV_IDLE_ENABLE 1972#if EV_IDLE_ENABLE
1973/* make idle watchers pending. this handles the "call-idle */
1974/* only when higher priorities are idle" logic */
1763inline_size void 1975inline_size void
1764idle_reify (EV_P) 1976idle_reify (EV_P)
1765{ 1977{
1766 if (expect_false (idleall)) 1978 if (expect_false (idleall))
1767 { 1979 {
… …
1780 } 1992 }
1781 } 1993 }
1782} 1994}
1783#endif 1995#endif
1784 1996
1997/* make timers pending */
1785inline_size void 1998inline_size void
1786timers_reify (EV_P) 1999timers_reify (EV_P)
1787{ 2000{
1788 EV_FREQUENT_CHECK; 2001 EV_FREQUENT_CHECK;
1789 2002
… …
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2031 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2032 }
1820} 2033}
1821 2034
1822#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
2036/* make periodics pending */
1823inline_size void 2037inline_size void
1824periodics_reify (EV_P) 2038periodics_reify (EV_P)
1825{ 2039{
1826 EV_FREQUENT_CHECK; 2040 EV_FREQUENT_CHECK;
1827 2041
… …
1874 2088
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2089 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2090 }
1877} 2091}
1878 2092
2093/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2095static void noinline
1880periodics_reschedule (EV_P) 2096periodics_reschedule (EV_P)
1881{ 2097{
1882 int i; 2098 int i;
1883 2099
… …
1896 2112
1897 reheap (periodics, periodiccnt); 2113 reheap (periodics, periodiccnt);
1898} 2114}
1899#endif 2115#endif
1900 2116
2117/* adjust all timers by a given offset */
1901static void noinline 2118static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2119timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2120{
1904 int i; 2121 int i;
1905 2122
… …
1909 ANHE_w (*he)->at += adjust; 2126 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2127 ANHE_at_cache (*he);
1911 } 2128 }
1912} 2129}
1913 2130
2131/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2133inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1916{ 2135{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1921 { 2138 {
2139 int i;
1922 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1923 2141
1924 mn_now = get_clock (); 2142 mn_now = get_clock ();
1925 2143
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2194
1977 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
1978 } 2196 }
1979} 2197}
1980 2198
1981static int loop_done;
1982
1983void 2199void
1984ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
1985{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
1986 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
1987 2209
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2211
1990 do 2212 do
1991 { 2213 {
1992#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2006 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2008 if (forkcnt) 2230 if (forkcnt)
2009 { 2231 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2012 } 2234 }
2013#endif 2235#endif
2014 2236
2015 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2017 { 2239 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2020 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2021 2246
2022 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2024 loop_fork (EV_A); 2249 loop_fork (EV_A);
2025 2250
… …
2031 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2033 2258
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2036 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2038 2266
2039 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2040 2268
… …
2050 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2051 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2052 } 2280 }
2053#endif 2281#endif
2054 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2055 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2056 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2057 2286
2058 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2059
2060 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2061 sleeptime = io_blocktime;
2062
2063 if (sleeptime)
2064 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
2065 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2066 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2067 } 2300 }
2068 } 2301 }
2069 2302
2303#if EV_MINIMAL < 2
2070 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2071 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2072 2309
2073 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2074 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2075 } 2312 }
2076 2313
… …
2087 2324
2088 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2089 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2090 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2091 2328
2092 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2093 } 2330 }
2094 while (expect_true ( 2331 while (expect_true (
2095 activecnt 2332 activecnt
2096 && !loop_done 2333 && !loop_done
2097 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2098 )); 2335 ));
2099 2336
2100 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2101 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2102} 2343}
2103 2344
2104void 2345void
2105ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2106{ 2347{
… …
2137 ev_tstamp mn_prev = mn_now; 2378 ev_tstamp mn_prev = mn_now;
2138 2379
2139 ev_now_update (EV_A); 2380 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev); 2381 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE 2382#if EV_PERIODIC_ENABLE
2383 /* TODO: really do this? */
2142 periodics_reschedule (EV_A); 2384 periodics_reschedule (EV_A);
2143#endif 2385#endif
2144} 2386}
2145 2387
2146/*****************************************************************************/ 2388/*****************************************************************************/
2389/* singly-linked list management, used when the expected list length is short */
2147 2390
2148inline_size void 2391inline_size void
2149wlist_add (WL *head, WL elem) 2392wlist_add (WL *head, WL elem)
2150{ 2393{
2151 elem->next = *head; 2394 elem->next = *head;
… …
2165 2408
2166 head = &(*head)->next; 2409 head = &(*head)->next;
2167 } 2410 }
2168} 2411}
2169 2412
2413/* internal, faster, version of ev_clear_pending */
2170inline_speed void 2414inline_speed void
2171clear_pending (EV_P_ W w) 2415clear_pending (EV_P_ W w)
2172{ 2416{
2173 if (w->pending) 2417 if (w->pending)
2174 { 2418 {
2175 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2419 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2176 w->pending = 0; 2420 w->pending = 0;
2177 } 2421 }
2178} 2422}
2179 2423
2180int 2424int
… …
2184 int pending = w_->pending; 2428 int pending = w_->pending;
2185 2429
2186 if (expect_true (pending)) 2430 if (expect_true (pending))
2187 { 2431 {
2188 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2432 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2433 p->w = (W)&pending_w;
2189 w_->pending = 0; 2434 w_->pending = 0;
2190 p->w = 0;
2191 return p->events; 2435 return p->events;
2192 } 2436 }
2193 else 2437 else
2194 return 0; 2438 return 0;
2195} 2439}
2196 2440
2197inline_size void 2441inline_size void
2198pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2199{ 2443{
2200 int pri = w->priority; 2444 int pri = ev_priority (w);
2201 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2202 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2203 w->priority = pri; 2447 ev_set_priority (w, pri);
2204} 2448}
2205 2449
2206inline_speed void 2450inline_speed void
2207ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2208{ 2452{
… …
2235 2479
2236 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2237 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2238 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2239 2483
2240 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2241 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2242 2486
2243 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2244} 2488}
2245 2489
… …
2339 } 2583 }
2340 2584
2341 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2342} 2586}
2343 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2344#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2345void noinline 2595void noinline
2346ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2347{ 2597{
2348 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2423 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2424 return; 2674 return;
2425 2675
2426 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2427 2677
2678 EV_FREQUENT_CHECK;
2679
2680#if EV_USE_SIGNALFD
2681 if (sigfd == -2)
2682 {
2683 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2684 if (sigfd < 0 && errno == EINVAL)
2685 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2686
2687 if (sigfd >= 0)
2688 {
2689 fd_intern (sigfd); /* doing it twice will not hurt */
2690
2691 sigemptyset (&sigfd_set);
2692
2693 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2694 ev_set_priority (&sigfd_w, EV_MAXPRI);
2695 ev_io_start (EV_A_ &sigfd_w);
2696 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2697 }
2698 }
2699
2700 if (sigfd >= 0)
2701 {
2702 /* TODO: check .head */
2703 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705
2706 signalfd (sigfd, &sigfd_set, 0);
2707 }
2708 else
2709#endif
2428 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2429
2430 EV_FREQUENT_CHECK;
2431 2711
2432 { 2712 {
2433#ifndef _WIN32 2713#ifndef _WIN32
2434 sigset_t full, prev; 2714 sigset_t full, prev;
2435 sigfillset (&full); 2715 sigfillset (&full);
… …
2437#endif 2717#endif
2438 2718
2439 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2440 2720
2441#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2442 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2443#endif 2727#endif
2444 } 2728 }
2445 2729
2446 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
… …
2449 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2450 { 2734 {
2451#if _WIN32 2735#if _WIN32
2452 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2453#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2454 struct sigaction sa; 2742 struct sigaction sa = { };
2455 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2456 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2457 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2458 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2459#endif 2748#endif
2460 } 2749 }
2461 2750
2462 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2463} 2752}
… …
2473 2762
2474 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2475 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2476 2765
2477 if (!signals [w->signum - 1].head) 2766 if (!signals [w->signum - 1].head)
2767#if EV_USE_SIGNALFD
2768 if (sigfd >= 0)
2769 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */
2775 }
2776 else
2777#endif
2478 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2479 2779
2480 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2481} 2781}
2482 2782
2483void 2783void
… …
3201 } 3501 }
3202} 3502}
3203 3503
3204/*****************************************************************************/ 3504/*****************************************************************************/
3205 3505
3206#if 0 3506#if EV_WALK_ENABLE
3207void 3507void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3508ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{ 3509{
3210 int i, j; 3510 int i, j;
3211 ev_watcher_list *wl, *wn; 3511 ev_watcher_list *wl, *wn;
… …
3227#if EV_USE_INOTIFY 3527#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb) 3528 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ; 3529 ;
3230 else 3530 else
3231#endif 3531#endif
3232 if ((ev_io *)wl != &pipeev) 3532 if ((ev_io *)wl != &pipe_w)
3233 if (types & EV_IO) 3533 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl); 3534 cb (EV_A_ EV_IO, wl);
3235 3535
3236 wl = wn; 3536 wl = wn;
3237 } 3537 }

Diff Legend

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