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

Comparing libev/ev.c (file contents):
Revision 1.293 by root, Mon Jun 29 18:46:52 2009 UTC vs.
Revision 1.319 by root, Wed Nov 18 10:25:22 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
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
178# endif 187# endif
179#endif 188#endif
180 189
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
182 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 299#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 301# define EV_USE_EVENTFD 1
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif
305#endif
306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
268# endif 312# endif
269#endif 313#endif
270 314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
339#endif 383#endif
340 384
341#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
344# ifdef __cplusplus 398# ifdef __cplusplus
345extern "C" { 399extern "C" {
346# endif 400# endif
347int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 402# ifdef __cplusplus
349} 403}
350# endif 404# endif
351#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
352 435
353/**/ 436/**/
354 437
355#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 451 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 453
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 455#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 456
375#if __GNUC__ >= 4 457#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
378#else 460#else
391# define inline_speed static noinline 473# define inline_speed static noinline
392#else 474#else
393# define inline_speed static inline 475# define inline_speed static inline
394#endif 476#endif
395 477
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
398 485
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
401 488
402typedef ev_watcher *W; 489typedef ev_watcher *W;
414 501
415#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 504#endif
418 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
419#ifdef _WIN32 516#ifdef _WIN32
420# include "ev_win32.c" 517# include "ev_win32.c"
421#endif 518#endif
422 519
423/*****************************************************************************/ 520/*****************************************************************************/
485#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
487 584
488/*****************************************************************************/ 585/*****************************************************************************/
489 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
490/* file descriptor info structure */ 590/* file descriptor info structure */
491typedef struct 591typedef struct
492{ 592{
493 WL head; 593 WL head;
494 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 597 unsigned char unused;
498#if EV_USE_EPOLL 598#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 600#endif
562 662
563 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
564 664
565#endif 665#endif
566 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
567/*****************************************************************************/ 679/*****************************************************************************/
568 680
569#ifndef EV_HAVE_EV_TIME 681#ifndef EV_HAVE_EV_TIME
570ev_tstamp 682ev_tstamp
571ev_time (void) 683ev_time (void)
627 739
628 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 742
631 /* 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 */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 745 /* by older ones */
634 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
635#endif 747#endif
636 } 748 }
637} 749}
745} 857}
746 858
747/*****************************************************************************/ 859/*****************************************************************************/
748 860
749inline_speed void 861inline_speed void
750fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
751{ 863{
752 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
753 ev_io *w; 865 ev_io *w;
754 866
755 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)
759 if (ev) 871 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
761 } 873 }
762} 874}
763 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
764void 887void
765ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 889{
767 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
769} 892}
770 893
771/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
773inline_size void 896inline_size void
788 911
789#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
790 if (events) 913 if (events)
791 { 914 {
792 unsigned long arg; 915 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 918 }
800#endif 919#endif
801 920
802 { 921 {
873 992
874 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 994 if (anfds [fd].events)
876 { 995 {
877 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
878 return; 997 break;
879 } 998 }
880} 999}
881 1000
882/* 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 */
883static void noinline 1002static void noinline
888 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1008 if (anfds [fd].events)
890 { 1009 {
891 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1013 }
895} 1014}
896 1015
897/*****************************************************************************/ 1016/*****************************************************************************/
898 1017
973 1092
974 for (;;) 1093 for (;;)
975 { 1094 {
976 int c = k << 1; 1095 int c = k << 1;
977 1096
978 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
979 break; 1098 break;
980 1099
981 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])
982 ? 1 : 0; 1101 ? 1 : 0;
983 1102
1019 1138
1020/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1021inline_size void 1140inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1023{ 1142{
1024 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)]))
1025 upheap (heap, k); 1144 upheap (heap, k);
1026 else 1145 else
1027 downheap (heap, N, k); 1146 downheap (heap, N, k);
1028} 1147}
1029 1148
1042/*****************************************************************************/ 1161/*****************************************************************************/
1043 1162
1044/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1045typedef struct 1164typedef struct
1046{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1047 WL head; 1170 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1171} ANSIG;
1050 1172
1051static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1174
1056/*****************************************************************************/ 1175/*****************************************************************************/
1057 1176
1058/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1059/* this is not fork-safe */ 1178/* this is not fork-safe */
1073evpipe_init (EV_P) 1192evpipe_init (EV_P)
1074{ 1193{
1075 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1076 { 1195 {
1077#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1079 { 1202 {
1080 evpipe [0] = -1; 1203 evpipe [0] = -1;
1081 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1206 }
1084 else 1207 else
1085#endif 1208#endif
1086 { 1209 {
1123/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1125static void 1248static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1250{
1251 int i;
1252
1128#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1254 if (evfd >= 0)
1130 { 1255 {
1131 uint64_t counter; 1256 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1136 { 1261 {
1137 char dummy; 1262 char dummy;
1138 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1139 } 1264 }
1140 1265
1141 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1142 { 1267 {
1143 int signum; 1268 sig_pending = 0;
1144 gotsig = 0;
1145 1269
1146 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1273 }
1150 1274
1151#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1152 if (gotasync) 1276 if (async_pending)
1153 { 1277 {
1154 int i; 1278 async_pending = 0;
1155 gotasync = 0;
1156 1279
1157 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1159 { 1282 {
1160 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1168 1291
1169static void 1292static void
1170ev_sighandler (int signum) 1293ev_sighandler (int signum)
1171{ 1294{
1172#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1174#endif 1297#endif
1175 1298
1176#if _WIN32 1299#if _WIN32
1177 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1178#endif 1301#endif
1179 1302
1180 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1182} 1305}
1183 1306
1184void noinline 1307void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1186{ 1309{
1187 WL w; 1310 WL w;
1188 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1189#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1190 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 */
1191#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1320
1193 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1322 return;
1323#endif
1197 1324
1198 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1199 1326
1200 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 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
1203 1350
1204/*****************************************************************************/ 1351/*****************************************************************************/
1205 1352
1206static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1207 1354
1352ev_backend (EV_P) 1499ev_backend (EV_P)
1353{ 1500{
1354 return backend; 1501 return backend;
1355} 1502}
1356 1503
1504#if EV_MINIMAL < 2
1357unsigned int 1505unsigned int
1358ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1359{ 1507{
1360 return loop_count; 1508 return loop_count;
1361} 1509}
1362 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1363void 1517void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1519{
1366 io_blocktime = interval; 1520 io_blocktime = interval;
1367} 1521}
1369void 1523void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1525{
1372 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1373} 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
1374 1552
1375/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1554static void noinline
1377loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1378{ 1556{
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1575 have_monotonic = 1;
1398 } 1576 }
1399#endif 1577#endif
1400 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
1401 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1591 mn_now = get_clock ();
1403 now_floor = mn_now; 1592 now_floor = mn_now;
1404 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
1405 1597
1406 io_blocktime = 0.; 1598 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1408 backend = 0; 1600 backend = 0;
1409 backend_fd = -1; 1601 backend_fd = -1;
1410 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1411#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1412 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1608#endif
1414 1609#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1611#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1612
1426 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1428 1615
1429#if EV_USE_PORT 1616#if EV_USE_PORT
1455{ 1642{
1456 int i; 1643 int i;
1457 1644
1458 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1459 { 1646 {
1460 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1649
1463#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1651 if (evfd >= 0)
1465 close (evfd); 1652 close (evfd);
1466#endif 1653#endif
1467 1654
1468 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1469 { 1656 {
1470 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1659 }
1473 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1474 1666
1475#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1477 close (fs_fd); 1669 close (fs_fd);
1478#endif 1670#endif
1502#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1695 array_free (idle, [i]);
1504#endif 1696#endif
1505 } 1697 }
1506 1698
1507 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1700
1509 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1547 1739
1548 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1549 { 1741 {
1550 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1552 gotsig = 1; 1744 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1746 async_pending = 1;
1555#endif 1747#endif
1556 1748
1557 ev_ref (EV_A); 1749 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1559 1751
1562 close (evfd); 1754 close (evfd);
1563#endif 1755#endif
1564 1756
1565 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1566 { 1758 {
1567 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1761 }
1570 1762
1571 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1579#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1580 1772
1581struct ev_loop * 1773struct ev_loop *
1582ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1583{ 1775{
1584 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));
1585 1777
1586 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1589 1780
1590 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1591 return loop; 1782 return EV_A;
1592 1783
1593 return 0; 1784 return 0;
1594} 1785}
1595 1786
1596void 1787void
1603void 1794void
1604ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1605{ 1796{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1607} 1798}
1799#endif /* multiplicity */
1608 1800
1609#if EV_VERIFY 1801#if EV_VERIFY
1610static void noinline 1802static void noinline
1611verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1612{ 1804{
1640 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1641 } 1833 }
1642} 1834}
1643#endif 1835#endif
1644 1836
1837#if EV_MINIMAL < 2
1645void 1838void
1646ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1647{ 1840{
1648#if EV_VERIFY 1841#if EV_VERIFY
1649 int i; 1842 int i;
1698 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1700 1893
1701# if 0 1894# if 0
1702 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)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1704# endif
1705#endif 1897# endif
1898#endif
1706} 1899}
1707 1900#endif
1708#endif /* multiplicity */
1709 1901
1710#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1711struct ev_loop * 1903struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1713#else 1905#else
1716#endif 1908#endif
1717{ 1909{
1718 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1719 { 1911 {
1720#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1914#else
1723 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1724#endif 1916#endif
1725 1917
1726 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1743 1935
1744void 1936void
1745ev_default_destroy (void) 1937ev_default_destroy (void)
1746{ 1938{
1747#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1749#endif 1941#endif
1750 1942
1751 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1752 1944
1753#ifndef _WIN32 1945#ifndef _WIN32
1760 1952
1761void 1953void
1762ev_default_fork (void) 1954ev_default_fork (void)
1763{ 1955{
1764#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1766#endif 1958#endif
1767 1959
1768 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1769} 1961}
1770 1962
1774ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1775{ 1967{
1776 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1777} 1969}
1778 1970
1779inline_speed void 1971unsigned int
1780call_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)
1781{ 1985{
1782 int pri; 1986 int pri;
1783 1987
1784 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
2020 2224
2021 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
2022 } 2226 }
2023} 2227}
2024 2228
2025static int loop_done;
2026
2027void 2229void
2028ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
2029{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
2030 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
2031 2239
2032 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 */
2033 2241
2034 do 2242 do
2035 { 2243 {
2036#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
2050 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2259 if (expect_false (postfork))
2052 if (forkcnt) 2260 if (forkcnt)
2053 { 2261 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
2056 } 2264 }
2057#endif 2265#endif
2058 2266
2059 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
2061 { 2269 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
2064 } 2272 }
2273
2274 if (expect_false (loop_done))
2275 break;
2065 2276
2066 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2068 loop_fork (EV_A); 2279 loop_fork (EV_A);
2069 2280
2117 waittime -= sleeptime; 2328 waittime -= sleeptime;
2118 } 2329 }
2119 } 2330 }
2120 } 2331 }
2121 2332
2333#if EV_MINIMAL < 2
2122 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2123 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2124 2339
2125 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2126 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2127 } 2342 }
2128 2343
2139 2354
2140 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2141 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2142 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2143 2358
2144 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2145 } 2360 }
2146 while (expect_true ( 2361 while (expect_true (
2147 activecnt 2362 activecnt
2148 && !loop_done 2363 && !loop_done
2149 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2150 )); 2365 ));
2151 2366
2152 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2153 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2154} 2373}
2155 2374
2156void 2375void
2157ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2158{ 2377{
2209inline_size void 2428inline_size void
2210wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2211{ 2430{
2212 while (*head) 2431 while (*head)
2213 { 2432 {
2214 if (*head == elem) 2433 if (expect_true (*head == elem))
2215 { 2434 {
2216 *head = elem->next; 2435 *head = elem->next;
2217 return; 2436 break;
2218 } 2437 }
2219 2438
2220 head = &(*head)->next; 2439 head = &(*head)->next;
2221 } 2440 }
2222} 2441}
2250} 2469}
2251 2470
2252inline_size void 2471inline_size void
2253pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2254{ 2473{
2255 int pri = w->priority; 2474 int pri = ev_priority (w);
2256 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2257 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2258 w->priority = pri; 2477 ev_set_priority (w, pri);
2259} 2478}
2260 2479
2261inline_speed void 2480inline_speed void
2262ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2263{ 2482{
2290 2509
2291 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2292 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2293 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2294 2513
2295 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2296 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2297 2516
2298 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2299} 2518}
2300 2519
2394 } 2613 }
2395 2614
2396 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2397} 2616}
2398 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
2399#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2400void noinline 2625void noinline
2401ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2402{ 2627{
2403 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2470#endif 2695#endif
2471 2696
2472void noinline 2697void noinline
2473ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2474{ 2699{
2475#if EV_MULTIPLICITY
2476 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2477#endif
2478 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2479 return; 2701 return;
2480 2702
2481 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));
2482 2704
2483 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));
2484 2708
2485 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2486 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2487 { 2716 {
2488#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2489 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2490 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2491 sigprocmask (SIG_SETMASK, &full, &prev);
2492#endif
2493 2720
2494 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 */
2495 2724
2496#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2497 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2498#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 }
2499 } 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
2500 2743
2501 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2502 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2503 2746
2504 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2505 { 2751 {
2506#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2507 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2508#else 2756# else
2509 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2510 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2511 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2512 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 */
2513 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);
2514#endif 2769#endif
2515 } 2770 }
2516 2771
2517 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2518} 2773}
2519 2774
2520void noinline 2775void noinline
2528 2783
2529 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2530 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2531 2786
2532 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 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2796 sigdelset (&sigfd_set, w->signum);
2797 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2799 /*TODO: maybe unblock signal? */
2800 }
2801 else
2802#endif
2533 signal (w->signum, SIG_DFL); 2803 signal (w->signum, SIG_DFL);
2804 }
2534 2805
2535 EV_FREQUENT_CHECK; 2806 EV_FREQUENT_CHECK;
2536} 2807}
2537 2808
2538void 2809void
2586static void noinline 2857static void noinline
2587infy_add (EV_P_ ev_stat *w) 2858infy_add (EV_P_ ev_stat *w)
2588{ 2859{
2589 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); 2860 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);
2590 2861
2591 if (w->wd < 0) 2862 if (w->wd >= 0)
2863 {
2864 struct statfs sfs;
2865
2866 /* now local changes will be tracked by inotify, but remote changes won't */
2867 /* unless the filesystem is known to be local, we therefore still poll */
2868 /* also do poll on <2.6.25, but with normal frequency */
2869
2870 if (!fs_2625)
2871 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2872 else if (!statfs (w->path, &sfs)
2873 && (sfs.f_type == 0x1373 /* devfs */
2874 || sfs.f_type == 0xEF53 /* ext2/3 */
2875 || sfs.f_type == 0x3153464a /* jfs */
2876 || sfs.f_type == 0x52654973 /* reiser3 */
2877 || sfs.f_type == 0x01021994 /* tempfs */
2878 || sfs.f_type == 0x58465342 /* xfs */))
2879 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2880 else
2881 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2592 { 2882 }
2883 else
2884 {
2885 /* can't use inotify, continue to stat */
2593 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2886 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2594 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2595 2887
2596 /* monitor some parent directory for speedup hints */ 2888 /* if path is not there, monitor some parent directory for speedup hints */
2597 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2889 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2598 /* but an efficiency issue only */ 2890 /* but an efficiency issue only */
2599 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2891 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2600 { 2892 {
2601 char path [4096]; 2893 char path [4096];
2617 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2909 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2618 } 2910 }
2619 } 2911 }
2620 2912
2621 if (w->wd >= 0) 2913 if (w->wd >= 0)
2622 {
2623 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2914 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2624 2915
2625 /* now local changes will be tracked by inotify, but remote changes won't */ 2916 /* now re-arm timer, if required */
2626 /* unless the filesystem it known to be local, we therefore still poll */ 2917 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2627 /* also do poll on <2.6.25, but with normal frequency */
2628 struct statfs sfs;
2629
2630 if (fs_2625 && !statfs (w->path, &sfs))
2631 if (sfs.f_type == 0x1373 /* devfs */
2632 || sfs.f_type == 0xEF53 /* ext2/3 */
2633 || sfs.f_type == 0x3153464a /* jfs */
2634 || sfs.f_type == 0x52654973 /* reiser3 */
2635 || sfs.f_type == 0x01021994 /* tempfs */
2636 || sfs.f_type == 0x58465342 /* xfs */)
2637 return;
2638
2639 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2640 ev_timer_again (EV_A_ &w->timer); 2918 ev_timer_again (EV_A_ &w->timer);
2641 } 2919 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2642} 2920}
2643 2921
2644static void noinline 2922static void noinline
2645infy_del (EV_P_ ev_stat *w) 2923infy_del (EV_P_ ev_stat *w)
2646{ 2924{
2722 return; 3000 return;
2723 3001
2724 fs_2625 = 1; 3002 fs_2625 = 1;
2725} 3003}
2726 3004
3005inline_size int
3006infy_newfd (void)
3007{
3008#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3009 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3010 if (fd >= 0)
3011 return fd;
3012#endif
3013 return inotify_init ();
3014}
3015
2727inline_size void 3016inline_size void
2728infy_init (EV_P) 3017infy_init (EV_P)
2729{ 3018{
2730 if (fs_fd != -2) 3019 if (fs_fd != -2)
2731 return; 3020 return;
2732 3021
2733 fs_fd = -1; 3022 fs_fd = -1;
2734 3023
2735 check_2625 (EV_A); 3024 check_2625 (EV_A);
2736 3025
2737 fs_fd = inotify_init (); 3026 fs_fd = infy_newfd ();
2738 3027
2739 if (fs_fd >= 0) 3028 if (fs_fd >= 0)
2740 { 3029 {
3030 fd_intern (fs_fd);
2741 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3031 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2742 ev_set_priority (&fs_w, EV_MAXPRI); 3032 ev_set_priority (&fs_w, EV_MAXPRI);
2743 ev_io_start (EV_A_ &fs_w); 3033 ev_io_start (EV_A_ &fs_w);
3034 ev_unref (EV_A);
2744 } 3035 }
2745} 3036}
2746 3037
2747inline_size void 3038inline_size void
2748infy_fork (EV_P) 3039infy_fork (EV_P)
2750 int slot; 3041 int slot;
2751 3042
2752 if (fs_fd < 0) 3043 if (fs_fd < 0)
2753 return; 3044 return;
2754 3045
3046 ev_ref (EV_A);
3047 ev_io_stop (EV_A_ &fs_w);
2755 close (fs_fd); 3048 close (fs_fd);
2756 fs_fd = inotify_init (); 3049 fs_fd = infy_newfd ();
3050
3051 if (fs_fd >= 0)
3052 {
3053 fd_intern (fs_fd);
3054 ev_io_set (&fs_w, fs_fd, EV_READ);
3055 ev_io_start (EV_A_ &fs_w);
3056 ev_unref (EV_A);
3057 }
2757 3058
2758 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3059 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2759 { 3060 {
2760 WL w_ = fs_hash [slot].head; 3061 WL w_ = fs_hash [slot].head;
2761 fs_hash [slot].head = 0; 3062 fs_hash [slot].head = 0;
2768 w->wd = -1; 3069 w->wd = -1;
2769 3070
2770 if (fs_fd >= 0) 3071 if (fs_fd >= 0)
2771 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2772 else 3073 else
3074 {
3075 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3076 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2773 ev_timer_again (EV_A_ &w->timer); 3077 ev_timer_again (EV_A_ &w->timer);
3078 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3079 }
2774 } 3080 }
2775 } 3081 }
2776} 3082}
2777 3083
2778#endif 3084#endif
2848 3154
2849 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
2850 infy_add (EV_A_ w); 3156 infy_add (EV_A_ w);
2851 else 3157 else
2852#endif 3158#endif
3159 {
2853 ev_timer_again (EV_A_ &w->timer); 3160 ev_timer_again (EV_A_ &w->timer);
3161 ev_unref (EV_A);
3162 }
2854 3163
2855 ev_start (EV_A_ (W)w, 1); 3164 ev_start (EV_A_ (W)w, 1);
2856 3165
2857 EV_FREQUENT_CHECK; 3166 EV_FREQUENT_CHECK;
2858} 3167}
2867 EV_FREQUENT_CHECK; 3176 EV_FREQUENT_CHECK;
2868 3177
2869#if EV_USE_INOTIFY 3178#if EV_USE_INOTIFY
2870 infy_del (EV_A_ w); 3179 infy_del (EV_A_ w);
2871#endif 3180#endif
3181
3182 if (ev_is_active (&w->timer))
3183 {
3184 ev_ref (EV_A);
2872 ev_timer_stop (EV_A_ &w->timer); 3185 ev_timer_stop (EV_A_ &w->timer);
3186 }
2873 3187
2874 ev_stop (EV_A_ (W)w); 3188 ev_stop (EV_A_ (W)w);
2875 3189
2876 EV_FREQUENT_CHECK; 3190 EV_FREQUENT_CHECK;
2877} 3191}
3018embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3332embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3019{ 3333{
3020 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3334 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3021 3335
3022 { 3336 {
3023 struct ev_loop *loop = w->other; 3337 EV_P = w->other;
3024 3338
3025 while (fdchangecnt) 3339 while (fdchangecnt)
3026 { 3340 {
3027 fd_reify (EV_A); 3341 fd_reify (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3342 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3036 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3350 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3037 3351
3038 ev_embed_stop (EV_A_ w); 3352 ev_embed_stop (EV_A_ w);
3039 3353
3040 { 3354 {
3041 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
3042 3356
3043 ev_loop_fork (EV_A); 3357 ev_loop_fork (EV_A);
3044 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3358 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3045 } 3359 }
3046 3360
3060{ 3374{
3061 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3062 return; 3376 return;
3063 3377
3064 { 3378 {
3065 struct ev_loop *loop = w->other; 3379 EV_P = w->other;
3066 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3380 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3067 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3381 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3068 } 3382 }
3069 3383
3070 EV_FREQUENT_CHECK; 3384 EV_FREQUENT_CHECK;
3182 3496
3183void 3497void
3184ev_async_send (EV_P_ ev_async *w) 3498ev_async_send (EV_P_ ev_async *w)
3185{ 3499{
3186 w->sent = 1; 3500 w->sent = 1;
3187 evpipe_write (EV_A_ &gotasync); 3501 evpipe_write (EV_A_ &async_pending);
3188} 3502}
3189#endif 3503#endif
3190 3504
3191/*****************************************************************************/ 3505/*****************************************************************************/
3192 3506
3341 if (types & EV_CHECK) 3655 if (types & EV_CHECK)
3342 for (i = checkcnt; i--; ) 3656 for (i = checkcnt; i--; )
3343 cb (EV_A_ EV_CHECK, checks [i]); 3657 cb (EV_A_ EV_CHECK, checks [i]);
3344 3658
3345 if (types & EV_SIGNAL) 3659 if (types & EV_SIGNAL)
3346 for (i = 0; i < signalmax; ++i) 3660 for (i = 0; i < EV_NSIG - 1; ++i)
3347 for (wl = signals [i].head; wl; ) 3661 for (wl = signals [i].head; wl; )
3348 { 3662 {
3349 wn = wl->next; 3663 wn = wl->next;
3350 cb (EV_A_ EV_SIGNAL, wl); 3664 cb (EV_A_ EV_SIGNAL, wl);
3351 wl = wn; 3665 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines