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

Comparing libev/ev.c (file contents):
Revision 1.317 by root, Sat Nov 14 00:15:21 2009 UTC vs.
Revision 1.333 by root, Tue Mar 9 08:58:22 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
…		…
182	# define WIN32_LEAN_AND_MEAN	184	# define WIN32_LEAN_AND_MEAN
183	# include <windows.h>	185	# include <windows.h>
184	# ifndef EV_SELECT_IS_WINSOCKET	186	# ifndef EV_SELECT_IS_WINSOCKET
185	# define EV_SELECT_IS_WINSOCKET 1	187	# define EV_SELECT_IS_WINSOCKET 1
186	# endif	188	# endif
		189	# undef EV_AVOID_STDIO
187	#endif	190	#endif
188		191
189	/* this block tries to deduce configuration from header-defined symbols and defaults */	192	/* this block tries to deduce configuration from header-defined symbols and defaults */
190		193
191	/* try to deduce the maximum number of signals on this platform */	194	/* try to deduce the maximum number of signals on this platform */
…		…
343	# endif	346	# endif
344	#endif	347	#endif
345		348
346	/* this block fixes any misconfiguration where we know we run into trouble otherwise */	349	/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347		350
		351	#ifdef _AIX
		352	/* AIX has a completely broken poll.h header */
		353	# undef EV_USE_POLL
		354	# define EV_USE_POLL 0
		355	#endif
		356
348	#ifndef CLOCK_MONOTONIC	357	#ifndef CLOCK_MONOTONIC
349	# undef EV_USE_MONOTONIC	358	# undef EV_USE_MONOTONIC
350	# define EV_USE_MONOTONIC 0	359	# define EV_USE_MONOTONIC 0
351	#endif	360	#endif
352		361
…		…
395	# endif	404	# endif
396	# endif	405	# endif
397	# ifdef __cplusplus	406	# ifdef __cplusplus
398	extern "C" {	407	extern "C" {
399	# endif	408	# endif
400	int eventfd (unsigned int initval, int flags);	409	int (eventfd) (unsigned int initval, int flags);
401	# ifdef __cplusplus	410	# ifdef __cplusplus
402	}	411	}
403	# endif	412	# endif
404	#endif	413	#endif
405		414
…		…
504		513
505	#ifndef EV_FD_TO_WIN32_HANDLE	514	#ifndef EV_FD_TO_WIN32_HANDLE
506	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)	515	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507	#endif	516	#endif
508	#ifndef EV_WIN32_HANDLE_TO_FD	517	#ifndef EV_WIN32_HANDLE_TO_FD
509	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)	518	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510	#endif	519	#endif
511	#ifndef EV_WIN32_CLOSE_FD	520	#ifndef EV_WIN32_CLOSE_FD
512	# define EV_WIN32_CLOSE_FD(fd) close (fd)	521	# define EV_WIN32_CLOSE_FD(fd) close (fd)
513	#endif	522	#endif
514		523
515	#ifdef _WIN32	524	#ifdef _WIN32
516	# include "ev_win32.c"	525	# include "ev_win32.c"
517	#endif	526	#endif
518		527
519	/*****************************************************************************/	528	/*****************************************************************************/
		529
		530	#if EV_AVOID_STDIO
		531	static void noinline
		532	ev_printerr (const char *msg)
		533	{
		534	write (STDERR_FILENO, msg, strlen (msg));
		535	}
		536	#endif
520		537
521	static void (syserr_cb)(const char msg);	538	static void (syserr_cb)(const char msg);
522		539
523	void	540	void
524	ev_set_syserr_cb (void (cb)(const char msg))	541	ev_set_syserr_cb (void (cb)(const char msg))
…		…
534		551
535	if (syserr_cb)	552	if (syserr_cb)
536	syserr_cb (msg);	553	syserr_cb (msg);
537	else	554	else
538	{	555	{
		556	#if EV_AVOID_STDIO
		557	const char *err = strerror (errno);
		558
		559	ev_printerr (msg);
		560	ev_printerr (": ");
		561	ev_printerr (err);
		562	ev_printerr ("\n");
		563	#else
539	perror (msg);	564	perror (msg);
		565	#endif
540	abort ();	566	abort ();
541	}	567	}
542	}	568	}
543		569
544	static void *	570	static void *
…		…
569	{	595	{
570	ptr = alloc (ptr, size);	596	ptr = alloc (ptr, size);
571		597
572	if (!ptr && size)	598	if (!ptr && size)
573	{	599	{
		600	#if EV_AVOID_STDIO
		601	ev_printerr ("libev: memory allocation failed, aborting.\n");
		602	#else
574	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);	603	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		604	#endif
575	abort ();	605	abort ();
576	}	606	}
577		607
578	return ptr;	608	return ptr;
579	}	609	}
…		…
963	/* check whether the given fd is atcually valid, for error recovery */	993	/* check whether the given fd is atcually valid, for error recovery */
964	inline_size int	994	inline_size int
965	fd_valid (int fd)	995	fd_valid (int fd)
966	{	996	{
967	#ifdef _WIN32	997	#ifdef _WIN32
968	return _get_osfhandle (fd) != -1;	998	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969	#else	999	#else
970	return fcntl (fd, F_GETFD) != -1;	1000	return fcntl (fd, F_GETFD) != -1;
971	#endif	1001	#endif
972	}	1002	}
973		1003
…		…
1178	inline_speed void	1208	inline_speed void
1179	fd_intern (int fd)	1209	fd_intern (int fd)
1180	{	1210	{
1181	#ifdef _WIN32	1211	#ifdef _WIN32
1182	unsigned long arg = 1;	1212	unsigned long arg = 1;
1183	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1213	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184	#else	1214	#else
1185	fcntl (fd, F_SETFD, FD_CLOEXEC);	1215	fcntl (fd, F_SETFD, FD_CLOEXEC);
1186	fcntl (fd, F_SETFL, O_NONBLOCK);	1216	fcntl (fd, F_SETFL, O_NONBLOCK);
1187	#endif	1217	#endif
1188	}	1218	}
…		…
1293	{	1323	{
1294	#if EV_MULTIPLICITY	1324	#if EV_MULTIPLICITY
1295	EV_P = signals [signum - 1].loop;	1325	EV_P = signals [signum - 1].loop;
1296	#endif	1326	#endif
1297		1327
1298	#if _WIN32	1328	#ifdef _WIN32
1299	signal (signum, ev_sighandler);	1329	signal (signum, ev_sighandler);
1300	#endif	1330	#endif
1301		1331
1302	signals [signum - 1].pending = 1;	1332	signals [signum - 1].pending = 1;
1303	evpipe_write (EV_A_ &sig_pending);	1333	evpipe_write (EV_A_ &sig_pending);
…		…
1604	#endif	1634	#endif
1605	#if EV_USE_INOTIFY	1635	#if EV_USE_INOTIFY
1606	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1636	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607	#endif	1637	#endif
1608	#if EV_USE_SIGNALFD	1638	#if EV_USE_SIGNALFD
1609	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1639	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610	#endif	1640	#endif
1611		1641
1612	if (!(flags & 0x0000ffffU))	1642	if (!(flags & 0x0000ffffU))
1613	flags \|= ev_recommended_backends ();	1643	flags \|= ev_recommended_backends ();
1614		1644
…		…
2156	ANHE_at_cache (*he);	2186	ANHE_at_cache (*he);
2157	}	2187	}
2158	}	2188	}
2159		2189
2160	/* fetch new monotonic and realtime times from the kernel */	2190	/* fetch new monotonic and realtime times from the kernel */
2161	/* also detetc if there was a timejump, and act accordingly */	2191	/* also detect if there was a timejump, and act accordingly */
2162	inline_speed void	2192	inline_speed void
2163	time_update (EV_P_ ev_tstamp max_block)	2193	time_update (EV_P_ ev_tstamp max_block)
2164	{	2194	{
2165	#if EV_USE_MONOTONIC	2195	#if EV_USE_MONOTONIC
2166	if (expect_true (have_monotonic))	2196	if (expect_true (have_monotonic))
…		…
2500		2530
2501	if (expect_false (ev_is_active (w)))	2531	if (expect_false (ev_is_active (w)))
2502	return;	2532	return;
2503		2533
2504	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2534	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505	assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));	2535	assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));
2506		2536
2507	EV_FREQUENT_CHECK;	2537	EV_FREQUENT_CHECK;
2508		2538
2509	ev_start (EV_A_ (W)w, 1);	2539	ev_start (EV_A_ (W)w, 1);
2510	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2540	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2580	timers [active] = timers [timercnt + HEAP0];	2610	timers [active] = timers [timercnt + HEAP0];
2581	adjustheap (timers, timercnt, active);	2611	adjustheap (timers, timercnt, active);
2582	}	2612	}
2583	}	2613	}
2584		2614
2585	EV_FREQUENT_CHECK;
2586
2587	ev_at (w) -= mn_now;	2615	ev_at (w) -= mn_now;
2588		2616
2589	ev_stop (EV_A_ (W)w);	2617	ev_stop (EV_A_ (W)w);
		2618
		2619	EV_FREQUENT_CHECK;
2590	}	2620	}
2591		2621
2592	void noinline	2622	void noinline
2593	ev_timer_again (EV_P_ ev_timer *w)	2623	ev_timer_again (EV_P_ ev_timer *w)
2594	{	2624	{
…		…
2673	periodics [active] = periodics [periodiccnt + HEAP0];	2703	periodics [active] = periodics [periodiccnt + HEAP0];
2674	adjustheap (periodics, periodiccnt, active);	2704	adjustheap (periodics, periodiccnt, active);
2675	}	2705	}
2676	}	2706	}
2677		2707
2678	EV_FREQUENT_CHECK;
2679
2680	ev_stop (EV_A_ (W)w);	2708	ev_stop (EV_A_ (W)w);
		2709
		2710	EV_FREQUENT_CHECK;
2681	}	2711	}
2682		2712
2683	void noinline	2713	void noinline
2684	ev_periodic_again (EV_P_ ev_periodic *w)	2714	ev_periodic_again (EV_P_ ev_periodic *w)
2685	{	2715	{
…		…
2746	if (!((WL)w)->next)	2776	if (!((WL)w)->next)
2747	# if EV_USE_SIGNALFD	2777	# if EV_USE_SIGNALFD
2748	if (sigfd < 0) /TODO/	2778	if (sigfd < 0) /TODO/
2749	# endif	2779	# endif
2750	{	2780	{
2751	# if _WIN32	2781	# ifdef _WIN32
2752	evpipe_init (EV_A);	2782	evpipe_init (EV_A);
2753		2783
2754	signal (w->signum, ev_sighandler);	2784	signal (w->signum, ev_sighandler);
2755	# else	2785	# else
2756	struct sigaction sa;	2786	struct sigaction sa;
…		…
2789	signals [w->signum - 1].loop = 0; /* unattach from signal */	2819	signals [w->signum - 1].loop = 0; /* unattach from signal */
2790	#endif	2820	#endif
2791	#if EV_USE_SIGNALFD	2821	#if EV_USE_SIGNALFD
2792	if (sigfd >= 0)	2822	if (sigfd >= 0)
2793	{	2823	{
2794	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2824	sigset_t ss;
		2825
		2826	sigemptyset (&ss);
		2827	sigaddset (&ss, w->signum);
2795	sigdelset (&sigfd_set, w->signum);	2828	sigdelset (&sigfd_set, w->signum);
		2829
2796	signalfd (sigfd, &sigfd_set, 0);	2830	signalfd (sigfd, &sigfd_set, 0);
2797	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2831	sigprocmask (SIG_UNBLOCK, &ss, 0);
2798	/TODO: maybe unblock signal? /
2799	}	2832	}
2800	else	2833	else
2801	#endif	2834	#endif
2802	signal (w->signum, SIG_DFL);	2835	signal (w->signum, SIG_DFL);
2803	}	2836	}
…		…
2849	#define MIN_STAT_INTERVAL 0.1074891	2882	#define MIN_STAT_INTERVAL 0.1074891
2850		2883
2851	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2884	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2852		2885
2853	#if EV_USE_INOTIFY	2886	#if EV_USE_INOTIFY
2854	# define EV_INOTIFY_BUFSIZE 8192	2887
		2888	/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
		2889	# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2855		2890
2856	static void noinline	2891	static void noinline
2857	infy_add (EV_P_ ev_stat *w)	2892	infy_add (EV_P_ ev_stat *w)
2858	{	2893	{
2859	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);	2894	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);
2860		2895
2861	if (w->wd < 0)	2896	if (w->wd >= 0)
		2897	{
		2898	struct statfs sfs;
		2899
		2900	/* now local changes will be tracked by inotify, but remote changes won't */
		2901	/* unless the filesystem is known to be local, we therefore still poll */
		2902	/* also do poll on <2.6.25, but with normal frequency */
		2903
		2904	if (!fs_2625)
		2905	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		2906	else if (!statfs (w->path, &sfs)
		2907	&& (sfs.f_type == 0x1373 /* devfs */
		2908	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2909	\|\| sfs.f_type == 0x3153464a /* jfs */
		2910	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2911	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2912	\|\| sfs.f_type == 0x58465342 /* xfs */))
		2913	w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
		2914	else
		2915	w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2862	{	2916	}
		2917	else
		2918	{
		2919	/* can't use inotify, continue to stat */
2863	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;	2920	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2864	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2865		2921
2866	/* monitor some parent directory for speedup hints */	2922	/* if path is not there, monitor some parent directory for speedup hints */
2867	/* note that exceeding the hardcoded path limit is not a correctness issue, */	2923	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2868	/* but an efficiency issue only */	2924	/* but an efficiency issue only */
2869	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2925	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2870	{	2926	{
2871	char path [4096];	2927	char path [4096];
…		…
2887	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2943	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2888	}	2944	}
2889	}	2945	}
2890		2946
2891	if (w->wd >= 0)	2947	if (w->wd >= 0)
2892	{
2893	struct statfs sfs;
2894
2895	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2948	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2896		2949
2897	/* now local changes will be tracked by inotify, but remote changes won't */	2950	/* now re-arm timer, if required */
2898	/* unless the filesystem is known to be local, we therefore still poll */	2951	if (ev_is_active (&w->timer)) ev_ref (EV_A);
2899	/* also do poll on <2.6.25, but with normal frequency */
2900
2901	if (fs_2625 && !statfs (w->path, &sfs))
2902	if (sfs.f_type == 0x1373 /* devfs */
2903	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2904	\|\| sfs.f_type == 0x3153464a /* jfs */
2905	\|\| sfs.f_type == 0x52654973 /* reiser3 */
2906	\|\| sfs.f_type == 0x01021994 /* tempfs */
2907	\|\| sfs.f_type == 0x58465342 /* xfs */)
2908	return;
2909
2910	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2911	ev_timer_again (EV_A_ &w->timer);	2952	ev_timer_again (EV_A_ &w->timer);
2912	}	2953	if (ev_is_active (&w->timer)) ev_unref (EV_A);
2913	}	2954	}
2914		2955
2915	static void noinline	2956	static void noinline
2916	infy_del (EV_P_ ev_stat *w)	2957	infy_del (EV_P_ ev_stat *w)
2917	{	2958	{
…		…
2962		3003
2963	static void	3004	static void
2964	infy_cb (EV_P_ ev_io *w, int revents)	3005	infy_cb (EV_P_ ev_io *w, int revents)
2965	{	3006	{
2966	char buf [EV_INOTIFY_BUFSIZE];	3007	char buf [EV_INOTIFY_BUFSIZE];
2967	struct inotify_event ev = (struct inotify_event )buf;
2968	int ofs;	3008	int ofs;
2969	int len = read (fs_fd, buf, sizeof (buf));	3009	int len = read (fs_fd, buf, sizeof (buf));
2970		3010
2971	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	3011	for (ofs = 0; ofs < len; )
		3012	{
		3013	struct inotify_event ev = (struct inotify_event )(buf + ofs);
2972	infy_wd (EV_A_ ev->wd, ev->wd, ev);	3014	infy_wd (EV_A_ ev->wd, ev->wd, ev);
		3015	ofs += sizeof (struct inotify_event) + ev->len;
		3016	}
		3017	}
		3018
		3019	inline_size unsigned int
		3020	ev_linux_version (void)
		3021	{
		3022	struct utsname buf;
		3023	unsigned int v;
		3024	int i;
		3025	char *p = buf.release;
		3026
		3027	if (uname (&buf))
		3028	return 0;
		3029
		3030	for (i = 3+1; --i; )
		3031	{
		3032	unsigned int c = 0;
		3033
		3034	for (;;)
		3035	{
		3036	if (p >= '0' && p <= '9')
		3037	c = c * 10 + *p++ - '0';
		3038	else
		3039	{
		3040	p += *p == '.';
		3041	break;
		3042	}
		3043	}
		3044
		3045	v = (v << 8) \| c;
		3046	}
		3047
		3048	return v;
2973	}	3049	}
2974		3050
2975	inline_size void	3051	inline_size void
2976	check_2625 (EV_P)	3052	ev_check_2625 (EV_P)
2977	{	3053	{
2978	/* kernels < 2.6.25 are borked	3054	/* kernels < 2.6.25 are borked
2979	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	3055	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2980	*/	3056	*/
2981	struct utsname buf;	3057	if (ev_linux_version () < 0x020619)
2982	int major, minor, micro;
2983
2984	if (uname (&buf))
2985	return;
2986
2987	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2988	return;
2989
2990	if (major < 2
2991	\|\| (major == 2 && minor < 6)
2992	\|\| (major == 2 && minor == 6 && micro < 25))
2993	return;	3058	return;
2994		3059
2995	fs_2625 = 1;	3060	fs_2625 = 1;
2996	}	3061	}
2997		3062
…		…
3012	if (fs_fd != -2)	3077	if (fs_fd != -2)
3013	return;	3078	return;
3014		3079
3015	fs_fd = -1;	3080	fs_fd = -1;
3016		3081
3017	check_2625 (EV_A);	3082	ev_check_2625 (EV_A);
3018		3083
3019	fs_fd = infy_newfd ();	3084	fs_fd = infy_newfd ();
3020		3085
3021	if (fs_fd >= 0)	3086	if (fs_fd >= 0)
3022	{	3087	{
…		…
3062	w->wd = -1;	3127	w->wd = -1;
3063		3128
3064	if (fs_fd >= 0)	3129	if (fs_fd >= 0)
3065	infy_add (EV_A_ w); /* re-add, no matter what */	3130	infy_add (EV_A_ w); /* re-add, no matter what */
3066	else	3131	else
		3132	{
		3133	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		3134	if (ev_is_active (&w->timer)) ev_ref (EV_A);
3067	ev_timer_again (EV_A_ &w->timer);	3135	ev_timer_again (EV_A_ &w->timer);
		3136	if (ev_is_active (&w->timer)) ev_unref (EV_A);
		3137	}
3068	}	3138	}
3069	}	3139	}
3070	}	3140	}
3071		3141
3072	#endif	3142	#endif
…		…
3089	static void noinline	3159	static void noinline
3090	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3160	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091	{	3161	{
3092	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3162	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3093		3163
3094	/* we copy this here each the time so that */	3164	ev_statdata prev = w->attr;
3095	/* prev has the old value when the callback gets invoked */
3096	w->prev = w->attr;
3097	ev_stat_stat (EV_A_ w);	3165	ev_stat_stat (EV_A_ w);
3098		3166
3099	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */	3167	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3100	if (	3168	if (
3101	w->prev.st_dev != w->attr.st_dev	3169	prev.st_dev != w->attr.st_dev
3102	\|\| w->prev.st_ino != w->attr.st_ino	3170	\|\| prev.st_ino != w->attr.st_ino
3103	\|\| w->prev.st_mode != w->attr.st_mode	3171	\|\| prev.st_mode != w->attr.st_mode
3104	\|\| w->prev.st_nlink != w->attr.st_nlink	3172	\|\| prev.st_nlink != w->attr.st_nlink
3105	\|\| w->prev.st_uid != w->attr.st_uid	3173	\|\| prev.st_uid != w->attr.st_uid
3106	\|\| w->prev.st_gid != w->attr.st_gid	3174	\|\| prev.st_gid != w->attr.st_gid
3107	\|\| w->prev.st_rdev != w->attr.st_rdev	3175	\|\| prev.st_rdev != w->attr.st_rdev
3108	\|\| w->prev.st_size != w->attr.st_size	3176	\|\| prev.st_size != w->attr.st_size
3109	\|\| w->prev.st_atime != w->attr.st_atime	3177	\|\| prev.st_atime != w->attr.st_atime
3110	\|\| w->prev.st_mtime != w->attr.st_mtime	3178	\|\| prev.st_mtime != w->attr.st_mtime
3111	\|\| w->prev.st_ctime != w->attr.st_ctime	3179	\|\| prev.st_ctime != w->attr.st_ctime
3112	) {	3180	) {
		3181	/* we only update w->prev on actual differences */
		3182	/* in case we test more often than invoke the callback, */
		3183	/* to ensure that prev is always different to attr */
		3184	w->prev = prev;
		3185
3113	#if EV_USE_INOTIFY	3186	#if EV_USE_INOTIFY
3114	if (fs_fd >= 0)	3187	if (fs_fd >= 0)
3115	{	3188	{
3116	infy_del (EV_A_ w);	3189	infy_del (EV_A_ w);
3117	infy_add (EV_A_ w);	3190	infy_add (EV_A_ w);
…		…
3142		3215
3143	if (fs_fd >= 0)	3216	if (fs_fd >= 0)
3144	infy_add (EV_A_ w);	3217	infy_add (EV_A_ w);
3145	else	3218	else
3146	#endif	3219	#endif
		3220	{
3147	ev_timer_again (EV_A_ &w->timer);	3221	ev_timer_again (EV_A_ &w->timer);
		3222	ev_unref (EV_A);
		3223	}
3148		3224
3149	ev_start (EV_A_ (W)w, 1);	3225	ev_start (EV_A_ (W)w, 1);
3150		3226
3151	EV_FREQUENT_CHECK;	3227	EV_FREQUENT_CHECK;
3152	}	3228	}
…		…
3161	EV_FREQUENT_CHECK;	3237	EV_FREQUENT_CHECK;
3162		3238
3163	#if EV_USE_INOTIFY	3239	#if EV_USE_INOTIFY
3164	infy_del (EV_A_ w);	3240	infy_del (EV_A_ w);
3165	#endif	3241	#endif
		3242
		3243	if (ev_is_active (&w->timer))
		3244	{
		3245	ev_ref (EV_A);
3166	ev_timer_stop (EV_A_ &w->timer);	3246	ev_timer_stop (EV_A_ &w->timer);
		3247	}
3167		3248
3168	ev_stop (EV_A_ (W)w);	3249	ev_stop (EV_A_ (W)w);
3169		3250
3170	EV_FREQUENT_CHECK;	3251	EV_FREQUENT_CHECK;
3171	}	3252	}
…		…
3390	EV_FREQUENT_CHECK;	3471	EV_FREQUENT_CHECK;
3391		3472
3392	ev_io_stop (EV_A_ &w->io);	3473	ev_io_stop (EV_A_ &w->io);
3393	ev_prepare_stop (EV_A_ &w->prepare);	3474	ev_prepare_stop (EV_A_ &w->prepare);
3394	ev_fork_stop (EV_A_ &w->fork);	3475	ev_fork_stop (EV_A_ &w->fork);
		3476
		3477	ev_stop (EV_A_ (W)w);
3395		3478
3396	EV_FREQUENT_CHECK;	3479	EV_FREQUENT_CHECK;
3397	}	3480	}
3398	#endif	3481	#endif
3399		3482

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.317 by root, Sat Nov 14 00:15:21 2009 UTC vs. Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.317 by root, Sat Nov 14 00:15:21 2009 UTC vs.
Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC