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

Comparing libev/ev.c (file contents):
Revision 1.291 by root, Mon Jun 29 04:44:18 2009 UTC vs.
Revision 1.322 by root, Thu Jan 7 06:49:31 2010 UTC

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
263#ifndef EV_USE_EVENTFD 299#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 301# define EV_USE_EVENTFD 1
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif
305#endif
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
268# endif 312# endif
269#endif 313#endif
270 314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
339#endif 383#endif
340 384
341#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
344# ifdef __cplusplus 398# ifdef __cplusplus
345extern "C" { 399extern "C" {
346# endif 400# endif
347int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 402# ifdef __cplusplus
349} 403}
350# endif 404# endif
351#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
352 435
353/**/ 436/**/
354 437
355#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 451 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 453
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
375#if __GNUC__ >= 4 457#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
378#else 460#else
391# define inline_speed static noinline 473# define inline_speed static noinline
392#else 474#else
393# define inline_speed static inline 475# define inline_speed static inline
394#endif 476#endif
395 477
396#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
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
398 485
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
401 488
402typedef ev_watcher *W; 489typedef ev_watcher *W;
414 501
415#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 504#endif
418 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 (handle, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
419#ifdef _WIN32 516#ifdef _WIN32
420# include "ev_win32.c" 517# include "ev_win32.c"
421#endif 518#endif
422 519
423/*****************************************************************************/ 520/*****************************************************************************/
485#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
487 584
488/*****************************************************************************/ 585/*****************************************************************************/
489 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
490/* file descriptor info structure */ 590/* file descriptor info structure */
491typedef struct 591typedef struct
492{ 592{
493 WL head; 593 WL head;
494 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 597 unsigned char unused;
498#if EV_USE_EPOLL 598#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 600#endif
562 662
563 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
564 664
565#endif 665#endif
566 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
567/*****************************************************************************/ 679/*****************************************************************************/
568 680
681#ifndef EV_HAVE_EV_TIME
569ev_tstamp 682ev_tstamp
570ev_time (void) 683ev_time (void)
571{ 684{
572#if EV_USE_REALTIME 685#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 686 if (expect_true (have_realtime))
580 693
581 struct timeval tv; 694 struct timeval tv;
582 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 697}
698#endif
585 699
586inline_size ev_tstamp 700inline_size ev_tstamp
587get_clock (void) 701get_clock (void)
588{ 702{
589#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
625 739
626 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 742
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 745 /* by older ones */
632 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
633#endif 747#endif
634 } 748 }
635} 749}
743} 857}
744 858
745/*****************************************************************************/ 859/*****************************************************************************/
746 860
747inline_speed void 861inline_speed void
748fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
749{ 863{
750 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
751 ev_io *w; 865 ev_io *w;
752 866
753 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)
757 if (ev) 871 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
759 } 873 }
760} 874}
761 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
762void 887void
763ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 889{
765 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
767} 892}
768 893
769/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
771inline_size void 896inline_size void
786 911
787#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
788 if (events) 913 if (events)
789 { 914 {
790 unsigned long arg; 915 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 918 }
798#endif 919#endif
799 920
800 { 921 {
843/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
844inline_size int 965inline_size int
845fd_valid (int fd) 966fd_valid (int fd)
846{ 967{
847#ifdef _WIN32 968#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 970#else
850 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
851#endif 972#endif
852} 973}
853 974
871 992
872 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 994 if (anfds [fd].events)
874 { 995 {
875 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
876 return; 997 break;
877 } 998 }
878} 999}
879 1000
880/* 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 */
881static void noinline 1002static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1008 if (anfds [fd].events)
888 { 1009 {
889 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1013 }
893} 1014}
894 1015
895/*****************************************************************************/ 1016/*****************************************************************************/
896 1017
971 1092
972 for (;;) 1093 for (;;)
973 { 1094 {
974 int c = k << 1; 1095 int c = k << 1;
975 1096
976 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
977 break; 1098 break;
978 1099
979 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])
980 ? 1 : 0; 1101 ? 1 : 0;
981 1102
1017 1138
1018/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1019inline_size void 1140inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1021{ 1142{
1022 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)]))
1023 upheap (heap, k); 1144 upheap (heap, k);
1024 else 1145 else
1025 downheap (heap, N, k); 1146 downheap (heap, N, k);
1026} 1147}
1027 1148
1040/*****************************************************************************/ 1161/*****************************************************************************/
1041 1162
1042/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1043typedef struct 1164typedef struct
1044{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1045 WL head; 1170 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1171} ANSIG;
1048 1172
1049static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1174
1054/*****************************************************************************/ 1175/*****************************************************************************/
1055 1176
1056/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1178/* this is not fork-safe */
1058inline_speed void 1179inline_speed void
1059fd_intern (int fd) 1180fd_intern (int fd)
1060{ 1181{
1061#ifdef _WIN32 1182#ifdef _WIN32
1062 unsigned long arg = 1; 1183 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1064#else 1185#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif 1188#endif
1068} 1189}
1071evpipe_init (EV_P) 1192evpipe_init (EV_P)
1072{ 1193{
1073 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1074 { 1195 {
1075#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1077 { 1202 {
1078 evpipe [0] = -1; 1203 evpipe [0] = -1;
1079 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1206 }
1082 else 1207 else
1083#endif 1208#endif
1084 { 1209 {
1121/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1123static void 1248static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1250{
1251 int i;
1252
1126#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1254 if (evfd >= 0)
1128 { 1255 {
1129 uint64_t counter; 1256 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1134 { 1261 {
1135 char dummy; 1262 char dummy;
1136 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1137 } 1264 }
1138 1265
1139 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1140 { 1267 {
1141 int signum; 1268 sig_pending = 0;
1142 gotsig = 0;
1143 1269
1144 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1273 }
1148 1274
1149#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1150 if (gotasync) 1276 if (async_pending)
1151 { 1277 {
1152 int i; 1278 async_pending = 0;
1153 gotasync = 0;
1154 1279
1155 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1157 { 1282 {
1158 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1166 1291
1167static void 1292static void
1168ev_sighandler (int signum) 1293ev_sighandler (int signum)
1169{ 1294{
1170#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1172#endif 1297#endif
1173 1298
1174#if _WIN32 1299#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1176#endif 1301#endif
1177 1302
1178 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1180} 1305}
1181 1306
1182void noinline 1307void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1184{ 1309{
1185 WL w; 1310 WL w;
1186 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1187#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1188 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 */
1189#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1320
1191 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1322 return;
1323#endif
1195 1324
1196 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1197 1326
1198 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1329}
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
1201 1350
1202/*****************************************************************************/ 1351/*****************************************************************************/
1203 1352
1204static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1205 1354
1350ev_backend (EV_P) 1499ev_backend (EV_P)
1351{ 1500{
1352 return backend; 1501 return backend;
1353} 1502}
1354 1503
1504#if EV_MINIMAL < 2
1355unsigned int 1505unsigned int
1356ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1357{ 1507{
1358 return loop_count; 1508 return loop_count;
1359} 1509}
1360 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1361void 1517void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1519{
1364 io_blocktime = interval; 1520 io_blocktime = interval;
1365} 1521}
1367void 1523void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1525{
1370 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1371} 1527}
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
1372 1552
1373/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1554static void noinline
1375loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1376{ 1556{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1575 have_monotonic = 1;
1396 } 1576 }
1397#endif 1577#endif
1398 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
1399 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1591 mn_now = get_clock ();
1401 now_floor = mn_now; 1592 now_floor = mn_now;
1402 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
1403 1597
1404 io_blocktime = 0.; 1598 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1406 backend = 0; 1600 backend = 0;
1407 backend_fd = -1; 1601 backend_fd = -1;
1408 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1409#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1410 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1608#endif
1412 1609#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1611#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1612
1424 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1426 1615
1427#if EV_USE_PORT 1616#if EV_USE_PORT
1453{ 1642{
1454 int i; 1643 int i;
1455 1644
1456 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1457 { 1646 {
1458 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1649
1461#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1651 if (evfd >= 0)
1463 close (evfd); 1652 close (evfd);
1464#endif 1653#endif
1465 1654
1466 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1467 { 1656 {
1468 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1659 }
1471 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1472 1666
1473#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1475 close (fs_fd); 1669 close (fs_fd);
1476#endif 1670#endif
1500#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1695 array_free (idle, [i]);
1502#endif 1696#endif
1503 } 1697 }
1504 1698
1505 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1700
1507 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1545 1739
1546 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1547 { 1741 {
1548 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1550 gotsig = 1; 1744 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1746 async_pending = 1;
1553#endif 1747#endif
1554 1748
1555 ev_ref (EV_A); 1749 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1557 1751
1560 close (evfd); 1754 close (evfd);
1561#endif 1755#endif
1562 1756
1563 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1564 { 1758 {
1565 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1761 }
1568 1762
1569 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1577#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1578 1772
1579struct ev_loop * 1773struct ev_loop *
1580ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1581{ 1775{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1777
1584 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1587 1780
1588 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1589 return loop; 1782 return EV_A;
1590 1783
1591 return 0; 1784 return 0;
1592} 1785}
1593 1786
1594void 1787void
1601void 1794void
1602ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1603{ 1796{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1605} 1798}
1799#endif /* multiplicity */
1606 1800
1607#if EV_VERIFY 1801#if EV_VERIFY
1608static void noinline 1802static void noinline
1609verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1610{ 1804{
1638 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1639 } 1833 }
1640} 1834}
1641#endif 1835#endif
1642 1836
1837#if EV_MINIMAL < 2
1643void 1838void
1644ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1645{ 1840{
1646#if EV_VERIFY 1841#if EV_VERIFY
1647 int i; 1842 int i;
1696 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1893
1699# if 0 1894# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 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) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1897# endif
1898#endif
1704} 1899}
1705 1900#endif
1706#endif /* multiplicity */
1707 1901
1708#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1709struct ev_loop * 1903struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1711#else 1905#else
1714#endif 1908#endif
1715{ 1909{
1716 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1717 { 1911 {
1718#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1914#else
1721 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1722#endif 1916#endif
1723 1917
1724 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1741 1935
1742void 1936void
1743ev_default_destroy (void) 1937ev_default_destroy (void)
1744{ 1938{
1745#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1747#endif 1941#endif
1748 1942
1749 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1750 1944
1751#ifndef _WIN32 1945#ifndef _WIN32
1758 1952
1759void 1953void
1760ev_default_fork (void) 1954ev_default_fork (void)
1761{ 1955{
1762#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1764#endif 1958#endif
1765 1959
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1961}
1768 1962
1772ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1773{ 1967{
1774 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1775} 1969}
1776 1970
1777inline_speed void 1971unsigned int
1778call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1779{ 1985{
1780 int pri; 1986 int pri;
1781 1987
1782 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
2018 2224
2019 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
2020 } 2226 }
2021} 2227}
2022 2228
2023static int loop_done;
2024
2025void 2229void
2026ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
2027{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
2028 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
2029 2239
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2241
2032 do 2242 do
2033 { 2243 {
2034#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2259 if (expect_false (postfork))
2050 if (forkcnt) 2260 if (forkcnt)
2051 { 2261 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
2054 } 2264 }
2055#endif 2265#endif
2056 2266
2057 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
2059 { 2269 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
2062 } 2272 }
2273
2274 if (expect_false (loop_done))
2275 break;
2063 2276
2064 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2066 loop_fork (EV_A); 2279 loop_fork (EV_A);
2067 2280
2073 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
2075 2288
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
2078 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
2080 2296
2081 waittime = MAX_BLOCKTIME; 2297 waittime = MAX_BLOCKTIME;
2082 2298
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
2094 } 2310 }
2095#endif 2311#endif
2096 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
2099 2316
2100 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2319 {
2320 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2321
2322 if (sleeptime > waittime - backend_fudge)
2323 sleeptime = waittime - backend_fudge;
2324
2325 if (expect_true (sleeptime > 0.))
2326 {
2107 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
2109 } 2330 }
2110 } 2331 }
2111 2332
2333#if EV_MINIMAL < 2
2112 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2339
2115 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2117 } 2342 }
2118 2343
2129 2354
2130 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2358
2134 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2135 } 2360 }
2136 while (expect_true ( 2361 while (expect_true (
2137 activecnt 2362 activecnt
2138 && !loop_done 2363 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2365 ));
2141 2366
2142 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2144} 2373}
2145 2374
2146void 2375void
2147ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2148{ 2377{
2199inline_size void 2428inline_size void
2200wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2201{ 2430{
2202 while (*head) 2431 while (*head)
2203 { 2432 {
2204 if (*head == elem) 2433 if (expect_true (*head == elem))
2205 { 2434 {
2206 *head = elem->next; 2435 *head = elem->next;
2207 return; 2436 break;
2208 } 2437 }
2209 2438
2210 head = &(*head)->next; 2439 head = &(*head)->next;
2211 } 2440 }
2212} 2441}
2240} 2469}
2241 2470
2242inline_size void 2471inline_size void
2243pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2244{ 2473{
2245 int pri = w->priority; 2474 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2477 ev_set_priority (w, pri);
2249} 2478}
2250 2479
2251inline_speed void 2480inline_speed void
2252ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2253{ 2482{
2280 2509
2281 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2284 2513
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2287 2516
2288 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2289} 2518}
2290 2519
2384 } 2613 }
2385 2614
2386 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2387} 2616}
2388 2617
2618ev_tstamp
2619ev_timer_remaining (EV_P_ ev_timer *w)
2620{
2621 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2622}
2623
2389#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2390void noinline 2625void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2627{
2393 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2460#endif 2695#endif
2461 2696
2462void noinline 2697void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2464{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2469 return; 2701 return;
2470 2702
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2704
2473 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2708
2475 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2476 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2477 { 2716 {
2478#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2720
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2724
2486#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2488#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2489 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2490 2743
2491 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2746
2494 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2495 { 2751 {
2496#if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2497 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2498#else 2756# else
2499 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2500 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2769#endif
2505 } 2770 }
2506 2771
2507 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2508} 2773}
2509 2774
2510void noinline 2775void noinline
2518 2783
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2521 2786
2522 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum);
2800
2801 signalfd (sigfd, &sigfd_set, 0);
2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2803 }
2804 else
2805#endif
2523 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2524 2808
2525 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2526} 2810}
2527 2811
2528void 2812void
2576static void noinline 2860static void noinline
2577infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2578{ 2862{
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); 2863 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 2864
2581 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2582 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2586 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2588 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 2895 {
2591 char path [4096]; 2896 char path [4096];
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 2913 }
2609 } 2914 }
2610 2915
2611 if (w->wd >= 0) 2916 if (w->wd >= 0)
2612 {
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2918
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2631 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 2923}
2633 2924
2634static void noinline 2925static void noinline
2635infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2636{ 2927{
2712 return; 3003 return;
2713 3004
2714 fs_2625 = 1; 3005 fs_2625 = 1;
2715} 3006}
2716 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2717inline_size void 3019inline_size void
2718infy_init (EV_P) 3020infy_init (EV_P)
2719{ 3021{
2720 if (fs_fd != -2) 3022 if (fs_fd != -2)
2721 return; 3023 return;
2722 3024
2723 fs_fd = -1; 3025 fs_fd = -1;
2724 3026
2725 check_2625 (EV_A); 3027 check_2625 (EV_A);
2726 3028
2727 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2728 3030
2729 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2730 { 3032 {
3033 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2734 } 3038 }
2735} 3039}
2736 3040
2737inline_size void 3041inline_size void
2738infy_fork (EV_P) 3042infy_fork (EV_P)
2740 int slot; 3044 int slot;
2741 3045
2742 if (fs_fd < 0) 3046 if (fs_fd < 0)
2743 return; 3047 return;
2744 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3051 close (fs_fd);
2746 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
2747 3061
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2749 { 3063 {
2750 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
2758 w->wd = -1; 3072 w->wd = -1;
2759 3073
2760 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2762 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2763 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
2764 } 3083 }
2765 } 3084 }
2766} 3085}
2767 3086
2768#endif 3087#endif
2785static void noinline 3104static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3106{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3108
2790 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
2794 3111
2795 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2796 if ( 3113 if (
2797 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2808 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
2809 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2811 { 3133 {
2812 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2838 3160
2839 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2841 else 3163 else
2842#endif 3164#endif
3165 {
2843 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2844 3169
2845 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2846 3171
2847 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2848} 3173}
2857 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2858 3183
2859#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2861#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2863 3193
2864 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2865 3195
2866 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2867} 3197}
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3339{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3341
3012 { 3342 {
3013 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3014 3344
3015 while (fdchangecnt) 3345 while (fdchangecnt)
3016 { 3346 {
3017 fd_reify (EV_A); 3347 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3356 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3357
3028 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3029 3359
3030 { 3360 {
3031 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3032 3362
3033 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3365 }
3036 3366
3050{ 3380{
3051 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3052 return; 3382 return;
3053 3383
3054 { 3384 {
3055 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3386 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); 3387 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3388 }
3059 3389
3060 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
3172 3502
3173void 3503void
3174ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3175{ 3505{
3176 w->sent = 1; 3506 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3178} 3508}
3179#endif 3509#endif
3180 3510
3181/*****************************************************************************/ 3511/*****************************************************************************/
3182 3512
3331 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3334 3664
3335 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3338 { 3668 {
3339 wn = wl->next; 3669 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3671 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines