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

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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
…		…
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
…		…
450	*/	458	*/
451	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */	459	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
452		460
453	#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) */
454	#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) */
455	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds, TODO */
456		463
457	#if __GNUC__ >= 4	464	#if __GNUC__ >= 4
458	# define expect(expr,value) __builtin_expect ((expr),(value))	465	# define expect(expr,value) __builtin_expect ((expr),(value))
459	# define noinline __attribute__ ((noinline))	466	# define noinline __attribute__ ((noinline))
460	#else	467	#else
…		…
505		512
506	#ifndef EV_FD_TO_WIN32_HANDLE	513	#ifndef EV_FD_TO_WIN32_HANDLE
507	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)	514	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508	#endif	515	#endif
509	#ifndef EV_WIN32_HANDLE_TO_FD	516	#ifndef EV_WIN32_HANDLE_TO_FD
510	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)	517	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511	#endif	518	#endif
512	#ifndef EV_WIN32_CLOSE_FD	519	#ifndef EV_WIN32_CLOSE_FD
513	# define EV_WIN32_CLOSE_FD(fd) close (fd)	520	# define EV_WIN32_CLOSE_FD(fd) close (fd)
514	#endif	521	#endif
515		522
…		…
535		542
536	if (syserr_cb)	543	if (syserr_cb)
537	syserr_cb (msg);	544	syserr_cb (msg);
538	else	545	else
539	{	546	{
		547	#if EV_AVOID_STDIO
		548	write (STDERR_FILENO, msg, strlen (msg));
		549	write (STDERR_FILENO, ": ", 2);
		550	msg = strerror (errno);
		551	write (STDERR_FILENO, msg, strlen (msg));
		552	write (STDERR_FILENO, "\n", 1);
		553	#else
540	perror (msg);	554	perror (msg);
		555	#endif
541	abort ();	556	abort ();
542	}	557	}
543	}	558	}
544		559
545	static void *	560	static void *
…		…
570	{	585	{
571	ptr = alloc (ptr, size);	586	ptr = alloc (ptr, size);
572		587
573	if (!ptr && size)	588	if (!ptr && size)
574	{	589	{
		590	#if EV_AVOID_STDIO
		591	write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
		592	sizeof ("libev: memory allocation failed, aborting.") - 1);
		593	#else
575	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);	594	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		595	#endif
576	abort ();	596	abort ();
577	}	597	}
578		598
579	return ptr;	599	return ptr;
580	}	600	}
…		…
964	/* check whether the given fd is atcually valid, for error recovery */	984	/* check whether the given fd is atcually valid, for error recovery */
965	inline_size int	985	inline_size int
966	fd_valid (int fd)	986	fd_valid (int fd)
967	{	987	{
968	#ifdef _WIN32	988	#ifdef _WIN32
969	return _get_osfhandle (fd) != -1;	989	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970	#else	990	#else
971	return fcntl (fd, F_GETFD) != -1;	991	return fcntl (fd, F_GETFD) != -1;
972	#endif	992	#endif
973	}	993	}
974		994
…		…
1179	inline_speed void	1199	inline_speed void
1180	fd_intern (int fd)	1200	fd_intern (int fd)
1181	{	1201	{
1182	#ifdef _WIN32	1202	#ifdef _WIN32
1183	unsigned long arg = 1;	1203	unsigned long arg = 1;
1184	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1204	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185	#else	1205	#else
1186	fcntl (fd, F_SETFD, FD_CLOEXEC);	1206	fcntl (fd, F_SETFD, FD_CLOEXEC);
1187	fcntl (fd, F_SETFL, O_NONBLOCK);	1207	fcntl (fd, F_SETFL, O_NONBLOCK);
1188	#endif	1208	#endif
1189	}	1209	}
…		…
1294	{	1314	{
1295	#if EV_MULTIPLICITY	1315	#if EV_MULTIPLICITY
1296	EV_P = signals [signum - 1].loop;	1316	EV_P = signals [signum - 1].loop;
1297	#endif	1317	#endif
1298		1318
1299	#if _WIN32	1319	#ifdef _WIN32
1300	signal (signum, ev_sighandler);	1320	signal (signum, ev_sighandler);
1301	#endif	1321	#endif
1302		1322
1303	signals [signum - 1].pending = 1;	1323	signals [signum - 1].pending = 1;
1304	evpipe_write (EV_A_ &sig_pending);	1324	evpipe_write (EV_A_ &sig_pending);
…		…
1605	#endif	1625	#endif
1606	#if EV_USE_INOTIFY	1626	#if EV_USE_INOTIFY
1607	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1627	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608	#endif	1628	#endif
1609	#if EV_USE_SIGNALFD	1629	#if EV_USE_SIGNALFD
1610	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1630	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611	#endif	1631	#endif
1612		1632
1613	if (!(flags & 0x0000ffffU))	1633	if (!(flags & 0x0000ffffU))
1614	flags \|= ev_recommended_backends ();	1634	flags \|= ev_recommended_backends ();
1615		1635
…		…
1659	}	1679	}
1660	}	1680	}
1661		1681
1662	#if EV_USE_SIGNALFD	1682	#if EV_USE_SIGNALFD
1663	if (ev_is_active (&sigfd_w))	1683	if (ev_is_active (&sigfd_w))
1664	{
1665	/ev_ref (EV_A);/
1666	/ev_io_stop (EV_A_ &sigfd_w);/
1667
1668	close (sigfd);	1684	close (sigfd);
1669	}
1670	#endif	1685	#endif
1671		1686
1672	#if EV_USE_INOTIFY	1687	#if EV_USE_INOTIFY
1673	if (fs_fd >= 0)	1688	if (fs_fd >= 0)
1674	close (fs_fd);	1689	close (fs_fd);
…		…
2162	ANHE_at_cache (*he);	2177	ANHE_at_cache (*he);
2163	}	2178	}
2164	}	2179	}
2165		2180
2166	/* fetch new monotonic and realtime times from the kernel */	2181	/* fetch new monotonic and realtime times from the kernel */
2167	/* also detetc if there was a timejump, and act accordingly */	2182	/* also detect if there was a timejump, and act accordingly */
2168	inline_speed void	2183	inline_speed void
2169	time_update (EV_P_ ev_tstamp max_block)	2184	time_update (EV_P_ ev_tstamp max_block)
2170	{	2185	{
2171	#if EV_USE_MONOTONIC	2186	#if EV_USE_MONOTONIC
2172	if (expect_true (have_monotonic))	2187	if (expect_true (have_monotonic))
…		…
2506		2521
2507	if (expect_false (ev_is_active (w)))	2522	if (expect_false (ev_is_active (w)))
2508	return;	2523	return;
2509		2524
2510	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2525	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511	assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));	2526	assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));
2512		2527
2513	EV_FREQUENT_CHECK;	2528	EV_FREQUENT_CHECK;
2514		2529
2515	ev_start (EV_A_ (W)w, 1);	2530	ev_start (EV_A_ (W)w, 1);
2516	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2531	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2586	timers [active] = timers [timercnt + HEAP0];	2601	timers [active] = timers [timercnt + HEAP0];
2587	adjustheap (timers, timercnt, active);	2602	adjustheap (timers, timercnt, active);
2588	}	2603	}
2589	}	2604	}
2590		2605
2591	EV_FREQUENT_CHECK;
2592
2593	ev_at (w) -= mn_now;	2606	ev_at (w) -= mn_now;
2594		2607
2595	ev_stop (EV_A_ (W)w);	2608	ev_stop (EV_A_ (W)w);
		2609
		2610	EV_FREQUENT_CHECK;
2596	}	2611	}
2597		2612
2598	void noinline	2613	void noinline
2599	ev_timer_again (EV_P_ ev_timer *w)	2614	ev_timer_again (EV_P_ ev_timer *w)
2600	{	2615	{
…		…
2679	periodics [active] = periodics [periodiccnt + HEAP0];	2694	periodics [active] = periodics [periodiccnt + HEAP0];
2680	adjustheap (periodics, periodiccnt, active);	2695	adjustheap (periodics, periodiccnt, active);
2681	}	2696	}
2682	}	2697	}
2683		2698
2684	EV_FREQUENT_CHECK;
2685
2686	ev_stop (EV_A_ (W)w);	2699	ev_stop (EV_A_ (W)w);
		2700
		2701	EV_FREQUENT_CHECK;
2687	}	2702	}
2688		2703
2689	void noinline	2704	void noinline
2690	ev_periodic_again (EV_P_ ev_periodic *w)	2705	ev_periodic_again (EV_P_ ev_periodic *w)
2691	{	2706	{
…		…
2752	if (!((WL)w)->next)	2767	if (!((WL)w)->next)
2753	# if EV_USE_SIGNALFD	2768	# if EV_USE_SIGNALFD
2754	if (sigfd < 0) /TODO/	2769	if (sigfd < 0) /TODO/
2755	# endif	2770	# endif
2756	{	2771	{
2757	# if _WIN32	2772	# ifdef _WIN32
		2773	evpipe_init (EV_A);
		2774
2758	signal (w->signum, ev_sighandler);	2775	signal (w->signum, ev_sighandler);
2759	# else	2776	# else
2760	struct sigaction sa;	2777	struct sigaction sa;
2761		2778
2762	evpipe_init (EV_A);	2779	evpipe_init (EV_A);
…		…
2793	signals [w->signum - 1].loop = 0; /* unattach from signal */	2810	signals [w->signum - 1].loop = 0; /* unattach from signal */
2794	#endif	2811	#endif
2795	#if EV_USE_SIGNALFD	2812	#if EV_USE_SIGNALFD
2796	if (sigfd >= 0)	2813	if (sigfd >= 0)
2797	{	2814	{
2798	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2815	sigset_t ss;
		2816
		2817	sigemptyset (&ss);
		2818	sigaddset (&ss, w->signum);
2799	sigdelset (&sigfd_set, w->signum);	2819	sigdelset (&sigfd_set, w->signum);
		2820
2800	signalfd (sigfd, &sigfd_set, 0);	2821	signalfd (sigfd, &sigfd_set, 0);
2801	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2822	sigprocmask (SIG_UNBLOCK, &ss, 0);
2802	/TODO: maybe unblock signal? /
2803	}	2823	}
2804	else	2824	else
2805	#endif	2825	#endif
2806	signal (w->signum, SIG_DFL);	2826	signal (w->signum, SIG_DFL);
2807	}	2827	}
…		…
2853	#define MIN_STAT_INTERVAL 0.1074891	2873	#define MIN_STAT_INTERVAL 0.1074891
2854		2874
2855	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2875	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856		2876
2857	#if EV_USE_INOTIFY	2877	#if EV_USE_INOTIFY
2858	# define EV_INOTIFY_BUFSIZE 8192	2878
		2879	/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
		2880	# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859		2881
2860	static void noinline	2882	static void noinline
2861	infy_add (EV_P_ ev_stat *w)	2883	infy_add (EV_P_ ev_stat *w)
2862	{	2884	{
2863	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);	2885	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);
2864		2886
2865	if (w->wd < 0)	2887	if (w->wd >= 0)
		2888	{
		2889	struct statfs sfs;
		2890
		2891	/* now local changes will be tracked by inotify, but remote changes won't */
		2892	/* unless the filesystem is known to be local, we therefore still poll */
		2893	/* also do poll on <2.6.25, but with normal frequency */
		2894
		2895	if (!fs_2625)
		2896	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		2897	else if (!statfs (w->path, &sfs)
		2898	&& (sfs.f_type == 0x1373 /* devfs */
		2899	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2900	\|\| sfs.f_type == 0x3153464a /* jfs */
		2901	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2902	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2903	\|\| sfs.f_type == 0x58465342 /* xfs */))
		2904	w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
		2905	else
		2906	w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2866	{	2907	}
		2908	else
		2909	{
		2910	/* can't use inotify, continue to stat */
2867	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;	2911	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2868	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2869		2912
2870	/* monitor some parent directory for speedup hints */	2913	/* if path is not there, monitor some parent directory for speedup hints */
2871	/* note that exceeding the hardcoded path limit is not a correctness issue, */	2914	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2872	/* but an efficiency issue only */	2915	/* but an efficiency issue only */
2873	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2916	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2874	{	2917	{
2875	char path [4096];	2918	char path [4096];
…		…
2891	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2934	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2892	}	2935	}
2893	}	2936	}
2894		2937
2895	if (w->wd >= 0)	2938	if (w->wd >= 0)
2896	{
2897	struct statfs sfs;
2898
2899	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2939	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2900		2940
2901	/* now local changes will be tracked by inotify, but remote changes won't */	2941	/* now re-arm timer, if required */
2902	/* unless the filesystem it known to be local, we therefore still poll */	2942	if (ev_is_active (&w->timer)) ev_ref (EV_A);
2903	/* also do poll on <2.6.25, but with normal frequency */
2904
2905	if (fs_2625 && !statfs (w->path, &sfs))
2906	if (sfs.f_type == 0x1373 /* devfs */
2907	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2908	\|\| sfs.f_type == 0x3153464a /* jfs */
2909	\|\| sfs.f_type == 0x52654973 /* reiser3 */
2910	\|\| sfs.f_type == 0x01021994 /* tempfs */
2911	\|\| sfs.f_type == 0x58465342 /* xfs */)
2912	return;
2913
2914	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915	ev_timer_again (EV_A_ &w->timer);	2943	ev_timer_again (EV_A_ &w->timer);
2916	}	2944	if (ev_is_active (&w->timer)) ev_unref (EV_A);
2917	}	2945	}
2918		2946
2919	static void noinline	2947	static void noinline
2920	infy_del (EV_P_ ev_stat *w)	2948	infy_del (EV_P_ ev_stat *w)
2921	{	2949	{
…		…
2966		2994
2967	static void	2995	static void
2968	infy_cb (EV_P_ ev_io *w, int revents)	2996	infy_cb (EV_P_ ev_io *w, int revents)
2969	{	2997	{
2970	char buf [EV_INOTIFY_BUFSIZE];	2998	char buf [EV_INOTIFY_BUFSIZE];
2971	struct inotify_event ev = (struct inotify_event )buf;
2972	int ofs;	2999	int ofs;
2973	int len = read (fs_fd, buf, sizeof (buf));	3000	int len = read (fs_fd, buf, sizeof (buf));
2974		3001
2975	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	3002	for (ofs = 0; ofs < len; )
		3003	{
		3004	struct inotify_event ev = (struct inotify_event )(buf + ofs);
2976	infy_wd (EV_A_ ev->wd, ev->wd, ev);	3005	infy_wd (EV_A_ ev->wd, ev->wd, ev);
		3006	ofs += sizeof (struct inotify_event) + ev->len;
		3007	}
		3008	}
		3009
		3010	inline_size unsigned int
		3011	ev_linux_version (void)
		3012	{
		3013	struct utsname buf;
		3014	unsigned int v;
		3015	int i;
		3016	char *p = buf.release;
		3017
		3018	if (uname (&buf))
		3019	return 0;
		3020
		3021	for (i = 3+1; --i; )
		3022	{
		3023	unsigned int c = 0;
		3024
		3025	for (;;)
		3026	{
		3027	if (p >= '0' && p <= '9')
		3028	c = c * 10 + *p++ - '0';
		3029	else
		3030	{
		3031	p += *p == '.';
		3032	break;
		3033	}
		3034	}
		3035
		3036	v = (v << 8) \| c;
		3037	}
		3038
		3039	return v;
2977	}	3040	}
2978		3041
2979	inline_size void	3042	inline_size void
2980	check_2625 (EV_P)	3043	ev_check_2625 (EV_P)
2981	{	3044	{
2982	/* kernels < 2.6.25 are borked	3045	/* kernels < 2.6.25 are borked
2983	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	3046	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984	*/	3047	*/
2985	struct utsname buf;	3048	if (ev_linux_version () < 0x020619)
2986	int major, minor, micro;
2987
2988	if (uname (&buf))
2989	return;	3049	return;
2990		3050
2991	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992	return;
2993
2994	if (major < 2
2995	\|\| (major == 2 && minor < 6)
2996	\|\| (major == 2 && minor == 6 && micro < 25))
2997	return;
2998
2999	fs_2625 = 1;	3051	fs_2625 = 1;
		3052	}
		3053
		3054	inline_size int
		3055	infy_newfd (void)
		3056	{
		3057	#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
		3058	int fd = inotify_init1 (IN_CLOEXEC \| IN_NONBLOCK);
		3059	if (fd >= 0)
		3060	return fd;
		3061	#endif
		3062	return inotify_init ();
3000	}	3063	}
3001		3064
3002	inline_size void	3065	inline_size void
3003	infy_init (EV_P)	3066	infy_init (EV_P)
3004	{	3067	{
3005	if (fs_fd != -2)	3068	if (fs_fd != -2)
3006	return;	3069	return;
3007		3070
3008	fs_fd = -1;	3071	fs_fd = -1;
3009		3072
3010	check_2625 (EV_A);	3073	ev_check_2625 (EV_A);
3011		3074
3012	fs_fd = inotify_init ();	3075	fs_fd = infy_newfd ();
3013		3076
3014	if (fs_fd >= 0)	3077	if (fs_fd >= 0)
3015	{	3078	{
		3079	fd_intern (fs_fd);
3016	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3080	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
3017	ev_set_priority (&fs_w, EV_MAXPRI);	3081	ev_set_priority (&fs_w, EV_MAXPRI);
3018	ev_io_start (EV_A_ &fs_w);	3082	ev_io_start (EV_A_ &fs_w);
		3083	ev_unref (EV_A);
3019	}	3084	}
3020	}	3085	}
3021		3086
3022	inline_size void	3087	inline_size void
3023	infy_fork (EV_P)	3088	infy_fork (EV_P)
…		…
3025	int slot;	3090	int slot;
3026		3091
3027	if (fs_fd < 0)	3092	if (fs_fd < 0)
3028	return;	3093	return;
3029		3094
		3095	ev_ref (EV_A);
		3096	ev_io_stop (EV_A_ &fs_w);
3030	close (fs_fd);	3097	close (fs_fd);
3031	fs_fd = inotify_init ();	3098	fs_fd = infy_newfd ();
		3099
		3100	if (fs_fd >= 0)
		3101	{
		3102	fd_intern (fs_fd);
		3103	ev_io_set (&fs_w, fs_fd, EV_READ);
		3104	ev_io_start (EV_A_ &fs_w);
		3105	ev_unref (EV_A);
		3106	}
3032		3107
3033	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3108	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3034	{	3109	{
3035	WL w_ = fs_hash [slot].head;	3110	WL w_ = fs_hash [slot].head;
3036	fs_hash [slot].head = 0;	3111	fs_hash [slot].head = 0;
…		…
3043	w->wd = -1;	3118	w->wd = -1;
3044		3119
3045	if (fs_fd >= 0)	3120	if (fs_fd >= 0)
3046	infy_add (EV_A_ w); /* re-add, no matter what */	3121	infy_add (EV_A_ w); /* re-add, no matter what */
3047	else	3122	else
		3123	{
		3124	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		3125	if (ev_is_active (&w->timer)) ev_ref (EV_A);
3048	ev_timer_again (EV_A_ &w->timer);	3126	ev_timer_again (EV_A_ &w->timer);
		3127	if (ev_is_active (&w->timer)) ev_unref (EV_A);
		3128	}
3049	}	3129	}
3050	}	3130	}
3051	}	3131	}
3052		3132
3053	#endif	3133	#endif
…		…
3070	static void noinline	3150	static void noinline
3071	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3151	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3072	{	3152	{
3073	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3153	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3074		3154
3075	/* we copy this here each the time so that */	3155	ev_statdata prev = w->attr;
3076	/* prev has the old value when the callback gets invoked */
3077	w->prev = w->attr;
3078	ev_stat_stat (EV_A_ w);	3156	ev_stat_stat (EV_A_ w);
3079		3157
3080	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */	3158	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3081	if (	3159	if (
3082	w->prev.st_dev != w->attr.st_dev	3160	prev.st_dev != w->attr.st_dev
3083	\|\| w->prev.st_ino != w->attr.st_ino	3161	\|\| prev.st_ino != w->attr.st_ino
3084	\|\| w->prev.st_mode != w->attr.st_mode	3162	\|\| prev.st_mode != w->attr.st_mode
3085	\|\| w->prev.st_nlink != w->attr.st_nlink	3163	\|\| prev.st_nlink != w->attr.st_nlink
3086	\|\| w->prev.st_uid != w->attr.st_uid	3164	\|\| prev.st_uid != w->attr.st_uid
3087	\|\| w->prev.st_gid != w->attr.st_gid	3165	\|\| prev.st_gid != w->attr.st_gid
3088	\|\| w->prev.st_rdev != w->attr.st_rdev	3166	\|\| prev.st_rdev != w->attr.st_rdev
3089	\|\| w->prev.st_size != w->attr.st_size	3167	\|\| prev.st_size != w->attr.st_size
3090	\|\| w->prev.st_atime != w->attr.st_atime	3168	\|\| prev.st_atime != w->attr.st_atime
3091	\|\| w->prev.st_mtime != w->attr.st_mtime	3169	\|\| prev.st_mtime != w->attr.st_mtime
3092	\|\| w->prev.st_ctime != w->attr.st_ctime	3170	\|\| prev.st_ctime != w->attr.st_ctime
3093	) {	3171	) {
		3172	/* we only update w->prev on actual differences */
		3173	/* in case we test more often than invoke the callback, */
		3174	/* to ensure that prev is always different to attr */
		3175	w->prev = prev;
		3176
3094	#if EV_USE_INOTIFY	3177	#if EV_USE_INOTIFY
3095	if (fs_fd >= 0)	3178	if (fs_fd >= 0)
3096	{	3179	{
3097	infy_del (EV_A_ w);	3180	infy_del (EV_A_ w);
3098	infy_add (EV_A_ w);	3181	infy_add (EV_A_ w);
…		…
3123		3206
3124	if (fs_fd >= 0)	3207	if (fs_fd >= 0)
3125	infy_add (EV_A_ w);	3208	infy_add (EV_A_ w);
3126	else	3209	else
3127	#endif	3210	#endif
		3211	{
3128	ev_timer_again (EV_A_ &w->timer);	3212	ev_timer_again (EV_A_ &w->timer);
		3213	ev_unref (EV_A);
		3214	}
3129		3215
3130	ev_start (EV_A_ (W)w, 1);	3216	ev_start (EV_A_ (W)w, 1);
3131		3217
3132	EV_FREQUENT_CHECK;	3218	EV_FREQUENT_CHECK;
3133	}	3219	}
…		…
3142	EV_FREQUENT_CHECK;	3228	EV_FREQUENT_CHECK;
3143		3229
3144	#if EV_USE_INOTIFY	3230	#if EV_USE_INOTIFY
3145	infy_del (EV_A_ w);	3231	infy_del (EV_A_ w);
3146	#endif	3232	#endif
		3233
		3234	if (ev_is_active (&w->timer))
		3235	{
		3236	ev_ref (EV_A);
3147	ev_timer_stop (EV_A_ &w->timer);	3237	ev_timer_stop (EV_A_ &w->timer);
		3238	}
3148		3239
3149	ev_stop (EV_A_ (W)w);	3240	ev_stop (EV_A_ (W)w);
3150		3241
3151	EV_FREQUENT_CHECK;	3242	EV_FREQUENT_CHECK;
3152	}	3243	}
…		…
3371	EV_FREQUENT_CHECK;	3462	EV_FREQUENT_CHECK;
3372		3463
3373	ev_io_stop (EV_A_ &w->io);	3464	ev_io_stop (EV_A_ &w->io);
3374	ev_prepare_stop (EV_A_ &w->prepare);	3465	ev_prepare_stop (EV_A_ &w->prepare);
3375	ev_fork_stop (EV_A_ &w->fork);	3466	ev_fork_stop (EV_A_ &w->fork);
		3467
		3468	ev_stop (EV_A_ (W)w);
3376		3469
3377	EV_FREQUENT_CHECK;	3470	EV_FREQUENT_CHECK;
3378	}	3471	}
3379	#endif	3472	#endif
3380		3473

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs. Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.314 by root, Wed Aug 26 17:31:20 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC