[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.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
…		…
388	{	389	{
389	syserr_cb = cb;	390	syserr_cb = cb;
390	}	391	}
391		392
392	static void noinline	393	static void noinline
393	syserr (const char *msg)	394	ev_syserr (const char *msg)
394	{	395	{
395	if (!msg)	396	if (!msg)
396	msg = "(libev) system error";	397	msg = "(libev) system error";
397		398
398	if (syserr_cb)	399	if (syserr_cb)
…		…
449	typedef struct	450	typedef struct
450	{	451	{
451	WL head;	452	WL head;
452	unsigned char events;	453	unsigned char events;
453	unsigned char reify;	454	unsigned char reify;
		455	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
		456	unsigned char unused;
		457	#if EV_USE_EPOLL
		458	unsigned int egen; /* generation counter to counter epoll bugs */
		459	#endif
454	#if EV_SELECT_IS_WINSOCKET	460	#if EV_SELECT_IS_WINSOCKET
455	SOCKET handle;	461	SOCKET handle;
456	#endif	462	#endif
457	} ANFD;	463	} ANFD;
458		464
…		…
611	{	617	{
612	cur = array_nextsize (elem, cur, cnt);	618	cur = array_nextsize (elem, cur, cnt);
613	return ev_realloc (base, elem * *cur);	619	return ev_realloc (base, elem * *cur);
614	}	620	}
615		621
		622	#define array_init_zero(base,count) \
		623	memset ((void )(base), 0, sizeof ((base)) * (count))
		624
616	#define array_needsize(type,base,cur,cnt,init) \	625	#define array_needsize(type,base,cur,cnt,init) \
617	if (expect_false ((cnt) > (cur))) \	626	if (expect_false ((cnt) > (cur))) \
618	{ \	627	{ \
619	int ocur_ = (cur); \	628	int ocur_ = (cur); \
620	(base) = (type *)array_realloc \	629	(base) = (type *)array_realloc \
…		…
662	for (i = 0; i < eventcnt; ++i)	671	for (i = 0; i < eventcnt; ++i)
663	ev_feed_event (EV_A_ events [i], type);	672	ev_feed_event (EV_A_ events [i], type);
664	}	673	}
665		674
666	/*****************************************************************************/	675	/*****************************************************************************/
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		676
681	void inline_speed	677	void inline_speed
682	fd_event (EV_P_ int fd, int revents)	678	fd_event (EV_P_ int fd, int revents)
683	{	679	{
684	ANFD *anfd = anfds + fd;	680	ANFD *anfd = anfds + fd;
…		…
814		810
815	for (fd = 0; fd < anfdmax; ++fd)	811	for (fd = 0; fd < anfdmax; ++fd)
816	if (anfds [fd].events)	812	if (anfds [fd].events)
817	{	813	{
818	anfds [fd].events = 0;	814	anfds [fd].events = 0;
		815	anfds [fd].emask = 0;
819	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	816	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
820	}	817	}
821	}	818	}
822		819
823	/*****************************************************************************/	820	/*****************************************************************************/
…		…
975	static ANSIG *signals;	972	static ANSIG *signals;
976	static int signalmax;	973	static int signalmax;
977		974
978	static EV_ATOMIC_T gotsig;	975	static EV_ATOMIC_T gotsig;
979		976
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	/*****************************************************************************/	977	/*****************************************************************************/
993		978
994	void inline_speed	979	void inline_speed
995	fd_intern (int fd)	980	fd_intern (int fd)
996	{	981	{
…		…
1017	}	1002	}
1018	else	1003	else
1019	#endif	1004	#endif
1020	{	1005	{
1021	while (pipe (evpipe))	1006	while (pipe (evpipe))
1022	syserr ("(libev) error creating signal/async pipe");	1007	ev_syserr ("(libev) error creating signal/async pipe");
1023		1008
1024	fd_intern (evpipe [0]);	1009	fd_intern (evpipe [0]);
1025	fd_intern (evpipe [1]);	1010	fd_intern (evpipe [1]);
1026	ev_io_set (&pipeev, evpipe [0], EV_READ);	1011	ev_io_set (&pipeev, evpipe [0], EV_READ);
1027	}	1012	}
…		…
1658	{	1643	{
1659	#if EV_MULTIPLICITY	1644	#if EV_MULTIPLICITY
1660	struct ev_loop *loop = ev_default_loop_ptr;	1645	struct ev_loop *loop = ev_default_loop_ptr;
1661	#endif	1646	#endif
1662		1647
		1648	ev_default_loop_ptr = 0;
		1649
1663	#ifndef _WIN32	1650	#ifndef _WIN32
1664	ev_ref (EV_A); /* child watcher */	1651	ev_ref (EV_A); /* child watcher */
1665	ev_signal_stop (EV_A_ &childev);	1652	ev_signal_stop (EV_A_ &childev);
1666	#endif	1653	#endif
1667		1654
…		…
1673	{	1660	{
1674	#if EV_MULTIPLICITY	1661	#if EV_MULTIPLICITY
1675	struct ev_loop *loop = ev_default_loop_ptr;	1662	struct ev_loop *loop = ev_default_loop_ptr;
1676	#endif	1663	#endif
1677		1664
1678	if (backend)
1679	postfork = 1; /* must be in line with ev_loop_fork */	1665	postfork = 1; /* must be in line with ev_loop_fork */
1680	}	1666	}
1681		1667
1682	/*****************************************************************************/	1668	/*****************************************************************************/
1683		1669
1684	void	1670	void
…		…
2139		2125
2140	if (expect_false (ev_is_active (w)))	2126	if (expect_false (ev_is_active (w)))
2141	return;	2127	return;
2142		2128
2143	assert (("ev_io_start called with negative fd", fd >= 0));	2129	assert (("ev_io_start called with negative fd", fd >= 0));
		2130	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2144		2131
2145	EV_FREQUENT_CHECK;	2132	EV_FREQUENT_CHECK;
2146		2133
2147	ev_start (EV_A_ (W)w, 1);	2134	ev_start (EV_A_ (W)w, 1);
2148	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2135	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149	wlist_add (&anfds[fd].head, (WL)w);	2136	wlist_add (&anfds[fd].head, (WL)w);
2150		2137
2151	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2138	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2152	w->events &= ~EV_IOFDSET;	2139	w->events &= ~EV_IOFDSET;
2153		2140
…		…
2345	sigset_t full, prev;	2332	sigset_t full, prev;
2346	sigfillset (&full);	2333	sigfillset (&full);
2347	sigprocmask (SIG_SETMASK, &full, &prev);	2334	sigprocmask (SIG_SETMASK, &full, &prev);
2348	#endif	2335	#endif
2349		2336
2350	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2337	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2351		2338
2352	#ifndef _WIN32	2339	#ifndef _WIN32
2353	sigprocmask (SIG_SETMASK, &prev, 0);	2340	sigprocmask (SIG_SETMASK, &prev, 0);
2354	#endif	2341	#endif
2355	}	2342	}
…		…
2428	# ifdef _WIN32	2415	# ifdef _WIN32
2429	# undef lstat	2416	# undef lstat
2430	# define lstat(a,b) _stati64 (a,b)	2417	# define lstat(a,b) _stati64 (a,b)
2431	# endif	2418	# endif
2432		2419
2433	#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 */
2434	#define MIN_STAT_INTERVAL 0.1074891	2422	#define MIN_STAT_INTERVAL 0.1074891
2435		2423
2436	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);
2437		2425
2438	#if EV_USE_INOTIFY	2426	#if EV_USE_INOTIFY
2439	# define EV_INOTIFY_BUFSIZE 8192	2427	# define EV_INOTIFY_BUFSIZE 8192
…		…
2443	{	2431	{
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);	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);
2445		2433
2446	if (w->wd < 0)	2434	if (w->wd < 0)
2447	{	2435	{
		2436	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 */	2437	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2449		2438
2450	/* monitor some parent directory for speedup hints */	2439	/* monitor some parent directory for speedup hints */
2451	/* note that exceeding the hardcoded limit is not a correctness issue, */	2440	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2452	/* but an efficiency issue only */	2441	/* but an efficiency issue only */
2453	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2442	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2454	{	2443	{
2455	char path [4096];	2444	char path [4096];
2456	strcpy (path, w->path);	2445	strcpy (path, w->path);
…		…
2470	}	2459	}
2471	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2460	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2472	}	2461	}
2473	}	2462	}
2474	else	2463	else
2475	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */	2464	{
2476
2477	if (w->wd >= 0)
2478	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	}
2479	}	2484	}
2480		2485
2481	static void noinline	2486	static void noinline
2482	infy_del (EV_P_ ev_stat *w)	2487	infy_del (EV_P_ ev_stat *w)
2483	{	2488	{
…		…
2536	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)
2537	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2542	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538	}	2543	}
2539		2544
2540	void inline_size	2545	void inline_size
2541	infy_init (EV_P)	2546	check_2625 (EV_P)
2542	{	2547	{
2543	if (fs_fd != -2)
2544	return;
2545
2546	/* kernels < 2.6.25 are borked	2548	/* kernels < 2.6.25 are borked
2547	* 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
2548	*/	2550	*/
2549	{
2550	struct utsname buf;	2551	struct utsname buf;
2551	int major, minor, micro;	2552	int major, minor, micro;
2552		2553
2553	fs_fd = -1;
2554
2555	if (uname (&buf))	2554	if (uname (&buf))
2556	return;	2555	return;
2557		2556
2558	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)	2557	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559	return;	2558	return;
2560		2559
2561	if (major < 2	2560	if (major < 2
2562	\|\| (major == 2 && minor < 6)	2561	\|\| (major == 2 && minor < 6)
2563	\|\| (major == 2 && minor == 6 && micro < 25))	2562	\|\| (major == 2 && minor == 6 && micro < 25))
2564	return;	2563	return;
2565	}	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);
2566		2577
2567	fs_fd = inotify_init ();	2578	fs_fd = inotify_init ();
2568		2579
2569	if (fs_fd >= 0)	2580	if (fs_fd >= 0)
2570	{	2581	{
…		…
2598	w->wd = -1;	2609	w->wd = -1;
2599		2610
2600	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2601	infy_add (EV_A_ w); /* re-add, no matter what */	2612	infy_add (EV_A_ w); /* re-add, no matter what */
2602	else	2613	else
2603	ev_timer_start (EV_A_ &w->timer);	2614	ev_timer_again (EV_A_ &w->timer);
2604	}	2615	}
2605	}	2616	}
2606	}	2617	}
2607		2618
2608	#endif	2619	#endif
…		…
2663	ev_stat_start (EV_P_ ev_stat *w)	2674	ev_stat_start (EV_P_ ev_stat *w)
2664	{	2675	{
2665	if (expect_false (ev_is_active (w)))	2676	if (expect_false (ev_is_active (w)))
2666	return;	2677	return;
2667		2678
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);	2679	ev_stat_stat (EV_A_ w);
2673		2680
		2681	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674	if (w->interval < MIN_STAT_INTERVAL)	2682	w->interval = MIN_STAT_INTERVAL;
2675	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676		2683
2677	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);
2678	ev_set_priority (&w->timer, ev_priority (w));	2685	ev_set_priority (&w->timer, ev_priority (w));
2679		2686
2680	#if EV_USE_INOTIFY	2687	#if EV_USE_INOTIFY
2681	infy_init (EV_A);	2688	infy_init (EV_A);
2682		2689
2683	if (fs_fd >= 0)	2690	if (fs_fd >= 0)
2684	infy_add (EV_A_ w);	2691	infy_add (EV_A_ w);
2685	else	2692	else
2686	#endif	2693	#endif
2687	ev_timer_start (EV_A_ &w->timer);	2694	ev_timer_again (EV_A_ &w->timer);
2688		2695
2689	ev_start (EV_A_ (W)w, 1);	2696	ev_start (EV_A_ (W)w, 1);
2690		2697
2691	EV_FREQUENT_CHECK;	2698	EV_FREQUENT_CHECK;
2692	}	2699	}

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.273 by root, Mon Nov 3 14:27:06 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.273 by root, Mon Nov 3 14:27:06 2008 UTC