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

Comparing libev/ev.c (file contents):
Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC vs.
Revision 1.276 by root, Sun Dec 14 13:03:54 2008 UTC

…		…
47	# include EV_CONFIG_H	47	# include EV_CONFIG_H
48	# else	48	# else
49	# include "config.h"	49	# include "config.h"
50	# endif	50	# endif
51		51
		52	# if HAVE_CLOCK_SYSCALL
		53	# ifndef EV_USE_CLOCK_SYSCALL
		54	# define EV_USE_CLOCK_SYSCALL 1
		55	# ifndef EV_USE_REALTIME
		56	# define EV_USE_REALTIME 0
		57	# endif
		58	# ifndef EV_USE_MONOTONIC
		59	# define EV_USE_MONOTONIC 1
		60	# endif
		61	# endif
		62	# endif
		63
52	# if HAVE_CLOCK_GETTIME	64	# if HAVE_CLOCK_GETTIME
53	# ifndef EV_USE_MONOTONIC	65	# ifndef EV_USE_MONOTONIC
54	# define EV_USE_MONOTONIC 1	66	# define EV_USE_MONOTONIC 1
55	# endif	67	# endif
56	# ifndef EV_USE_REALTIME	68	# ifndef EV_USE_REALTIME
…		…
164	# endif	176	# endif
165	#endif	177	#endif
166		178
167	/* this block tries to deduce configuration from header-defined symbols and defaults */	179	/* this block tries to deduce configuration from header-defined symbols and defaults */
168		180
		181	#ifndef EV_USE_CLOCK_SYSCALL
		182	# if __linux && __GLIBC__ >= 2
		183	# define EV_USE_CLOCK_SYSCALL 1
		184	# else
		185	# define EV_USE_CLOCK_SYSCALL 0
		186	# endif
		187	#endif
		188
169	#ifndef EV_USE_MONOTONIC	189	#ifndef EV_USE_MONOTONIC
170	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0	190	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171	# define EV_USE_MONOTONIC 1	191	# define EV_USE_MONOTONIC 1
172	# else	192	# else
173	# define EV_USE_MONOTONIC 0	193	# define EV_USE_MONOTONIC 0
…		…
298	# endif	318	# endif
299	#endif	319	#endif
300		320
301	#if EV_SELECT_IS_WINSOCKET	321	#if EV_SELECT_IS_WINSOCKET
302	# include <winsock.h>	322	# include <winsock.h>
		323	#endif
		324
		325	/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
		326	/* which makes programs even slower. might work on other unices, too. */
		327	#if EV_USE_CLOCK_SYSCALL
		328	# include <syscall.h>
		329	# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
		330	# undef EV_USE_MONOTONIC
		331	# define EV_USE_MONOTONIC 1
303	#endif	332	#endif
304		333
305	#if EV_USE_EVENTFD	334	#if EV_USE_EVENTFD
306	/* our minimum requirement is glibc 2.7 which has the stub, but not the header */	335	/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307	# include <stdint.h>	336	# include <stdint.h>
…		…
1241	/* kqueue is borked on everything but netbsd apparently */	1270	/* kqueue is borked on everything but netbsd apparently */
1242	/* it usually doesn't work correctly on anything but sockets and pipes */	1271	/* it usually doesn't work correctly on anything but sockets and pipes */
1243	flags &= ~EVBACKEND_KQUEUE;	1272	flags &= ~EVBACKEND_KQUEUE;
1244	#endif	1273	#endif
1245	#ifdef __APPLE__	1274	#ifdef __APPLE__
1246	// flags &= ~EVBACKEND_KQUEUE; for documentation	1275	// flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
1247	flags &= ~EVBACKEND_POLL;	1276	flags &= ~EVBACKEND_SELECT;
1248	#endif	1277	#endif
1249		1278
1250	return flags;	1279	return flags;
1251	}	1280	}
1252		1281
…		…
2415	# ifdef _WIN32	2444	# ifdef _WIN32
2416	# undef lstat	2445	# undef lstat
2417	# define lstat(a,b) _stati64 (a,b)	2446	# define lstat(a,b) _stati64 (a,b)
2418	# endif	2447	# endif
2419		2448
2420	#define DEF_STAT_INTERVAL 5.0074891	2449	#define DEF_STAT_INTERVAL 5.0074891
		2450	#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2421	#define MIN_STAT_INTERVAL 0.1074891	2451	#define MIN_STAT_INTERVAL 0.1074891
2422		2452
2423	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2453	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2424		2454
2425	#if EV_USE_INOTIFY	2455	#if EV_USE_INOTIFY
2426	# define EV_INOTIFY_BUFSIZE 8192	2456	# define EV_INOTIFY_BUFSIZE 8192
…		…
2430	{	2460	{
2431	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);	2461	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		2462
2433	if (w->wd < 0)	2463	if (w->wd < 0)
2434	{	2464	{
		2465	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2435	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */	2466	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2436		2467
2437	/* monitor some parent directory for speedup hints */	2468	/* monitor some parent directory for speedup hints */
2438	/* note that exceeding the hardcoded path limit is not a correctness issue, */	2469	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2439	/* but an efficiency issue only */	2470	/* but an efficiency issue only */
2440	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2471	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
…		…
2447	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF	2478	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF
2448	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);	2479	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);
2449		2480
2450	char *pend = strrchr (path, '/');	2481	char *pend = strrchr (path, '/');
2451		2482
2452	if (!pend)	2483	if (!pend \|\| pend == path)
2453	break; /* whoops, no '/', complain to your admin */	2484	break;
2454		2485
2455	*pend = 0;	2486	*pend = 0;
2456	w->wd = inotify_add_watch (fs_fd, path, mask);	2487	w->wd = inotify_add_watch (fs_fd, path, mask);
2457	}	2488	}
2458	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2489	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2459	}	2490	}
2460	}	2491	}
2461	else
2462	todo, on nfs etc., we need to poll every 60s or so
2463	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464		2492
2465	if (w->wd >= 0)	2493	if (w->wd >= 0)
		2494	{
2466	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2495	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
		2496
		2497	/* now local changes will be tracked by inotify, but remote changes won't */
		2498	/* unless the filesystem it known to be local, we therefore still poll */
		2499	/* also do poll on <2.6.25, but with normal frequency */
		2500	struct statfs sfs;
		2501
		2502	if (fs_2625 && !statfs (w->path, &sfs))
		2503	if (sfs.f_type == 0x1373 /* devfs */
		2504	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2505	\|\| sfs.f_type == 0x3153464a /* jfs */
		2506	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2507	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2508	\|\| sfs.f_type == 0x58465342 /* xfs */)
		2509	return;
		2510
		2511	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
		2512	ev_timer_again (EV_A_ &w->timer);
		2513	}
2467	}	2514	}
2468		2515
2469	static void noinline	2516	static void noinline
2470	infy_del (EV_P_ ev_stat *w)	2517	infy_del (EV_P_ ev_stat *w)
2471	{	2518	{
…		…
2501		2548
2502	if (w->wd == wd \|\| wd == -1)	2549	if (w->wd == wd \|\| wd == -1)
2503	{	2550	{
2504	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))	2551	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))
2505	{	2552	{
		2553	wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506	w->wd = -1;	2554	w->wd = -1;
2507	infy_add (EV_A_ w); /* re-add, no matter what */	2555	infy_add (EV_A_ w); /* re-add, no matter what */
2508	}	2556	}
2509		2557
2510	stat_timer_cb (EV_A_ &w->timer, 0);	2558	stat_timer_cb (EV_A_ &w->timer, 0);
…		…
2524	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	2572	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2573	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526	}	2574	}
2527		2575
2528	void inline_size	2576	void inline_size
2529	infy_init (EV_P)	2577	check_2625 (EV_P)
2530	{	2578	{
2531	if (fs_fd != -2)
2532	return;
2533
2534	/* kernels < 2.6.25 are borked	2579	/* kernels < 2.6.25 are borked
2535	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	2580	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2536	*/	2581	*/
2537	{
2538	struct utsname buf;	2582	struct utsname buf;
2539	int major, minor, micro;	2583	int major, minor, micro;
2540		2584
2541	fs_fd = -1;
2542
2543	if (uname (&buf))	2585	if (uname (&buf))
2544	return;	2586	return;
2545		2587
2546	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)	2588	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2547	return;	2589	return;
2548		2590
2549	if (major < 2	2591	if (major < 2
2550	\|\| (major == 2 && minor < 6)	2592	\|\| (major == 2 && minor < 6)
2551	\|\| (major == 2 && minor == 6 && micro < 25))	2593	\|\| (major == 2 && minor == 6 && micro < 25))
2552	return;	2594	return;
2553	}	2595
		2596	fs_2625 = 1;
		2597	}
		2598
		2599	void inline_size
		2600	infy_init (EV_P)
		2601	{
		2602	if (fs_fd != -2)
		2603	return;
		2604
		2605	fs_fd = -1;
		2606
		2607	check_2625 (EV_A);
2554		2608
2555	fs_fd = inotify_init ();	2609	fs_fd = inotify_init ();
2556		2610
2557	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2558	{	2612	{
…		…
2586	w->wd = -1;	2640	w->wd = -1;
2587		2641
2588	if (fs_fd >= 0)	2642	if (fs_fd >= 0)
2589	infy_add (EV_A_ w); /* re-add, no matter what */	2643	infy_add (EV_A_ w); /* re-add, no matter what */
2590	else	2644	else
2591	ev_timer_start (EV_A_ &w->timer);	2645	ev_timer_again (EV_A_ &w->timer);
2592	}	2646	}
2593	}	2647	}
2594	}	2648	}
2595		2649
2596	#endif	2650	#endif
…		…
2651	ev_stat_start (EV_P_ ev_stat *w)	2705	ev_stat_start (EV_P_ ev_stat *w)
2652	{	2706	{
2653	if (expect_false (ev_is_active (w)))	2707	if (expect_false (ev_is_active (w)))
2654	return;	2708	return;
2655		2709
2656	/* since we use memcmp, we need to clear any padding data etc. */
2657	memset (&w->prev, 0, sizeof (ev_statdata));
2658	memset (&w->attr, 0, sizeof (ev_statdata));
2659
2660	ev_stat_stat (EV_A_ w);	2710	ev_stat_stat (EV_A_ w);
2661		2711
		2712	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2662	if (w->interval < MIN_STAT_INTERVAL)	2713	w->interval = MIN_STAT_INTERVAL;
2663	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2664		2714
2665	ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);	2715	ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2666	ev_set_priority (&w->timer, ev_priority (w));	2716	ev_set_priority (&w->timer, ev_priority (w));
2667		2717
2668	#if EV_USE_INOTIFY	2718	#if EV_USE_INOTIFY
2669	infy_init (EV_A);	2719	infy_init (EV_A);
2670		2720
2671	if (fs_fd >= 0)	2721	if (fs_fd >= 0)
2672	infy_add (EV_A_ w);	2722	infy_add (EV_A_ w);
2673	else	2723	else
2674	#endif	2724	#endif
2675	ev_timer_start (EV_A_ &w->timer);	2725	ev_timer_again (EV_A_ &w->timer);
2676		2726
2677	ev_start (EV_A_ (W)w, 1);	2727	ev_start (EV_A_ (W)w, 1);
2678		2728
2679	EV_FREQUENT_CHECK;	2729	EV_FREQUENT_CHECK;
2680	}	2730	}

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC vs. Revision 1.276 by root, Sun Dec 14 13:03:54 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC vs.
Revision 1.276 by root, Sun Dec 14 13:03:54 2008 UTC