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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs.
Revision 1.275 by root, Fri Dec 12 20:35:21 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
…		…
287	# endif	307	# endif
288	#endif	308	#endif
289		309
290	#if EV_USE_INOTIFY	310	#if EV_USE_INOTIFY
291	# include <sys/utsname.h>	311	# include <sys/utsname.h>
		312	# include <sys/statfs.h>
292	# include <sys/inotify.h>	313	# include <sys/inotify.h>
293	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */	314	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294	# ifndef IN_DONT_FOLLOW	315	# ifndef IN_DONT_FOLLOW
295	# undef EV_USE_INOTIFY	316	# undef EV_USE_INOTIFY
296	# define EV_USE_INOTIFY 0	317	# define EV_USE_INOTIFY 0
297	# endif	318	# endif
298	#endif	319	#endif
299		320
300	#if EV_SELECT_IS_WINSOCKET	321	#if EV_SELECT_IS_WINSOCKET
301	# 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
302	#endif	332	#endif
303		333
304	#if EV_USE_EVENTFD	334	#if EV_USE_EVENTFD
305	/* 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 */
306	# include <stdint.h>	336	# include <stdint.h>
…		…
388	{	418	{
389	syserr_cb = cb;	419	syserr_cb = cb;
390	}	420	}
391		421
392	static void noinline	422	static void noinline
393	syserr (const char *msg)	423	ev_syserr (const char *msg)
394	{	424	{
395	if (!msg)	425	if (!msg)
396	msg = "(libev) system error";	426	msg = "(libev) system error";
397		427
398	if (syserr_cb)	428	if (syserr_cb)
…		…
449	typedef struct	479	typedef struct
450	{	480	{
451	WL head;	481	WL head;
452	unsigned char events;	482	unsigned char events;
453	unsigned char reify;	483	unsigned char reify;
		484	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
		485	unsigned char unused;
		486	#if EV_USE_EPOLL
		487	unsigned int egen; /* generation counter to counter epoll bugs */
		488	#endif
454	#if EV_SELECT_IS_WINSOCKET	489	#if EV_SELECT_IS_WINSOCKET
455	SOCKET handle;	490	SOCKET handle;
456	#endif	491	#endif
457	} ANFD;	492	} ANFD;
458		493
…		…
611	{	646	{
612	cur = array_nextsize (elem, cur, cnt);	647	cur = array_nextsize (elem, cur, cnt);
613	return ev_realloc (base, elem * *cur);	648	return ev_realloc (base, elem * *cur);
614	}	649	}
615		650
		651	#define array_init_zero(base,count) \
		652	memset ((void )(base), 0, sizeof ((base)) * (count))
		653
616	#define array_needsize(type,base,cur,cnt,init) \	654	#define array_needsize(type,base,cur,cnt,init) \
617	if (expect_false ((cnt) > (cur))) \	655	if (expect_false ((cnt) > (cur))) \
618	{ \	656	{ \
619	int ocur_ = (cur); \	657	int ocur_ = (cur); \
620	(base) = (type *)array_realloc \	658	(base) = (type *)array_realloc \
…		…
662	for (i = 0; i < eventcnt; ++i)	700	for (i = 0; i < eventcnt; ++i)
663	ev_feed_event (EV_A_ events [i], type);	701	ev_feed_event (EV_A_ events [i], type);
664	}	702	}
665		703
666	/*****************************************************************************/	704	/*****************************************************************************/
667
668	void inline_size
669	anfds_init (ANFD *base, int count)
670	{
671	while (count--)
672	{
673	base->head = 0;
674	base->events = EV_NONE;
675	base->reify = 0;
676
677	++base;
678	}
679	}
680		705
681	void inline_speed	706	void inline_speed
682	fd_event (EV_P_ int fd, int revents)	707	fd_event (EV_P_ int fd, int revents)
683	{	708	{
684	ANFD *anfd = anfds + fd;	709	ANFD *anfd = anfds + fd;
…		…
814		839
815	for (fd = 0; fd < anfdmax; ++fd)	840	for (fd = 0; fd < anfdmax; ++fd)
816	if (anfds [fd].events)	841	if (anfds [fd].events)
817	{	842	{
818	anfds [fd].events = 0;	843	anfds [fd].events = 0;
		844	anfds [fd].emask = 0;
819	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	845	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
820	}	846	}
821	}	847	}
822		848
823	/*****************************************************************************/	849	/*****************************************************************************/
…		…
975	static ANSIG *signals;	1001	static ANSIG *signals;
976	static int signalmax;	1002	static int signalmax;
977		1003
978	static EV_ATOMIC_T gotsig;	1004	static EV_ATOMIC_T gotsig;
979		1005
980	void inline_size
981	signals_init (ANSIG *base, int count)
982	{
983	while (count--)
984	{
985	base->head = 0;
986	base->gotsig = 0;
987
988	++base;
989	}
990	}
991
992	/*****************************************************************************/	1006	/*****************************************************************************/
993		1007
994	void inline_speed	1008	void inline_speed
995	fd_intern (int fd)	1009	fd_intern (int fd)
996	{	1010	{
…		…
1017	}	1031	}
1018	else	1032	else
1019	#endif	1033	#endif
1020	{	1034	{
1021	while (pipe (evpipe))	1035	while (pipe (evpipe))
1022	syserr ("(libev) error creating signal/async pipe");	1036	ev_syserr ("(libev) error creating signal/async pipe");
1023		1037
1024	fd_intern (evpipe [0]);	1038	fd_intern (evpipe [0]);
1025	fd_intern (evpipe [1]);	1039	fd_intern (evpipe [1]);
1026	ev_io_set (&pipeev, evpipe [0], EV_READ);	1040	ev_io_set (&pipeev, evpipe [0], EV_READ);
1027	}	1041	}
…		…
1658	{	1672	{
1659	#if EV_MULTIPLICITY	1673	#if EV_MULTIPLICITY
1660	struct ev_loop *loop = ev_default_loop_ptr;	1674	struct ev_loop *loop = ev_default_loop_ptr;
1661	#endif	1675	#endif
1662		1676
		1677	ev_default_loop_ptr = 0;
		1678
1663	#ifndef _WIN32	1679	#ifndef _WIN32
1664	ev_ref (EV_A); /* child watcher */	1680	ev_ref (EV_A); /* child watcher */
1665	ev_signal_stop (EV_A_ &childev);	1681	ev_signal_stop (EV_A_ &childev);
1666	#endif	1682	#endif
1667		1683
…		…
1673	{	1689	{
1674	#if EV_MULTIPLICITY	1690	#if EV_MULTIPLICITY
1675	struct ev_loop *loop = ev_default_loop_ptr;	1691	struct ev_loop *loop = ev_default_loop_ptr;
1676	#endif	1692	#endif
1677		1693
1678	if (backend)
1679	postfork = 1; /* must be in line with ev_loop_fork */	1694	postfork = 1; /* must be in line with ev_loop_fork */
1680	}	1695	}
1681		1696
1682	/*****************************************************************************/	1697	/*****************************************************************************/
1683		1698
1684	void	1699	void
…		…
2139		2154
2140	if (expect_false (ev_is_active (w)))	2155	if (expect_false (ev_is_active (w)))
2141	return;	2156	return;
2142		2157
2143	assert (("ev_io_start called with negative fd", fd >= 0));	2158	assert (("ev_io_start called with negative fd", fd >= 0));
		2159	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2144		2160
2145	EV_FREQUENT_CHECK;	2161	EV_FREQUENT_CHECK;
2146		2162
2147	ev_start (EV_A_ (W)w, 1);	2163	ev_start (EV_A_ (W)w, 1);
2148	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2164	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149	wlist_add (&anfds[fd].head, (WL)w);	2165	wlist_add (&anfds[fd].head, (WL)w);
2150		2166
2151	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2167	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2152	w->events &= ~EV_IOFDSET;	2168	w->events &= ~EV_IOFDSET;
2153		2169
…		…
2345	sigset_t full, prev;	2361	sigset_t full, prev;
2346	sigfillset (&full);	2362	sigfillset (&full);
2347	sigprocmask (SIG_SETMASK, &full, &prev);	2363	sigprocmask (SIG_SETMASK, &full, &prev);
2348	#endif	2364	#endif
2349		2365
2350	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2366	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2351		2367
2352	#ifndef _WIN32	2368	#ifndef _WIN32
2353	sigprocmask (SIG_SETMASK, &prev, 0);	2369	sigprocmask (SIG_SETMASK, &prev, 0);
2354	#endif	2370	#endif
2355	}	2371	}
…		…
2428	# ifdef _WIN32	2444	# ifdef _WIN32
2429	# undef lstat	2445	# undef lstat
2430	# define lstat(a,b) _stati64 (a,b)	2446	# define lstat(a,b) _stati64 (a,b)
2431	# endif	2447	# endif
2432		2448
2433	#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 */
2434	#define MIN_STAT_INTERVAL 0.1074891	2451	#define MIN_STAT_INTERVAL 0.1074891
2435		2452
2436	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);
2437		2454
2438	#if EV_USE_INOTIFY	2455	#if EV_USE_INOTIFY
2439	# define EV_INOTIFY_BUFSIZE 8192	2456	# define EV_INOTIFY_BUFSIZE 8192
…		…
2443	{	2460	{
2444	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);
2445		2462
2446	if (w->wd < 0)	2463	if (w->wd < 0)
2447	{	2464	{
		2465	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2448	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 */
2449		2467
2450	/* monitor some parent directory for speedup hints */	2468	/* monitor some parent directory for speedup hints */
2451	/* note that exceeding the hardcoded limit is not a correctness issue, */	2469	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2452	/* but an efficiency issue only */	2470	/* but an efficiency issue only */
2453	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2471	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2454	{	2472	{
2455	char path [4096];	2473	char path [4096];
2456	strcpy (path, w->path);	2474	strcpy (path, w->path);
…		…
2460	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF	2478	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF
2461	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);	2479	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);
2462		2480
2463	char *pend = strrchr (path, '/');	2481	char *pend = strrchr (path, '/');
2464		2482
2465	if (!pend)	2483	if (!pend \|\| pend == path)
2466	break; /* whoops, no '/', complain to your admin */	2484	break;
2467		2485
2468	*pend = 0;	2486	*pend = 0;
2469	w->wd = inotify_add_watch (fs_fd, path, mask);	2487	w->wd = inotify_add_watch (fs_fd, path, mask);
2470	}	2488	}
2471	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2489	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2472	}	2490	}
2473	}	2491	}
2474	else
2475	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476		2492
2477	if (w->wd >= 0)	2493	if (w->wd >= 0)
		2494	{
2478	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	}
2479	}	2514	}
2480		2515
2481	static void noinline	2516	static void noinline
2482	infy_del (EV_P_ ev_stat *w)	2517	infy_del (EV_P_ ev_stat *w)
2483	{	2518	{
…		…
2513		2548
2514	if (w->wd == wd \|\| wd == -1)	2549	if (w->wd == wd \|\| wd == -1)
2515	{	2550	{
2516	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))	2551	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))
2517	{	2552	{
		2553	wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518	w->wd = -1;	2554	w->wd = -1;
2519	infy_add (EV_A_ w); /* re-add, no matter what */	2555	infy_add (EV_A_ w); /* re-add, no matter what */
2520	}	2556	}
2521		2557
2522	stat_timer_cb (EV_A_ &w->timer, 0);	2558	stat_timer_cb (EV_A_ &w->timer, 0);
…		…
2536	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)
2537	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2573	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538	}	2574	}
2539		2575
2540	void inline_size	2576	void inline_size
2541	infy_init (EV_P)	2577	check_2625 (EV_P)
2542	{	2578	{
2543	if (fs_fd != -2)
2544	return;
2545
2546	/* kernels < 2.6.25 are borked	2579	/* kernels < 2.6.25 are borked
2547	* 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
2548	*/	2581	*/
2549	{
2550	struct utsname buf;	2582	struct utsname buf;
2551	int major, minor, micro;	2583	int major, minor, micro;
2552		2584
2553	fs_fd = -1;
2554
2555	if (uname (&buf))	2585	if (uname (&buf))
2556	return;	2586	return;
2557		2587
2558	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)	2588	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559	return;	2589	return;
2560		2590
2561	if (major < 2	2591	if (major < 2
2562	\|\| (major == 2 && minor < 6)	2592	\|\| (major == 2 && minor < 6)
2563	\|\| (major == 2 && minor == 6 && micro < 25))	2593	\|\| (major == 2 && minor == 6 && micro < 25))
2564	return;	2594	return;
2565	}	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);
2566		2608
2567	fs_fd = inotify_init ();	2609	fs_fd = inotify_init ();
2568		2610
2569	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2570	{	2612	{
…		…
2598	w->wd = -1;	2640	w->wd = -1;
2599		2641
2600	if (fs_fd >= 0)	2642	if (fs_fd >= 0)
2601	infy_add (EV_A_ w); /* re-add, no matter what */	2643	infy_add (EV_A_ w); /* re-add, no matter what */
2602	else	2644	else
2603	ev_timer_start (EV_A_ &w->timer);	2645	ev_timer_again (EV_A_ &w->timer);
2604	}	2646	}
2605	}	2647	}
2606	}	2648	}
2607		2649
2608	#endif	2650	#endif
…		…
2663	ev_stat_start (EV_P_ ev_stat *w)	2705	ev_stat_start (EV_P_ ev_stat *w)
2664	{	2706	{
2665	if (expect_false (ev_is_active (w)))	2707	if (expect_false (ev_is_active (w)))
2666	return;	2708	return;
2667		2709
2668	/* since we use memcmp, we need to clear any padding data etc. */
2669	memset (&w->prev, 0, sizeof (ev_statdata));
2670	memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672	ev_stat_stat (EV_A_ w);	2710	ev_stat_stat (EV_A_ w);
2673		2711
		2712	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674	if (w->interval < MIN_STAT_INTERVAL)	2713	w->interval = MIN_STAT_INTERVAL;
2675	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676		2714
2677	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);
2678	ev_set_priority (&w->timer, ev_priority (w));	2716	ev_set_priority (&w->timer, ev_priority (w));
2679		2717
2680	#if EV_USE_INOTIFY	2718	#if EV_USE_INOTIFY
2681	infy_init (EV_A);	2719	infy_init (EV_A);
2682		2720
2683	if (fs_fd >= 0)	2721	if (fs_fd >= 0)
2684	infy_add (EV_A_ w);	2722	infy_add (EV_A_ w);
2685	else	2723	else
2686	#endif	2724	#endif
2687	ev_timer_start (EV_A_ &w->timer);	2725	ev_timer_again (EV_A_ &w->timer);
2688		2726
2689	ev_start (EV_A_ (W)w, 1);	2727	ev_start (EV_A_ (W)w, 1);
2690		2728
2691	EV_FREQUENT_CHECK;	2729	EV_FREQUENT_CHECK;
2692	}	2730	}

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs. Revision 1.275 by root, Fri Dec 12 20:35:21 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC vs.
Revision 1.275 by root, Fri Dec 12 20:35:21 2008 UTC