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

Comparing libev/ev.c (file contents):
Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC vs.
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC

…		…
287	# endif	287	# endif
288	#endif	288	#endif
289		289
290	#if EV_USE_INOTIFY	290	#if EV_USE_INOTIFY
291	# include <sys/utsname.h>	291	# include <sys/utsname.h>
		292	# include <sys/statfs.h>
292	# include <sys/inotify.h>	293	# include <sys/inotify.h>
293	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */	294	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294	# ifndef IN_DONT_FOLLOW	295	# ifndef IN_DONT_FOLLOW
295	# undef EV_USE_INOTIFY	296	# undef EV_USE_INOTIFY
296	# define EV_USE_INOTIFY 0	297	# define EV_USE_INOTIFY 0
…		…
2414	# ifdef _WIN32	2415	# ifdef _WIN32
2415	# undef lstat	2416	# undef lstat
2416	# define lstat(a,b) _stati64 (a,b)	2417	# define lstat(a,b) _stati64 (a,b)
2417	# endif	2418	# endif
2418		2419
2419	#define DEF_STAT_INTERVAL 5.0074891	2420	#define DEF_STAT_INTERVAL 5.0074891
		2421	#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2420	#define MIN_STAT_INTERVAL 0.1074891	2422	#define MIN_STAT_INTERVAL 0.1074891
2421		2423
2422	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2424	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2423		2425
2424	#if EV_USE_INOTIFY	2426	#if EV_USE_INOTIFY
2425	# define EV_INOTIFY_BUFSIZE 8192	2427	# define EV_INOTIFY_BUFSIZE 8192
…		…
2429	{	2431	{
2430	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);	2432	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);
2431		2433
2432	if (w->wd < 0)	2434	if (w->wd < 0)
2433	{	2435	{
		2436	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2434	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */	2437	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2435		2438
2436	/* monitor some parent directory for speedup hints */	2439	/* monitor some parent directory for speedup hints */
2437	/* note that exceeding the hardcoded path limit is not a correctness issue, */	2440	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2438	/* but an efficiency issue only */	2441	/* but an efficiency issue only */
2439	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2442	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
…		…
2456	}	2459	}
2457	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2460	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2458	}	2461	}
2459	}	2462	}
2460	else	2463	else
2461	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */	2464	{
2462
2463	if (w->wd >= 0)
2464	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2465	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
		2466
		2467	/* now local changes will be tracked by inotify, but remote changes won't */
		2468	/* unless the filesystem it known to be local, we therefore still poll */
		2469	/* also do poll on <2.6.25, but with normal frequency */
		2470	struct statfs sfs;
		2471
		2472	if (fs_2625 && !statfs (w->path, &sfs))
		2473	if (sfs.f_type == 0x1373 /* devfs */
		2474	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2475	\|\| sfs.f_type == 0x3153464a /* jfs */
		2476	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2477	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2478	\|\| sfs.f_type == 0x58465342 /* xfs */)
		2479	return;
		2480
		2481	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
		2482	ev_timer_again (EV_A_ &w->timer);
		2483	}
2465	}	2484	}
2466		2485
2467	static void noinline	2486	static void noinline
2468	infy_del (EV_P_ ev_stat *w)	2487	infy_del (EV_P_ ev_stat *w)
2469	{	2488	{
…		…
2522	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	2541	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2523	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2542	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2524	}	2543	}
2525		2544
2526	void inline_size	2545	void inline_size
2527	infy_init (EV_P)	2546	check_2625 (EV_P)
2528	{	2547	{
2529	if (fs_fd != -2)
2530	return;
2531
2532	/* kernels < 2.6.25 are borked	2548	/* kernels < 2.6.25 are borked
2533	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	2549	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534	*/	2550	*/
2535	{
2536	struct utsname buf;	2551	struct utsname buf;
2537	int major, minor, micro;	2552	int major, minor, micro;
2538		2553
2539	fs_fd = -1;
2540
2541	if (uname (&buf))	2554	if (uname (&buf))
2542	return;	2555	return;
2543		2556
2544	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)	2557	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545	return;	2558	return;
2546		2559
2547	if (major < 2	2560	if (major < 2
2548	\|\| (major == 2 && minor < 6)	2561	\|\| (major == 2 && minor < 6)
2549	\|\| (major == 2 && minor == 6 && micro < 25))	2562	\|\| (major == 2 && minor == 6 && micro < 25))
2550	return;	2563	return;
2551	}	2564
		2565	fs_2625 = 1;
		2566	}
		2567
		2568	void inline_size
		2569	infy_init (EV_P)
		2570	{
		2571	if (fs_fd != -2)
		2572	return;
		2573
		2574	fs_fd = -1;
		2575
		2576	check_2625 (EV_A);
2552		2577
2553	fs_fd = inotify_init ();	2578	fs_fd = inotify_init ();
2554		2579
2555	if (fs_fd >= 0)	2580	if (fs_fd >= 0)
2556	{	2581	{
…		…
2584	w->wd = -1;	2609	w->wd = -1;
2585		2610
2586	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2587	infy_add (EV_A_ w); /* re-add, no matter what */	2612	infy_add (EV_A_ w); /* re-add, no matter what */
2588	else	2613	else
2589	ev_timer_start (EV_A_ &w->timer);	2614	ev_timer_again (EV_A_ &w->timer);
2590	}	2615	}
2591	}	2616	}
2592	}	2617	}
2593		2618
2594	#endif	2619	#endif
…		…
2649	ev_stat_start (EV_P_ ev_stat *w)	2674	ev_stat_start (EV_P_ ev_stat *w)
2650	{	2675	{
2651	if (expect_false (ev_is_active (w)))	2676	if (expect_false (ev_is_active (w)))
2652	return;	2677	return;
2653		2678
2654	/* since we use memcmp, we need to clear any padding data etc. */
2655	memset (&w->prev, 0, sizeof (ev_statdata));
2656	memset (&w->attr, 0, sizeof (ev_statdata));
2657
2658	ev_stat_stat (EV_A_ w);	2679	ev_stat_stat (EV_A_ w);
2659		2680
		2681	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2660	if (w->interval < MIN_STAT_INTERVAL)	2682	w->interval = MIN_STAT_INTERVAL;
2661	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2662		2683
2663	ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);	2684	ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2664	ev_set_priority (&w->timer, ev_priority (w));	2685	ev_set_priority (&w->timer, ev_priority (w));
2665		2686
2666	#if EV_USE_INOTIFY	2687	#if EV_USE_INOTIFY
2667	infy_init (EV_A);	2688	infy_init (EV_A);
2668		2689
2669	if (fs_fd >= 0)	2690	if (fs_fd >= 0)
2670	infy_add (EV_A_ w);	2691	infy_add (EV_A_ w);
2671	else	2692	else
2672	#endif	2693	#endif
2673	ev_timer_start (EV_A_ &w->timer);	2694	ev_timer_again (EV_A_ &w->timer);
2674		2695
2675	ev_start (EV_A_ (W)w, 1);	2696	ev_start (EV_A_ (W)w, 1);
2676		2697
2677	EV_FREQUENT_CHECK;	2698	EV_FREQUENT_CHECK;
2678	}	2699	}

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC vs. Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC vs.
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC