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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 2009 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46: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
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)
419 501
420#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 504#endif
423 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
424#ifdef _WIN32 516#ifdef _WIN32
425# include "ev_win32.c" 517# include "ev_win32.c"
426#endif 518#endif
427 519
428/*****************************************************************************/ 520/*****************************************************************************/
490#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
492 584
493/*****************************************************************************/ 585/*****************************************************************************/
494 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
495/* file descriptor info structure */ 590/* file descriptor info structure */
496typedef struct 591typedef struct
497{ 592{
498 WL head; 593 WL head;
499 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 597 unsigned char unused;
503#if EV_USE_EPOLL 598#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 600#endif
567 662
568 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
569 664
570#endif 665#endif
571 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
572/*****************************************************************************/ 679/*****************************************************************************/
573 680
574#ifndef EV_HAVE_EV_TIME 681#ifndef EV_HAVE_EV_TIME
575ev_tstamp 682ev_tstamp
576ev_time (void) 683ev_time (void)
632 739
633 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 742
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 745 /* by older ones */
639 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
640#endif 747#endif
641 } 748 }
642} 749}
750} 857}
751 858
752/*****************************************************************************/ 859/*****************************************************************************/
753 860
754inline_speed void 861inline_speed void
755fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
756{ 863{
757 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
758 ev_io *w; 865 ev_io *w;
759 866
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
764 if (ev) 871 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
766 } 873 }
767} 874}
768 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
769void 887void
770ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 889{
772 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
774} 892}
775 893
776/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
778inline_size void 896inline_size void
793 911
794#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
795 if (events) 913 if (events)
796 { 914 {
797 unsigned long arg; 915 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 918 }
805#endif 919#endif
806 920
807 { 921 {
878 992
879 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 994 if (anfds [fd].events)
881 { 995 {
882 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
883 return; 997 break;
884 } 998 }
885} 999}
886 1000
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1002static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1008 if (anfds [fd].events)
895 { 1009 {
896 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1013 }
900} 1014}
901 1015
902/*****************************************************************************/ 1016/*****************************************************************************/
903 1017
978 1092
979 for (;;) 1093 for (;;)
980 { 1094 {
981 int c = k << 1; 1095 int c = k << 1;
982 1096
983 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
984 break; 1098 break;
985 1099
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1101 ? 1 : 0;
988 1102
1024 1138
1025/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1026inline_size void 1140inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1028{ 1142{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1144 upheap (heap, k);
1031 else 1145 else
1032 downheap (heap, N, k); 1146 downheap (heap, N, k);
1033} 1147}
1034 1148
1047/*****************************************************************************/ 1161/*****************************************************************************/
1048 1162
1049/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1050typedef struct 1164typedef struct
1051{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1052 WL head; 1170 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1171} ANSIG;
1055 1172
1056static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1174
1061/*****************************************************************************/ 1175/*****************************************************************************/
1062 1176
1063/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1178/* this is not fork-safe */
1078evpipe_init (EV_P) 1192evpipe_init (EV_P)
1079{ 1193{
1080 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1081 { 1195 {
1082#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1084 { 1202 {
1085 evpipe [0] = -1; 1203 evpipe [0] = -1;
1086 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1206 }
1089 else 1207 else
1090#endif 1208#endif
1091 { 1209 {
1128/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1130static void 1248static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1250{
1251 int i;
1252
1133#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1254 if (evfd >= 0)
1135 { 1255 {
1136 uint64_t counter; 1256 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1141 { 1261 {
1142 char dummy; 1262 char dummy;
1143 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1144 } 1264 }
1145 1265
1146 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1147 { 1267 {
1148 int signum; 1268 sig_pending = 0;
1149 gotsig = 0;
1150 1269
1151 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1273 }
1155 1274
1156#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1157 if (gotasync) 1276 if (async_pending)
1158 { 1277 {
1159 int i; 1278 async_pending = 0;
1160 gotasync = 0;
1161 1279
1162 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1164 { 1282 {
1165 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1173 1291
1174static void 1292static void
1175ev_sighandler (int signum) 1293ev_sighandler (int signum)
1176{ 1294{
1177#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1179#endif 1297#endif
1180 1298
1181#if _WIN32 1299#if _WIN32
1182 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1183#endif 1301#endif
1184 1302
1185 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1187} 1305}
1188 1306
1189void noinline 1307void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1191{ 1309{
1192 WL w; 1310 WL w;
1193 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1194#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1320
1198 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1322 return;
1323#endif
1202 1324
1203 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1204 1326
1205 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1329}
1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1208 1350
1209/*****************************************************************************/ 1351/*****************************************************************************/
1210 1352
1211static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1212 1354
1357ev_backend (EV_P) 1499ev_backend (EV_P)
1358{ 1500{
1359 return backend; 1501 return backend;
1360} 1502}
1361 1503
1504#if EV_MINIMAL < 2
1362unsigned int 1505unsigned int
1363ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1364{ 1507{
1365 return loop_count; 1508 return loop_count;
1366} 1509}
1380void 1523void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1525{
1383 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1384} 1527}
1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1385 1552
1386/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1554static void noinline
1388loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1389{ 1556{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1575 have_monotonic = 1;
1409 } 1576 }
1410#endif 1577#endif
1411 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1412 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1591 mn_now = get_clock ();
1414 now_floor = mn_now; 1592 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1595 invoke_cb = ev_invoke_pending;
1596#endif
1417 1597
1418 io_blocktime = 0.; 1598 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1420 backend = 0; 1600 backend = 0;
1421 backend_fd = -1; 1601 backend_fd = -1;
1422 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1423#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1424 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1608#endif
1426 1609#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1611#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1612
1438 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1440 1615
1441#if EV_USE_PORT 1616#if EV_USE_PORT
1467{ 1642{
1468 int i; 1643 int i;
1469 1644
1470 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1471 { 1646 {
1472 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1649
1475#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1651 if (evfd >= 0)
1477 close (evfd); 1652 close (evfd);
1478#endif 1653#endif
1479 1654
1480 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1481 { 1656 {
1482 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1483 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1484 } 1659 }
1485 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1486 1671
1487#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1489 close (fs_fd); 1674 close (fs_fd);
1490#endif 1675#endif
1514#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1700 array_free (idle, [i]);
1516#endif 1701#endif
1517 } 1702 }
1518 1703
1519 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1705
1521 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1707 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1559 1744
1560 if (ev_is_active (&pipe_w)) 1745 if (ev_is_active (&pipe_w))
1561 { 1746 {
1562 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1564 gotsig = 1; 1749 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1751 async_pending = 1;
1567#endif 1752#endif
1568 1753
1569 ev_ref (EV_A); 1754 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1755 ev_io_stop (EV_A_ &pipe_w);
1571 1756
1574 close (evfd); 1759 close (evfd);
1575#endif 1760#endif
1576 1761
1577 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1578 { 1763 {
1579 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1580 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1581 } 1766 }
1582 1767
1583 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1584 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1585 pipecb (EV_A_ &pipe_w, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1591#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1592 1777
1593struct ev_loop * 1778struct ev_loop *
1594ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1595{ 1780{
1596 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1597 1782
1598 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1601 1785
1602 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1603 return loop; 1787 return EV_A;
1604 1788
1605 return 0; 1789 return 0;
1606} 1790}
1607 1791
1608void 1792void
1615void 1799void
1616ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1617{ 1801{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1619} 1803}
1804#endif /* multiplicity */
1620 1805
1621#if EV_VERIFY 1806#if EV_VERIFY
1622static void noinline 1807static void noinline
1623verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1624{ 1809{
1652 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1653 } 1838 }
1654} 1839}
1655#endif 1840#endif
1656 1841
1842#if EV_MINIMAL < 2
1657void 1843void
1658ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1659{ 1845{
1660#if EV_VERIFY 1846#if EV_VERIFY
1661 int i; 1847 int i;
1710 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1898
1713# if 0 1899# if 0
1714 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1716# endif
1717#endif 1902# endif
1903#endif
1718} 1904}
1719 1905#endif
1720#endif /* multiplicity */
1721 1906
1722#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1723struct ev_loop * 1908struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1725#else 1910#else
1728#endif 1913#endif
1729{ 1914{
1730 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1731 { 1916 {
1732#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1919#else
1735 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1736#endif 1921#endif
1737 1922
1738 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
1755 1940
1756void 1941void
1757ev_default_destroy (void) 1942ev_default_destroy (void)
1758{ 1943{
1759#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1761#endif 1946#endif
1762 1947
1763 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1764 1949
1765#ifndef _WIN32 1950#ifndef _WIN32
1772 1957
1773void 1958void
1774ev_default_fork (void) 1959ev_default_fork (void)
1775{ 1960{
1776#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1778#endif 1963#endif
1779 1964
1780 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1781} 1966}
1782 1967
1786ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1787{ 1972{
1788 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1789} 1974}
1790 1975
1791void 1976unsigned int
1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1792ev_invoke_pending (EV_P) 1989ev_invoke_pending (EV_P)
1793{ 1990{
1794 int pri; 1991 int pri;
1795 1992
1796 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
2035} 2232}
2036 2233
2037void 2234void
2038ev_loop (EV_P_ int flags) 2235ev_loop (EV_P_ int flags)
2039{ 2236{
2237#if EV_MINIMAL < 2
2040 ++loop_depth; 2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2242
2042 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
2043 2244
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2246
2046 do 2247 do
2047 { 2248 {
2048#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
2062 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2264 if (expect_false (postfork))
2064 if (forkcnt) 2265 if (forkcnt)
2065 { 2266 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2268 EV_INVOKE_PENDING;
2068 } 2269 }
2069#endif 2270#endif
2070 2271
2071 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
2073 { 2274 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2276 EV_INVOKE_PENDING;
2076 } 2277 }
2278
2279 if (expect_false (loop_done))
2280 break;
2077 2281
2078 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2283 if (expect_false (postfork))
2080 loop_fork (EV_A); 2284 loop_fork (EV_A);
2081 2285
2129 waittime -= sleeptime; 2333 waittime -= sleeptime;
2130 } 2334 }
2131 } 2335 }
2132 } 2336 }
2133 2337
2338#if EV_MINIMAL < 2
2134 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2344
2137 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2139 } 2347 }
2140 2348
2151 2359
2152 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2363
2156 invoke_cb (EV_A); 2364 EV_INVOKE_PENDING;
2157 } 2365 }
2158 while (expect_true ( 2366 while (expect_true (
2159 activecnt 2367 activecnt
2160 && !loop_done 2368 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2370 ));
2163 2371
2164 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2166 2374
2375#if EV_MINIMAL < 2
2167 --loop_depth; 2376 --loop_depth;
2377#endif
2168} 2378}
2169 2379
2170void 2380void
2171ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2172{ 2382{
2223inline_size void 2433inline_size void
2224wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2225{ 2435{
2226 while (*head) 2436 while (*head)
2227 { 2437 {
2228 if (*head == elem) 2438 if (expect_true (*head == elem))
2229 { 2439 {
2230 *head = elem->next; 2440 *head = elem->next;
2231 return; 2441 break;
2232 } 2442 }
2233 2443
2234 head = &(*head)->next; 2444 head = &(*head)->next;
2235 } 2445 }
2236} 2446}
2304 2514
2305 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2308 2518
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2311 2521
2312 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2313} 2523}
2314 2524
2408 } 2618 }
2409 2619
2410 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2411} 2621}
2412 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2413#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2414void noinline 2630void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2632{
2417 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2484#endif 2700#endif
2485 2701
2486void noinline 2702void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2488{ 2704{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2493 return; 2706 return;
2494 2707
2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2496 2709
2497 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2498 2713
2499 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2500 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2501 { 2721 {
2502#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2725
2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2509 2729
2510#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2512#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2513 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2514 2748
2515 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2751
2518 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2519 { 2756 {
2520#if _WIN32 2757# if _WIN32
2521 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2522#else 2759# else
2523 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2524 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2526 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2527 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2528#endif 2772#endif
2529 } 2773 }
2530 2774
2531 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2532} 2776}
2533 2777
2534void noinline 2778void noinline
2542 2786
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2545 2789
2546 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2547 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2548 2808
2549 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2550} 2810}
2551 2811
2552void 2812void
2632 } 2892 }
2633 } 2893 }
2634 2894
2635 if (w->wd >= 0) 2895 if (w->wd >= 0)
2636 { 2896 {
2897 struct statfs sfs;
2898
2637 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2638 2900
2639 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* now local changes will be tracked by inotify, but remote changes won't */
2640 /* unless the filesystem it known to be local, we therefore still poll */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2641 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2642 struct statfs sfs;
2643 2904
2644 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2645 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2646 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2647 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
2736 return; 2997 return;
2737 2998
2738 fs_2625 = 1; 2999 fs_2625 = 1;
2739} 3000}
2740 3001
3002inline_size int
3003infy_newfd (void)
3004{
3005#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3006 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3007 if (fd >= 0)
3008 return fd;
3009#endif
3010 return inotify_init ();
3011}
3012
2741inline_size void 3013inline_size void
2742infy_init (EV_P) 3014infy_init (EV_P)
2743{ 3015{
2744 if (fs_fd != -2) 3016 if (fs_fd != -2)
2745 return; 3017 return;
2746 3018
2747 fs_fd = -1; 3019 fs_fd = -1;
2748 3020
2749 check_2625 (EV_A); 3021 check_2625 (EV_A);
2750 3022
2751 fs_fd = inotify_init (); 3023 fs_fd = infy_newfd ();
2752 3024
2753 if (fs_fd >= 0) 3025 if (fs_fd >= 0)
2754 { 3026 {
3027 fd_intern (fs_fd);
2755 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2756 ev_set_priority (&fs_w, EV_MAXPRI); 3029 ev_set_priority (&fs_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &fs_w); 3030 ev_io_start (EV_A_ &fs_w);
2758 } 3031 }
2759} 3032}
2764 int slot; 3037 int slot;
2765 3038
2766 if (fs_fd < 0) 3039 if (fs_fd < 0)
2767 return; 3040 return;
2768 3041
3042 ev_io_stop (EV_A_ &fs_w);
2769 close (fs_fd); 3043 close (fs_fd);
2770 fs_fd = inotify_init (); 3044 fs_fd = infy_newfd ();
3045
3046 if (fs_fd >= 0)
3047 {
3048 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w);
3051 }
2771 3052
2772 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2773 { 3054 {
2774 WL w_ = fs_hash [slot].head; 3055 WL w_ = fs_hash [slot].head;
2775 fs_hash [slot].head = 0; 3056 fs_hash [slot].head = 0;
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3313embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3314{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3315 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3316
3036 { 3317 {
3037 struct ev_loop *loop = w->other; 3318 EV_P = w->other;
3038 3319
3039 while (fdchangecnt) 3320 while (fdchangecnt)
3040 { 3321 {
3041 fd_reify (EV_A); 3322 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3323 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3331 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051 3332
3052 ev_embed_stop (EV_A_ w); 3333 ev_embed_stop (EV_A_ w);
3053 3334
3054 { 3335 {
3055 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
3056 3337
3057 ev_loop_fork (EV_A); 3338 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3339 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3340 }
3060 3341
3074{ 3355{
3075 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3076 return; 3357 return;
3077 3358
3078 { 3359 {
3079 struct ev_loop *loop = w->other; 3360 EV_P = w->other;
3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3361 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3081 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3362 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3082 } 3363 }
3083 3364
3084 EV_FREQUENT_CHECK; 3365 EV_FREQUENT_CHECK;
3196 3477
3197void 3478void
3198ev_async_send (EV_P_ ev_async *w) 3479ev_async_send (EV_P_ ev_async *w)
3199{ 3480{
3200 w->sent = 1; 3481 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3482 evpipe_write (EV_A_ &async_pending);
3202} 3483}
3203#endif 3484#endif
3204 3485
3205/*****************************************************************************/ 3486/*****************************************************************************/
3206 3487
3355 if (types & EV_CHECK) 3636 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3637 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3638 cb (EV_A_ EV_CHECK, checks [i]);
3358 3639
3359 if (types & EV_SIGNAL) 3640 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3641 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3642 for (wl = signals [i].head; wl; )
3362 { 3643 {
3363 wn = wl->next; 3644 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3645 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3646 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines