[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 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
…		…
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
163	#include <assert.h>	164	#include <assert.h>
164	#include <errno.h>	165	#include <errno.h>
165	#include <sys/types.h>	166	#include <sys/types.h>
166	#include <time.h>	167	#include <time.h>
		168	#include <limits.h>
167		169
168	#include <signal.h>	170	#include <signal.h>
169		171
170	#ifdef EV_H	172	#ifdef EV_H
171	# include EV_H	173	# include EV_H
…		…
302	# define EV_USE_EVENTFD 0	304	# define EV_USE_EVENTFD 0
303	# endif	305	# endif
304	#endif	306	#endif
305		307
306	#ifndef EV_USE_SIGNALFD	308	#ifndef EV_USE_SIGNALFD
307	# if __linux && (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))	309	# if __linux && (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308	# define EV_USE_SIGNALFD 1	310	# define EV_USE_SIGNALFD 1
309	# else	311	# else
310	# define EV_USE_SIGNALFD 0	312	# define EV_USE_SIGNALFD 0
311	# endif	313	# endif
312	#endif	314	#endif
…		…
343	# endif	345	# endif
344	#endif	346	#endif
345		347
346	/* 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 */
347		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
348	#ifndef CLOCK_MONOTONIC	356	#ifndef CLOCK_MONOTONIC
349	# undef EV_USE_MONOTONIC	357	# undef EV_USE_MONOTONIC
350	# define EV_USE_MONOTONIC 0	358	# define EV_USE_MONOTONIC 0
351	#endif	359	#endif
352		360
…		…
386	# include <stdint.h>	394	# include <stdint.h>
387	# ifndef EFD_NONBLOCK	395	# ifndef EFD_NONBLOCK
388	# define EFD_NONBLOCK O_NONBLOCK	396	# define EFD_NONBLOCK O_NONBLOCK
389	# endif	397	# endif
390	# ifndef EFD_CLOEXEC	398	# ifndef EFD_CLOEXEC
		399	# ifdef O_CLOEXEC
391	# define EFD_CLOEXEC O_CLOEXEC	400	# define EFD_CLOEXEC O_CLOEXEC
		401	# else
		402	# define EFD_CLOEXEC 02000000
		403	# endif
392	# endif	404	# endif
393	# ifdef __cplusplus	405	# ifdef __cplusplus
394	extern "C" {	406	extern "C" {
395	# endif	407	# endif
396	int eventfd (unsigned int initval, int flags);	408	int eventfd (unsigned int initval, int flags);
…		…
398	}	410	}
399	# endif	411	# endif
400	#endif	412	#endif
401		413
402	#if EV_USE_SIGNALFD	414	#if EV_USE_SIGNALFD
403	# include <sys/signalfd.h>	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
404	#endif	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
		428	extern "C" {
		429	# endif
		430	int signalfd (int fd, const sigset_t *mask, int flags);
		431
		432	struct 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
405		442
406	/**/	443	/**/
407		444
408	#if EV_VERIFY >= 3	445	#if EV_VERIFY >= 3
409	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)	446	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
…		…
421	*/	458	*/
422	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */	459	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423		460
424	#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) */
425	#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) */
426	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds, TODO */
427		463
428	#if __GNUC__ >= 4	464	#if __GNUC__ >= 4
429	# define expect(expr,value) __builtin_expect ((expr),(value))	465	# define expect(expr,value) __builtin_expect ((expr),(value))
430	# define noinline __attribute__ ((noinline))	466	# define noinline __attribute__ ((noinline))
431	#else	467	#else
…		…
470	static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */	506	static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471	#endif	507	#endif
472		508
473	#if EV_USE_MONOTONIC	509	#if EV_USE_MONOTONIC
474	static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	510	static 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)
475	#endif	521	#endif
476		522
477	#ifdef _WIN32	523	#ifdef _WIN32
478	# include "ev_win32.c"	524	# include "ev_win32.c"
479	#endif	525	#endif
…		…
872		918
873	#if EV_SELECT_IS_WINSOCKET	919	#if EV_SELECT_IS_WINSOCKET
874	if (events)	920	if (events)
875	{	921	{
876	unsigned long arg;	922	unsigned long arg;
877	#ifdef EV_FD_TO_WIN32_HANDLE
878	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	923	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
879	#else
880	anfd->handle = _get_osfhandle (fd);
881	#endif
882	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));
883	}	925	}
884	#endif	926	#endif
885		927
886	{	928	{
…		…
929	/* check whether the given fd is atcually valid, for error recovery */	971	/* check whether the given fd is atcually valid, for error recovery */
930	inline_size int	972	inline_size int
931	fd_valid (int fd)	973	fd_valid (int fd)
932	{	974	{
933	#ifdef _WIN32	975	#ifdef _WIN32
934	return _get_osfhandle (fd) != -1;	976	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935	#else	977	#else
936	return fcntl (fd, F_GETFD) != -1;	978	return fcntl (fd, F_GETFD) != -1;
937	#endif	979	#endif
938	}	980	}
939		981
…		…
1057		1099
1058	for (;;)	1100	for (;;)
1059	{	1101	{
1060	int c = k << 1;	1102	int c = k << 1;
1061		1103
1062	if (c > N + HEAP0 - 1)	1104	if (c >= N + HEAP0)
1063	break;	1105	break;
1064		1106
1065	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])
1066	? 1 : 0;	1108	? 1 : 0;
1067		1109
…		…
1103		1145
1104	/* move an element suitably so it is in a correct place */	1146	/* move an element suitably so it is in a correct place */
1105	inline_size void	1147	inline_size void
1106	adjustheap (ANHE *heap, int N, int k)	1148	adjustheap (ANHE *heap, int N, int k)
1107	{	1149	{
1108	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)]))
1109	upheap (heap, k);	1151	upheap (heap, k);
1110	else	1152	else
1111	downheap (heap, N, k);	1153	downheap (heap, N, k);
1112	}	1154	}
1113		1155
…		…
1144	inline_speed void	1186	inline_speed void
1145	fd_intern (int fd)	1187	fd_intern (int fd)
1146	{	1188	{
1147	#ifdef _WIN32	1189	#ifdef _WIN32
1148	unsigned long arg = 1;	1190	unsigned long arg = 1;
1149	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1191	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1150	#else	1192	#else
1151	fcntl (fd, F_SETFD, FD_CLOEXEC);	1193	fcntl (fd, F_SETFD, FD_CLOEXEC);
1152	fcntl (fd, F_SETFL, O_NONBLOCK);	1194	fcntl (fd, F_SETFL, O_NONBLOCK);
1153	#endif	1195	#endif
1154	}	1196	}
…		…
1259	{	1301	{
1260	#if EV_MULTIPLICITY	1302	#if EV_MULTIPLICITY
1261	EV_P = signals [signum - 1].loop;	1303	EV_P = signals [signum - 1].loop;
1262	#endif	1304	#endif
1263		1305
1264	#if _WIN32	1306	#ifdef _WIN32
1265	signal (signum, ev_sighandler);	1307	signal (signum, ev_sighandler);
1266	#endif	1308	#endif
1267		1309
1268	signals [signum - 1].pending = 1;	1310	signals [signum - 1].pending = 1;
1269	evpipe_write (EV_A_ &sig_pending);	1311	evpipe_write (EV_A_ &sig_pending);
…		…
1570	#endif	1612	#endif
1571	#if EV_USE_INOTIFY	1613	#if EV_USE_INOTIFY
1572	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1614	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573	#endif	1615	#endif
1574	#if EV_USE_SIGNALFD	1616	#if EV_USE_SIGNALFD
1575	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1617	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576	#endif	1618	#endif
1577		1619
1578	if (!(flags & 0x0000ffffU))	1620	if (!(flags & 0x0000ffffU))
1579	flags \|= ev_recommended_backends ();	1621	flags \|= ev_recommended_backends ();
1580		1622
…		…
1617	close (evfd);	1659	close (evfd);
1618	#endif	1660	#endif
1619		1661
1620	if (evpipe [0] >= 0)	1662	if (evpipe [0] >= 0)
1621	{	1663	{
1622	close (evpipe [0]);	1664	EV_WIN32_CLOSE_FD (evpipe [0]);
1623	close (evpipe [1]);	1665	EV_WIN32_CLOSE_FD (evpipe [1]);
1624	}	1666	}
1625	}	1667	}
1626		1668
1627	#if EV_USE_SIGNALFD	1669	#if EV_USE_SIGNALFD
1628	if (ev_is_active (&sigfd_w))	1670	if (ev_is_active (&sigfd_w))
1629	{
1630	/ev_ref (EV_A);/
1631	/ev_io_stop (EV_A_ &sigfd_w);/
1632
1633	close (sigfd);	1671	close (sigfd);
1634	}
1635	#endif	1672	#endif
1636		1673
1637	#if EV_USE_INOTIFY	1674	#if EV_USE_INOTIFY
1638	if (fs_fd >= 0)	1675	if (fs_fd >= 0)
1639	close (fs_fd);	1676	close (fs_fd);
…		…
1724	close (evfd);	1761	close (evfd);
1725	#endif	1762	#endif
1726		1763
1727	if (evpipe [0] >= 0)	1764	if (evpipe [0] >= 0)
1728	{	1765	{
1729	close (evpipe [0]);	1766	EV_WIN32_CLOSE_FD (evpipe [0]);
1730	close (evpipe [1]);	1767	EV_WIN32_CLOSE_FD (evpipe [1]);
1731	}	1768	}
1732		1769
1733	evpipe_init (EV_A);	1770	evpipe_init (EV_A);
1734	/* now iterate over everything, in case we missed something */	1771	/* now iterate over everything, in case we missed something */
1735	pipecb (EV_A_ &pipe_w, EV_READ);	1772	pipecb (EV_A_ &pipe_w, EV_READ);
…		…
2127	ANHE_at_cache (*he);	2164	ANHE_at_cache (*he);
2128	}	2165	}
2129	}	2166	}
2130		2167
2131	/* fetch new monotonic and realtime times from the kernel */	2168	/* fetch new monotonic and realtime times from the kernel */
2132	/* also detetc if there was a timejump, and act accordingly */	2169	/* also detect if there was a timejump, and act accordingly */
2133	inline_speed void	2170	inline_speed void
2134	time_update (EV_P_ ev_tstamp max_block)	2171	time_update (EV_P_ ev_tstamp max_block)
2135	{	2172	{
2136	#if EV_USE_MONOTONIC	2173	#if EV_USE_MONOTONIC
2137	if (expect_true (have_monotonic))	2174	if (expect_true (have_monotonic))
…		…
2471		2508
2472	if (expect_false (ev_is_active (w)))	2509	if (expect_false (ev_is_active (w)))
2473	return;	2510	return;
2474		2511
2475	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2512	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476	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))));
2477		2514
2478	EV_FREQUENT_CHECK;	2515	EV_FREQUENT_CHECK;
2479		2516
2480	ev_start (EV_A_ (W)w, 1);	2517	ev_start (EV_A_ (W)w, 1);
2481	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2518	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2671	return;	2708	return;
2672		2709
2673	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));	2710	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2674		2711
2675	#if EV_MULTIPLICITY	2712	#if EV_MULTIPLICITY
2676	assert (("libev: tried to attach to a signal from two different loops",	2713	assert (("libev: a signal must not be attached to two different loops",
2677	!signals [w->signum - 1].loop \|\| signals [w->signum - 1].loop == loop));	2714	!signals [w->signum - 1].loop \|\| signals [w->signum - 1].loop == loop));
2678		2715
2679	signals [w->signum - 1].loop = EV_A;	2716	signals [w->signum - 1].loop = EV_A;
2680	#endif	2717	#endif
2681		2718
…		…
2717	if (!((WL)w)->next)	2754	if (!((WL)w)->next)
2718	# if EV_USE_SIGNALFD	2755	# if EV_USE_SIGNALFD
2719	if (sigfd < 0) /TODO/	2756	if (sigfd < 0) /TODO/
2720	# endif	2757	# endif
2721	{	2758	{
2722	# if _WIN32	2759	# ifdef _WIN32
		2760	evpipe_init (EV_A);
		2761
2723	signal (w->signum, ev_sighandler);	2762	signal (w->signum, ev_sighandler);
2724	# else	2763	# else
2725	struct sigaction sa;	2764	struct sigaction sa;
2726		2765
2727	evpipe_init (EV_A);	2766	evpipe_init (EV_A);
…		…
2758	signals [w->signum - 1].loop = 0; /* unattach from signal */	2797	signals [w->signum - 1].loop = 0; /* unattach from signal */
2759	#endif	2798	#endif
2760	#if EV_USE_SIGNALFD	2799	#if EV_USE_SIGNALFD
2761	if (sigfd >= 0)	2800	if (sigfd >= 0)
2762	{	2801	{
2763	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2802	sigset_t ss;
		2803
		2804	sigemptyset (&ss);
		2805	sigaddset (&ss, w->signum);
2764	sigdelset (&sigfd_set, w->signum);	2806	sigdelset (&sigfd_set, w->signum);
		2807
2765	signalfd (sigfd, &sigfd_set, 0);	2808	signalfd (sigfd, &sigfd_set, 0);
2766	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2809	sigprocmask (SIG_UNBLOCK, &ss, 0);
2767	/TODO: maybe unblock signal? /
2768	}	2810	}
2769	else	2811	else
2770	#endif	2812	#endif
2771	signal (w->signum, SIG_DFL);	2813	signal (w->signum, SIG_DFL);
2772	}	2814	}
…		…
2818	#define MIN_STAT_INTERVAL 0.1074891	2860	#define MIN_STAT_INTERVAL 0.1074891
2819		2861
2820	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2862	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821		2863
2822	#if EV_USE_INOTIFY	2864	#if EV_USE_INOTIFY
2823	# 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)
2824		2868
2825	static void noinline	2869	static void noinline
2826	infy_add (EV_P_ ev_stat *w)	2870	infy_add (EV_P_ ev_stat *w)
2827	{	2871	{
2828	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);
2829		2873
2830	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 */
2831	{	2894	}
		2895	else
		2896	{
		2897	/* can't use inotify, continue to stat */
2832	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;	2898	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834		2899
2835	/* monitor some parent directory for speedup hints */	2900	/* if path is not there, monitor some parent directory for speedup hints */
2836	/* 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, */
2837	/* but an efficiency issue only */	2902	/* but an efficiency issue only */
2838	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2903	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2839	{	2904	{
2840	char path [4096];	2905	char path [4096];
…		…
2856	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2921	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2857	}	2922	}
2858	}	2923	}
2859		2924
2860	if (w->wd >= 0)	2925	if (w->wd >= 0)
2861	{
2862	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);
2863		2927
2864	/* now local changes will be tracked by inotify, but remote changes won't */	2928	/* now re-arm timer, if required */
2865	/* unless the filesystem it known to be local, we therefore still poll */	2929	if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866	/* also do poll on <2.6.25, but with normal frequency */
2867	struct statfs sfs;
2868
2869	if (fs_2625 && !statfs (w->path, &sfs))
2870	if (sfs.f_type == 0x1373 /* devfs */
2871	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2872	\|\| sfs.f_type == 0x3153464a /* jfs */
2873	\|\| sfs.f_type == 0x52654973 /* reiser3 */
2874	\|\| sfs.f_type == 0x01021994 /* tempfs */
2875	\|\| sfs.f_type == 0x58465342 /* xfs */)
2876	return;
2877
2878	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879	ev_timer_again (EV_A_ &w->timer);	2930	ev_timer_again (EV_A_ &w->timer);
2880	}	2931	if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881	}	2932	}
2882		2933
2883	static void noinline	2934	static void noinline
2884	infy_del (EV_P_ ev_stat *w)	2935	infy_del (EV_P_ ev_stat *w)
2885	{	2936	{
…		…
2930		2981
2931	static void	2982	static void
2932	infy_cb (EV_P_ ev_io *w, int revents)	2983	infy_cb (EV_P_ ev_io *w, int revents)
2933	{	2984	{
2934	char buf [EV_INOTIFY_BUFSIZE];	2985	char buf [EV_INOTIFY_BUFSIZE];
2935	struct inotify_event ev = (struct inotify_event )buf;
2936	int ofs;	2986	int ofs;
2937	int len = read (fs_fd, buf, sizeof (buf));	2987	int len = read (fs_fd, buf, sizeof (buf));
2938		2988
2939	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);
2940	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	}
2941	}	2995	}
2942		2996
2943	inline_size void	2997	inline_size void
2944	check_2625 (EV_P)	2998	check_2625 (EV_P)
2945	{	2999	{
…		…
2961	return;	3015	return;
2962		3016
2963	fs_2625 = 1;	3017	fs_2625 = 1;
2964	}	3018	}
2965		3019
		3020	inline_size int
		3021	infy_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
2966	inline_size void	3031	inline_size void
2967	infy_init (EV_P)	3032	infy_init (EV_P)
2968	{	3033	{
2969	if (fs_fd != -2)	3034	if (fs_fd != -2)
2970	return;	3035	return;
2971		3036
2972	fs_fd = -1;	3037	fs_fd = -1;
2973		3038
2974	check_2625 (EV_A);	3039	check_2625 (EV_A);
2975		3040
2976	fs_fd = inotify_init ();	3041	fs_fd = infy_newfd ();
2977		3042
2978	if (fs_fd >= 0)	3043	if (fs_fd >= 0)
2979	{	3044	{
		3045	fd_intern (fs_fd);
2980	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3046	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981	ev_set_priority (&fs_w, EV_MAXPRI);	3047	ev_set_priority (&fs_w, EV_MAXPRI);
2982	ev_io_start (EV_A_ &fs_w);	3048	ev_io_start (EV_A_ &fs_w);
		3049	ev_unref (EV_A);
2983	}	3050	}
2984	}	3051	}
2985		3052
2986	inline_size void	3053	inline_size void
2987	infy_fork (EV_P)	3054	infy_fork (EV_P)
…		…
2989	int slot;	3056	int slot;
2990		3057
2991	if (fs_fd < 0)	3058	if (fs_fd < 0)
2992	return;	3059	return;
2993		3060
		3061	ev_ref (EV_A);
		3062	ev_io_stop (EV_A_ &fs_w);
2994	close (fs_fd);	3063	close (fs_fd);
2995	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	}
2996		3073
2997	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3074	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2998	{	3075	{
2999	WL w_ = fs_hash [slot].head;	3076	WL w_ = fs_hash [slot].head;
3000	fs_hash [slot].head = 0;	3077	fs_hash [slot].head = 0;
…		…
3007	w->wd = -1;	3084	w->wd = -1;
3008		3085
3009	if (fs_fd >= 0)	3086	if (fs_fd >= 0)
3010	infy_add (EV_A_ w); /* re-add, no matter what */	3087	infy_add (EV_A_ w); /* re-add, no matter what */
3011	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);
3012	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	}
3013	}	3095	}
3014	}	3096	}
3015	}	3097	}
3016		3098
3017	#endif	3099	#endif
…		…
3034	static void noinline	3116	static void noinline
3035	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3117	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036	{	3118	{
3037	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3119	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3038		3120
3039	/* we copy this here each the time so that */	3121	ev_statdata prev = w->attr;
3040	/* prev has the old value when the callback gets invoked */
3041	w->prev = w->attr;
3042	ev_stat_stat (EV_A_ w);	3122	ev_stat_stat (EV_A_ w);
3043		3123
3044	/* 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 */
3045	if (	3125	if (
3046	w->prev.st_dev != w->attr.st_dev	3126	prev.st_dev != w->attr.st_dev
3047	\|\| w->prev.st_ino != w->attr.st_ino	3127	\|\| prev.st_ino != w->attr.st_ino
3048	\|\| w->prev.st_mode != w->attr.st_mode	3128	\|\| prev.st_mode != w->attr.st_mode
3049	\|\| w->prev.st_nlink != w->attr.st_nlink	3129	\|\| prev.st_nlink != w->attr.st_nlink
3050	\|\| w->prev.st_uid != w->attr.st_uid	3130	\|\| prev.st_uid != w->attr.st_uid
3051	\|\| w->prev.st_gid != w->attr.st_gid	3131	\|\| prev.st_gid != w->attr.st_gid
3052	\|\| w->prev.st_rdev != w->attr.st_rdev	3132	\|\| prev.st_rdev != w->attr.st_rdev
3053	\|\| w->prev.st_size != w->attr.st_size	3133	\|\| prev.st_size != w->attr.st_size
3054	\|\| w->prev.st_atime != w->attr.st_atime	3134	\|\| prev.st_atime != w->attr.st_atime
3055	\|\| w->prev.st_mtime != w->attr.st_mtime	3135	\|\| prev.st_mtime != w->attr.st_mtime
3056	\|\| w->prev.st_ctime != w->attr.st_ctime	3136	\|\| prev.st_ctime != w->attr.st_ctime
3057	) {	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
3058	#if EV_USE_INOTIFY	3143	#if EV_USE_INOTIFY
3059	if (fs_fd >= 0)	3144	if (fs_fd >= 0)
3060	{	3145	{
3061	infy_del (EV_A_ w);	3146	infy_del (EV_A_ w);
3062	infy_add (EV_A_ w);	3147	infy_add (EV_A_ w);
…		…
3087		3172
3088	if (fs_fd >= 0)	3173	if (fs_fd >= 0)
3089	infy_add (EV_A_ w);	3174	infy_add (EV_A_ w);
3090	else	3175	else
3091	#endif	3176	#endif
		3177	{
3092	ev_timer_again (EV_A_ &w->timer);	3178	ev_timer_again (EV_A_ &w->timer);
		3179	ev_unref (EV_A);
		3180	}
3093		3181
3094	ev_start (EV_A_ (W)w, 1);	3182	ev_start (EV_A_ (W)w, 1);
3095		3183
3096	EV_FREQUENT_CHECK;	3184	EV_FREQUENT_CHECK;
3097	}	3185	}
…		…
3106	EV_FREQUENT_CHECK;	3194	EV_FREQUENT_CHECK;
3107		3195
3108	#if EV_USE_INOTIFY	3196	#if EV_USE_INOTIFY
3109	infy_del (EV_A_ w);	3197	infy_del (EV_A_ w);
3110	#endif	3198	#endif
		3199
		3200	if (ev_is_active (&w->timer))
		3201	{
		3202	ev_ref (EV_A);
3111	ev_timer_stop (EV_A_ &w->timer);	3203	ev_timer_stop (EV_A_ &w->timer);
		3204	}
3112		3205
3113	ev_stop (EV_A_ (W)w);	3206	ev_stop (EV_A_ (W)w);
3114		3207
3115	EV_FREQUENT_CHECK;	3208	EV_FREQUENT_CHECK;
3116	}	3209	}

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC vs. Revision 1.327 by root, Sun Feb 14 19:09:04 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 2010 UTC