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.314 by root, Wed Aug 26 17:31:20 2009 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
176# endif 186# endif
177#endif 187#endif
178 188
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
180 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
344#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
345 434
346/**/ 435/**/
347 436
348#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
384# define inline_speed static noinline 473# define inline_speed static noinline
385#else 474#else
386# define inline_speed static inline 475# define inline_speed static inline
387#endif 476#endif
388 477
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
391 485
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
394 488
395typedef ev_watcher *W; 489typedef ev_watcher *W;
407 501
408#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 504#endif
411 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
412#ifdef _WIN32 516#ifdef _WIN32
413# include "ev_win32.c" 517# include "ev_win32.c"
414#endif 518#endif
415 519
416/*****************************************************************************/ 520/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
480 584
481/*****************************************************************************/ 585/*****************************************************************************/
482 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
483typedef struct 591typedef struct
484{ 592{
485 WL head; 593 WL head;
486 unsigned char events; 594 unsigned char events; /* the events watched for */
487 unsigned char reify; 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 597 unsigned char unused;
490#if EV_USE_EPOLL 598#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 600#endif
493#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 602 SOCKET handle;
495#endif 603#endif
496} ANFD; 604} ANFD;
497 605
606/* stores the pending event set for a given watcher */
498typedef struct 607typedef struct
499{ 608{
500 W w; 609 W w;
501 int events; 610 int events; /* the pending event set for the given watcher */
502} ANPENDING; 611} ANPENDING;
503 612
504#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
506typedef struct 615typedef struct
509} ANFS; 618} ANFS;
510#endif 619#endif
511 620
512/* Heap Entry */ 621/* Heap Entry */
513#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
514 typedef struct { 624 typedef struct {
515 ev_tstamp at; 625 ev_tstamp at;
516 WT w; 626 WT w;
517 } ANHE; 627 } ANHE;
518 628
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #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 */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 632#else
633 /* a heap element */
523 typedef WT ANHE; 634 typedef WT ANHE;
524 635
525 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
551 662
552 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
553 664
554#endif 665#endif
555 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
556/*****************************************************************************/ 679/*****************************************************************************/
557 680
681#ifndef EV_HAVE_EV_TIME
558ev_tstamp 682ev_tstamp
559ev_time (void) 683ev_time (void)
560{ 684{
561#if EV_USE_REALTIME 685#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 686 if (expect_true (have_realtime))
569 693
570 struct timeval tv; 694 struct timeval tv;
571 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 697}
698#endif
574 699
575inline_size ev_tstamp 700inline_size ev_tstamp
576get_clock (void) 701get_clock (void)
577{ 702{
578#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
614 739
615 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 742
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 745 /* by older ones */
621 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
622#endif 747#endif
623 } 748 }
624} 749}
625 750
626/*****************************************************************************/ 751/*****************************************************************************/
627 752
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 754
755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 757inline_size int
631array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
632{ 759{
633 int ncur = cur + 1; 760 int ncur = cur + 1;
634 761
680#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 809
683/*****************************************************************************/ 810/*****************************************************************************/
684 811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
817
685void noinline 818void noinline
686ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
687{ 820{
688 W w_ = (W)w; 821 W w_ = (W)w;
689 int pri = ABSPRI (w_); 822 int pri = ABSPRI (w_);
724} 857}
725 858
726/*****************************************************************************/ 859/*****************************************************************************/
727 860
728inline_speed void 861inline_speed void
729fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
730{ 863{
731 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
732 ev_io *w; 865 ev_io *w;
733 866
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 871 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
740 } 873 }
741} 874}
742 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
743void 887void
744ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 889{
746 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
748} 892}
749 893
894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
750inline_size void 896inline_size void
751fd_reify (EV_P) 897fd_reify (EV_P)
752{ 898{
753 int i; 899 int i;
754 900
765 911
766#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
767 if (events) 913 if (events)
768 { 914 {
769 unsigned long arg; 915 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 918 }
777#endif 919#endif
778 920
779 { 921 {
789 } 931 }
790 932
791 fdchangecnt = 0; 933 fdchangecnt = 0;
792} 934}
793 935
936/* something about the given fd changed */
794inline_size void 937inline_size void
795fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
796{ 939{
797 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
805 } 948 }
806} 949}
807 950
951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 952inline_speed void
809fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
810{ 954{
811 ev_io *w; 955 ev_io *w;
812 956
815 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 961 }
818} 962}
819 963
964/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 965inline_size int
821fd_valid (int fd) 966fd_valid (int fd)
822{ 967{
823#ifdef _WIN32 968#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
847 992
848 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 994 if (anfds [fd].events)
850 { 995 {
851 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
852 return; 997 break;
853 } 998 }
854} 999}
855 1000
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1002static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1008 if (anfds [fd].events)
864 { 1009 {
865 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1013 }
869} 1014}
870 1015
871/*****************************************************************************/ 1016/*****************************************************************************/
872 1017
947 1092
948 for (;;) 1093 for (;;)
949 { 1094 {
950 int c = k << 1; 1095 int c = k << 1;
951 1096
952 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
953 break; 1098 break;
954 1099
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1101 ? 1 : 0;
957 1102
989 1134
990 heap [k] = he; 1135 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
992} 1137}
993 1138
1139/* move an element suitably so it is in a correct place */
994inline_size void 1140inline_size void
995adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
996{ 1142{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1144 upheap (heap, k);
999 else 1145 else
1000 downheap (heap, N, k); 1146 downheap (heap, N, k);
1001} 1147}
1002 1148
1012 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
1013} 1159}
1014 1160
1015/*****************************************************************************/ 1161/*****************************************************************************/
1016 1162
1163/* associate signal watchers to a signal signal */
1017typedef struct 1164typedef struct
1018{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1019 WL head; 1170 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1171} ANSIG;
1022 1172
1023static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1174
1028/*****************************************************************************/ 1175/*****************************************************************************/
1029 1176
1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1030inline_speed void 1179inline_speed void
1031fd_intern (int fd) 1180fd_intern (int fd)
1032{ 1181{
1033#ifdef _WIN32 1182#ifdef _WIN32
1034 unsigned long arg = 1; 1183 unsigned long arg = 1;
1040} 1189}
1041 1190
1042static void noinline 1191static void noinline
1043evpipe_init (EV_P) 1192evpipe_init (EV_P)
1044{ 1193{
1045 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
1046 { 1195 {
1047#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1049 { 1202 {
1050 evpipe [0] = -1; 1203 evpipe [0] = -1;
1051 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1206 }
1054 else 1207 else
1055#endif 1208#endif
1056 { 1209 {
1057 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1059 1212
1060 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1216 }
1064 1217
1065 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1220 }
1068} 1221}
1069 1222
1070inline_size void 1223inline_size void
1088 1241
1089 errno = old_errno; 1242 errno = old_errno;
1090 } 1243 }
1091} 1244}
1092 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1093static void 1248static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1250{
1251 int i;
1252
1096#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1254 if (evfd >= 0)
1098 { 1255 {
1099 uint64_t counter; 1256 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1104 { 1261 {
1105 char dummy; 1262 char dummy;
1106 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1107 } 1264 }
1108 1265
1109 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1110 { 1267 {
1111 int signum; 1268 sig_pending = 0;
1112 gotsig = 0;
1113 1269
1114 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1273 }
1118 1274
1119#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1120 if (gotasync) 1276 if (async_pending)
1121 { 1277 {
1122 int i; 1278 async_pending = 0;
1123 gotasync = 0;
1124 1279
1125 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1127 { 1282 {
1128 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1136 1291
1137static void 1292static void
1138ev_sighandler (int signum) 1293ev_sighandler (int signum)
1139{ 1294{
1140#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1142#endif 1297#endif
1143 1298
1144#if _WIN32 1299#if _WIN32
1145 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1146#endif 1301#endif
1147 1302
1148 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1150} 1305}
1151 1306
1152void noinline 1307void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1154{ 1309{
1155 WL w; 1310 WL w;
1156 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1157#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1320
1161 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1322 return;
1323#endif
1165 1324
1166 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1167 1326
1168 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1329}
1171 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1172/*****************************************************************************/ 1351/*****************************************************************************/
1173 1352
1174static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1175 1354
1176#ifndef _WIN32 1355#ifndef _WIN32
1179 1358
1180#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1182#endif 1361#endif
1183 1362
1363/* handle a single child status event */
1184inline_speed void 1364inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1186{ 1366{
1187 ev_child *w; 1367 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1382
1203#ifndef WCONTINUED 1383#ifndef WCONTINUED
1204# define WCONTINUED 0 1384# define WCONTINUED 0
1205#endif 1385#endif
1206 1386
1387/* called on sigchld etc., calls waitpid */
1207static void 1388static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1390{
1210 int pid, status; 1391 int pid, status;
1211 1392
1318ev_backend (EV_P) 1499ev_backend (EV_P)
1319{ 1500{
1320 return backend; 1501 return backend;
1321} 1502}
1322 1503
1504#if EV_MINIMAL < 2
1323unsigned int 1505unsigned int
1324ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1325{ 1507{
1326 return loop_count; 1508 return loop_count;
1327} 1509}
1328 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1329void 1517void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1519{
1332 io_blocktime = interval; 1520 io_blocktime = interval;
1333} 1521}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1525{
1338 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1339} 1527}
1340 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1554static void noinline
1342loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1343{ 1556{
1344 if (!backend) 1557 if (!backend)
1345 { 1558 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1575 have_monotonic = 1;
1363 } 1576 }
1364#endif 1577#endif
1365 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1366 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1591 mn_now = get_clock ();
1368 now_floor = mn_now; 1592 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1370 1597
1371 io_blocktime = 0.; 1598 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1373 backend = 0; 1600 backend = 0;
1374 backend_fd = -1; 1601 backend_fd = -1;
1375 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1376#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1377 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1608#endif
1379 1609#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1611#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1612
1391 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1393 1615
1394#if EV_USE_PORT 1616#if EV_USE_PORT
1405#endif 1627#endif
1406#if EV_USE_SELECT 1628#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1630#endif
1409 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1410 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1636 }
1413} 1637}
1414 1638
1639/* free up a loop structure */
1415static void noinline 1640static void noinline
1416loop_destroy (EV_P) 1641loop_destroy (EV_P)
1417{ 1642{
1418 int i; 1643 int i;
1419 1644
1420 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1421 { 1646 {
1422 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1649
1425#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1651 if (evfd >= 0)
1427 close (evfd); 1652 close (evfd);
1428#endif 1653#endif
1429 1654
1430 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1431 { 1656 {
1432 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1659 }
1435 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1436 1671
1437#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1439 close (fs_fd); 1674 close (fs_fd);
1440#endif 1675#endif
1464#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1700 array_free (idle, [i]);
1466#endif 1701#endif
1467 } 1702 }
1468 1703
1469 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1705
1471 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1707 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1505#endif 1740#endif
1506#if EV_USE_INOTIFY 1741#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1742 infy_fork (EV_A);
1508#endif 1743#endif
1509 1744
1510 if (ev_is_active (&pipeev)) 1745 if (ev_is_active (&pipe_w))
1511 { 1746 {
1512 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1514 gotsig = 1; 1749 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1751 async_pending = 1;
1517#endif 1752#endif
1518 1753
1519 ev_ref (EV_A); 1754 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1755 ev_io_stop (EV_A_ &pipe_w);
1521 1756
1522#if EV_USE_EVENTFD 1757#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1758 if (evfd >= 0)
1524 close (evfd); 1759 close (evfd);
1525#endif 1760#endif
1526 1761
1527 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1528 { 1763 {
1529 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1766 }
1532 1767
1533 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1771 }
1537 1772
1538 postfork = 0; 1773 postfork = 0;
1539} 1774}
1540 1775
1541#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1542 1777
1543struct ev_loop * 1778struct ev_loop *
1544ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1545{ 1780{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1782
1548 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1551 1785
1552 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1553 return loop; 1787 return EV_A;
1554 1788
1555 return 0; 1789 return 0;
1556} 1790}
1557 1791
1558void 1792void
1565void 1799void
1566ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1567{ 1801{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1569} 1803}
1804#endif /* multiplicity */
1570 1805
1571#if EV_VERIFY 1806#if EV_VERIFY
1572static void noinline 1807static void noinline
1573verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1574{ 1809{
1602 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1603 } 1838 }
1604} 1839}
1605#endif 1840#endif
1606 1841
1842#if EV_MINIMAL < 2
1607void 1843void
1608ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1609{ 1845{
1610#if EV_VERIFY 1846#if EV_VERIFY
1611 int i; 1847 int i;
1660 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1898
1663# if 0 1899# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 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) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1902# endif
1903#endif
1668} 1904}
1669 1905#endif
1670#endif /* multiplicity */
1671 1906
1672#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1673struct ev_loop * 1908struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1675#else 1910#else
1678#endif 1913#endif
1679{ 1914{
1680 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1681 { 1916 {
1682#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1919#else
1685 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1686#endif 1921#endif
1687 1922
1688 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
1705 1940
1706void 1941void
1707ev_default_destroy (void) 1942ev_default_destroy (void)
1708{ 1943{
1709#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1711#endif 1946#endif
1712 1947
1713 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1714 1949
1715#ifndef _WIN32 1950#ifndef _WIN32
1722 1957
1723void 1958void
1724ev_default_fork (void) 1959ev_default_fork (void)
1725{ 1960{
1726#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1728#endif 1963#endif
1729 1964
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1966}
1732 1967
1736ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1737{ 1972{
1738 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1739} 1974}
1740 1975
1741inline_speed void 1976unsigned int
1742call_pending (EV_P) 1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1989ev_invoke_pending (EV_P)
1743{ 1990{
1744 int pri; 1991 int pri;
1745 1992
1746 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
1748 { 1995 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1996 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 1997
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1998 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1999 /* ^ this is no longer true, as pending_w could be here */
1754 2000
1755 p->w->pending = 0; 2001 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2002 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2003 EV_FREQUENT_CHECK;
1758 }
1759 } 2004 }
1760} 2005}
1761 2006
1762#if EV_IDLE_ENABLE 2007#if EV_IDLE_ENABLE
2008/* make idle watchers pending. this handles the "call-idle */
2009/* only when higher priorities are idle" logic */
1763inline_size void 2010inline_size void
1764idle_reify (EV_P) 2011idle_reify (EV_P)
1765{ 2012{
1766 if (expect_false (idleall)) 2013 if (expect_false (idleall))
1767 { 2014 {
1780 } 2027 }
1781 } 2028 }
1782} 2029}
1783#endif 2030#endif
1784 2031
2032/* make timers pending */
1785inline_size void 2033inline_size void
1786timers_reify (EV_P) 2034timers_reify (EV_P)
1787{ 2035{
1788 EV_FREQUENT_CHECK; 2036 EV_FREQUENT_CHECK;
1789 2037
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2066 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2067 }
1820} 2068}
1821 2069
1822#if EV_PERIODIC_ENABLE 2070#if EV_PERIODIC_ENABLE
2071/* make periodics pending */
1823inline_size void 2072inline_size void
1824periodics_reify (EV_P) 2073periodics_reify (EV_P)
1825{ 2074{
1826 EV_FREQUENT_CHECK; 2075 EV_FREQUENT_CHECK;
1827 2076
1874 2123
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2124 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2125 }
1877} 2126}
1878 2127
2128/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2130static void noinline
1880periodics_reschedule (EV_P) 2131periodics_reschedule (EV_P)
1881{ 2132{
1882 int i; 2133 int i;
1883 2134
1896 2147
1897 reheap (periodics, periodiccnt); 2148 reheap (periodics, periodiccnt);
1898} 2149}
1899#endif 2150#endif
1900 2151
2152/* adjust all timers by a given offset */
1901static void noinline 2153static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2154timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2155{
1904 int i; 2156 int i;
1905 2157
1909 ANHE_w (*he)->at += adjust; 2161 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2162 ANHE_at_cache (*he);
1911 } 2163 }
1912} 2164}
1913 2165
2166/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */
1914inline_speed void 2168inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2169time_update (EV_P_ ev_tstamp max_block)
1916{ 2170{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2171#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2172 if (expect_true (have_monotonic))
1921 { 2173 {
2174 int i;
1922 ev_tstamp odiff = rtmn_diff; 2175 ev_tstamp odiff = rtmn_diff;
1923 2176
1924 mn_now = get_clock (); 2177 mn_now = get_clock ();
1925 2178
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2179 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1976 2229
1977 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
1978 } 2231 }
1979} 2232}
1980 2233
1981static int loop_done;
1982
1983void 2234void
1984ev_loop (EV_P_ int flags) 2235ev_loop (EV_P_ int flags)
1985{ 2236{
2237#if EV_MINIMAL < 2
2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242
1986 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
1987 2244
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2246
1990 do 2247 do
1991 { 2248 {
1992#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
2006 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2264 if (expect_false (postfork))
2008 if (forkcnt) 2265 if (forkcnt)
2009 { 2266 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
2012 } 2269 }
2013#endif 2270#endif
2014 2271
2015 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
2017 { 2274 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
2020 } 2277 }
2278
2279 if (expect_false (loop_done))
2280 break;
2021 2281
2022 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2283 if (expect_false (postfork))
2024 loop_fork (EV_A); 2284 loop_fork (EV_A);
2025 2285
2031 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
2033 2293
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2036 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
2038 2301
2039 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
2040 2303
2050 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2051 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
2052 } 2315 }
2053#endif 2316#endif
2054 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
2055 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
2056 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
2057 2321
2058 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
2059
2060 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
2061 sleeptime = io_blocktime;
2062
2063 if (sleeptime)
2064 { 2324 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326
2327 if (sleeptime > waittime - backend_fudge)
2328 sleeptime = waittime - backend_fudge;
2329
2330 if (expect_true (sleeptime > 0.))
2331 {
2065 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
2066 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
2067 } 2335 }
2068 } 2336 }
2069 2337
2338#if EV_MINIMAL < 2
2070 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2071 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2072 2344
2073 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2074 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2075 } 2347 }
2076 2348
2087 2359
2088 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2089 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2090 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2091 2363
2092 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2093 } 2365 }
2094 while (expect_true ( 2366 while (expect_true (
2095 activecnt 2367 activecnt
2096 && !loop_done 2368 && !loop_done
2097 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2098 )); 2370 ));
2099 2371
2100 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2101 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2102} 2378}
2103 2379
2104void 2380void
2105ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2106{ 2382{
2137 ev_tstamp mn_prev = mn_now; 2413 ev_tstamp mn_prev = mn_now;
2138 2414
2139 ev_now_update (EV_A); 2415 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev); 2416 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE 2417#if EV_PERIODIC_ENABLE
2418 /* TODO: really do this? */
2142 periodics_reschedule (EV_A); 2419 periodics_reschedule (EV_A);
2143#endif 2420#endif
2144} 2421}
2145 2422
2146/*****************************************************************************/ 2423/*****************************************************************************/
2424/* singly-linked list management, used when the expected list length is short */
2147 2425
2148inline_size void 2426inline_size void
2149wlist_add (WL *head, WL elem) 2427wlist_add (WL *head, WL elem)
2150{ 2428{
2151 elem->next = *head; 2429 elem->next = *head;
2155inline_size void 2433inline_size void
2156wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2157{ 2435{
2158 while (*head) 2436 while (*head)
2159 { 2437 {
2160 if (*head == elem) 2438 if (expect_true (*head == elem))
2161 { 2439 {
2162 *head = elem->next; 2440 *head = elem->next;
2163 return; 2441 break;
2164 } 2442 }
2165 2443
2166 head = &(*head)->next; 2444 head = &(*head)->next;
2167 } 2445 }
2168} 2446}
2169 2447
2448/* internal, faster, version of ev_clear_pending */
2170inline_speed void 2449inline_speed void
2171clear_pending (EV_P_ W w) 2450clear_pending (EV_P_ W w)
2172{ 2451{
2173 if (w->pending) 2452 if (w->pending)
2174 { 2453 {
2175 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2454 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2176 w->pending = 0; 2455 w->pending = 0;
2177 } 2456 }
2178} 2457}
2179 2458
2180int 2459int
2184 int pending = w_->pending; 2463 int pending = w_->pending;
2185 2464
2186 if (expect_true (pending)) 2465 if (expect_true (pending))
2187 { 2466 {
2188 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2467 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2468 p->w = (W)&pending_w;
2189 w_->pending = 0; 2469 w_->pending = 0;
2190 p->w = 0;
2191 return p->events; 2470 return p->events;
2192 } 2471 }
2193 else 2472 else
2194 return 0; 2473 return 0;
2195} 2474}
2196 2475
2197inline_size void 2476inline_size void
2198pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2199{ 2478{
2200 int pri = w->priority; 2479 int pri = ev_priority (w);
2201 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2202 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2203 w->priority = pri; 2482 ev_set_priority (w, pri);
2204} 2483}
2205 2484
2206inline_speed void 2485inline_speed void
2207ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2208{ 2487{
2235 2514
2236 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2237 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2238 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2239 2518
2240 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2241 w->events &= ~EV__IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2242 2521
2243 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2244} 2523}
2245 2524
2339 } 2618 }
2340 2619
2341 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2342} 2621}
2343 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2344#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2345void noinline 2630void noinline
2346ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2347{ 2632{
2348 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2415#endif 2700#endif
2416 2701
2417void noinline 2702void noinline
2418ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2419{ 2704{
2420#if EV_MULTIPLICITY
2421 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2422#endif
2423 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2424 return; 2706 return;
2425 2707
2426 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2427 2709
2428 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2429 2713
2430 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2431 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2432 { 2721 {
2433#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2434 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2435 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2436 sigprocmask (SIG_SETMASK, &full, &prev);
2437#endif
2438 2725
2439 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2440 2729
2441#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2442 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2443#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2444 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2445 2748
2446 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2447 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2448 2751
2449 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2450 { 2756 {
2451#if _WIN32 2757# if _WIN32
2452 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2453#else 2759# else
2454 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2455 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2456 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2457 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2458 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2459#endif 2772#endif
2460 } 2773 }
2461 2774
2462 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2463} 2776}
2464 2777
2465void noinline 2778void noinline
2473 2786
2474 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2475 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2476 2789
2477 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2478 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2479 2808
2480 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2481} 2810}
2482 2811
2483void 2812void
2563 } 2892 }
2564 } 2893 }
2565 2894
2566 if (w->wd >= 0) 2895 if (w->wd >= 0)
2567 { 2896 {
2897 struct statfs sfs;
2898
2568 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2569 2900
2570 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* now local changes will be tracked by inotify, but remote changes won't */
2571 /* unless the filesystem it known to be local, we therefore still poll */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2572 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2573 struct statfs sfs;
2574 2904
2575 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2576 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2577 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2578 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
2963embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2964{ 3294{
2965 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3295 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2966 3296
2967 { 3297 {
2968 struct ev_loop *loop = w->other; 3298 EV_P = w->other;
2969 3299
2970 while (fdchangecnt) 3300 while (fdchangecnt)
2971 { 3301 {
2972 fd_reify (EV_A); 3302 fd_reify (EV_A);
2973 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3303 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2981 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3311 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2982 3312
2983 ev_embed_stop (EV_A_ w); 3313 ev_embed_stop (EV_A_ w);
2984 3314
2985 { 3315 {
2986 struct ev_loop *loop = w->other; 3316 EV_P = w->other;
2987 3317
2988 ev_loop_fork (EV_A); 3318 ev_loop_fork (EV_A);
2989 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3319 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2990 } 3320 }
2991 3321
3005{ 3335{
3006 if (expect_false (ev_is_active (w))) 3336 if (expect_false (ev_is_active (w)))
3007 return; 3337 return;
3008 3338
3009 { 3339 {
3010 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
3011 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3341 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3012 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3342 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3013 } 3343 }
3014 3344
3015 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3127 3457
3128void 3458void
3129ev_async_send (EV_P_ ev_async *w) 3459ev_async_send (EV_P_ ev_async *w)
3130{ 3460{
3131 w->sent = 1; 3461 w->sent = 1;
3132 evpipe_write (EV_A_ &gotasync); 3462 evpipe_write (EV_A_ &async_pending);
3133} 3463}
3134#endif 3464#endif
3135 3465
3136/*****************************************************************************/ 3466/*****************************************************************************/
3137 3467
3201 } 3531 }
3202} 3532}
3203 3533
3204/*****************************************************************************/ 3534/*****************************************************************************/
3205 3535
3206#if 0 3536#if EV_WALK_ENABLE
3207void 3537void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3538ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{ 3539{
3210 int i, j; 3540 int i, j;
3211 ev_watcher_list *wl, *wn; 3541 ev_watcher_list *wl, *wn;
3227#if EV_USE_INOTIFY 3557#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb) 3558 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ; 3559 ;
3230 else 3560 else
3231#endif 3561#endif
3232 if ((ev_io *)wl != &pipeev) 3562 if ((ev_io *)wl != &pipe_w)
3233 if (types & EV_IO) 3563 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl); 3564 cb (EV_A_ EV_IO, wl);
3235 3565
3236 wl = wn; 3566 wl = wn;
3237 } 3567 }
3286 if (types & EV_CHECK) 3616 if (types & EV_CHECK)
3287 for (i = checkcnt; i--; ) 3617 for (i = checkcnt; i--; )
3288 cb (EV_A_ EV_CHECK, checks [i]); 3618 cb (EV_A_ EV_CHECK, checks [i]);
3289 3619
3290 if (types & EV_SIGNAL) 3620 if (types & EV_SIGNAL)
3291 for (i = 0; i < signalmax; ++i) 3621 for (i = 0; i < EV_NSIG - 1; ++i)
3292 for (wl = signals [i].head; wl; ) 3622 for (wl = signals [i].head; wl; )
3293 { 3623 {
3294 wn = wl->next; 3624 wn = wl->next;
3295 cb (EV_A_ EV_SIGNAL, wl); 3625 cb (EV_A_ EV_SIGNAL, wl);
3296 wl = wn; 3626 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines