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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.323 by root, Wed Jan 13 12:44:33 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
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
567 662
568 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
569 664
570#endif 665#endif
571 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
572/*****************************************************************************/ 679/*****************************************************************************/
573 680
574#ifndef EV_HAVE_EV_TIME 681#ifndef EV_HAVE_EV_TIME
575ev_tstamp 682ev_tstamp
576ev_time (void) 683ev_time (void)
632 739
633 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 742
636 /* 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 */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 745 /* by older ones */
639 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
640#endif 747#endif
641 } 748 }
642} 749}
750} 857}
751 858
752/*****************************************************************************/ 859/*****************************************************************************/
753 860
754inline_speed void 861inline_speed void
755fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
756{ 863{
757 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
758 ev_io *w; 865 ev_io *w;
759 866
760 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)
764 if (ev) 871 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
766 } 873 }
767} 874}
768 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
769void 887void
770ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 889{
772 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
774} 892}
775 893
776/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
778inline_size void 896inline_size void
793 911
794#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
795 if (events) 913 if (events)
796 { 914 {
797 unsigned long arg; 915 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 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));
804 } 918 }
805#endif 919#endif
806 920
807 { 921 {
850/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
851inline_size int 965inline_size int
852fd_valid (int fd) 966fd_valid (int fd)
853{ 967{
854#ifdef _WIN32 968#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 970#else
857 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
858#endif 972#endif
859} 973}
860 974
878 992
879 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 994 if (anfds [fd].events)
881 { 995 {
882 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
883 return; 997 break;
884 } 998 }
885} 999}
886 1000
887/* 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 */
888static void noinline 1002static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1008 if (anfds [fd].events)
895 { 1009 {
896 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1013 }
900} 1014}
901 1015
902/*****************************************************************************/ 1016/*****************************************************************************/
903 1017
978 1092
979 for (;;) 1093 for (;;)
980 { 1094 {
981 int c = k << 1; 1095 int c = k << 1;
982 1096
983 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
984 break; 1098 break;
985 1099
986 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])
987 ? 1 : 0; 1101 ? 1 : 0;
988 1102
1024 1138
1025/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1026inline_size void 1140inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1028{ 1142{
1029 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)]))
1030 upheap (heap, k); 1144 upheap (heap, k);
1031 else 1145 else
1032 downheap (heap, N, k); 1146 downheap (heap, N, k);
1033} 1147}
1034 1148
1047/*****************************************************************************/ 1161/*****************************************************************************/
1048 1162
1049/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1050typedef struct 1164typedef struct
1051{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1052 WL head; 1170 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1171} ANSIG;
1055 1172
1056static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1174
1061/*****************************************************************************/ 1175/*****************************************************************************/
1062 1176
1063/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1178/* this is not fork-safe */
1065inline_speed void 1179inline_speed void
1066fd_intern (int fd) 1180fd_intern (int fd)
1067{ 1181{
1068#ifdef _WIN32 1182#ifdef _WIN32
1069 unsigned long arg = 1; 1183 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1071#else 1185#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif 1188#endif
1075} 1189}
1078evpipe_init (EV_P) 1192evpipe_init (EV_P)
1079{ 1193{
1080 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1081 { 1195 {
1082#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1084 { 1202 {
1085 evpipe [0] = -1; 1203 evpipe [0] = -1;
1086 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1206 }
1089 else 1207 else
1090#endif 1208#endif
1091 { 1209 {
1128/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1130static void 1248static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1250{
1251 int i;
1252
1133#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1254 if (evfd >= 0)
1135 { 1255 {
1136 uint64_t counter; 1256 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1141 { 1261 {
1142 char dummy; 1262 char dummy;
1143 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1144 } 1264 }
1145 1265
1146 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1147 { 1267 {
1148 int signum; 1268 sig_pending = 0;
1149 gotsig = 0;
1150 1269
1151 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1273 }
1155 1274
1156#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1157 if (gotasync) 1276 if (async_pending)
1158 { 1277 {
1159 int i; 1278 async_pending = 0;
1160 gotasync = 0;
1161 1279
1162 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1164 { 1282 {
1165 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1173 1291
1174static void 1292static void
1175ev_sighandler (int signum) 1293ev_sighandler (int signum)
1176{ 1294{
1177#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1179#endif 1297#endif
1180 1298
1181#if _WIN32 1299#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1183#endif 1301#endif
1184 1302
1185 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1187} 1305}
1188 1306
1189void noinline 1307void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1191{ 1309{
1192 WL w; 1310 WL w;
1193 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1194#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1195 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 */
1196#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1320
1198 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1322 return;
1323#endif
1202 1324
1203 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1204 1326
1205 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 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
1208 1350
1209/*****************************************************************************/ 1351/*****************************************************************************/
1210 1352
1211static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1212 1354
1357ev_backend (EV_P) 1499ev_backend (EV_P)
1358{ 1500{
1359 return backend; 1501 return backend;
1360} 1502}
1361 1503
1504#if EV_MINIMAL < 2
1362unsigned int 1505unsigned int
1363ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1364{ 1507{
1365 return loop_count; 1508 return loop_count;
1366} 1509}
1380void 1523void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1525{
1383 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1384} 1527}
1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1385 1552
1386/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1554static void noinline
1388loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1389{ 1556{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1575 have_monotonic = 1;
1409 } 1576 }
1410#endif 1577#endif
1411 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1412 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1591 mn_now = get_clock ();
1414 now_floor = mn_now; 1592 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1416 1597
1417 io_blocktime = 0.; 1598 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1419 backend = 0; 1600 backend = 0;
1420 backend_fd = -1; 1601 backend_fd = -1;
1421 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1422#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1423 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1608#endif
1425 1609#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1611#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1612
1437 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1439 1615
1440#if EV_USE_PORT 1616#if EV_USE_PORT
1466{ 1642{
1467 int i; 1643 int i;
1468 1644
1469 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1470 { 1646 {
1471 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1649
1474#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1651 if (evfd >= 0)
1476 close (evfd); 1652 close (evfd);
1477#endif 1653#endif
1478 1654
1479 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1480 { 1656 {
1481 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1659 }
1484 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1485 1666
1486#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1488 close (fs_fd); 1669 close (fs_fd);
1489#endif 1670#endif
1513#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1695 array_free (idle, [i]);
1515#endif 1696#endif
1516 } 1697 }
1517 1698
1518 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1700
1520 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1558 1739
1559 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1560 { 1741 {
1561 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1563 gotsig = 1; 1744 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1746 async_pending = 1;
1566#endif 1747#endif
1567 1748
1568 ev_ref (EV_A); 1749 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1570 1751
1573 close (evfd); 1754 close (evfd);
1574#endif 1755#endif
1575 1756
1576 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1577 { 1758 {
1578 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1761 }
1581 1762
1582 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1590#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1591 1772
1592struct ev_loop * 1773struct ev_loop *
1593ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1594{ 1775{
1595 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));
1596 1777
1597 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1600 1780
1601 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1602 return loop; 1782 return EV_A;
1603 1783
1604 return 0; 1784 return 0;
1605} 1785}
1606 1786
1607void 1787void
1614void 1794void
1615ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1616{ 1796{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1618} 1798}
1799#endif /* multiplicity */
1619 1800
1620#if EV_VERIFY 1801#if EV_VERIFY
1621static void noinline 1802static void noinline
1622verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1623{ 1804{
1651 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1652 } 1833 }
1653} 1834}
1654#endif 1835#endif
1655 1836
1837#if EV_MINIMAL < 2
1656void 1838void
1657ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1658{ 1840{
1659#if EV_VERIFY 1841#if EV_VERIFY
1660 int i; 1842 int i;
1709 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1711 1893
1712# if 0 1894# if 0
1713 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)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif
1716#endif 1897# endif
1898#endif
1717} 1899}
1718 1900#endif
1719#endif /* multiplicity */
1720 1901
1721#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1722struct ev_loop * 1903struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1724#else 1905#else
1727#endif 1908#endif
1728{ 1909{
1729 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1730 { 1911 {
1731#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1914#else
1734 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1735#endif 1916#endif
1736 1917
1737 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1754 1935
1755void 1936void
1756ev_default_destroy (void) 1937ev_default_destroy (void)
1757{ 1938{
1758#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1760#endif 1941#endif
1761 1942
1762 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1763 1944
1764#ifndef _WIN32 1945#ifndef _WIN32
1771 1952
1772void 1953void
1773ev_default_fork (void) 1954ev_default_fork (void)
1774{ 1955{
1775#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1777#endif 1958#endif
1778 1959
1779 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1780} 1961}
1781 1962
1785ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1786{ 1967{
1787 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1788} 1969}
1789 1970
1790inline_speed void 1971unsigned int
1791call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1792{ 1985{
1793 int pri; 1986 int pri;
1794 1987
1795 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
2034} 2227}
2035 2228
2036void 2229void
2037ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
2038{ 2231{
2232#if EV_MINIMAL < 2
2039 ++loop_depth; 2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2237
2041 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
2042 2239
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2241
2045 do 2242 do
2046 { 2243 {
2047#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
2061 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2259 if (expect_false (postfork))
2063 if (forkcnt) 2260 if (forkcnt)
2064 { 2261 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
2067 } 2264 }
2068#endif 2265#endif
2069 2266
2070 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
2072 { 2269 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
2075 } 2272 }
2273
2274 if (expect_false (loop_done))
2275 break;
2076 2276
2077 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2079 loop_fork (EV_A); 2279 loop_fork (EV_A);
2080 2280
2128 waittime -= sleeptime; 2328 waittime -= sleeptime;
2129 } 2329 }
2130 } 2330 }
2131 } 2331 }
2132 2332
2333#if EV_MINIMAL < 2
2133 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2339
2136 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2138 } 2342 }
2139 2343
2150 2354
2151 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2154 2358
2155 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2156 } 2360 }
2157 while (expect_true ( 2361 while (expect_true (
2158 activecnt 2362 activecnt
2159 && !loop_done 2363 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2365 ));
2162 2366
2163 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2165 2369
2370#if EV_MINIMAL < 2
2166 --loop_depth; 2371 --loop_depth;
2372#endif
2167} 2373}
2168 2374
2169void 2375void
2170ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2171{ 2377{
2222inline_size void 2428inline_size void
2223wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2224{ 2430{
2225 while (*head) 2431 while (*head)
2226 { 2432 {
2227 if (*head == elem) 2433 if (expect_true (*head == elem))
2228 { 2434 {
2229 *head = elem->next; 2435 *head = elem->next;
2230 return; 2436 break;
2231 } 2437 }
2232 2438
2233 head = &(*head)->next; 2439 head = &(*head)->next;
2234 } 2440 }
2235} 2441}
2303 2509
2304 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2307 2513
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2310 2516
2311 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2312} 2518}
2313 2519
2407 } 2613 }
2408 2614
2409 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2410} 2616}
2411 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
2412#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2413void noinline 2625void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2627{
2416 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2483#endif 2695#endif
2484 2696
2485void noinline 2697void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2487{ 2699{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2492 return; 2701 return;
2493 2702
2494 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));
2495 2704
2496 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));
2497 2708
2498 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2499 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2500 { 2716 {
2501#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2720
2507 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 */
2508 2724
2509#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2511#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 }
2512 } 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
2513 2743
2514 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2746
2517 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2518 { 2751 {
2519#if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2520 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2521#else 2756# else
2522 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2523 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2525 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 */
2526 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);
2527#endif 2769#endif
2528 } 2770 }
2529 2771
2530 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2531} 2773}
2532 2774
2533void noinline 2775void noinline
2541 2783
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2544 2786
2545 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
2546 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2547 2808
2548 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2549} 2810}
2550 2811
2551void 2812void
2599static void noinline 2860static void noinline
2600infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2601{ 2862{
2602 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);
2603 2864
2604 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 */
2605 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2606 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2607 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2608 2890
2609 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2610 /* 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, */
2611 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2612 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2613 { 2895 {
2614 char path [4096]; 2896 char path [4096];
2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2631 } 2913 }
2632 } 2914 }
2633 2915
2634 if (w->wd >= 0) 2916 if (w->wd >= 0)
2635 {
2636 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);
2637 2918
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2640 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642
2643 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */
2647 || sfs.f_type == 0x52654973 /* reiser3 */
2648 || sfs.f_type == 0x01021994 /* tempfs */
2649 || sfs.f_type == 0x58465342 /* xfs */)
2650 return;
2651
2652 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2653 ev_timer_again (EV_A_ &w->timer); 2921 ev_timer_again (EV_A_ &w->timer);
2654 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2655} 2923}
2656 2924
2657static void noinline 2925static void noinline
2658infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2659{ 2927{
2735 return; 3003 return;
2736 3004
2737 fs_2625 = 1; 3005 fs_2625 = 1;
2738} 3006}
2739 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
2740inline_size void 3019inline_size void
2741infy_init (EV_P) 3020infy_init (EV_P)
2742{ 3021{
2743 if (fs_fd != -2) 3022 if (fs_fd != -2)
2744 return; 3023 return;
2745 3024
2746 fs_fd = -1; 3025 fs_fd = -1;
2747 3026
2748 check_2625 (EV_A); 3027 check_2625 (EV_A);
2749 3028
2750 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2751 3030
2752 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2753 { 3032 {
3033 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2757 } 3038 }
2758} 3039}
2759 3040
2760inline_size void 3041inline_size void
2761infy_fork (EV_P) 3042infy_fork (EV_P)
2763 int slot; 3044 int slot;
2764 3045
2765 if (fs_fd < 0) 3046 if (fs_fd < 0)
2766 return; 3047 return;
2767 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3051 close (fs_fd);
2769 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 }
2770 3061
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2772 { 3063 {
2773 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
2781 w->wd = -1; 3072 w->wd = -1;
2782 3073
2783 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2784 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2785 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);
2786 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 }
2787 } 3083 }
2788 } 3084 }
2789} 3085}
2790 3086
2791#endif 3087#endif
2808static void noinline 3104static void noinline
2809stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2810{ 3106{
2811 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2812 3108
2813 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
2814 /* prev has the old value when the callback gets invoked */
2815 w->prev = w->attr;
2816 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
2817 3111
2818 /* 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 */
2819 if ( 3113 if (
2820 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2821 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2822 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2823 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2824 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2825 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2826 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2827 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2828 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2829 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2830 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2831 ) { 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
2832 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2833 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2834 { 3133 {
2835 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2836 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2861 3160
2862 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2863 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2864 else 3163 else
2865#endif 3164#endif
3165 {
2866 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2867 3169
2868 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2869 3171
2870 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2871} 3173}
2880 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2881 3183
2882#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2883 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2884#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2885 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2886 3193
2887 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2888 3195
2889 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2890} 3197}
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3339{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3341
3035 { 3342 {
3036 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3037 3344
3038 while (fdchangecnt) 3345 while (fdchangecnt)
3039 { 3346 {
3040 fd_reify (EV_A); 3347 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3049 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));
3050 3357
3051 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3052 3359
3053 { 3360 {
3054 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3055 3362
3056 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3365 }
3059 3366
3073{ 3380{
3074 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3075 return; 3382 return;
3076 3383
3077 { 3384 {
3078 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3079 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 ()));
3080 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);
3081 } 3388 }
3082 3389
3083 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
3195 3502
3196void 3503void
3197ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3198{ 3505{
3199 w->sent = 1; 3506 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3201} 3508}
3202#endif 3509#endif
3203 3510
3204/*****************************************************************************/ 3511/*****************************************************************************/
3205 3512
3354 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3357 3664
3358 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3361 { 3668 {
3362 wn = wl->next; 3669 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3671 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines