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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC

133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
339#endif 382#endif
340 383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
351#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
352 434
353/**/ 435/**/
354 436
355#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 450 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 452
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#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) */ 454#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 455
375#if __GNUC__ >= 4 456#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
378#else 459#else
391# define inline_speed static noinline 472# define inline_speed static noinline
392#else 473#else
393# define inline_speed static inline 474# define inline_speed static inline
394#endif 475#endif
395 476
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478
479#if EV_MINPRI == EV_MAXPRI
480# define ABSPRI(w) (((W)w), 0)
481#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
398 484
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
401 487
402typedef ev_watcher *W; 488typedef ev_watcher *W;
414 500
415#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 503#endif
418 504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif
514
419#ifdef _WIN32 515#ifdef _WIN32
420# include "ev_win32.c" 516# include "ev_win32.c"
421#endif 517#endif
422 518
423/*****************************************************************************/ 519/*****************************************************************************/
485#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
487 583
488/*****************************************************************************/ 584/*****************************************************************************/
489 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
490/* file descriptor info structure */ 589/* file descriptor info structure */
491typedef struct 590typedef struct
492{ 591{
493 WL head; 592 WL head;
494 unsigned char events; /* the events watched for */ 593 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 594 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 596 unsigned char unused;
498#if EV_USE_EPOLL 597#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 598 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 599#endif
562 661
563 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
564 663
565#endif 664#endif
566 665
666#if EV_MINIMAL < 2
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else
671# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif
675
676#define EVUNLOOP_RECURSE 0x80
677
567/*****************************************************************************/ 678/*****************************************************************************/
568 679
569#ifndef EV_HAVE_EV_TIME 680#ifndef EV_HAVE_EV_TIME
570ev_tstamp 681ev_tstamp
571ev_time (void) 682ev_time (void)
627 738
628 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 741
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 744 /* by older ones */
634 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
635#endif 746#endif
636 } 747 }
637} 748}
745} 856}
746 857
747/*****************************************************************************/ 858/*****************************************************************************/
748 859
749inline_speed void 860inline_speed void
750fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
751{ 862{
752 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
753 ev_io *w; 864 ev_io *w;
754 865
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
759 if (ev) 870 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
761 } 872 }
762} 873}
763 874
875/* do not submit kernel events for fds that have reify set */
876/* because that means they changed while we were polling for new events */
877inline_speed void
878fd_event (EV_P_ int fd, int revents)
879{
880 ANFD *anfd = anfds + fd;
881
882 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents);
884}
885
764void 886void
765ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 888{
767 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
769} 891}
770 892
771/* make sure the external fd watch events are in-sync */ 893/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 894/* with the kernel/libev internal state */
773inline_size void 895inline_size void
788 910
789#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
790 if (events) 912 if (events)
791 { 913 {
792 unsigned long arg; 914 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 917 }
800#endif 918#endif
801 919
802 { 920 {
873 991
874 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 993 if (anfds [fd].events)
876 { 994 {
877 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
878 return; 996 break;
879 } 997 }
880} 998}
881 999
882/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
883static void noinline 1001static void noinline
888 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1007 if (anfds [fd].events)
890 { 1008 {
891 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1010 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1012 }
895} 1013}
896 1014
897/*****************************************************************************/ 1015/*****************************************************************************/
898 1016
973 1091
974 for (;;) 1092 for (;;)
975 { 1093 {
976 int c = k << 1; 1094 int c = k << 1;
977 1095
978 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
979 break; 1097 break;
980 1098
981 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
982 ? 1 : 0; 1100 ? 1 : 0;
983 1101
1019 1137
1020/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1021inline_size void 1139inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1023{ 1141{
1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1025 upheap (heap, k); 1143 upheap (heap, k);
1026 else 1144 else
1027 downheap (heap, N, k); 1145 downheap (heap, N, k);
1028} 1146}
1029 1147
1042/*****************************************************************************/ 1160/*****************************************************************************/
1043 1161
1044/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1045typedef struct 1163typedef struct
1046{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1047 WL head; 1169 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1170} ANSIG;
1050 1171
1051static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1173
1056/*****************************************************************************/ 1174/*****************************************************************************/
1057 1175
1058/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1059/* this is not fork-safe */ 1177/* this is not fork-safe */
1073evpipe_init (EV_P) 1191evpipe_init (EV_P)
1074{ 1192{
1075 if (!ev_is_active (&pipe_w)) 1193 if (!ev_is_active (&pipe_w))
1076 { 1194 {
1077#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1079 { 1201 {
1080 evpipe [0] = -1; 1202 evpipe [0] = -1;
1081 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1205 }
1084 else 1206 else
1085#endif 1207#endif
1086 { 1208 {
1123/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1125static void 1247static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1249{
1250 int i;
1251
1128#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1253 if (evfd >= 0)
1130 { 1254 {
1131 uint64_t counter; 1255 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
1136 { 1260 {
1137 char dummy; 1261 char dummy;
1138 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1139 } 1263 }
1140 1264
1141 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1142 { 1266 {
1143 int signum; 1267 sig_pending = 0;
1144 gotsig = 0;
1145 1268
1146 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1272 }
1150 1273
1151#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1152 if (gotasync) 1275 if (async_pending)
1153 { 1276 {
1154 int i; 1277 async_pending = 0;
1155 gotasync = 0;
1156 1278
1157 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1159 { 1281 {
1160 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
1168 1290
1169static void 1291static void
1170ev_sighandler (int signum) 1292ev_sighandler (int signum)
1171{ 1293{
1172#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1174#endif 1296#endif
1175 1297
1176#if _WIN32 1298#if _WIN32
1177 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1178#endif 1300#endif
1179 1301
1180 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1182} 1304}
1183 1305
1184void noinline 1306void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1186{ 1308{
1187 WL w; 1309 WL w;
1188 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1189#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1319
1193 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1321 return;
1322#endif
1197 1323
1198 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1199 1325
1200 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1328}
1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1203 1349
1204/*****************************************************************************/ 1350/*****************************************************************************/
1205 1351
1206static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1207 1353
1352ev_backend (EV_P) 1498ev_backend (EV_P)
1353{ 1499{
1354 return backend; 1500 return backend;
1355} 1501}
1356 1502
1503#if EV_MINIMAL < 2
1357unsigned int 1504unsigned int
1358ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1359{ 1506{
1360 return loop_count; 1507 return loop_count;
1361} 1508}
1375void 1522void
1376ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1377{ 1524{
1378 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1379} 1526}
1527
1528void
1529ev_set_userdata (EV_P_ void *data)
1530{
1531 userdata = data;
1532}
1533
1534void *
1535ev_userdata (EV_P)
1536{
1537 return userdata;
1538}
1539
1540void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1541{
1542 invoke_cb = invoke_pending_cb;
1543}
1544
1545void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1546{
1547 release_cb = release;
1548 acquire_cb = acquire;
1549}
1550#endif
1380 1551
1381/* initialise a loop structure, must be zero-initialised */ 1552/* initialise a loop structure, must be zero-initialised */
1382static void noinline 1553static void noinline
1383loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1384{ 1555{
1402 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1403 have_monotonic = 1; 1574 have_monotonic = 1;
1404 } 1575 }
1405#endif 1576#endif
1406 1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1588
1407 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1408 mn_now = get_clock (); 1590 mn_now = get_clock ();
1409 now_floor = mn_now; 1591 now_floor = mn_now;
1410 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2
1594 invoke_cb = ev_invoke_pending;
1595#endif
1411 1596
1412 io_blocktime = 0.; 1597 io_blocktime = 0.;
1413 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1414 backend = 0; 1599 backend = 0;
1415 backend_fd = -1; 1600 backend_fd = -1;
1416 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1417#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1418 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1419#endif 1607#endif
1420 1608#if EV_USE_SIGNALFD
1421 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1422#ifndef _WIN32
1423 if (flags & EVFLAG_FORKCHECK)
1424 curpid = getpid ();
1425#endif 1610#endif
1426
1427 if (!(flags & EVFLAG_NOENV)
1428 && !enable_secure ()
1429 && getenv ("LIBEV_FLAGS"))
1430 flags = atoi (getenv ("LIBEV_FLAGS"));
1431 1611
1432 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1433 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1434 1614
1435#if EV_USE_PORT 1615#if EV_USE_PORT
1461{ 1641{
1462 int i; 1642 int i;
1463 1643
1464 if (ev_is_active (&pipe_w)) 1644 if (ev_is_active (&pipe_w))
1465 { 1645 {
1466 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1467 ev_io_stop (EV_A_ &pipe_w); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1468 1648
1469#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1650 if (evfd >= 0)
1471 close (evfd); 1651 close (evfd);
1472#endif 1652#endif
1473 1653
1474 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1475 { 1655 {
1476 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1477 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1478 } 1658 }
1479 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 close (sigfd);
1664#endif
1480 1665
1481#if EV_USE_INOTIFY 1666#if EV_USE_INOTIFY
1482 if (fs_fd >= 0) 1667 if (fs_fd >= 0)
1483 close (fs_fd); 1668 close (fs_fd);
1484#endif 1669#endif
1508#if EV_IDLE_ENABLE 1693#if EV_IDLE_ENABLE
1509 array_free (idle, [i]); 1694 array_free (idle, [i]);
1510#endif 1695#endif
1511 } 1696 }
1512 1697
1513 ev_free (anfds); anfdmax = 0; 1698 ev_free (anfds); anfds = 0; anfdmax = 0;
1514 1699
1515 /* have to use the microsoft-never-gets-it-right macro */ 1700 /* have to use the microsoft-never-gets-it-right macro */
1516 array_free (rfeed, EMPTY); 1701 array_free (rfeed, EMPTY);
1517 array_free (fdchange, EMPTY); 1702 array_free (fdchange, EMPTY);
1518 array_free (timer, EMPTY); 1703 array_free (timer, EMPTY);
1553 1738
1554 if (ev_is_active (&pipe_w)) 1739 if (ev_is_active (&pipe_w))
1555 { 1740 {
1556 /* this "locks" the handlers against writing to the pipe */ 1741 /* this "locks" the handlers against writing to the pipe */
1557 /* while we modify the fd vars */ 1742 /* while we modify the fd vars */
1558 gotsig = 1; 1743 sig_pending = 1;
1559#if EV_ASYNC_ENABLE 1744#if EV_ASYNC_ENABLE
1560 gotasync = 1; 1745 async_pending = 1;
1561#endif 1746#endif
1562 1747
1563 ev_ref (EV_A); 1748 ev_ref (EV_A);
1564 ev_io_stop (EV_A_ &pipe_w); 1749 ev_io_stop (EV_A_ &pipe_w);
1565 1750
1568 close (evfd); 1753 close (evfd);
1569#endif 1754#endif
1570 1755
1571 if (evpipe [0] >= 0) 1756 if (evpipe [0] >= 0)
1572 { 1757 {
1573 close (evpipe [0]); 1758 EV_WIN32_CLOSE_FD (evpipe [0]);
1574 close (evpipe [1]); 1759 EV_WIN32_CLOSE_FD (evpipe [1]);
1575 } 1760 }
1576 1761
1577 evpipe_init (EV_A); 1762 evpipe_init (EV_A);
1578 /* now iterate over everything, in case we missed something */ 1763 /* now iterate over everything, in case we missed something */
1579 pipecb (EV_A_ &pipe_w, EV_READ); 1764 pipecb (EV_A_ &pipe_w, EV_READ);
1585#if EV_MULTIPLICITY 1770#if EV_MULTIPLICITY
1586 1771
1587struct ev_loop * 1772struct ev_loop *
1588ev_loop_new (unsigned int flags) 1773ev_loop_new (unsigned int flags)
1589{ 1774{
1590 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1775 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1591 1776
1592 memset (loop, 0, sizeof (struct ev_loop)); 1777 memset (EV_A, 0, sizeof (struct ev_loop));
1593
1594 loop_init (EV_A_ flags); 1778 loop_init (EV_A_ flags);
1595 1779
1596 if (ev_backend (EV_A)) 1780 if (ev_backend (EV_A))
1597 return loop; 1781 return EV_A;
1598 1782
1599 return 0; 1783 return 0;
1600} 1784}
1601 1785
1602void 1786void
1609void 1793void
1610ev_loop_fork (EV_P) 1794ev_loop_fork (EV_P)
1611{ 1795{
1612 postfork = 1; /* must be in line with ev_default_fork */ 1796 postfork = 1; /* must be in line with ev_default_fork */
1613} 1797}
1798#endif /* multiplicity */
1614 1799
1615#if EV_VERIFY 1800#if EV_VERIFY
1616static void noinline 1801static void noinline
1617verify_watcher (EV_P_ W w) 1802verify_watcher (EV_P_ W w)
1618{ 1803{
1646 verify_watcher (EV_A_ ws [cnt]); 1831 verify_watcher (EV_A_ ws [cnt]);
1647 } 1832 }
1648} 1833}
1649#endif 1834#endif
1650 1835
1836#if EV_MINIMAL < 2
1651void 1837void
1652ev_loop_verify (EV_P) 1838ev_loop_verify (EV_P)
1653{ 1839{
1654#if EV_VERIFY 1840#if EV_VERIFY
1655 int i; 1841 int i;
1704 assert (checkmax >= checkcnt); 1890 assert (checkmax >= checkcnt);
1705 array_verify (EV_A_ (W *)checks, checkcnt); 1891 array_verify (EV_A_ (W *)checks, checkcnt);
1706 1892
1707# if 0 1893# if 0
1708 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1894 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1709 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1895 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1710# endif
1711#endif 1896# endif
1897#endif
1712} 1898}
1713 1899#endif
1714#endif /* multiplicity */
1715 1900
1716#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1717struct ev_loop * 1902struct ev_loop *
1718ev_default_loop_init (unsigned int flags) 1903ev_default_loop_init (unsigned int flags)
1719#else 1904#else
1722#endif 1907#endif
1723{ 1908{
1724 if (!ev_default_loop_ptr) 1909 if (!ev_default_loop_ptr)
1725 { 1910 {
1726#if EV_MULTIPLICITY 1911#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1912 EV_P = ev_default_loop_ptr = &default_loop_struct;
1728#else 1913#else
1729 ev_default_loop_ptr = 1; 1914 ev_default_loop_ptr = 1;
1730#endif 1915#endif
1731 1916
1732 loop_init (EV_A_ flags); 1917 loop_init (EV_A_ flags);
1749 1934
1750void 1935void
1751ev_default_destroy (void) 1936ev_default_destroy (void)
1752{ 1937{
1753#if EV_MULTIPLICITY 1938#if EV_MULTIPLICITY
1754 struct ev_loop *loop = ev_default_loop_ptr; 1939 EV_P = ev_default_loop_ptr;
1755#endif 1940#endif
1756 1941
1757 ev_default_loop_ptr = 0; 1942 ev_default_loop_ptr = 0;
1758 1943
1759#ifndef _WIN32 1944#ifndef _WIN32
1766 1951
1767void 1952void
1768ev_default_fork (void) 1953ev_default_fork (void)
1769{ 1954{
1770#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr; 1956 EV_P = ev_default_loop_ptr;
1772#endif 1957#endif
1773 1958
1774 postfork = 1; /* must be in line with ev_loop_fork */ 1959 postfork = 1; /* must be in line with ev_loop_fork */
1775} 1960}
1776 1961
1780ev_invoke (EV_P_ void *w, int revents) 1965ev_invoke (EV_P_ void *w, int revents)
1781{ 1966{
1782 EV_CB_INVOKE ((W)w, revents); 1967 EV_CB_INVOKE ((W)w, revents);
1783} 1968}
1784 1969
1785inline_speed void 1970unsigned int
1786call_pending (EV_P) 1971ev_pending_count (EV_P)
1972{
1973 int pri;
1974 unsigned int count = 0;
1975
1976 for (pri = NUMPRI; pri--; )
1977 count += pendingcnt [pri];
1978
1979 return count;
1980}
1981
1982void noinline
1983ev_invoke_pending (EV_P)
1787{ 1984{
1788 int pri; 1985 int pri;
1789 1986
1790 for (pri = NUMPRI; pri--; ) 1987 for (pri = NUMPRI; pri--; )
1791 while (pendingcnt [pri]) 1988 while (pendingcnt [pri])
2029} 2226}
2030 2227
2031void 2228void
2032ev_loop (EV_P_ int flags) 2229ev_loop (EV_P_ int flags)
2033{ 2230{
2231#if EV_MINIMAL < 2
2034 ++loop_depth; 2232 ++loop_depth;
2233#endif
2234
2235 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2035 2236
2036 loop_done = EVUNLOOP_CANCEL; 2237 loop_done = EVUNLOOP_CANCEL;
2037 2238
2038 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2239 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2039 2240
2040 do 2241 do
2041 { 2242 {
2042#if EV_VERIFY >= 2 2243#if EV_VERIFY >= 2
2043 ev_loop_verify (EV_A); 2244 ev_loop_verify (EV_A);
2056 /* we might have forked, so queue fork handlers */ 2257 /* we might have forked, so queue fork handlers */
2057 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2058 if (forkcnt) 2259 if (forkcnt)
2059 { 2260 {
2060 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2261 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2061 call_pending (EV_A); 2262 EV_INVOKE_PENDING;
2062 } 2263 }
2063#endif 2264#endif
2064 2265
2065 /* queue prepare watchers (and execute them) */ 2266 /* queue prepare watchers (and execute them) */
2066 if (expect_false (preparecnt)) 2267 if (expect_false (preparecnt))
2067 { 2268 {
2068 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2269 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2069 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
2070 } 2271 }
2272
2273 if (expect_false (loop_done))
2274 break;
2071 2275
2072 /* we might have forked, so reify kernel state if necessary */ 2276 /* we might have forked, so reify kernel state if necessary */
2073 if (expect_false (postfork)) 2277 if (expect_false (postfork))
2074 loop_fork (EV_A); 2278 loop_fork (EV_A);
2075 2279
2123 waittime -= sleeptime; 2327 waittime -= sleeptime;
2124 } 2328 }
2125 } 2329 }
2126 } 2330 }
2127 2331
2332#if EV_MINIMAL < 2
2128 ++loop_count; 2333 ++loop_count;
2334#endif
2335 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2129 backend_poll (EV_A_ waittime); 2336 backend_poll (EV_A_ waittime);
2337 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2130 2338
2131 /* update ev_rt_now, do magic */ 2339 /* update ev_rt_now, do magic */
2132 time_update (EV_A_ waittime + sleeptime); 2340 time_update (EV_A_ waittime + sleeptime);
2133 } 2341 }
2134 2342
2145 2353
2146 /* queue check watchers, to be executed first */ 2354 /* queue check watchers, to be executed first */
2147 if (expect_false (checkcnt)) 2355 if (expect_false (checkcnt))
2148 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2356 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2149 2357
2150 call_pending (EV_A); 2358 EV_INVOKE_PENDING;
2151 } 2359 }
2152 while (expect_true ( 2360 while (expect_true (
2153 activecnt 2361 activecnt
2154 && !loop_done 2362 && !loop_done
2155 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2363 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2156 )); 2364 ));
2157 2365
2158 if (loop_done == EVUNLOOP_ONE) 2366 if (loop_done == EVUNLOOP_ONE)
2159 loop_done = EVUNLOOP_CANCEL; 2367 loop_done = EVUNLOOP_CANCEL;
2160 2368
2369#if EV_MINIMAL < 2
2161 --loop_depth; 2370 --loop_depth;
2371#endif
2162} 2372}
2163 2373
2164void 2374void
2165ev_unloop (EV_P_ int how) 2375ev_unloop (EV_P_ int how)
2166{ 2376{
2217inline_size void 2427inline_size void
2218wlist_del (WL *head, WL elem) 2428wlist_del (WL *head, WL elem)
2219{ 2429{
2220 while (*head) 2430 while (*head)
2221 { 2431 {
2222 if (*head == elem) 2432 if (expect_true (*head == elem))
2223 { 2433 {
2224 *head = elem->next; 2434 *head = elem->next;
2225 return; 2435 break;
2226 } 2436 }
2227 2437
2228 head = &(*head)->next; 2438 head = &(*head)->next;
2229 } 2439 }
2230} 2440}
2258} 2468}
2259 2469
2260inline_size void 2470inline_size void
2261pri_adjust (EV_P_ W w) 2471pri_adjust (EV_P_ W w)
2262{ 2472{
2263 int pri = w->priority; 2473 int pri = ev_priority (w);
2264 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2474 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2265 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2475 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2266 w->priority = pri; 2476 ev_set_priority (w, pri);
2267} 2477}
2268 2478
2269inline_speed void 2479inline_speed void
2270ev_start (EV_P_ W w, int active) 2480ev_start (EV_P_ W w, int active)
2271{ 2481{
2298 2508
2299 ev_start (EV_A_ (W)w, 1); 2509 ev_start (EV_A_ (W)w, 1);
2300 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2301 wlist_add (&anfds[fd].head, (WL)w); 2511 wlist_add (&anfds[fd].head, (WL)w);
2302 2512
2303 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2513 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2304 w->events &= ~EV__IOFDSET; 2514 w->events &= ~EV__IOFDSET;
2305 2515
2306 EV_FREQUENT_CHECK; 2516 EV_FREQUENT_CHECK;
2307} 2517}
2308 2518
2402 } 2612 }
2403 2613
2404 EV_FREQUENT_CHECK; 2614 EV_FREQUENT_CHECK;
2405} 2615}
2406 2616
2617ev_tstamp
2618ev_timer_remaining (EV_P_ ev_timer *w)
2619{
2620 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2621}
2622
2407#if EV_PERIODIC_ENABLE 2623#if EV_PERIODIC_ENABLE
2408void noinline 2624void noinline
2409ev_periodic_start (EV_P_ ev_periodic *w) 2625ev_periodic_start (EV_P_ ev_periodic *w)
2410{ 2626{
2411 if (expect_false (ev_is_active (w))) 2627 if (expect_false (ev_is_active (w)))
2478#endif 2694#endif
2479 2695
2480void noinline 2696void noinline
2481ev_signal_start (EV_P_ ev_signal *w) 2697ev_signal_start (EV_P_ ev_signal *w)
2482{ 2698{
2483#if EV_MULTIPLICITY
2484 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2485#endif
2486 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2487 return; 2700 return;
2488 2701
2489 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2702 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2490 2703
2491 evpipe_init (EV_A); 2704#if EV_MULTIPLICITY
2705 assert (("libev: a signal must not be attached to two different loops",
2706 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2492 2707
2493 EV_FREQUENT_CHECK; 2708 signals [w->signum - 1].loop = EV_A;
2709#endif
2494 2710
2711 EV_FREQUENT_CHECK;
2712
2713#if EV_USE_SIGNALFD
2714 if (sigfd == -2)
2495 { 2715 {
2496#ifndef _WIN32 2716 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2497 sigset_t full, prev; 2717 if (sigfd < 0 && errno == EINVAL)
2498 sigfillset (&full); 2718 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2499 sigprocmask (SIG_SETMASK, &full, &prev);
2500#endif
2501 2719
2502 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2720 if (sigfd >= 0)
2721 {
2722 fd_intern (sigfd); /* doing it twice will not hurt */
2503 2723
2504#ifndef _WIN32 2724 sigemptyset (&sigfd_set);
2505 sigprocmask (SIG_SETMASK, &prev, 0); 2725
2506#endif 2726 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2727 ev_set_priority (&sigfd_w, EV_MAXPRI);
2728 ev_io_start (EV_A_ &sigfd_w);
2729 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2730 }
2507 } 2731 }
2732
2733 if (sigfd >= 0)
2734 {
2735 /* TODO: check .head */
2736 sigaddset (&sigfd_set, w->signum);
2737 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2738
2739 signalfd (sigfd, &sigfd_set, 0);
2740 }
2741#endif
2508 2742
2509 ev_start (EV_A_ (W)w, 1); 2743 ev_start (EV_A_ (W)w, 1);
2510 wlist_add (&signals [w->signum - 1].head, (WL)w); 2744 wlist_add (&signals [w->signum - 1].head, (WL)w);
2511 2745
2512 if (!((WL)w)->next) 2746 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/
2749# endif
2513 { 2750 {
2514#if _WIN32 2751# if _WIN32
2752 evpipe_init (EV_A);
2753
2515 signal (w->signum, ev_sighandler); 2754 signal (w->signum, ev_sighandler);
2516#else 2755# else
2517 struct sigaction sa; 2756 struct sigaction sa;
2757
2758 evpipe_init (EV_A);
2759
2518 sa.sa_handler = ev_sighandler; 2760 sa.sa_handler = ev_sighandler;
2519 sigfillset (&sa.sa_mask); 2761 sigfillset (&sa.sa_mask);
2520 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2762 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2521 sigaction (w->signum, &sa, 0); 2763 sigaction (w->signum, &sa, 0);
2764
2765 sigemptyset (&sa.sa_mask);
2766 sigaddset (&sa.sa_mask, w->signum);
2767 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2522#endif 2768#endif
2523 } 2769 }
2524 2770
2525 EV_FREQUENT_CHECK; 2771 EV_FREQUENT_CHECK;
2526} 2772}
2527 2773
2528void noinline 2774void noinline
2536 2782
2537 wlist_del (&signals [w->signum - 1].head, (WL)w); 2783 wlist_del (&signals [w->signum - 1].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2784 ev_stop (EV_A_ (W)w);
2539 2785
2540 if (!signals [w->signum - 1].head) 2786 if (!signals [w->signum - 1].head)
2787 {
2788#if EV_MULTIPLICITY
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif
2791#if EV_USE_SIGNALFD
2792 if (sigfd >= 0)
2793 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2795 sigdelset (&sigfd_set, w->signum);
2796 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2798 /*TODO: maybe unblock signal? */
2799 }
2800 else
2801#endif
2541 signal (w->signum, SIG_DFL); 2802 signal (w->signum, SIG_DFL);
2803 }
2542 2804
2543 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2544} 2806}
2545 2807
2546void 2808void
2594static void noinline 2856static void noinline
2595infy_add (EV_P_ ev_stat *w) 2857infy_add (EV_P_ ev_stat *w)
2596{ 2858{
2597 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); 2859 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);
2598 2860
2599 if (w->wd < 0) 2861 if (w->wd >= 0)
2862 {
2863 struct statfs sfs;
2864
2865 /* now local changes will be tracked by inotify, but remote changes won't */
2866 /* unless the filesystem is known to be local, we therefore still poll */
2867 /* also do poll on <2.6.25, but with normal frequency */
2868
2869 if (!fs_2625)
2870 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2871 else if (!statfs (w->path, &sfs)
2872 && (sfs.f_type == 0x1373 /* devfs */
2873 || sfs.f_type == 0xEF53 /* ext2/3 */
2874 || sfs.f_type == 0x3153464a /* jfs */
2875 || sfs.f_type == 0x52654973 /* reiser3 */
2876 || sfs.f_type == 0x01021994 /* tempfs */
2877 || sfs.f_type == 0x58465342 /* xfs */))
2878 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2879 else
2880 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2600 { 2881 }
2882 else
2883 {
2884 /* can't use inotify, continue to stat */
2601 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2885 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2602 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2603 2886
2604 /* monitor some parent directory for speedup hints */ 2887 /* if path is not there, monitor some parent directory for speedup hints */
2605 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2888 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2606 /* but an efficiency issue only */ 2889 /* but an efficiency issue only */
2607 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2890 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2608 { 2891 {
2609 char path [4096]; 2892 char path [4096];
2625 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2908 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2626 } 2909 }
2627 } 2910 }
2628 2911
2629 if (w->wd >= 0) 2912 if (w->wd >= 0)
2630 {
2631 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2913 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2632 2914
2633 /* now local changes will be tracked by inotify, but remote changes won't */ 2915 /* now re-arm timer, if required */
2634 /* unless the filesystem it known to be local, we therefore still poll */ 2916 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2635 /* also do poll on <2.6.25, but with normal frequency */
2636 struct statfs sfs;
2637
2638 if (fs_2625 && !statfs (w->path, &sfs))
2639 if (sfs.f_type == 0x1373 /* devfs */
2640 || sfs.f_type == 0xEF53 /* ext2/3 */
2641 || sfs.f_type == 0x3153464a /* jfs */
2642 || sfs.f_type == 0x52654973 /* reiser3 */
2643 || sfs.f_type == 0x01021994 /* tempfs */
2644 || sfs.f_type == 0x58465342 /* xfs */)
2645 return;
2646
2647 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2648 ev_timer_again (EV_A_ &w->timer); 2917 ev_timer_again (EV_A_ &w->timer);
2649 } 2918 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2650} 2919}
2651 2920
2652static void noinline 2921static void noinline
2653infy_del (EV_P_ ev_stat *w) 2922infy_del (EV_P_ ev_stat *w)
2654{ 2923{
2730 return; 2999 return;
2731 3000
2732 fs_2625 = 1; 3001 fs_2625 = 1;
2733} 3002}
2734 3003
3004inline_size int
3005infy_newfd (void)
3006{
3007#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3008 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3009 if (fd >= 0)
3010 return fd;
3011#endif
3012 return inotify_init ();
3013}
3014
2735inline_size void 3015inline_size void
2736infy_init (EV_P) 3016infy_init (EV_P)
2737{ 3017{
2738 if (fs_fd != -2) 3018 if (fs_fd != -2)
2739 return; 3019 return;
2740 3020
2741 fs_fd = -1; 3021 fs_fd = -1;
2742 3022
2743 check_2625 (EV_A); 3023 check_2625 (EV_A);
2744 3024
2745 fs_fd = inotify_init (); 3025 fs_fd = infy_newfd ();
2746 3026
2747 if (fs_fd >= 0) 3027 if (fs_fd >= 0)
2748 { 3028 {
3029 fd_intern (fs_fd);
2749 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3030 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2750 ev_set_priority (&fs_w, EV_MAXPRI); 3031 ev_set_priority (&fs_w, EV_MAXPRI);
2751 ev_io_start (EV_A_ &fs_w); 3032 ev_io_start (EV_A_ &fs_w);
3033 ev_unref (EV_A);
2752 } 3034 }
2753} 3035}
2754 3036
2755inline_size void 3037inline_size void
2756infy_fork (EV_P) 3038infy_fork (EV_P)
2758 int slot; 3040 int slot;
2759 3041
2760 if (fs_fd < 0) 3042 if (fs_fd < 0)
2761 return; 3043 return;
2762 3044
3045 ev_ref (EV_A);
3046 ev_io_stop (EV_A_ &fs_w);
2763 close (fs_fd); 3047 close (fs_fd);
2764 fs_fd = inotify_init (); 3048 fs_fd = infy_newfd ();
3049
3050 if (fs_fd >= 0)
3051 {
3052 fd_intern (fs_fd);
3053 ev_io_set (&fs_w, fs_fd, EV_READ);
3054 ev_io_start (EV_A_ &fs_w);
3055 ev_unref (EV_A);
3056 }
2765 3057
2766 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3058 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2767 { 3059 {
2768 WL w_ = fs_hash [slot].head; 3060 WL w_ = fs_hash [slot].head;
2769 fs_hash [slot].head = 0; 3061 fs_hash [slot].head = 0;
2776 w->wd = -1; 3068 w->wd = -1;
2777 3069
2778 if (fs_fd >= 0) 3070 if (fs_fd >= 0)
2779 infy_add (EV_A_ w); /* re-add, no matter what */ 3071 infy_add (EV_A_ w); /* re-add, no matter what */
2780 else 3072 else
3073 {
3074 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3075 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2781 ev_timer_again (EV_A_ &w->timer); 3076 ev_timer_again (EV_A_ &w->timer);
3077 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3078 }
2782 } 3079 }
2783 } 3080 }
2784} 3081}
2785 3082
2786#endif 3083#endif
2856 3153
2857 if (fs_fd >= 0) 3154 if (fs_fd >= 0)
2858 infy_add (EV_A_ w); 3155 infy_add (EV_A_ w);
2859 else 3156 else
2860#endif 3157#endif
3158 {
2861 ev_timer_again (EV_A_ &w->timer); 3159 ev_timer_again (EV_A_ &w->timer);
3160 ev_unref (EV_A);
3161 }
2862 3162
2863 ev_start (EV_A_ (W)w, 1); 3163 ev_start (EV_A_ (W)w, 1);
2864 3164
2865 EV_FREQUENT_CHECK; 3165 EV_FREQUENT_CHECK;
2866} 3166}
2875 EV_FREQUENT_CHECK; 3175 EV_FREQUENT_CHECK;
2876 3176
2877#if EV_USE_INOTIFY 3177#if EV_USE_INOTIFY
2878 infy_del (EV_A_ w); 3178 infy_del (EV_A_ w);
2879#endif 3179#endif
3180
3181 if (ev_is_active (&w->timer))
3182 {
3183 ev_ref (EV_A);
2880 ev_timer_stop (EV_A_ &w->timer); 3184 ev_timer_stop (EV_A_ &w->timer);
3185 }
2881 3186
2882 ev_stop (EV_A_ (W)w); 3187 ev_stop (EV_A_ (W)w);
2883 3188
2884 EV_FREQUENT_CHECK; 3189 EV_FREQUENT_CHECK;
2885} 3190}
3026embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3331embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3027{ 3332{
3028 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3333 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3029 3334
3030 { 3335 {
3031 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
3032 3337
3033 while (fdchangecnt) 3338 while (fdchangecnt)
3034 { 3339 {
3035 fd_reify (EV_A); 3340 fd_reify (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3341 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3044 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3349 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3045 3350
3046 ev_embed_stop (EV_A_ w); 3351 ev_embed_stop (EV_A_ w);
3047 3352
3048 { 3353 {
3049 struct ev_loop *loop = w->other; 3354 EV_P = w->other;
3050 3355
3051 ev_loop_fork (EV_A); 3356 ev_loop_fork (EV_A);
3052 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3357 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3053 } 3358 }
3054 3359
3068{ 3373{
3069 if (expect_false (ev_is_active (w))) 3374 if (expect_false (ev_is_active (w)))
3070 return; 3375 return;
3071 3376
3072 { 3377 {
3073 struct ev_loop *loop = w->other; 3378 EV_P = w->other;
3074 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3379 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3075 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3380 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3076 } 3381 }
3077 3382
3078 EV_FREQUENT_CHECK; 3383 EV_FREQUENT_CHECK;
3190 3495
3191void 3496void
3192ev_async_send (EV_P_ ev_async *w) 3497ev_async_send (EV_P_ ev_async *w)
3193{ 3498{
3194 w->sent = 1; 3499 w->sent = 1;
3195 evpipe_write (EV_A_ &gotasync); 3500 evpipe_write (EV_A_ &async_pending);
3196} 3501}
3197#endif 3502#endif
3198 3503
3199/*****************************************************************************/ 3504/*****************************************************************************/
3200 3505
3349 if (types & EV_CHECK) 3654 if (types & EV_CHECK)
3350 for (i = checkcnt; i--; ) 3655 for (i = checkcnt; i--; )
3351 cb (EV_A_ EV_CHECK, checks [i]); 3656 cb (EV_A_ EV_CHECK, checks [i]);
3352 3657
3353 if (types & EV_SIGNAL) 3658 if (types & EV_SIGNAL)
3354 for (i = 0; i < signalmax; ++i) 3659 for (i = 0; i < EV_NSIG - 1; ++i)
3355 for (wl = signals [i].head; wl; ) 3660 for (wl = signals [i].head; wl; )
3356 { 3661 {
3357 wn = wl->next; 3662 wn = wl->next;
3358 cb (EV_A_ EV_SIGNAL, wl); 3663 cb (EV_A_ EV_SIGNAL, wl);
3359 wl = wn; 3664 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines