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

Comparing libev/ev.c (file contents):
Revision 1.299 by root, Tue Jul 14 00:09:59 2009 UTC vs.
Revision 1.328 by root, Sun Feb 14 19:23:19 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
178# endif 188# endif
179#endif 189#endif
180 190
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
182 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
183#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
186# else 223# else
187# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 300#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 302# define EV_USE_EVENTFD 1
266# else 303# else
267# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
305# endif
306#endif
307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
268# endif 313# endif
269#endif 314#endif
270 315
271#if 0 /* debugging */ 316#if 0 /* debugging */
272# define EV_VERIFY 3 317# define EV_VERIFY 3
300# endif 345# endif
301#endif 346#endif
302 347
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
305#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
308#endif 359#endif
309 360
339#endif 390#endif
340 391
341#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
344# ifdef __cplusplus 405# ifdef __cplusplus
345extern "C" { 406extern "C" {
346# endif 407# endif
347int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 409# ifdef __cplusplus
349} 410}
350# endif 411# endif
351#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
352 442
353/**/ 443/**/
354 444
355#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 458 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 460
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#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) */ 462#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 463
375#if __GNUC__ >= 4 464#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
378#else 467#else
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 507#endif
419 508
420#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
511#endif
512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
422#endif 521#endif
423 522
424#ifdef _WIN32 523#ifdef _WIN32
425# include "ev_win32.c" 524# include "ev_win32.c"
426#endif 525#endif
647 746
648 tv.tv_sec = (time_t)delay; 747 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650 749
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 750 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 751 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 752 /* by older ones */
654 select (0, 0, 0, 0, &tv); 753 select (0, 0, 0, 0, &tv);
655#endif 754#endif
656 } 755 }
657} 756}
819 918
820#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
821 if (events) 920 if (events)
822 { 921 {
823 unsigned long arg; 922 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830 } 925 }
831#endif 926#endif
832 927
833 { 928 {
876/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
877inline_size int 972inline_size int
878fd_valid (int fd) 973fd_valid (int fd)
879{ 974{
880#ifdef _WIN32 975#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 977#else
883 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
884#endif 979#endif
885} 980}
886 981
904 999
905 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1001 if (anfds [fd].events)
907 { 1002 {
908 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
909 return; 1004 break;
910 } 1005 }
911} 1006}
912 1007
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1009static void noinline
1004 1099
1005 for (;;) 1100 for (;;)
1006 { 1101 {
1007 int c = k << 1; 1102 int c = k << 1;
1008 1103
1009 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
1010 break; 1105 break;
1011 1106
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1108 ? 1 : 0;
1014 1109
1050 1145
1051/* move an element suitably so it is in a correct place */ 1146/* move an element suitably so it is in a correct place */
1052inline_size void 1147inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
1054{ 1149{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1151 upheap (heap, k);
1057 else 1152 else
1058 downheap (heap, N, k); 1153 downheap (heap, N, k);
1059} 1154}
1060 1155
1073/*****************************************************************************/ 1168/*****************************************************************************/
1074 1169
1075/* associate signal watchers to a signal signal */ 1170/* associate signal watchers to a signal signal */
1076typedef struct 1171typedef struct
1077{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1078 WL head; 1177 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1178} ANSIG;
1081 1179
1082static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1181
1087/*****************************************************************************/ 1182/*****************************************************************************/
1088 1183
1089/* used to prepare libev internal fd's */ 1184/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1185/* this is not fork-safe */
1091inline_speed void 1186inline_speed void
1092fd_intern (int fd) 1187fd_intern (int fd)
1093{ 1188{
1094#ifdef _WIN32 1189#ifdef _WIN32
1095 unsigned long arg = 1; 1190 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1097#else 1192#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif 1195#endif
1101} 1196}
1104evpipe_init (EV_P) 1199evpipe_init (EV_P)
1105{ 1200{
1106 if (!ev_is_active (&pipe_w)) 1201 if (!ev_is_active (&pipe_w))
1107 { 1202 {
1108#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1110 { 1209 {
1111 evpipe [0] = -1; 1210 evpipe [0] = -1;
1112 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1213 }
1115 else 1214 else
1116#endif 1215#endif
1117 { 1216 {
1154/* called whenever the libev signal pipe */ 1253/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1254/* got some events (signal, async) */
1156static void 1255static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1257{
1258 int i;
1259
1159#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1261 if (evfd >= 0)
1161 { 1262 {
1162 uint64_t counter; 1263 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
1167 { 1268 {
1168 char dummy; 1269 char dummy;
1169 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1170 } 1271 }
1171 1272
1172 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1173 { 1274 {
1174 int signum; 1275 sig_pending = 0;
1175 gotsig = 0;
1176 1276
1177 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1280 }
1181 1281
1182#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1183 if (gotasync) 1283 if (async_pending)
1184 { 1284 {
1185 int i; 1285 async_pending = 0;
1186 gotasync = 0;
1187 1286
1188 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1190 { 1289 {
1191 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
1199 1298
1200static void 1299static void
1201ev_sighandler (int signum) 1300ev_sighandler (int signum)
1202{ 1301{
1203#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1205#endif 1304#endif
1206 1305
1207#if _WIN32 1306#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1209#endif 1308#endif
1210 1309
1211 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1213} 1312}
1214 1313
1215void noinline 1314void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1217{ 1316{
1218 WL w; 1317 WL w;
1219 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1220#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1327
1224 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1329 return;
1330#endif
1228 1331
1229 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1230 1333
1231 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1336}
1337
1338#if EV_USE_SIGNALFD
1339static void
1340sigfdcb (EV_P_ ev_io *iow, int revents)
1341{
1342 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1343
1344 for (;;)
1345 {
1346 ssize_t res = read (sigfd, si, sizeof (si));
1347
1348 /* not ISO-C, as res might be -1, but works with SuS */
1349 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1350 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1351
1352 if (res < (ssize_t)sizeof (si))
1353 break;
1354 }
1355}
1356#endif
1234 1357
1235/*****************************************************************************/ 1358/*****************************************************************************/
1236 1359
1237static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1238 1361
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1582 have_monotonic = 1;
1460 } 1583 }
1461#endif 1584#endif
1462 1585
1586 /* pid check not overridable via env */
1587#ifndef _WIN32
1588 if (flags & EVFLAG_FORKCHECK)
1589 curpid = getpid ();
1590#endif
1591
1592 if (!(flags & EVFLAG_NOENV)
1593 && !enable_secure ()
1594 && getenv ("LIBEV_FLAGS"))
1595 flags = atoi (getenv ("LIBEV_FLAGS"));
1596
1463 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1598 mn_now = get_clock ();
1465 now_floor = mn_now; 1599 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1601#if EV_MINIMAL < 2
1470 1604
1471 io_blocktime = 0.; 1605 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1473 backend = 0; 1607 backend = 0;
1474 backend_fd = -1; 1608 backend_fd = -1;
1475 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1476#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1477 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1615#endif
1479 1616#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1618#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1619
1491 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1493 1622
1494#if EV_USE_PORT 1623#if EV_USE_PORT
1520{ 1649{
1521 int i; 1650 int i;
1522 1651
1523 if (ev_is_active (&pipe_w)) 1652 if (ev_is_active (&pipe_w))
1524 { 1653 {
1525 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1656
1528#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1658 if (evfd >= 0)
1530 close (evfd); 1659 close (evfd);
1531#endif 1660#endif
1532 1661
1533 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1534 { 1663 {
1535 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1666 }
1538 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1539 1673
1540#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1542 close (fs_fd); 1676 close (fs_fd);
1543#endif 1677#endif
1567#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1702 array_free (idle, [i]);
1569#endif 1703#endif
1570 } 1704 }
1571 1705
1572 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1707
1574 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1709 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
1612 1746
1613 if (ev_is_active (&pipe_w)) 1747 if (ev_is_active (&pipe_w))
1614 { 1748 {
1615 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1617 gotsig = 1; 1751 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1753 async_pending = 1;
1620#endif 1754#endif
1621 1755
1622 ev_ref (EV_A); 1756 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1757 ev_io_stop (EV_A_ &pipe_w);
1624 1758
1627 close (evfd); 1761 close (evfd);
1628#endif 1762#endif
1629 1763
1630 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1631 { 1765 {
1632 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1768 }
1635 1769
1636 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
1644#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1645 1779
1646struct ev_loop * 1780struct ev_loop *
1647ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1648{ 1782{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1783 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1784
1651 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1654 1787
1655 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1656 return loop; 1789 return EV_A;
1657 1790
1658 return 0; 1791 return 0;
1659} 1792}
1660 1793
1661void 1794void
1765 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1900
1768# if 0 1901# if 0
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1904# endif
1772#endif 1905#endif
1773} 1906}
1774#endif 1907#endif
1775 1908
1782#endif 1915#endif
1783{ 1916{
1784 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1785 { 1918 {
1786#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1921#else
1789 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1790#endif 1923#endif
1791 1924
1792 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
1809 1942
1810void 1943void
1811ev_default_destroy (void) 1944ev_default_destroy (void)
1812{ 1945{
1813#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1815#endif 1948#endif
1816 1949
1817 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1818 1951
1819#ifndef _WIN32 1952#ifndef _WIN32
1826 1959
1827void 1960void
1828ev_default_fork (void) 1961ev_default_fork (void)
1829{ 1962{
1830#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1832#endif 1965#endif
1833 1966
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1968}
1836 1969
1838 1971
1839void 1972void
1840ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1841{ 1974{
1842 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1976}
1977
1978unsigned int
1979ev_pending_count (EV_P)
1980{
1981 int pri;
1982 unsigned int count = 0;
1983
1984 for (pri = NUMPRI; pri--; )
1985 count += pendingcnt [pri];
1986
1987 return count;
1843} 1988}
1844 1989
1845void noinline 1990void noinline
1846ev_invoke_pending (EV_P) 1991ev_invoke_pending (EV_P)
1847{ 1992{
2019 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2020 } 2165 }
2021} 2166}
2022 2167
2023/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2024/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2025inline_speed void 2170inline_speed void
2026time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2027{ 2172{
2028#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2029 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
2290inline_size void 2435inline_size void
2291wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2292{ 2437{
2293 while (*head) 2438 while (*head)
2294 { 2439 {
2295 if (*head == elem) 2440 if (expect_true (*head == elem))
2296 { 2441 {
2297 *head = elem->next; 2442 *head = elem->next;
2298 return; 2443 break;
2299 } 2444 }
2300 2445
2301 head = &(*head)->next; 2446 head = &(*head)->next;
2302 } 2447 }
2303} 2448}
2363 2508
2364 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2365 return; 2510 return;
2366 2511
2367 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2368 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2369 2514
2370 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2371 2516
2372 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2373 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2443 timers [active] = timers [timercnt + HEAP0]; 2588 timers [active] = timers [timercnt + HEAP0];
2444 adjustheap (timers, timercnt, active); 2589 adjustheap (timers, timercnt, active);
2445 } 2590 }
2446 } 2591 }
2447 2592
2448 EV_FREQUENT_CHECK;
2449
2450 ev_at (w) -= mn_now; 2593 ev_at (w) -= mn_now;
2451 2594
2452 ev_stop (EV_A_ (W)w); 2595 ev_stop (EV_A_ (W)w);
2596
2597 EV_FREQUENT_CHECK;
2453} 2598}
2454 2599
2455void noinline 2600void noinline
2456ev_timer_again (EV_P_ ev_timer *w) 2601ev_timer_again (EV_P_ ev_timer *w)
2457{ 2602{
2475 } 2620 }
2476 2621
2477 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2478} 2623}
2479 2624
2625ev_tstamp
2626ev_timer_remaining (EV_P_ ev_timer *w)
2627{
2628 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2629}
2630
2480#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2481void noinline 2632void noinline
2482ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2483{ 2634{
2484 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
2530 periodics [active] = periodics [periodiccnt + HEAP0]; 2681 periodics [active] = periodics [periodiccnt + HEAP0];
2531 adjustheap (periodics, periodiccnt, active); 2682 adjustheap (periodics, periodiccnt, active);
2532 } 2683 }
2533 } 2684 }
2534 2685
2535 EV_FREQUENT_CHECK;
2536
2537 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2538} 2689}
2539 2690
2540void noinline 2691void noinline
2541ev_periodic_again (EV_P_ ev_periodic *w) 2692ev_periodic_again (EV_P_ ev_periodic *w)
2542{ 2693{
2551#endif 2702#endif
2552 2703
2553void noinline 2704void noinline
2554ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2555{ 2706{
2556#if EV_MULTIPLICITY
2557 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2558#endif
2559 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2560 return; 2708 return;
2561 2709
2562 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2563 2711
2564 evpipe_init (EV_A); 2712#if EV_MULTIPLICITY
2713 assert (("libev: a signal must not be attached to two different loops",
2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2565 2715
2566 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2567 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2568 { 2723 {
2569#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2570 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2571 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2572 sigprocmask (SIG_SETMASK, &full, &prev);
2573#endif
2574 2727
2575 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2728 if (sigfd >= 0)
2729 {
2730 fd_intern (sigfd); /* doing it twice will not hurt */
2576 2731
2577#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2578 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2579#endif 2734 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2735 ev_set_priority (&sigfd_w, EV_MAXPRI);
2736 ev_io_start (EV_A_ &sigfd_w);
2737 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2738 }
2580 } 2739 }
2740
2741 if (sigfd >= 0)
2742 {
2743 /* TODO: check .head */
2744 sigaddset (&sigfd_set, w->signum);
2745 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2746
2747 signalfd (sigfd, &sigfd_set, 0);
2748 }
2749#endif
2581 2750
2582 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2583 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2584 2753
2585 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2586 { 2758 {
2587#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2588 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2589#else 2763# else
2590 struct sigaction sa = { }; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2591 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2592 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2593 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2770 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2594 sigaction (w->signum, &sa, 0); 2771 sigaction (w->signum, &sa, 0);
2772
2773 sigemptyset (&sa.sa_mask);
2774 sigaddset (&sa.sa_mask, w->signum);
2775 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2595#endif 2776#endif
2596 } 2777 }
2597 2778
2598 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2599} 2780}
2600 2781
2601void noinline 2782void noinline
2609 2790
2610 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2611 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2612 2793
2613 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2795 {
2796#if EV_MULTIPLICITY
2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2798#endif
2799#if EV_USE_SIGNALFD
2800 if (sigfd >= 0)
2801 {
2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2806 sigdelset (&sigfd_set, w->signum);
2807
2808 signalfd (sigfd, &sigfd_set, 0);
2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2810 }
2811 else
2812#endif
2614 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2615 2815
2616 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2617} 2817}
2618 2818
2619void 2819void
2660#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2661 2861
2662static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2663 2863
2664#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2665# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2666 2868
2667static void noinline 2869static void noinline
2668infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2669{ 2871{
2670 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); 2872 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);
2671 2873
2672 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2673 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2674 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2675 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2676 2899
2677 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2678 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2679 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2680 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2681 { 2904 {
2682 char path [4096]; 2905 char path [4096];
2698 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2699 } 2922 }
2700 } 2923 }
2701 2924
2702 if (w->wd >= 0) 2925 if (w->wd >= 0)
2703 {
2704 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2705 2927
2706 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2707 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2708 /* also do poll on <2.6.25, but with normal frequency */
2709 struct statfs sfs;
2710
2711 if (fs_2625 && !statfs (w->path, &sfs))
2712 if (sfs.f_type == 0x1373 /* devfs */
2713 || sfs.f_type == 0xEF53 /* ext2/3 */
2714 || sfs.f_type == 0x3153464a /* jfs */
2715 || sfs.f_type == 0x52654973 /* reiser3 */
2716 || sfs.f_type == 0x01021994 /* tempfs */
2717 || sfs.f_type == 0x58465342 /* xfs */)
2718 return;
2719
2720 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2721 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2722 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2723} 2932}
2724 2933
2725static void noinline 2934static void noinline
2726infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2727{ 2936{
2772 2981
2773static void 2982static void
2774infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2775{ 2984{
2776 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2777 struct inotify_event *ev = (struct inotify_event *)buf;
2778 int ofs; 2986 int ofs;
2779 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2780 2988
2781 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2782 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2783} 2995}
2784 2996
2785inline_size void 2997inline_size void
2786check_2625 (EV_P) 2998check_2625 (EV_P)
2787{ 2999{
2803 return; 3015 return;
2804 3016
2805 fs_2625 = 1; 3017 fs_2625 = 1;
2806} 3018}
2807 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2808inline_size void 3031inline_size void
2809infy_init (EV_P) 3032infy_init (EV_P)
2810{ 3033{
2811 if (fs_fd != -2) 3034 if (fs_fd != -2)
2812 return; 3035 return;
2813 3036
2814 fs_fd = -1; 3037 fs_fd = -1;
2815 3038
2816 check_2625 (EV_A); 3039 check_2625 (EV_A);
2817 3040
2818 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2819 3042
2820 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2821 { 3044 {
3045 fd_intern (fs_fd);
2822 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2823 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2824 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2825 } 3050 }
2826} 3051}
2827 3052
2828inline_size void 3053inline_size void
2829infy_fork (EV_P) 3054infy_fork (EV_P)
2831 int slot; 3056 int slot;
2832 3057
2833 if (fs_fd < 0) 3058 if (fs_fd < 0)
2834 return; 3059 return;
2835 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2836 close (fs_fd); 3063 close (fs_fd);
2837 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2838 3073
2839 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2840 { 3075 {
2841 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2842 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
2849 w->wd = -1; 3084 w->wd = -1;
2850 3085
2851 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2852 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2853 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2854 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
2855 } 3095 }
2856 } 3096 }
2857} 3097}
2858 3098
2859#endif 3099#endif
2876static void noinline 3116static void noinline
2877stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2878{ 3118{
2879 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2880 3120
2881 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2882 /* prev has the old value when the callback gets invoked */
2883 w->prev = w->attr;
2884 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2885 3123
2886 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2887 if ( 3125 if (
2888 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2889 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2890 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2891 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2892 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2893 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2894 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2895 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2896 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2897 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2898 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2899 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
2900 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
2901 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2902 { 3145 {
2903 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2904 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
2929 3172
2930 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2931 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2932 else 3175 else
2933#endif 3176#endif
3177 {
2934 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2935 3181
2936 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2937 3183
2938 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2939} 3185}
2948 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2949 3195
2950#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2951 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2952#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2953 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2954 3205
2955 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2956 3207
2957 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2958} 3209}
3099embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3100{ 3351{
3101 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3102 3353
3103 { 3354 {
3104 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
3105 3356
3106 while (fdchangecnt) 3357 while (fdchangecnt)
3107 { 3358 {
3108 fd_reify (EV_A); 3359 fd_reify (EV_A);
3109 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3117 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3368 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3118 3369
3119 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
3120 3371
3121 { 3372 {
3122 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
3123 3374
3124 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
3125 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3126 } 3377 }
3127 3378
3141{ 3392{
3142 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3143 return; 3394 return;
3144 3395
3145 { 3396 {
3146 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3147 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3398 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3148 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3399 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3149 } 3400 }
3150 3401
3151 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
3178 3429
3179 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
3180 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
3181 ev_fork_stop (EV_A_ &w->fork); 3432 ev_fork_stop (EV_A_ &w->fork);
3182 3433
3434 ev_stop (EV_A_ (W)w);
3435
3183 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3184} 3437}
3185#endif 3438#endif
3186 3439
3187#if EV_FORK_ENABLE 3440#if EV_FORK_ENABLE
3263 3516
3264void 3517void
3265ev_async_send (EV_P_ ev_async *w) 3518ev_async_send (EV_P_ ev_async *w)
3266{ 3519{
3267 w->sent = 1; 3520 w->sent = 1;
3268 evpipe_write (EV_A_ &gotasync); 3521 evpipe_write (EV_A_ &async_pending);
3269} 3522}
3270#endif 3523#endif
3271 3524
3272/*****************************************************************************/ 3525/*****************************************************************************/
3273 3526
3422 if (types & EV_CHECK) 3675 if (types & EV_CHECK)
3423 for (i = checkcnt; i--; ) 3676 for (i = checkcnt; i--; )
3424 cb (EV_A_ EV_CHECK, checks [i]); 3677 cb (EV_A_ EV_CHECK, checks [i]);
3425 3678
3426 if (types & EV_SIGNAL) 3679 if (types & EV_SIGNAL)
3427 for (i = 0; i < signalmax; ++i) 3680 for (i = 0; i < EV_NSIG - 1; ++i)
3428 for (wl = signals [i].head; wl; ) 3681 for (wl = signals [i].head; wl; )
3429 { 3682 {
3430 wn = wl->next; 3683 wn = wl->next;
3431 cb (EV_A_ EV_SIGNAL, wl); 3684 cb (EV_A_ EV_SIGNAL, wl);
3432 wl = wn; 3685 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines