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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC

110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 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
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
178# endif 187# endif
179#endif 188#endif
180 189
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
182 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
268# endif 304# endif
269#endif 305#endif
270 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
275#endif 319#endif
282# define EV_USE_4HEAP !EV_MINIMAL 326# define EV_USE_4HEAP !EV_MINIMAL
283#endif 327#endif
284 328
285#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 331#endif
326 332
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 334/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 335#if EV_USE_CLOCK_SYSCALL
336# undef EV_USE_CLOCK_SYSCALL 342# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 343# define EV_USE_CLOCK_SYSCALL 0
338# endif 344# endif
339#endif 345#endif
340 346
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
355#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0
358#endif
359
360#ifndef CLOCK_REALTIME
361# undef EV_USE_REALTIME
362# define EV_USE_REALTIME 0
363#endif
364
365#if !EV_STAT_ENABLE
366# undef EV_USE_INOTIFY
367# define EV_USE_INOTIFY 0
368#endif
369
370#if !EV_USE_NANOSLEEP
371# ifndef _WIN32
372# include <sys/select.h>
373# endif
374#endif
375
376#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h>
379# include <sys/inotify.h>
380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
381# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY
383# define EV_USE_INOTIFY 0
384# endif
385#endif
386
387#if EV_SELECT_IS_WINSOCKET
388# include <winsock.h>
389#endif
390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* 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 */
343# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
403# endif
344# ifdef __cplusplus 404# ifdef __cplusplus
345extern "C" { 405extern "C" {
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 408# ifdef __cplusplus
349} 409}
350# endif 410# endif
351#endif 411#endif
412
413#if EV_USE_SIGNALFD
414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
352 441
353/**/ 442/**/
354 443
355#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 457 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 459
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
391# define inline_speed static noinline 479# define inline_speed static noinline
392#else 480#else
393# define inline_speed static inline 481# define inline_speed static inline
394#endif 482#endif
395 483
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
488#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
398 491
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
401 494
402typedef ev_watcher *W; 495typedef ev_watcher *W;
414 507
415#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 510#endif
418 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
419#ifdef _WIN32 522#ifdef _WIN32
420# include "ev_win32.c" 523# include "ev_win32.c"
421#endif 524#endif
422 525
423/*****************************************************************************/ 526/*****************************************************************************/
485#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
487 590
488/*****************************************************************************/ 591/*****************************************************************************/
489 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
490/* file descriptor info structure */ 596/* file descriptor info structure */
491typedef struct 597typedef struct
492{ 598{
493 WL head; 599 WL head;
494 unsigned char events; /* the events watched for */ 600 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 601 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 602 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 603 unsigned char unused;
498#if EV_USE_EPOLL 604#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 605 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 606#endif
562 668
563 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
564 670
565#endif 671#endif
566 672
673#if EV_MINIMAL < 2
674# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
675# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
676# define EV_INVOKE_PENDING invoke_cb (EV_A)
677#else
678# define EV_RELEASE_CB (void)0
679# define EV_ACQUIRE_CB (void)0
680# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
681#endif
682
683#define EVUNLOOP_RECURSE 0x80
684
567/*****************************************************************************/ 685/*****************************************************************************/
568 686
687#ifndef EV_HAVE_EV_TIME
569ev_tstamp 688ev_tstamp
570ev_time (void) 689ev_time (void)
571{ 690{
572#if EV_USE_REALTIME 691#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 692 if (expect_true (have_realtime))
580 699
581 struct timeval tv; 700 struct timeval tv;
582 gettimeofday (&tv, 0); 701 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 702 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 703}
704#endif
585 705
586inline_size ev_tstamp 706inline_size ev_tstamp
587get_clock (void) 707get_clock (void)
588{ 708{
589#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
625 745
626 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 748
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 749 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 750 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 751 /* by older ones */
632 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
633#endif 753#endif
634 } 754 }
635} 755}
743} 863}
744 864
745/*****************************************************************************/ 865/*****************************************************************************/
746 866
747inline_speed void 867inline_speed void
748fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
749{ 869{
750 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
751 ev_io *w; 871 ev_io *w;
752 872
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 873 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
757 if (ev) 877 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
759 } 879 }
760} 880}
761 881
882/* do not submit kernel events for fds that have reify set */
883/* because that means they changed while we were polling for new events */
884inline_speed void
885fd_event (EV_P_ int fd, int revents)
886{
887 ANFD *anfd = anfds + fd;
888
889 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents);
891}
892
762void 893void
763ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 895{
765 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
767} 898}
768 899
769/* make sure the external fd watch events are in-sync */ 900/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 901/* with the kernel/libev internal state */
771inline_size void 902inline_size void
786 917
787#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
788 if (events) 919 if (events)
789 { 920 {
790 unsigned long arg; 921 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 924 }
798#endif 925#endif
799 926
800 { 927 {
843/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
844inline_size int 971inline_size int
845fd_valid (int fd) 972fd_valid (int fd)
846{ 973{
847#ifdef _WIN32 974#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 976#else
850 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
851#endif 978#endif
852} 979}
853 980
871 998
872 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1000 if (anfds [fd].events)
874 { 1001 {
875 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
876 return; 1003 break;
877 } 1004 }
878} 1005}
879 1006
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 1008static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1014 if (anfds [fd].events)
888 { 1015 {
889 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1017 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1019 }
893} 1020}
894 1021
895/*****************************************************************************/ 1022/*****************************************************************************/
896 1023
971 1098
972 for (;;) 1099 for (;;)
973 { 1100 {
974 int c = k << 1; 1101 int c = k << 1;
975 1102
976 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
977 break; 1104 break;
978 1105
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1107 ? 1 : 0;
981 1108
1017 1144
1018/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1019inline_size void 1146inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1021{ 1148{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1150 upheap (heap, k);
1024 else 1151 else
1025 downheap (heap, N, k); 1152 downheap (heap, N, k);
1026} 1153}
1027 1154
1040/*****************************************************************************/ 1167/*****************************************************************************/
1041 1168
1042/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1043typedef struct 1170typedef struct
1044{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1045 WL head; 1176 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1177} ANSIG;
1048 1178
1049static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1180
1054/*****************************************************************************/ 1181/*****************************************************************************/
1055 1182
1056/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1184/* this is not fork-safe */
1058inline_speed void 1185inline_speed void
1059fd_intern (int fd) 1186fd_intern (int fd)
1060{ 1187{
1061#ifdef _WIN32 1188#ifdef _WIN32
1062 unsigned long arg = 1; 1189 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1064#else 1191#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif 1194#endif
1068} 1195}
1071evpipe_init (EV_P) 1198evpipe_init (EV_P)
1072{ 1199{
1073 if (!ev_is_active (&pipe_w)) 1200 if (!ev_is_active (&pipe_w))
1074 { 1201 {
1075#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1077 { 1208 {
1078 evpipe [0] = -1; 1209 evpipe [0] = -1;
1079 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1212 }
1082 else 1213 else
1083#endif 1214#endif
1084 { 1215 {
1121/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1123static void 1254static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1256{
1257 int i;
1258
1126#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1260 if (evfd >= 0)
1128 { 1261 {
1129 uint64_t counter; 1262 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
1134 { 1267 {
1135 char dummy; 1268 char dummy;
1136 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1137 } 1270 }
1138 1271
1139 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1140 { 1273 {
1141 int signum; 1274 sig_pending = 0;
1142 gotsig = 0;
1143 1275
1144 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1279 }
1148 1280
1149#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1150 if (gotasync) 1282 if (async_pending)
1151 { 1283 {
1152 int i; 1284 async_pending = 0;
1153 gotasync = 0;
1154 1285
1155 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1157 { 1288 {
1158 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
1166 1297
1167static void 1298static void
1168ev_sighandler (int signum) 1299ev_sighandler (int signum)
1169{ 1300{
1170#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1172#endif 1303#endif
1173 1304
1174#if _WIN32 1305#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1176#endif 1307#endif
1177 1308
1178 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1180} 1311}
1181 1312
1182void noinline 1313void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1184{ 1315{
1185 WL w; 1316 WL w;
1186 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1187#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1326
1191 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1328 return;
1329#endif
1195 1330
1196 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1197 1332
1198 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1335}
1336
1337#if EV_USE_SIGNALFD
1338static void
1339sigfdcb (EV_P_ ev_io *iow, int revents)
1340{
1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1342
1343 for (;;)
1344 {
1345 ssize_t res = read (sigfd, si, sizeof (si));
1346
1347 /* not ISO-C, as res might be -1, but works with SuS */
1348 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1349 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1350
1351 if (res < (ssize_t)sizeof (si))
1352 break;
1353 }
1354}
1355#endif
1201 1356
1202/*****************************************************************************/ 1357/*****************************************************************************/
1203 1358
1204static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1205 1360
1350ev_backend (EV_P) 1505ev_backend (EV_P)
1351{ 1506{
1352 return backend; 1507 return backend;
1353} 1508}
1354 1509
1510#if EV_MINIMAL < 2
1355unsigned int 1511unsigned int
1356ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1357{ 1513{
1358 return loop_count; 1514 return loop_count;
1359} 1515}
1360 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1361void 1523void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1525{
1364 io_blocktime = interval; 1526 io_blocktime = interval;
1365} 1527}
1367void 1529void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1531{
1370 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1371} 1533}
1534
1535void
1536ev_set_userdata (EV_P_ void *data)
1537{
1538 userdata = data;
1539}
1540
1541void *
1542ev_userdata (EV_P)
1543{
1544 return userdata;
1545}
1546
1547void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1548{
1549 invoke_cb = invoke_pending_cb;
1550}
1551
1552void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1553{
1554 release_cb = release;
1555 acquire_cb = acquire;
1556}
1557#endif
1372 1558
1373/* initialise a loop structure, must be zero-initialised */ 1559/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1560static void noinline
1375loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1376{ 1562{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1581 have_monotonic = 1;
1396 } 1582 }
1397#endif 1583#endif
1398 1584
1585 /* pid check not overridable via env */
1586#ifndef _WIN32
1587 if (flags & EVFLAG_FORKCHECK)
1588 curpid = getpid ();
1589#endif
1590
1591 if (!(flags & EVFLAG_NOENV)
1592 && !enable_secure ()
1593 && getenv ("LIBEV_FLAGS"))
1594 flags = atoi (getenv ("LIBEV_FLAGS"));
1595
1399 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1597 mn_now = get_clock ();
1401 now_floor = mn_now; 1598 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1600#if EV_MINIMAL < 2
1601 invoke_cb = ev_invoke_pending;
1602#endif
1403 1603
1404 io_blocktime = 0.; 1604 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1406 backend = 0; 1606 backend = 0;
1407 backend_fd = -1; 1607 backend_fd = -1;
1408 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1409#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1410 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1614#endif
1412 1615#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1617#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1618
1424 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1426 1621
1427#if EV_USE_PORT 1622#if EV_USE_PORT
1453{ 1648{
1454 int i; 1649 int i;
1455 1650
1456 if (ev_is_active (&pipe_w)) 1651 if (ev_is_active (&pipe_w))
1457 { 1652 {
1458 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1655
1461#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1657 if (evfd >= 0)
1463 close (evfd); 1658 close (evfd);
1464#endif 1659#endif
1465 1660
1466 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1467 { 1662 {
1468 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1665 }
1471 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1472 1672
1473#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1475 close (fs_fd); 1675 close (fs_fd);
1476#endif 1676#endif
1500#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1701 array_free (idle, [i]);
1502#endif 1702#endif
1503 } 1703 }
1504 1704
1505 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1706
1507 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1545 1745
1546 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1547 { 1747 {
1548 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1550 gotsig = 1; 1750 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1752 async_pending = 1;
1553#endif 1753#endif
1554 1754
1555 ev_ref (EV_A); 1755 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1557 1757
1560 close (evfd); 1760 close (evfd);
1561#endif 1761#endif
1562 1762
1563 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1564 { 1764 {
1565 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1767 }
1568 1768
1569 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1577#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1578 1778
1579struct ev_loop * 1779struct ev_loop *
1580ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1581{ 1781{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1782 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1783
1584 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1587 1786
1588 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1589 return loop; 1788 return EV_A;
1590 1789
1591 return 0; 1790 return 0;
1592} 1791}
1593 1792
1594void 1793void
1601void 1800void
1602ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1603{ 1802{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1605} 1804}
1805#endif /* multiplicity */
1606 1806
1607#if EV_VERIFY 1807#if EV_VERIFY
1608static void noinline 1808static void noinline
1609verify_watcher (EV_P_ W w) 1809verify_watcher (EV_P_ W w)
1610{ 1810{
1638 verify_watcher (EV_A_ ws [cnt]); 1838 verify_watcher (EV_A_ ws [cnt]);
1639 } 1839 }
1640} 1840}
1641#endif 1841#endif
1642 1842
1843#if EV_MINIMAL < 2
1643void 1844void
1644ev_loop_verify (EV_P) 1845ev_loop_verify (EV_P)
1645{ 1846{
1646#if EV_VERIFY 1847#if EV_VERIFY
1647 int i; 1848 int i;
1696 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1899
1699# if 0 1900# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1903# endif
1904#endif
1704} 1905}
1705 1906#endif
1706#endif /* multiplicity */
1707 1907
1708#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1709struct ev_loop * 1909struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1910ev_default_loop_init (unsigned int flags)
1711#else 1911#else
1714#endif 1914#endif
1715{ 1915{
1716 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1717 { 1917 {
1718#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1920#else
1721 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1722#endif 1922#endif
1723 1923
1724 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1741 1941
1742void 1942void
1743ev_default_destroy (void) 1943ev_default_destroy (void)
1744{ 1944{
1745#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1747#endif 1947#endif
1748 1948
1749 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1750 1950
1751#ifndef _WIN32 1951#ifndef _WIN32
1758 1958
1759void 1959void
1760ev_default_fork (void) 1960ev_default_fork (void)
1761{ 1961{
1762#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1764#endif 1964#endif
1765 1965
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1967}
1768 1968
1772ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1773{ 1973{
1774 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1775} 1975}
1776 1976
1777inline_speed void 1977unsigned int
1778call_pending (EV_P) 1978ev_pending_count (EV_P)
1979{
1980 int pri;
1981 unsigned int count = 0;
1982
1983 for (pri = NUMPRI; pri--; )
1984 count += pendingcnt [pri];
1985
1986 return count;
1987}
1988
1989void noinline
1990ev_invoke_pending (EV_P)
1779{ 1991{
1780 int pri; 1992 int pri;
1781 1993
1782 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1951 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
1952 } 2164 }
1953} 2165}
1954 2166
1955/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2169inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1959{ 2171{
1960#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
2018 2230
2019 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
2020 } 2232 }
2021} 2233}
2022 2234
2023static int loop_done;
2024
2025void 2235void
2026ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
2027{ 2237{
2238#if EV_MINIMAL < 2
2239 ++loop_depth;
2240#endif
2241
2242 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2243
2028 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
2029 2245
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2246 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2247
2032 do 2248 do
2033 { 2249 {
2034#if EV_VERIFY >= 2 2250#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2251 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2265 if (expect_false (postfork))
2050 if (forkcnt) 2266 if (forkcnt)
2051 { 2267 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
2054 } 2270 }
2055#endif 2271#endif
2056 2272
2057 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
2059 { 2275 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
2062 } 2278 }
2279
2280 if (expect_false (loop_done))
2281 break;
2063 2282
2064 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2284 if (expect_false (postfork))
2066 loop_fork (EV_A); 2285 loop_fork (EV_A);
2067 2286
2073 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
2075 2294
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
2078 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
2080 2302
2081 waittime = MAX_BLOCKTIME; 2303 waittime = MAX_BLOCKTIME;
2082 2304
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2314 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
2094 } 2316 }
2095#endif 2317#endif
2096 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
2099 2322
2100 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2325 {
2326 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2327
2328 if (sleeptime > waittime - backend_fudge)
2329 sleeptime = waittime - backend_fudge;
2330
2331 if (expect_true (sleeptime > 0.))
2332 {
2107 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
2109 } 2336 }
2110 } 2337 }
2111 2338
2339#if EV_MINIMAL < 2
2112 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2345
2115 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2117 } 2348 }
2118 2349
2129 2360
2130 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2364
2134 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
2135 } 2366 }
2136 while (expect_true ( 2367 while (expect_true (
2137 activecnt 2368 activecnt
2138 && !loop_done 2369 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2371 ));
2141 2372
2142 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
2144} 2379}
2145 2380
2146void 2381void
2147ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
2148{ 2383{
2199inline_size void 2434inline_size void
2200wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2201{ 2436{
2202 while (*head) 2437 while (*head)
2203 { 2438 {
2204 if (*head == elem) 2439 if (expect_true (*head == elem))
2205 { 2440 {
2206 *head = elem->next; 2441 *head = elem->next;
2207 return; 2442 break;
2208 } 2443 }
2209 2444
2210 head = &(*head)->next; 2445 head = &(*head)->next;
2211 } 2446 }
2212} 2447}
2240} 2475}
2241 2476
2242inline_size void 2477inline_size void
2243pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
2244{ 2479{
2245 int pri = w->priority; 2480 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2483 ev_set_priority (w, pri);
2249} 2484}
2250 2485
2251inline_speed void 2486inline_speed void
2252ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
2253{ 2488{
2280 2515
2281 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2284 2519
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2287 2522
2288 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2289} 2524}
2290 2525
2384 } 2619 }
2385 2620
2386 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2387} 2622}
2388 2623
2624ev_tstamp
2625ev_timer_remaining (EV_P_ ev_timer *w)
2626{
2627 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2628}
2629
2389#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2390void noinline 2631void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2633{
2393 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2460#endif 2701#endif
2461 2702
2462void noinline 2703void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2464{ 2705{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2469 return; 2707 return;
2470 2708
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2710
2473 evpipe_init (EV_A); 2711#if EV_MULTIPLICITY
2712 assert (("libev: a signal must not be attached to two different loops",
2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2714
2475 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2476 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2477 { 2722 {
2478#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2726
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2730
2486#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2488#endif 2733 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2734 ev_set_priority (&sigfd_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &sigfd_w);
2736 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2737 }
2489 } 2738 }
2739
2740 if (sigfd >= 0)
2741 {
2742 /* TODO: check .head */
2743 sigaddset (&sigfd_set, w->signum);
2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2745
2746 signalfd (sigfd, &sigfd_set, 0);
2747 }
2748#endif
2490 2749
2491 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2752
2494 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2495 { 2757 {
2496#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2497 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2498#else 2762# else
2499 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2500 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2770 sigaction (w->signum, &sa, 0);
2771
2772 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2775#endif
2505 } 2776 }
2506 2777
2507 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2508} 2779}
2509 2780
2510void noinline 2781void noinline
2518 2789
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2521 2792
2522 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2794 {
2795#if EV_MULTIPLICITY
2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2797#endif
2798#if EV_USE_SIGNALFD
2799 if (sigfd >= 0)
2800 {
2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2805 sigdelset (&sigfd_set, w->signum);
2806
2807 signalfd (sigfd, &sigfd_set, 0);
2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2809 }
2810 else
2811#endif
2523 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2524 2814
2525 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2526} 2816}
2527 2817
2528void 2818void
2576static void noinline 2866static void noinline
2577infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2578{ 2868{
2579 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2869 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2580 2870
2581 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 2896
2586 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 2901 {
2591 char path [4096]; 2902 char path [4096];
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 2919 }
2609 } 2920 }
2610 2921
2611 if (w->wd >= 0) 2922 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2924
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2631 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 2929}
2633 2930
2634static void noinline 2931static void noinline
2635infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2636{ 2933{
2712 return; 3009 return;
2713 3010
2714 fs_2625 = 1; 3011 fs_2625 = 1;
2715} 3012}
2716 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2717inline_size void 3025inline_size void
2718infy_init (EV_P) 3026infy_init (EV_P)
2719{ 3027{
2720 if (fs_fd != -2) 3028 if (fs_fd != -2)
2721 return; 3029 return;
2722 3030
2723 fs_fd = -1; 3031 fs_fd = -1;
2724 3032
2725 check_2625 (EV_A); 3033 check_2625 (EV_A);
2726 3034
2727 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2728 3036
2729 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2730 { 3038 {
3039 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2734 } 3044 }
2735} 3045}
2736 3046
2737inline_size void 3047inline_size void
2738infy_fork (EV_P) 3048infy_fork (EV_P)
2740 int slot; 3050 int slot;
2741 3051
2742 if (fs_fd < 0) 3052 if (fs_fd < 0)
2743 return; 3053 return;
2744 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3057 close (fs_fd);
2746 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2747 3067
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2749 { 3069 {
2750 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
2758 w->wd = -1; 3078 w->wd = -1;
2759 3079
2760 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
2764 } 3089 }
2765 } 3090 }
2766} 3091}
2767 3092
2768#endif 3093#endif
2785static void noinline 3110static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3112{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3114
2790 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2794 3117
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3119 if (
2797 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
2809 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2811 { 3139 {
2812 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2838 3166
2839 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2841 else 3169 else
2842#endif 3170#endif
3171 {
2843 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2844 3175
2845 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2846 3177
2847 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2848} 3179}
2857 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2858 3189
2859#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2861#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2863 3199
2864 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2865 3201
2866 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2867} 3203}
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3345{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3347
3012 { 3348 {
3013 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3014 3350
3015 while (fdchangecnt) 3351 while (fdchangecnt)
3016 { 3352 {
3017 fd_reify (EV_A); 3353 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3363
3028 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3029 3365
3030 { 3366 {
3031 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3032 3368
3033 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3371 }
3036 3372
3050{ 3386{
3051 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3052 return; 3388 return;
3053 3389
3054 { 3390 {
3055 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3392 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3057 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3393 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3394 }
3059 3395
3060 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
3172 3508
3173void 3509void
3174ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3175{ 3511{
3176 w->sent = 1; 3512 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3178} 3514}
3179#endif 3515#endif
3180 3516
3181/*****************************************************************************/ 3517/*****************************************************************************/
3182 3518
3331 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3334 3670
3335 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3338 { 3674 {
3339 wn = wl->next; 3675 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3677 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines