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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 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
419 501
420#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 504#endif
423 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
424#ifdef _WIN32 516#ifdef _WIN32
425# include "ev_win32.c" 517# include "ev_win32.c"
426#endif 518#endif
427 519
428/*****************************************************************************/ 520/*****************************************************************************/
490#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
492 584
493/*****************************************************************************/ 585/*****************************************************************************/
494 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
495/* file descriptor info structure */ 590/* file descriptor info structure */
496typedef struct 591typedef struct
497{ 592{
498 WL head; 593 WL head;
499 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
500 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) */
501 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 */
502 unsigned char unused; 597 unsigned char unused;
503#if EV_USE_EPOLL 598#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 600#endif
568 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
569 664
570#endif 665#endif
571 666
572#if EV_MINIMAL < 2 667#if EV_MINIMAL < 2
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 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)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 670# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 671#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 675#endif
676
677#define EVUNLOOP_RECURSE 0x80
581 678
582/*****************************************************************************/ 679/*****************************************************************************/
583 680
584#ifndef EV_HAVE_EV_TIME 681#ifndef EV_HAVE_EV_TIME
585ev_tstamp 682ev_tstamp
642 739
643 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 742
646 /* 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 */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 745 /* by older ones */
649 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
650#endif 747#endif
651 } 748 }
652} 749}
760} 857}
761 858
762/*****************************************************************************/ 859/*****************************************************************************/
763 860
764inline_speed void 861inline_speed void
765fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
766{ 863{
767 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
768 ev_io *w; 865 ev_io *w;
769 866
770 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)
774 if (ev) 871 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
776 } 873 }
777} 874}
778 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
779void 887void
780ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 889{
782 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
784} 892}
785 893
786/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
788inline_size void 896inline_size void
803 911
804#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
805 if (events) 913 if (events)
806 { 914 {
807 unsigned long arg; 915 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810 #else
811 anfd->handle = _get_osfhandle (fd);
812 #endif
813 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));
814 } 918 }
815#endif 919#endif
816 920
817 { 921 {
860/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
861inline_size int 965inline_size int
862fd_valid (int fd) 966fd_valid (int fd)
863{ 967{
864#ifdef _WIN32 968#ifdef _WIN32
865 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
866#else 970#else
867 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
868#endif 972#endif
869} 973}
870 974
888 992
889 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 994 if (anfds [fd].events)
891 { 995 {
892 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
893 return; 997 break;
894 } 998 }
895} 999}
896 1000
897/* 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 */
898static void noinline 1002static void noinline
903 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 1008 if (anfds [fd].events)
905 { 1009 {
906 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 1013 }
910} 1014}
911 1015
912/*****************************************************************************/ 1016/*****************************************************************************/
913 1017
988 1092
989 for (;;) 1093 for (;;)
990 { 1094 {
991 int c = k << 1; 1095 int c = k << 1;
992 1096
993 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
994 break; 1098 break;
995 1099
996 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])
997 ? 1 : 0; 1101 ? 1 : 0;
998 1102
1034 1138
1035/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1036inline_size void 1140inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1038{ 1142{
1039 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)]))
1040 upheap (heap, k); 1144 upheap (heap, k);
1041 else 1145 else
1042 downheap (heap, N, k); 1146 downheap (heap, N, k);
1043} 1147}
1044 1148
1057/*****************************************************************************/ 1161/*****************************************************************************/
1058 1162
1059/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1060typedef struct 1164typedef struct
1061{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1062 WL head; 1170 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1171} ANSIG;
1065 1172
1066static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1174
1071/*****************************************************************************/ 1175/*****************************************************************************/
1072 1176
1073/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1074/* this is not fork-safe */ 1178/* this is not fork-safe */
1075inline_speed void 1179inline_speed void
1076fd_intern (int fd) 1180fd_intern (int fd)
1077{ 1181{
1078#ifdef _WIN32 1182#ifdef _WIN32
1079 unsigned long arg = 1; 1183 unsigned long arg = 1;
1080 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1081#else 1185#else
1082 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1083 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1084#endif 1188#endif
1085} 1189}
1088evpipe_init (EV_P) 1192evpipe_init (EV_P)
1089{ 1193{
1090 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1091 { 1195 {
1092#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1094 { 1202 {
1095 evpipe [0] = -1; 1203 evpipe [0] = -1;
1096 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1206 }
1099 else 1207 else
1100#endif 1208#endif
1101 { 1209 {
1138/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1140static void 1248static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1250{
1251 int i;
1252
1143#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1254 if (evfd >= 0)
1145 { 1255 {
1146 uint64_t counter; 1256 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1151 { 1261 {
1152 char dummy; 1262 char dummy;
1153 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1154 } 1264 }
1155 1265
1156 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1157 { 1267 {
1158 int signum; 1268 sig_pending = 0;
1159 gotsig = 0;
1160 1269
1161 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1273 }
1165 1274
1166#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1167 if (gotasync) 1276 if (async_pending)
1168 { 1277 {
1169 int i; 1278 async_pending = 0;
1170 gotasync = 0;
1171 1279
1172 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1174 { 1282 {
1175 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1183 1291
1184static void 1292static void
1185ev_sighandler (int signum) 1293ev_sighandler (int signum)
1186{ 1294{
1187#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1189#endif 1297#endif
1190 1298
1191#if _WIN32 1299#ifdef _WIN32
1192 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1193#endif 1301#endif
1194 1302
1195 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1197} 1305}
1198 1306
1199void noinline 1307void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1201{ 1309{
1202 WL w; 1310 WL w;
1203 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1204#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1205 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 */
1206#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1320
1208 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1322 return;
1323#endif
1212 1324
1213 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1214 1326
1215 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 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
1218 1350
1219/*****************************************************************************/ 1351/*****************************************************************************/
1220 1352
1221static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1222 1354
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1542{
1411 invoke_cb = invoke_pending_cb; 1543 invoke_cb = invoke_pending_cb;
1412} 1544}
1413 1545
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1547{
1416 suspend_cb = suspend_cb_; 1548 release_cb = release;
1417 resume_cb = resume_cb_; 1549 acquire_cb = acquire;
1418} 1550}
1419#endif 1551#endif
1420 1552
1421/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1554static void noinline
1441 1573
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1575 have_monotonic = 1;
1444 } 1576 }
1445#endif 1577#endif
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"));
1446 1589
1447 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1591 mn_now = get_clock ();
1449 now_floor = mn_now; 1592 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1454 1597
1455 io_blocktime = 0.; 1598 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1457 backend = 0; 1600 backend = 0;
1458 backend_fd = -1; 1601 backend_fd = -1;
1459 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1460#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1461 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1608#endif
1463 1609#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1611#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1612
1475 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1477 1615
1478#if EV_USE_PORT 1616#if EV_USE_PORT
1504{ 1642{
1505 int i; 1643 int i;
1506 1644
1507 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1508 { 1646 {
1509 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1649
1512#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1651 if (evfd >= 0)
1514 close (evfd); 1652 close (evfd);
1515#endif 1653#endif
1516 1654
1517 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1518 { 1656 {
1519 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1659 }
1522 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1523 1666
1524#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1526 close (fs_fd); 1669 close (fs_fd);
1527#endif 1670#endif
1551#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1695 array_free (idle, [i]);
1553#endif 1696#endif
1554 } 1697 }
1555 1698
1556 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1700
1558 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1596 1739
1597 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1598 { 1741 {
1599 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1601 gotsig = 1; 1744 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1746 async_pending = 1;
1604#endif 1747#endif
1605 1748
1606 ev_ref (EV_A); 1749 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1608 1751
1611 close (evfd); 1754 close (evfd);
1612#endif 1755#endif
1613 1756
1614 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1615 { 1758 {
1616 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1761 }
1619 1762
1620 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1628#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1629 1772
1630struct ev_loop * 1773struct ev_loop *
1631ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1632{ 1775{
1633 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));
1634 1777
1635 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1638 1780
1639 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1640 return loop; 1782 return EV_A;
1641 1783
1642 return 0; 1784 return 0;
1643} 1785}
1644 1786
1645void 1787void
1749 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1751 1893
1752# if 0 1894# if 0
1753 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)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755# endif 1897# endif
1756#endif 1898#endif
1757} 1899}
1758#endif 1900#endif
1759 1901
1766#endif 1908#endif
1767{ 1909{
1768 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1769 { 1911 {
1770#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1914#else
1773 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1774#endif 1916#endif
1775 1917
1776 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1793 1935
1794void 1936void
1795ev_default_destroy (void) 1937ev_default_destroy (void)
1796{ 1938{
1797#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1799#endif 1941#endif
1800 1942
1801 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1802 1944
1803#ifndef _WIN32 1945#ifndef _WIN32
1810 1952
1811void 1953void
1812ev_default_fork (void) 1954ev_default_fork (void)
1813{ 1955{
1814#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1816#endif 1958#endif
1817 1959
1818 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1819} 1961}
1820 1962
1822 1964
1823void 1965void
1824ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1825{ 1967{
1826 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1969}
1970
1971unsigned int
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;
1827} 1981}
1828 1982
1829void noinline 1983void noinline
1830ev_invoke_pending (EV_P) 1984ev_invoke_pending (EV_P)
1831{ 1985{
2077{ 2231{
2078#if EV_MINIMAL < 2 2232#if EV_MINIMAL < 2
2079 ++loop_depth; 2233 ++loop_depth;
2080#endif 2234#endif
2081 2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
2082 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
2083 2239
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2241
2086 do 2242 do
2113 { 2269 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2271 EV_INVOKE_PENDING;
2116 } 2272 }
2117 2273
2274 if (expect_false (loop_done))
2275 break;
2276
2118 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2120 loop_fork (EV_A); 2279 loop_fork (EV_A);
2121 2280
2122 /* update fd-related kernel structures */ 2281 /* update fd-related kernel structures */
2172 } 2331 }
2173 2332
2174#if EV_MINIMAL < 2 2333#if EV_MINIMAL < 2
2175 ++loop_count; 2334 ++loop_count;
2176#endif 2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2339
2179 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2181 } 2342 }
2182 2343
2267inline_size void 2428inline_size void
2268wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2269{ 2430{
2270 while (*head) 2431 while (*head)
2271 { 2432 {
2272 if (*head == elem) 2433 if (expect_true (*head == elem))
2273 { 2434 {
2274 *head = elem->next; 2435 *head = elem->next;
2275 return; 2436 break;
2276 } 2437 }
2277 2438
2278 head = &(*head)->next; 2439 head = &(*head)->next;
2279 } 2440 }
2280} 2441}
2348 2509
2349 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2352 2513
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2355 2516
2356 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2357} 2518}
2358 2519
2452 } 2613 }
2453 2614
2454 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2455} 2616}
2456 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
2457#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2458void noinline 2625void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2627{
2461 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2528#endif 2695#endif
2529 2696
2530void noinline 2697void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2532{ 2699{
2533#if EV_MULTIPLICITY
2534 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535#endif
2536 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2537 return; 2701 return;
2538 2702
2539 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));
2540 2704
2541 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));
2542 2708
2543 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2544 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2545 { 2716 {
2546#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2720
2552 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 */
2553 2724
2554#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2556#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 }
2557 } 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
2558 2743
2559 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2746
2562 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2563 { 2751 {
2564#if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2565 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2566#else 2756# else
2567 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2568 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2570 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 */
2571 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);
2572#endif 2769#endif
2573 } 2770 }
2574 2771
2575 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2576} 2773}
2577 2774
2578void noinline 2775void noinline
2586 2783
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2589 2786
2590 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
2591 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2592 2808
2593 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2594} 2810}
2595 2811
2596void 2812void
2644static void noinline 2860static void noinline
2645infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2646{ 2862{
2647 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);
2648 2864
2649 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 */
2650 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2651 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2652 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2653 2890
2654 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2655 /* 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, */
2656 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2657 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2658 { 2895 {
2659 char path [4096]; 2896 char path [4096];
2675 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2676 } 2913 }
2677 } 2914 }
2678 2915
2679 if (w->wd >= 0) 2916 if (w->wd >= 0)
2680 {
2681 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);
2682 2918
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2685 /* also do poll on <2.6.25, but with normal frequency */
2686 struct statfs sfs;
2687
2688 if (fs_2625 && !statfs (w->path, &sfs))
2689 if (sfs.f_type == 0x1373 /* devfs */
2690 || sfs.f_type == 0xEF53 /* ext2/3 */
2691 || sfs.f_type == 0x3153464a /* jfs */
2692 || sfs.f_type == 0x52654973 /* reiser3 */
2693 || sfs.f_type == 0x01021994 /* tempfs */
2694 || sfs.f_type == 0x58465342 /* xfs */)
2695 return;
2696
2697 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2698 ev_timer_again (EV_A_ &w->timer); 2921 ev_timer_again (EV_A_ &w->timer);
2699 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2700} 2923}
2701 2924
2702static void noinline 2925static void noinline
2703infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2704{ 2927{
2780 return; 3003 return;
2781 3004
2782 fs_2625 = 1; 3005 fs_2625 = 1;
2783} 3006}
2784 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
2785inline_size void 3019inline_size void
2786infy_init (EV_P) 3020infy_init (EV_P)
2787{ 3021{
2788 if (fs_fd != -2) 3022 if (fs_fd != -2)
2789 return; 3023 return;
2790 3024
2791 fs_fd = -1; 3025 fs_fd = -1;
2792 3026
2793 check_2625 (EV_A); 3027 check_2625 (EV_A);
2794 3028
2795 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2796 3030
2797 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2798 { 3032 {
3033 fd_intern (fs_fd);
2799 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2802 } 3038 }
2803} 3039}
2804 3040
2805inline_size void 3041inline_size void
2806infy_fork (EV_P) 3042infy_fork (EV_P)
2808 int slot; 3044 int slot;
2809 3045
2810 if (fs_fd < 0) 3046 if (fs_fd < 0)
2811 return; 3047 return;
2812 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2813 close (fs_fd); 3051 close (fs_fd);
2814 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 }
2815 3061
2816 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2817 { 3063 {
2818 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2819 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
2826 w->wd = -1; 3072 w->wd = -1;
2827 3073
2828 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2829 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2830 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);
2831 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 }
2832 } 3083 }
2833 } 3084 }
2834} 3085}
2835 3086
2836#endif 3087#endif
2853static void noinline 3104static void noinline
2854stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2855{ 3106{
2856 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2857 3108
2858 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
2859 /* prev has the old value when the callback gets invoked */
2860 w->prev = w->attr;
2861 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
2862 3111
2863 /* 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 */
2864 if ( 3113 if (
2865 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2866 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2867 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2868 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2869 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2870 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2871 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2872 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2873 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2874 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2875 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2876 ) { 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
2877 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2878 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2879 { 3133 {
2880 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2881 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2906 3160
2907 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2908 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2909 else 3163 else
2910#endif 3164#endif
3165 {
2911 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2912 3169
2913 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2914 3171
2915 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2916} 3173}
2925 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2926 3183
2927#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2928 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2929#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2930 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2931 3193
2932 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2933 3195
2934 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2935} 3197}
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3339{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3341
3080 { 3342 {
3081 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3082 3344
3083 while (fdchangecnt) 3345 while (fdchangecnt)
3084 { 3346 {
3085 fd_reify (EV_A); 3347 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3094 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));
3095 3357
3096 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3097 3359
3098 { 3360 {
3099 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3100 3362
3101 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3365 }
3104 3366
3118{ 3380{
3119 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3120 return; 3382 return;
3121 3383
3122 { 3384 {
3123 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3124 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 ()));
3125 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);
3126 } 3388 }
3127 3389
3128 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
3240 3502
3241void 3503void
3242ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3243{ 3505{
3244 w->sent = 1; 3506 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3246} 3508}
3247#endif 3509#endif
3248 3510
3249/*****************************************************************************/ 3511/*****************************************************************************/
3250 3512
3399 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3402 3664
3403 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3406 { 3668 {
3407 wn = wl->next; 3669 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3671 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines