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.325 by root, Sun Jan 24 12:31:55 2010 UTC

110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
178# endif 187# endif
179#endif 188#endif
180 189
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
182 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
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
300# endif 344# endif
301#endif 345#endif
302 346
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
305#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
308#endif 358#endif
309 359
339#endif 389#endif
340 390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
403# endif
344# ifdef __cplusplus 404# ifdef __cplusplus
345extern "C" { 405extern "C" {
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 408# ifdef __cplusplus
349} 409}
350# endif 410# endif
351#endif 411#endif
412
413#if EV_USE_SIGNALFD
414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
352 441
353/**/ 442/**/
354 443
355#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 457 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 459
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
419 507
420#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 510#endif
423 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
424#ifdef _WIN32 522#ifdef _WIN32
425# include "ev_win32.c" 523# include "ev_win32.c"
426#endif 524#endif
427 525
428/*****************************************************************************/ 526/*****************************************************************************/
490#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
492 590
493/*****************************************************************************/ 591/*****************************************************************************/
494 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
495/* file descriptor info structure */ 596/* file descriptor info structure */
496typedef struct 597typedef struct
497{ 598{
498 WL head; 599 WL head;
499 unsigned char events; /* the events watched for */ 600 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 601 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 602 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 603 unsigned char unused;
503#if EV_USE_EPOLL 604#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 605 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 606#endif
568 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
569 670
570#endif 671#endif
571 672
572#if EV_MINIMAL < 2 673#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) 674# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
675# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 676# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 677#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 678# define EV_RELEASE_CB (void)0
679# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 680# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 681#endif
682
683#define EVUNLOOP_RECURSE 0x80
581 684
582/*****************************************************************************/ 685/*****************************************************************************/
583 686
584#ifndef EV_HAVE_EV_TIME 687#ifndef EV_HAVE_EV_TIME
585ev_tstamp 688ev_tstamp
642 745
643 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 748
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 749 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 750 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 751 /* by older ones */
649 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
650#endif 753#endif
651 } 754 }
652} 755}
760} 863}
761 864
762/*****************************************************************************/ 865/*****************************************************************************/
763 866
764inline_speed void 867inline_speed void
765fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
766{ 869{
767 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
768 ev_io *w; 871 ev_io *w;
769 872
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 873 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
774 if (ev) 877 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
776 } 879 }
777} 880}
778 881
882/* do not submit kernel events for fds that have reify set */
883/* because that means they changed while we were polling for new events */
884inline_speed void
885fd_event (EV_P_ int fd, int revents)
886{
887 ANFD *anfd = anfds + fd;
888
889 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents);
891}
892
779void 893void
780ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 895{
782 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
784} 898}
785 899
786/* make sure the external fd watch events are in-sync */ 900/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 901/* with the kernel/libev internal state */
788inline_size void 902inline_size void
803 917
804#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
805 if (events) 919 if (events)
806 { 920 {
807 unsigned long arg; 921 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 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)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
814 } 924 }
815#endif 925#endif
816 926
817 { 927 {
860/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
861inline_size int 971inline_size int
862fd_valid (int fd) 972fd_valid (int fd)
863{ 973{
864#ifdef _WIN32 974#ifdef _WIN32
865 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
866#else 976#else
867 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
868#endif 978#endif
869} 979}
870 980
888 998
889 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 1000 if (anfds [fd].events)
891 { 1001 {
892 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
893 return; 1003 break;
894 } 1004 }
895} 1005}
896 1006
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 1008static void noinline
903 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 1014 if (anfds [fd].events)
905 { 1015 {
906 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 1017 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 1019 }
910} 1020}
911 1021
912/*****************************************************************************/ 1022/*****************************************************************************/
913 1023
988 1098
989 for (;;) 1099 for (;;)
990 { 1100 {
991 int c = k << 1; 1101 int c = k << 1;
992 1102
993 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
994 break; 1104 break;
995 1105
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1107 ? 1 : 0;
998 1108
1034 1144
1035/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1036inline_size void 1146inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1038{ 1148{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1150 upheap (heap, k);
1041 else 1151 else
1042 downheap (heap, N, k); 1152 downheap (heap, N, k);
1043} 1153}
1044 1154
1057/*****************************************************************************/ 1167/*****************************************************************************/
1058 1168
1059/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1060typedef struct 1170typedef struct
1061{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1062 WL head; 1176 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1177} ANSIG;
1065 1178
1066static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1180
1071/*****************************************************************************/ 1181/*****************************************************************************/
1072 1182
1073/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1074/* this is not fork-safe */ 1184/* this is not fork-safe */
1075inline_speed void 1185inline_speed void
1076fd_intern (int fd) 1186fd_intern (int fd)
1077{ 1187{
1078#ifdef _WIN32 1188#ifdef _WIN32
1079 unsigned long arg = 1; 1189 unsigned long arg = 1;
1080 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1081#else 1191#else
1082 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1083 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1084#endif 1194#endif
1085} 1195}
1088evpipe_init (EV_P) 1198evpipe_init (EV_P)
1089{ 1199{
1090 if (!ev_is_active (&pipe_w)) 1200 if (!ev_is_active (&pipe_w))
1091 { 1201 {
1092#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1094 { 1208 {
1095 evpipe [0] = -1; 1209 evpipe [0] = -1;
1096 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1212 }
1099 else 1213 else
1100#endif 1214#endif
1101 { 1215 {
1138/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1140static void 1254static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1256{
1257 int i;
1258
1143#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1260 if (evfd >= 0)
1145 { 1261 {
1146 uint64_t counter; 1262 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
1151 { 1267 {
1152 char dummy; 1268 char dummy;
1153 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1154 } 1270 }
1155 1271
1156 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1157 { 1273 {
1158 int signum; 1274 sig_pending = 0;
1159 gotsig = 0;
1160 1275
1161 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1279 }
1165 1280
1166#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1167 if (gotasync) 1282 if (async_pending)
1168 { 1283 {
1169 int i; 1284 async_pending = 0;
1170 gotasync = 0;
1171 1285
1172 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1174 { 1288 {
1175 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
1183 1297
1184static void 1298static void
1185ev_sighandler (int signum) 1299ev_sighandler (int signum)
1186{ 1300{
1187#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1189#endif 1303#endif
1190 1304
1191#if _WIN32 1305#ifdef _WIN32
1192 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1193#endif 1307#endif
1194 1308
1195 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1197} 1311}
1198 1312
1199void noinline 1313void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1201{ 1315{
1202 WL w; 1316 WL w;
1203 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1204#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1326
1208 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1328 return;
1329#endif
1212 1330
1213 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1214 1332
1215 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1335}
1336
1337#if EV_USE_SIGNALFD
1338static void
1339sigfdcb (EV_P_ ev_io *iow, int revents)
1340{
1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1342
1343 for (;;)
1344 {
1345 ssize_t res = read (sigfd, si, sizeof (si));
1346
1347 /* not ISO-C, as res might be -1, but works with SuS */
1348 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1349 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1350
1351 if (res < (ssize_t)sizeof (si))
1352 break;
1353 }
1354}
1355#endif
1218 1356
1219/*****************************************************************************/ 1357/*****************************************************************************/
1220 1358
1221static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1222 1360
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1547void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1548{
1411 invoke_cb = invoke_pending_cb; 1549 invoke_cb = invoke_pending_cb;
1412} 1550}
1413 1551
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1552void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1553{
1416 suspend_cb = suspend_cb_; 1554 release_cb = release;
1417 resume_cb = resume_cb_; 1555 acquire_cb = acquire;
1418} 1556}
1419#endif 1557#endif
1420 1558
1421/* initialise a loop structure, must be zero-initialised */ 1559/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1560static void noinline
1441 1579
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1581 have_monotonic = 1;
1444 } 1582 }
1445#endif 1583#endif
1584
1585 /* pid check not overridable via env */
1586#ifndef _WIN32
1587 if (flags & EVFLAG_FORKCHECK)
1588 curpid = getpid ();
1589#endif
1590
1591 if (!(flags & EVFLAG_NOENV)
1592 && !enable_secure ()
1593 && getenv ("LIBEV_FLAGS"))
1594 flags = atoi (getenv ("LIBEV_FLAGS"));
1446 1595
1447 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1597 mn_now = get_clock ();
1449 now_floor = mn_now; 1598 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1454 1603
1455 io_blocktime = 0.; 1604 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1457 backend = 0; 1606 backend = 0;
1458 backend_fd = -1; 1607 backend_fd = -1;
1459 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1460#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1461 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1614#endif
1463 1615#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1617#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1618
1475 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1477 1621
1478#if EV_USE_PORT 1622#if EV_USE_PORT
1504{ 1648{
1505 int i; 1649 int i;
1506 1650
1507 if (ev_is_active (&pipe_w)) 1651 if (ev_is_active (&pipe_w))
1508 { 1652 {
1509 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1655
1512#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1657 if (evfd >= 0)
1514 close (evfd); 1658 close (evfd);
1515#endif 1659#endif
1516 1660
1517 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1518 { 1662 {
1519 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1665 }
1522 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1523 1672
1524#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1526 close (fs_fd); 1675 close (fs_fd);
1527#endif 1676#endif
1551#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1701 array_free (idle, [i]);
1553#endif 1702#endif
1554 } 1703 }
1555 1704
1556 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1706
1558 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1596 1745
1597 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1598 { 1747 {
1599 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1601 gotsig = 1; 1750 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1752 async_pending = 1;
1604#endif 1753#endif
1605 1754
1606 ev_ref (EV_A); 1755 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1608 1757
1611 close (evfd); 1760 close (evfd);
1612#endif 1761#endif
1613 1762
1614 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1615 { 1764 {
1616 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1767 }
1619 1768
1620 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1628#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1629 1778
1630struct ev_loop * 1779struct ev_loop *
1631ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1632{ 1781{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1782 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1783
1635 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1638 1786
1639 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1640 return loop; 1788 return EV_A;
1641 1789
1642 return 0; 1790 return 0;
1643} 1791}
1644 1792
1645void 1793void
1749 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1751 1899
1752# if 0 1900# if 0
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755# endif 1903# endif
1756#endif 1904#endif
1757} 1905}
1758#endif 1906#endif
1759 1907
1766#endif 1914#endif
1767{ 1915{
1768 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1769 { 1917 {
1770#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1920#else
1773 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1774#endif 1922#endif
1775 1923
1776 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1793 1941
1794void 1942void
1795ev_default_destroy (void) 1943ev_default_destroy (void)
1796{ 1944{
1797#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1799#endif 1947#endif
1800 1948
1801 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1802 1950
1803#ifndef _WIN32 1951#ifndef _WIN32
1810 1958
1811void 1959void
1812ev_default_fork (void) 1960ev_default_fork (void)
1813{ 1961{
1814#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1816#endif 1964#endif
1817 1965
1818 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1819} 1967}
1820 1968
1822 1970
1823void 1971void
1824ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1825{ 1973{
1826 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1975}
1976
1977unsigned int
1978ev_pending_count (EV_P)
1979{
1980 int pri;
1981 unsigned int count = 0;
1982
1983 for (pri = NUMPRI; pri--; )
1984 count += pendingcnt [pri];
1985
1986 return count;
1827} 1987}
1828 1988
1829void noinline 1989void noinline
1830ev_invoke_pending (EV_P) 1990ev_invoke_pending (EV_P)
1831{ 1991{
2003 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2004 } 2164 }
2005} 2165}
2006 2166
2007/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2008/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2009inline_speed void 2169inline_speed void
2010time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2011{ 2171{
2012#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2013 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
2077{ 2237{
2078#if EV_MINIMAL < 2 2238#if EV_MINIMAL < 2
2079 ++loop_depth; 2239 ++loop_depth;
2080#endif 2240#endif
2081 2241
2242 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2243
2082 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
2083 2245
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2246 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2247
2086 do 2248 do
2113 { 2275 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2277 EV_INVOKE_PENDING;
2116 } 2278 }
2117 2279
2280 if (expect_false (loop_done))
2281 break;
2282
2118 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2284 if (expect_false (postfork))
2120 loop_fork (EV_A); 2285 loop_fork (EV_A);
2121 2286
2122 /* update fd-related kernel structures */ 2287 /* update fd-related kernel structures */
2172 } 2337 }
2173 2338
2174#if EV_MINIMAL < 2 2339#if EV_MINIMAL < 2
2175 ++loop_count; 2340 ++loop_count;
2176#endif 2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2345
2179 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2181 } 2348 }
2182 2349
2267inline_size void 2434inline_size void
2268wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2269{ 2436{
2270 while (*head) 2437 while (*head)
2271 { 2438 {
2272 if (*head == elem) 2439 if (expect_true (*head == elem))
2273 { 2440 {
2274 *head = elem->next; 2441 *head = elem->next;
2275 return; 2442 break;
2276 } 2443 }
2277 2444
2278 head = &(*head)->next; 2445 head = &(*head)->next;
2279 } 2446 }
2280} 2447}
2348 2515
2349 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2352 2519
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2355 2522
2356 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2357} 2524}
2358 2525
2452 } 2619 }
2453 2620
2454 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2455} 2622}
2456 2623
2624ev_tstamp
2625ev_timer_remaining (EV_P_ ev_timer *w)
2626{
2627 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2628}
2629
2457#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2458void noinline 2631void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2633{
2461 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2528#endif 2701#endif
2529 2702
2530void noinline 2703void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2532{ 2705{
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))) 2706 if (expect_false (ev_is_active (w)))
2537 return; 2707 return;
2538 2708
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2710
2541 evpipe_init (EV_A); 2711#if EV_MULTIPLICITY
2712 assert (("libev: a signal must not be attached to two different loops",
2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2714
2543 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2544 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2545 { 2722 {
2546#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2726
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2730
2554#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2556#endif 2733 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2734 ev_set_priority (&sigfd_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &sigfd_w);
2736 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2737 }
2557 } 2738 }
2739
2740 if (sigfd >= 0)
2741 {
2742 /* TODO: check .head */
2743 sigaddset (&sigfd_set, w->signum);
2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2745
2746 signalfd (sigfd, &sigfd_set, 0);
2747 }
2748#endif
2558 2749
2559 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2752
2562 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2563 { 2757 {
2564#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2565 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2566#else 2762# else
2567 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2568 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2770 sigaction (w->signum, &sa, 0);
2771
2772 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2775#endif
2573 } 2776 }
2574 2777
2575 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2576} 2779}
2577 2780
2578void noinline 2781void noinline
2586 2789
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2589 2792
2590 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2794 {
2795#if EV_MULTIPLICITY
2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2797#endif
2798#if EV_USE_SIGNALFD
2799 if (sigfd >= 0)
2800 {
2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2805 sigdelset (&sigfd_set, w->signum);
2806
2807 signalfd (sigfd, &sigfd_set, 0);
2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2809 }
2810 else
2811#endif
2591 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2592 2814
2593 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2594} 2816}
2595 2817
2596void 2818void
2644static void noinline 2866static void noinline
2645infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2646{ 2868{
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); 2869 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2648 2870
2649 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2650 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2651 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 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 2896
2654 /* monitor some parent directory for speedup hints */ 2897 /* 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, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2656 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2657 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2658 { 2901 {
2659 char path [4096]; 2902 char path [4096];
2675 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2676 } 2919 }
2677 } 2920 }
2678 2921
2679 if (w->wd >= 0) 2922 if (w->wd >= 0)
2680 {
2681 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2682 2924
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 2926 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); 2927 ev_timer_again (EV_A_ &w->timer);
2699 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2700} 2929}
2701 2930
2702static void noinline 2931static void noinline
2703infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2704{ 2933{
2780 return; 3009 return;
2781 3010
2782 fs_2625 = 1; 3011 fs_2625 = 1;
2783} 3012}
2784 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2785inline_size void 3025inline_size void
2786infy_init (EV_P) 3026infy_init (EV_P)
2787{ 3027{
2788 if (fs_fd != -2) 3028 if (fs_fd != -2)
2789 return; 3029 return;
2790 3030
2791 fs_fd = -1; 3031 fs_fd = -1;
2792 3032
2793 check_2625 (EV_A); 3033 check_2625 (EV_A);
2794 3034
2795 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2796 3036
2797 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2798 { 3038 {
3039 fd_intern (fs_fd);
2799 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2802 } 3044 }
2803} 3045}
2804 3046
2805inline_size void 3047inline_size void
2806infy_fork (EV_P) 3048infy_fork (EV_P)
2808 int slot; 3050 int slot;
2809 3051
2810 if (fs_fd < 0) 3052 if (fs_fd < 0)
2811 return; 3053 return;
2812 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2813 close (fs_fd); 3057 close (fs_fd);
2814 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2815 3067
2816 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2817 { 3069 {
2818 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2819 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
2826 w->wd = -1; 3078 w->wd = -1;
2827 3079
2828 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2829 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2830 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2831 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
2832 } 3089 }
2833 } 3090 }
2834} 3091}
2835 3092
2836#endif 3093#endif
2853static void noinline 3110static void noinline
2854stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2855{ 3112{
2856 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2857 3114
2858 /* we copy this here each the time so that */ 3115 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); 3116 ev_stat_stat (EV_A_ w);
2862 3117
2863 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2864 if ( 3119 if (
2865 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2866 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2867 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2868 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2869 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2870 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2871 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2872 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2873 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2874 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2875 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2876 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
2877 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2878 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2879 { 3139 {
2880 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2881 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2906 3166
2907 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2908 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2909 else 3169 else
2910#endif 3170#endif
3171 {
2911 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2912 3175
2913 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2914 3177
2915 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2916} 3179}
2925 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2926 3189
2927#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2928 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2929#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2930 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2931 3199
2932 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2933 3201
2934 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2935} 3203}
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3345{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3347
3080 { 3348 {
3081 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3082 3350
3083 while (fdchangecnt) 3351 while (fdchangecnt)
3084 { 3352 {
3085 fd_reify (EV_A); 3353 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3363
3096 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3097 3365
3098 { 3366 {
3099 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3100 3368
3101 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3371 }
3104 3372
3118{ 3386{
3119 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3120 return; 3388 return;
3121 3389
3122 { 3390 {
3123 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3392 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3125 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3393 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3394 }
3127 3395
3128 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
3240 3508
3241void 3509void
3242ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3243{ 3511{
3244 w->sent = 1; 3512 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3246} 3514}
3247#endif 3515#endif
3248 3516
3249/*****************************************************************************/ 3517/*****************************************************************************/
3250 3518
3399 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3402 3670
3403 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3406 { 3674 {
3407 wn = wl->next; 3675 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3677 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines