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

Comparing libev/ev.c (file contents):
Revision 1.311 by root, Wed Jul 29 09:36:05 2009 UTC vs.
Revision 1.329 by root, Tue Feb 16 09:32:39 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
…		…
395	# endif	403	# endif
396	# endif	404	# endif
397	# ifdef __cplusplus	405	# ifdef __cplusplus
398	extern "C" {	406	extern "C" {
399	# endif	407	# endif
400	int eventfd (unsigned int initval, int flags);	408	int (eventfd) (unsigned int initval, int flags);
401	# ifdef __cplusplus	409	# ifdef __cplusplus
402	}	410	}
403	# endif	411	# endif
404	#endif	412	#endif
405		413
406	#if EV_USE_SIGNALFD	414	#if EV_USE_SIGNALFD
407	# 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
408	#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
409		442
410	/**/	443	/**/
411		444
412	#if EV_VERIFY >= 3	445	#if EV_VERIFY >= 3
413	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)	446	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
…		…
425	*/	458	*/
426	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */	459	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427		460
428	#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) */
429	#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) */
430	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds, TODO */
431		463
432	#if __GNUC__ >= 4	464	#if __GNUC__ >= 4
433	# define expect(expr,value) __builtin_expect ((expr),(value))	465	# define expect(expr,value) __builtin_expect ((expr),(value))
434	# define noinline __attribute__ ((noinline))	466	# define noinline __attribute__ ((noinline))
435	#else	467	#else
…		…
474	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? */
475	#endif	507	#endif
476		508
477	#if EV_USE_MONOTONIC	509	#if EV_USE_MONOTONIC
478	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)
479	#endif	521	#endif
480		522
481	#ifdef _WIN32	523	#ifdef _WIN32
482	# include "ev_win32.c"	524	# include "ev_win32.c"
483	#endif	525	#endif
…		…
876		918
877	#if EV_SELECT_IS_WINSOCKET	919	#if EV_SELECT_IS_WINSOCKET
878	if (events)	920	if (events)
879	{	921	{
880	unsigned long arg;	922	unsigned long arg;
881	#ifdef EV_FD_TO_WIN32_HANDLE
882	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	923	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
883	#else
884	anfd->handle = _get_osfhandle (fd);
885	#endif
886	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));
887	}	925	}
888	#endif	926	#endif
889		927
890	{	928	{
…		…
933	/* check whether the given fd is atcually valid, for error recovery */	971	/* check whether the given fd is atcually valid, for error recovery */
934	inline_size int	972	inline_size int
935	fd_valid (int fd)	973	fd_valid (int fd)
936	{	974	{
937	#ifdef _WIN32	975	#ifdef _WIN32
938	return _get_osfhandle (fd) != -1;	976	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939	#else	977	#else
940	return fcntl (fd, F_GETFD) != -1;	978	return fcntl (fd, F_GETFD) != -1;
941	#endif	979	#endif
942	}	980	}
943		981
…		…
1148	inline_speed void	1186	inline_speed void
1149	fd_intern (int fd)	1187	fd_intern (int fd)
1150	{	1188	{
1151	#ifdef _WIN32	1189	#ifdef _WIN32
1152	unsigned long arg = 1;	1190	unsigned long arg = 1;
1153	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1191	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1154	#else	1192	#else
1155	fcntl (fd, F_SETFD, FD_CLOEXEC);	1193	fcntl (fd, F_SETFD, FD_CLOEXEC);
1156	fcntl (fd, F_SETFL, O_NONBLOCK);	1194	fcntl (fd, F_SETFL, O_NONBLOCK);
1157	#endif	1195	#endif
1158	}	1196	}
…		…
1263	{	1301	{
1264	#if EV_MULTIPLICITY	1302	#if EV_MULTIPLICITY
1265	EV_P = signals [signum - 1].loop;	1303	EV_P = signals [signum - 1].loop;
1266	#endif	1304	#endif
1267		1305
1268	#if _WIN32	1306	#ifdef _WIN32
1269	signal (signum, ev_sighandler);	1307	signal (signum, ev_sighandler);
1270	#endif	1308	#endif
1271		1309
1272	signals [signum - 1].pending = 1;	1310	signals [signum - 1].pending = 1;
1273	evpipe_write (EV_A_ &sig_pending);	1311	evpipe_write (EV_A_ &sig_pending);
…		…
1574	#endif	1612	#endif
1575	#if EV_USE_INOTIFY	1613	#if EV_USE_INOTIFY
1576	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1614	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577	#endif	1615	#endif
1578	#if EV_USE_SIGNALFD	1616	#if EV_USE_SIGNALFD
1579	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1617	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580	#endif	1618	#endif
1581		1619
1582	if (!(flags & 0x0000ffffU))	1620	if (!(flags & 0x0000ffffU))
1583	flags \|= ev_recommended_backends ();	1621	flags \|= ev_recommended_backends ();
1584		1622
…		…
1621	close (evfd);	1659	close (evfd);
1622	#endif	1660	#endif
1623		1661
1624	if (evpipe [0] >= 0)	1662	if (evpipe [0] >= 0)
1625	{	1663	{
1626	close (evpipe [0]);	1664	EV_WIN32_CLOSE_FD (evpipe [0]);
1627	close (evpipe [1]);	1665	EV_WIN32_CLOSE_FD (evpipe [1]);
1628	}	1666	}
1629	}	1667	}
1630		1668
1631	#if EV_USE_SIGNALFD	1669	#if EV_USE_SIGNALFD
1632	if (ev_is_active (&sigfd_w))	1670	if (ev_is_active (&sigfd_w))
1633	{
1634	/ev_ref (EV_A);/
1635	/ev_io_stop (EV_A_ &sigfd_w);/
1636
1637	close (sigfd);	1671	close (sigfd);
1638	}
1639	#endif	1672	#endif
1640		1673
1641	#if EV_USE_INOTIFY	1674	#if EV_USE_INOTIFY
1642	if (fs_fd >= 0)	1675	if (fs_fd >= 0)
1643	close (fs_fd);	1676	close (fs_fd);
…		…
1728	close (evfd);	1761	close (evfd);
1729	#endif	1762	#endif
1730		1763
1731	if (evpipe [0] >= 0)	1764	if (evpipe [0] >= 0)
1732	{	1765	{
1733	close (evpipe [0]);	1766	EV_WIN32_CLOSE_FD (evpipe [0]);
1734	close (evpipe [1]);	1767	EV_WIN32_CLOSE_FD (evpipe [1]);
1735	}	1768	}
1736		1769
1737	evpipe_init (EV_A);	1770	evpipe_init (EV_A);
1738	/* now iterate over everything, in case we missed something */	1771	/* now iterate over everything, in case we missed something */
1739	pipecb (EV_A_ &pipe_w, EV_READ);	1772	pipecb (EV_A_ &pipe_w, EV_READ);
…		…
2131	ANHE_at_cache (*he);	2164	ANHE_at_cache (*he);
2132	}	2165	}
2133	}	2166	}
2134		2167
2135	/* fetch new monotonic and realtime times from the kernel */	2168	/* fetch new monotonic and realtime times from the kernel */
2136	/* also detetc if there was a timejump, and act accordingly */	2169	/* also detect if there was a timejump, and act accordingly */
2137	inline_speed void	2170	inline_speed void
2138	time_update (EV_P_ ev_tstamp max_block)	2171	time_update (EV_P_ ev_tstamp max_block)
2139	{	2172	{
2140	#if EV_USE_MONOTONIC	2173	#if EV_USE_MONOTONIC
2141	if (expect_true (have_monotonic))	2174	if (expect_true (have_monotonic))
…		…
2475		2508
2476	if (expect_false (ev_is_active (w)))	2509	if (expect_false (ev_is_active (w)))
2477	return;	2510	return;
2478		2511
2479	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2512	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480	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))));
2481		2514
2482	EV_FREQUENT_CHECK;	2515	EV_FREQUENT_CHECK;
2483		2516
2484	ev_start (EV_A_ (W)w, 1);	2517	ev_start (EV_A_ (W)w, 1);
2485	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2518	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2555	timers [active] = timers [timercnt + HEAP0];	2588	timers [active] = timers [timercnt + HEAP0];
2556	adjustheap (timers, timercnt, active);	2589	adjustheap (timers, timercnt, active);
2557	}	2590	}
2558	}	2591	}
2559		2592
2560	EV_FREQUENT_CHECK;
2561
2562	ev_at (w) -= mn_now;	2593	ev_at (w) -= mn_now;
2563		2594
2564	ev_stop (EV_A_ (W)w);	2595	ev_stop (EV_A_ (W)w);
		2596
		2597	EV_FREQUENT_CHECK;
2565	}	2598	}
2566		2599
2567	void noinline	2600	void noinline
2568	ev_timer_again (EV_P_ ev_timer *w)	2601	ev_timer_again (EV_P_ ev_timer *w)
2569	{	2602	{
…		…
2648	periodics [active] = periodics [periodiccnt + HEAP0];	2681	periodics [active] = periodics [periodiccnt + HEAP0];
2649	adjustheap (periodics, periodiccnt, active);	2682	adjustheap (periodics, periodiccnt, active);
2650	}	2683	}
2651	}	2684	}
2652		2685
2653	EV_FREQUENT_CHECK;
2654
2655	ev_stop (EV_A_ (W)w);	2686	ev_stop (EV_A_ (W)w);
		2687
		2688	EV_FREQUENT_CHECK;
2656	}	2689	}
2657		2690
2658	void noinline	2691	void noinline
2659	ev_periodic_again (EV_P_ ev_periodic *w)	2692	ev_periodic_again (EV_P_ ev_periodic *w)
2660	{	2693	{
…		…
2721	if (!((WL)w)->next)	2754	if (!((WL)w)->next)
2722	# if EV_USE_SIGNALFD	2755	# if EV_USE_SIGNALFD
2723	if (sigfd < 0) /TODO/	2756	if (sigfd < 0) /TODO/
2724	# endif	2757	# endif
2725	{	2758	{
2726	# if _WIN32	2759	# ifdef _WIN32
		2760	evpipe_init (EV_A);
		2761
2727	signal (w->signum, ev_sighandler);	2762	signal (w->signum, ev_sighandler);
2728	# else	2763	# else
2729	struct sigaction sa;	2764	struct sigaction sa;
2730		2765
2731	evpipe_init (EV_A);	2766	evpipe_init (EV_A);
…		…
2762	signals [w->signum - 1].loop = 0; /* unattach from signal */	2797	signals [w->signum - 1].loop = 0; /* unattach from signal */
2763	#endif	2798	#endif
2764	#if EV_USE_SIGNALFD	2799	#if EV_USE_SIGNALFD
2765	if (sigfd >= 0)	2800	if (sigfd >= 0)
2766	{	2801	{
2767	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2802	sigset_t ss;
		2803
		2804	sigemptyset (&ss);
		2805	sigaddset (&ss, w->signum);
2768	sigdelset (&sigfd_set, w->signum);	2806	sigdelset (&sigfd_set, w->signum);
		2807
2769	signalfd (sigfd, &sigfd_set, 0);	2808	signalfd (sigfd, &sigfd_set, 0);
2770	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2809	sigprocmask (SIG_UNBLOCK, &ss, 0);
2771	/TODO: maybe unblock signal? /
2772	}	2810	}
2773	else	2811	else
2774	#endif	2812	#endif
2775	signal (w->signum, SIG_DFL);	2813	signal (w->signum, SIG_DFL);
2776	}	2814	}
…		…
2822	#define MIN_STAT_INTERVAL 0.1074891	2860	#define MIN_STAT_INTERVAL 0.1074891
2823		2861
2824	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);
2825		2863
2826	#if EV_USE_INOTIFY	2864	#if EV_USE_INOTIFY
2827	# 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)
2828		2868
2829	static void noinline	2869	static void noinline
2830	infy_add (EV_P_ ev_stat *w)	2870	infy_add (EV_P_ ev_stat *w)
2831	{	2871	{
2832	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);
2833		2873
2834	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 */
2835	{	2894	}
		2895	else
		2896	{
		2897	/* can't use inotify, continue to stat */
2836	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;	2898	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2837	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2838		2899
2839	/* monitor some parent directory for speedup hints */	2900	/* if path is not there, monitor some parent directory for speedup hints */
2840	/* 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, */
2841	/* but an efficiency issue only */	2902	/* but an efficiency issue only */
2842	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2903	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2843	{	2904	{
2844	char path [4096];	2905	char path [4096];
…		…
2860	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2921	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2861	}	2922	}
2862	}	2923	}
2863		2924
2864	if (w->wd >= 0)	2925	if (w->wd >= 0)
2865	{
2866	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);
2867		2927
2868	/* now local changes will be tracked by inotify, but remote changes won't */	2928	/* now re-arm timer, if required */
2869	/* unless the filesystem it known to be local, we therefore still poll */	2929	if (ev_is_active (&w->timer)) ev_ref (EV_A);
2870	/* also do poll on <2.6.25, but with normal frequency */
2871	struct statfs sfs;
2872
2873	if (fs_2625 && !statfs (w->path, &sfs))
2874	if (sfs.f_type == 0x1373 /* devfs */
2875	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2876	\|\| sfs.f_type == 0x3153464a /* jfs */
2877	\|\| sfs.f_type == 0x52654973 /* reiser3 */
2878	\|\| sfs.f_type == 0x01021994 /* tempfs */
2879	\|\| sfs.f_type == 0x58465342 /* xfs */)
2880	return;
2881
2882	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2883	ev_timer_again (EV_A_ &w->timer);	2930	ev_timer_again (EV_A_ &w->timer);
2884	}	2931	if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885	}	2932	}
2886		2933
2887	static void noinline	2934	static void noinline
2888	infy_del (EV_P_ ev_stat *w)	2935	infy_del (EV_P_ ev_stat *w)
2889	{	2936	{
…		…
2934		2981
2935	static void	2982	static void
2936	infy_cb (EV_P_ ev_io *w, int revents)	2983	infy_cb (EV_P_ ev_io *w, int revents)
2937	{	2984	{
2938	char buf [EV_INOTIFY_BUFSIZE];	2985	char buf [EV_INOTIFY_BUFSIZE];
2939	struct inotify_event ev = (struct inotify_event )buf;
2940	int ofs;	2986	int ofs;
2941	int len = read (fs_fd, buf, sizeof (buf));	2987	int len = read (fs_fd, buf, sizeof (buf));
2942		2988
2943	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);
2944	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	}
2945	}	2995	}
2946		2996
2947	inline_size void	2997	inline_size void
2948	check_2625 (EV_P)	2998	check_2625 (EV_P)
2949	{	2999	{
…		…
2965	return;	3015	return;
2966		3016
2967	fs_2625 = 1;	3017	fs_2625 = 1;
2968	}	3018	}
2969		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
2970	inline_size void	3031	inline_size void
2971	infy_init (EV_P)	3032	infy_init (EV_P)
2972	{	3033	{
2973	if (fs_fd != -2)	3034	if (fs_fd != -2)
2974	return;	3035	return;
2975		3036
2976	fs_fd = -1;	3037	fs_fd = -1;
2977		3038
2978	check_2625 (EV_A);	3039	check_2625 (EV_A);
2979		3040
2980	fs_fd = inotify_init ();	3041	fs_fd = infy_newfd ();
2981		3042
2982	if (fs_fd >= 0)	3043	if (fs_fd >= 0)
2983	{	3044	{
		3045	fd_intern (fs_fd);
2984	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3046	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985	ev_set_priority (&fs_w, EV_MAXPRI);	3047	ev_set_priority (&fs_w, EV_MAXPRI);
2986	ev_io_start (EV_A_ &fs_w);	3048	ev_io_start (EV_A_ &fs_w);
		3049	ev_unref (EV_A);
2987	}	3050	}
2988	}	3051	}
2989		3052
2990	inline_size void	3053	inline_size void
2991	infy_fork (EV_P)	3054	infy_fork (EV_P)
…		…
2993	int slot;	3056	int slot;
2994		3057
2995	if (fs_fd < 0)	3058	if (fs_fd < 0)
2996	return;	3059	return;
2997		3060
		3061	ev_ref (EV_A);
		3062	ev_io_stop (EV_A_ &fs_w);
2998	close (fs_fd);	3063	close (fs_fd);
2999	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	}
3000		3073
3001	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3074	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002	{	3075	{
3003	WL w_ = fs_hash [slot].head;	3076	WL w_ = fs_hash [slot].head;
3004	fs_hash [slot].head = 0;	3077	fs_hash [slot].head = 0;
…		…
3011	w->wd = -1;	3084	w->wd = -1;
3012		3085
3013	if (fs_fd >= 0)	3086	if (fs_fd >= 0)
3014	infy_add (EV_A_ w); /* re-add, no matter what */	3087	infy_add (EV_A_ w); /* re-add, no matter what */
3015	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);
3016	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	}
3017	}	3095	}
3018	}	3096	}
3019	}	3097	}
3020		3098
3021	#endif	3099	#endif
…		…
3038	static void noinline	3116	static void noinline
3039	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3117	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040	{	3118	{
3041	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3119	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3042		3120
3043	/* we copy this here each the time so that */	3121	ev_statdata prev = w->attr;
3044	/* prev has the old value when the callback gets invoked */
3045	w->prev = w->attr;
3046	ev_stat_stat (EV_A_ w);	3122	ev_stat_stat (EV_A_ w);
3047		3123
3048	/* 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 */
3049	if (	3125	if (
3050	w->prev.st_dev != w->attr.st_dev	3126	prev.st_dev != w->attr.st_dev
3051	\|\| w->prev.st_ino != w->attr.st_ino	3127	\|\| prev.st_ino != w->attr.st_ino
3052	\|\| w->prev.st_mode != w->attr.st_mode	3128	\|\| prev.st_mode != w->attr.st_mode
3053	\|\| w->prev.st_nlink != w->attr.st_nlink	3129	\|\| prev.st_nlink != w->attr.st_nlink
3054	\|\| w->prev.st_uid != w->attr.st_uid	3130	\|\| prev.st_uid != w->attr.st_uid
3055	\|\| w->prev.st_gid != w->attr.st_gid	3131	\|\| prev.st_gid != w->attr.st_gid
3056	\|\| w->prev.st_rdev != w->attr.st_rdev	3132	\|\| prev.st_rdev != w->attr.st_rdev
3057	\|\| w->prev.st_size != w->attr.st_size	3133	\|\| prev.st_size != w->attr.st_size
3058	\|\| w->prev.st_atime != w->attr.st_atime	3134	\|\| prev.st_atime != w->attr.st_atime
3059	\|\| w->prev.st_mtime != w->attr.st_mtime	3135	\|\| prev.st_mtime != w->attr.st_mtime
3060	\|\| w->prev.st_ctime != w->attr.st_ctime	3136	\|\| prev.st_ctime != w->attr.st_ctime
3061	) {	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
3062	#if EV_USE_INOTIFY	3143	#if EV_USE_INOTIFY
3063	if (fs_fd >= 0)	3144	if (fs_fd >= 0)
3064	{	3145	{
3065	infy_del (EV_A_ w);	3146	infy_del (EV_A_ w);
3066	infy_add (EV_A_ w);	3147	infy_add (EV_A_ w);
…		…
3091		3172
3092	if (fs_fd >= 0)	3173	if (fs_fd >= 0)
3093	infy_add (EV_A_ w);	3174	infy_add (EV_A_ w);
3094	else	3175	else
3095	#endif	3176	#endif
		3177	{
3096	ev_timer_again (EV_A_ &w->timer);	3178	ev_timer_again (EV_A_ &w->timer);
		3179	ev_unref (EV_A);
		3180	}
3097		3181
3098	ev_start (EV_A_ (W)w, 1);	3182	ev_start (EV_A_ (W)w, 1);
3099		3183
3100	EV_FREQUENT_CHECK;	3184	EV_FREQUENT_CHECK;
3101	}	3185	}
…		…
3110	EV_FREQUENT_CHECK;	3194	EV_FREQUENT_CHECK;
3111		3195
3112	#if EV_USE_INOTIFY	3196	#if EV_USE_INOTIFY
3113	infy_del (EV_A_ w);	3197	infy_del (EV_A_ w);
3114	#endif	3198	#endif
		3199
		3200	if (ev_is_active (&w->timer))
		3201	{
		3202	ev_ref (EV_A);
3115	ev_timer_stop (EV_A_ &w->timer);	3203	ev_timer_stop (EV_A_ &w->timer);
		3204	}
3116		3205
3117	ev_stop (EV_A_ (W)w);	3206	ev_stop (EV_A_ (W)w);
3118		3207
3119	EV_FREQUENT_CHECK;	3208	EV_FREQUENT_CHECK;
3120	}	3209	}
…		…
3339	EV_FREQUENT_CHECK;	3428	EV_FREQUENT_CHECK;
3340		3429
3341	ev_io_stop (EV_A_ &w->io);	3430	ev_io_stop (EV_A_ &w->io);
3342	ev_prepare_stop (EV_A_ &w->prepare);	3431	ev_prepare_stop (EV_A_ &w->prepare);
3343	ev_fork_stop (EV_A_ &w->fork);	3432	ev_fork_stop (EV_A_ &w->fork);
		3433
		3434	ev_stop (EV_A_ (W)w);
3344		3435
3345	EV_FREQUENT_CHECK;	3436	EV_FREQUENT_CHECK;
3346	}	3437	}
3347	#endif	3438	#endif
3348		3439

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.311 by root, Wed Jul 29 09:36:05 2009 UTC vs. Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.311 by root, Wed Jul 29 09:36:05 2009 UTC vs.
Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC