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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC

… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
… …
187#endif 188#endif
188 189
189/* 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 */
190 191
191/* try to deduce the maximum number of signals on this platform */ 192/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 193#if defined (EV_NSIG)
194/* use what's provided */ 194/* use what's provided */
195#elif defined (NSIG) 195#elif defined (NSIG)
196# define EV_NSIG (NSIG) 196# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 197#elif defined(_NSIG)
… …
303# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif 304# endif
305#endif 305#endif
306 306
307#ifndef EV_USE_SIGNALFD 307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 309# define EV_USE_SIGNALFD 1
310# else 310# else
311# define EV_USE_SIGNALFD 0 311# define EV_USE_SIGNALFD 0
312# endif 312# endif
313#endif 313#endif
… …
344# endif 344# endif
345#endif 345#endif
346 346
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
349#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
352#endif 358#endif
353 359
… …
387# include <stdint.h> 393# include <stdint.h>
388# ifndef EFD_NONBLOCK 394# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 395# define EFD_NONBLOCK O_NONBLOCK
390# endif 396# endif
391# ifndef EFD_CLOEXEC 397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
393# endif 403# endif
394# ifdef __cplusplus 404# ifdef __cplusplus
395extern "C" { 405extern "C" {
396# endif 406# endif
397int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
… …
399} 409}
400# endif 410# endif
401#endif 411#endif
402 412
403#if EV_USE_SIGNALFD 413#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
405#endif 418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
406 441
407/**/ 442/**/
408 443
409#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
422 */ 457 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 459
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 462
429#if __GNUC__ >= 4 463#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
432#else 466#else
… …
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 506#endif
473 507
474#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
510#endif
511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
476#endif 520#endif
477 521
478#ifdef _WIN32 522#ifdef _WIN32
479# include "ev_win32.c" 523# include "ev_win32.c"
480#endif 524#endif
… …
873 917
874#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
875 if (events) 919 if (events)
876 { 920 {
877 unsigned long arg; 921 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 924 }
885#endif 925#endif
886 926
887 { 927 {
… …
930/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
931inline_size int 971inline_size int
932fd_valid (int fd) 972fd_valid (int fd)
933{ 973{
934#ifdef _WIN32 974#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 976#else
937 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
938#endif 978#endif
939} 979}
940 980
… …
958 998
959 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1000 if (anfds [fd].events)
961 { 1001 {
962 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
963 return; 1003 break;
964 } 1004 }
965} 1005}
966 1006
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1008static void noinline
… …
1058 1098
1059 for (;;) 1099 for (;;)
1060 { 1100 {
1061 int c = k << 1; 1101 int c = k << 1;
1062 1102
1063 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
1064 break; 1104 break;
1065 1105
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1107 ? 1 : 0;
1068 1108
… …
1104 1144
1105/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1106inline_size void 1146inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1108{ 1148{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1150 upheap (heap, k);
1111 else 1151 else
1112 downheap (heap, N, k); 1152 downheap (heap, N, k);
1113} 1153}
1114 1154
… …
1127/*****************************************************************************/ 1167/*****************************************************************************/
1128 1168
1129/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1130typedef struct 1170typedef struct
1131{ 1171{
1172 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1173#if EV_MULTIPLICITY
1133 EV_P; 1174 EV_P;
1134#endif 1175#endif
1135 WL head; 1176 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1177} ANSIG;
1138 1178
1139static ANSIG signals [EV_NSIG - 1]; 1179static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1180
1142/*****************************************************************************/ 1181/*****************************************************************************/
1143 1182
1144/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1145/* this is not fork-safe */ 1184/* this is not fork-safe */
1146inline_speed void 1185inline_speed void
1147fd_intern (int fd) 1186fd_intern (int fd)
1148{ 1187{
1149#ifdef _WIN32 1188#ifdef _WIN32
1150 unsigned long arg = 1; 1189 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152#else 1191#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif 1194#endif
1156} 1195}
… …
1213/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1215static void 1254static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1256{
1257 int i;
1258
1218#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1260 if (evfd >= 0)
1220 { 1261 {
1221 uint64_t counter; 1262 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1226 { 1267 {
1227 char dummy; 1268 char dummy;
1228 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1229 } 1270 }
1230 1271
1231 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1232 { 1273 {
1233 int signum; 1274 sig_pending = 0;
1234 gotsig = 0;
1235 1275
1236 for (signum = EV_NSIG - 1; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1279 }
1240 1280
1241#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1242 if (gotasync) 1282 if (async_pending)
1243 { 1283 {
1244 int i; 1284 async_pending = 0;
1245 gotasync = 0;
1246 1285
1247 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1249 { 1288 {
1250 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1261{ 1300{
1262#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1302 EV_P = signals [signum - 1].loop;
1264#endif 1303#endif
1265 1304
1266#if _WIN32 1305#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1268#endif 1307#endif
1269 1308
1270 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1272} 1311}
1273 1312
1274void noinline 1313void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1276{ 1315{
1277 WL w; 1316 WL w;
1278 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1279#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1326
1283 if (signum <= 0 || signum > EV_NSIG) 1327 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1328 return;
1329#endif
1285 1330
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1289 1332
1290 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1335}
1293 1336
… …
1560 1603
1561 io_blocktime = 0.; 1604 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1563 backend = 0; 1606 backend = 0;
1564 backend_fd = -1; 1607 backend_fd = -1;
1565 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1566#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1614#endif
1569#if EV_USE_SIGNALFD 1615#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1617#endif
1572 1618
1573 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1575 1621
… …
1612 close (evfd); 1658 close (evfd);
1613#endif 1659#endif
1614 1660
1615 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1616 { 1662 {
1617 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1665 }
1620 } 1666 }
1621 1667
1622#if EV_USE_SIGNALFD 1668#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1669 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1670 close (sigfd);
1629 }
1630#endif 1671#endif
1631 1672
1632#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1634 close (fs_fd); 1675 close (fs_fd);
… …
1704 1745
1705 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1706 { 1747 {
1707 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1709 gotsig = 1; 1750 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1752 async_pending = 1;
1712#endif 1753#endif
1713 1754
1714 ev_ref (EV_A); 1755 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1716 1757
… …
1719 close (evfd); 1760 close (evfd);
1720#endif 1761#endif
1721 1762
1722 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1723 { 1764 {
1724 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1767 }
1727 1768
1728 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1856 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1899
1859# if 0 1900# if 0
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862# endif 1903# endif
1863#endif 1904#endif
1864} 1905}
1865#endif 1906#endif
1866 1907
… …
2122 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2123 } 2164 }
2124} 2165}
2125 2166
2126/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2169inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2130{ 2171{
2131#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
… …
2393inline_size void 2434inline_size void
2394wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2395{ 2436{
2396 while (*head) 2437 while (*head)
2397 { 2438 {
2398 if (*head == elem) 2439 if (expect_true (*head == elem))
2399 { 2440 {
2400 *head = elem->next; 2441 *head = elem->next;
2401 return; 2442 break;
2402 } 2443 }
2403 2444
2404 head = &(*head)->next; 2445 head = &(*head)->next;
2405 } 2446 }
2406} 2447}
… …
2666 return; 2707 return;
2667 2708
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2710
2670#if EV_MULTIPLICITY 2711#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2712 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2714
2674 signals [w->signum - 1].loop = EV_A; 2715 signals [w->signum - 1].loop = EV_A;
2675#endif 2716#endif
2676 2717
… …
2712 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2754# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2755 if (sigfd < 0) /*TODO*/
2715# endif 2756# endif
2716 { 2757 {
2717# if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2718 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2719# else 2762# else
2720 struct sigaction sa; 2763 struct sigaction sa;
2721 2764
2722 evpipe_init (EV_A); 2765 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2749 2792
2750 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2751 { 2794 {
2752 #if EV_MULTIPLICITY 2795#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2797#endif
2755 #if EV_USE_SIGNALFD 2798#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2799 if (sigfd >= 0)
2757 { 2800 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2805 sigdelset (&sigfd_set, w->signum);
2806
2760 signalfd (sigfd, &sigfd_set, 0); 2807 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2809 }
2764 else 2810 else
2765 #endif 2811#endif
2766 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2767 } 2813 }
2768 2814
2769 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2770} 2816}
… …
2820static void noinline 2866static void noinline
2821infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2822{ 2868{
2823 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); 2869 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);
2824 2870
2825 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2896
2830 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2901 {
2835 char path [4096]; 2902 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2919 }
2853 } 2920 }
2854 2921
2855 if (w->wd >= 0) 2922 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858 2924
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2875 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2929}
2877 2930
2878static void noinline 2931static void noinline
2879infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2880{ 2933{
… …
2956 return; 3009 return;
2957 3010
2958 fs_2625 = 1; 3011 fs_2625 = 1;
2959} 3012}
2960 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2961inline_size void 3025inline_size void
2962infy_init (EV_P) 3026infy_init (EV_P)
2963{ 3027{
2964 if (fs_fd != -2) 3028 if (fs_fd != -2)
2965 return; 3029 return;
2966 3030
2967 fs_fd = -1; 3031 fs_fd = -1;
2968 3032
2969 check_2625 (EV_A); 3033 check_2625 (EV_A);
2970 3034
2971 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2972 3036
2973 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2974 { 3038 {
3039 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2978 } 3044 }
2979} 3045}
2980 3046
2981inline_size void 3047inline_size void
2982infy_fork (EV_P) 3048infy_fork (EV_P)
… …
2984 int slot; 3050 int slot;
2985 3051
2986 if (fs_fd < 0) 3052 if (fs_fd < 0)
2987 return; 3053 return;
2988 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3057 close (fs_fd);
2990 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2991 3067
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3069 {
2994 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
3002 w->wd = -1; 3078 w->wd = -1;
3003 3079
3004 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
3008 } 3089 }
3009 } 3090 }
3010} 3091}
3011 3092
3012#endif 3093#endif
… …
3029static void noinline 3110static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3112{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3114
3034 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
3038 3117
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3119 if (
3041 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
3053 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
3055 { 3139 {
3056 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
3082 3166
3083 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
3085 else 3169 else
3086#endif 3170#endif
3171 {
3087 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
3088 3175
3089 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3090 3177
3091 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
3092} 3179}
… …
3101 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
3102 3189
3103#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
3105#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
3107 3199
3108 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3109 3201
3110 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
3111} 3203}
… …
3416 3508
3417void 3509void
3418ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3419{ 3511{
3420 w->sent = 1; 3512 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3422} 3514}
3423#endif 3515#endif
3424 3516
3425/*****************************************************************************/ 3517/*****************************************************************************/
3426 3518

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines