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

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC

…		…
286	# include <sys/select.h>	286	# include <sys/select.h>
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>
		292	# include <sys/statfs.h>
291	# include <sys/inotify.h>	293	# include <sys/inotify.h>
		294	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
		295	# ifndef IN_DONT_FOLLOW
		296	# undef EV_USE_INOTIFY
		297	# define EV_USE_INOTIFY 0
		298	# endif
292	#endif	299	#endif
293		300
294	#if EV_SELECT_IS_WINSOCKET	301	#if EV_SELECT_IS_WINSOCKET
295	# include <winsock.h>	302	# include <winsock.h>
296	#endif	303	#endif
…		…
382	{	389	{
383	syserr_cb = cb;	390	syserr_cb = cb;
384	}	391	}
385		392
386	static void noinline	393	static void noinline
387	syserr (const char *msg)	394	ev_syserr (const char *msg)
388	{	395	{
389	if (!msg)	396	if (!msg)
390	msg = "(libev) system error";	397	msg = "(libev) system error";
391		398
392	if (syserr_cb)	399	if (syserr_cb)
…		…
443	typedef struct	450	typedef struct
444	{	451	{
445	WL head;	452	WL head;
446	unsigned char events;	453	unsigned char events;
447	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
448	#if EV_SELECT_IS_WINSOCKET	460	#if EV_SELECT_IS_WINSOCKET
449	SOCKET handle;	461	SOCKET handle;
450	#endif	462	#endif
451	} ANFD;	463	} ANFD;
452		464
…		…
565	struct timeval tv;	577	struct timeval tv;
566		578
567	tv.tv_sec = (time_t)delay;	579	tv.tv_sec = (time_t)delay;
568	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	580	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569		581
		582	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		583	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		584	/* by older ones */
570	select (0, 0, 0, 0, &tv);	585	select (0, 0, 0, 0, &tv);
571	#endif	586	#endif
572	}	587	}
573	}	588	}
574		589
…		…
601	array_realloc (int elem, void base, int cur, int cnt)	616	array_realloc (int elem, void base, int cur, int cnt)
602	{	617	{
603	cur = array_nextsize (elem, cur, cnt);	618	cur = array_nextsize (elem, cur, cnt);
604	return ev_realloc (base, elem * *cur);	619	return ev_realloc (base, elem * *cur);
605	}	620	}
		621
		622	#define array_init_zero(base,count) \
		623	memset ((void )(base), 0, sizeof ((base)) * (count))
606		624
607	#define array_needsize(type,base,cur,cnt,init) \	625	#define array_needsize(type,base,cur,cnt,init) \
608	if (expect_false ((cnt) > (cur))) \	626	if (expect_false ((cnt) > (cur))) \
609	{ \	627	{ \
610	int ocur_ = (cur); \	628	int ocur_ = (cur); \
…		…
653	for (i = 0; i < eventcnt; ++i)	671	for (i = 0; i < eventcnt; ++i)
654	ev_feed_event (EV_A_ events [i], type);	672	ev_feed_event (EV_A_ events [i], type);
655	}	673	}
656		674
657	/*****************************************************************************/	675	/*****************************************************************************/
658
659	void inline_size
660	anfds_init (ANFD *base, int count)
661	{
662	while (count--)
663	{
664	base->head = 0;
665	base->events = EV_NONE;
666	base->reify = 0;
667
668	++base;
669	}
670	}
671		676
672	void inline_speed	677	void inline_speed
673	fd_event (EV_P_ int fd, int revents)	678	fd_event (EV_P_ int fd, int revents)
674	{	679	{
675	ANFD *anfd = anfds + fd;	680	ANFD *anfd = anfds + fd;
…		…
805		810
806	for (fd = 0; fd < anfdmax; ++fd)	811	for (fd = 0; fd < anfdmax; ++fd)
807	if (anfds [fd].events)	812	if (anfds [fd].events)
808	{	813	{
809	anfds [fd].events = 0;	814	anfds [fd].events = 0;
		815	anfds [fd].emask = 0;
810	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	816	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
811	}	817	}
812	}	818	}
813		819
814	/*****************************************************************************/	820	/*****************************************************************************/
…		…
966	static ANSIG *signals;	972	static ANSIG *signals;
967	static int signalmax;	973	static int signalmax;
968		974
969	static EV_ATOMIC_T gotsig;	975	static EV_ATOMIC_T gotsig;
970		976
971	void inline_size
972	signals_init (ANSIG *base, int count)
973	{
974	while (count--)
975	{
976	base->head = 0;
977	base->gotsig = 0;
978
979	++base;
980	}
981	}
982
983	/*****************************************************************************/	977	/*****************************************************************************/
984		978
985	void inline_speed	979	void inline_speed
986	fd_intern (int fd)	980	fd_intern (int fd)
987	{	981	{
…		…
1008	}	1002	}
1009	else	1003	else
1010	#endif	1004	#endif
1011	{	1005	{
1012	while (pipe (evpipe))	1006	while (pipe (evpipe))
1013	syserr ("(libev) error creating signal/async pipe");	1007	ev_syserr ("(libev) error creating signal/async pipe");
1014		1008
1015	fd_intern (evpipe [0]);	1009	fd_intern (evpipe [0]);
1016	fd_intern (evpipe [1]);	1010	fd_intern (evpipe [1]);
1017	ev_io_set (&pipeev, evpipe [0], EV_READ);	1011	ev_io_set (&pipeev, evpipe [0], EV_READ);
1018	}	1012	}
…		…
1508	{	1502	{
1509	postfork = 1; /* must be in line with ev_default_fork */	1503	postfork = 1; /* must be in line with ev_default_fork */
1510	}	1504	}
1511		1505
1512	#if EV_VERIFY	1506	#if EV_VERIFY
1513	void noinline	1507	static void noinline
1514	verify_watcher (EV_P_ W w)	1508	verify_watcher (EV_P_ W w)
1515	{	1509	{
1516	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1510	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517		1511
1518	if (w->pending)	1512	if (w->pending)
…		…
1649	{	1643	{
1650	#if EV_MULTIPLICITY	1644	#if EV_MULTIPLICITY
1651	struct ev_loop *loop = ev_default_loop_ptr;	1645	struct ev_loop *loop = ev_default_loop_ptr;
1652	#endif	1646	#endif
1653		1647
		1648	ev_default_loop_ptr = 0;
		1649
1654	#ifndef _WIN32	1650	#ifndef _WIN32
1655	ev_ref (EV_A); /* child watcher */	1651	ev_ref (EV_A); /* child watcher */
1656	ev_signal_stop (EV_A_ &childev);	1652	ev_signal_stop (EV_A_ &childev);
1657	#endif	1653	#endif
1658		1654
…		…
1664	{	1660	{
1665	#if EV_MULTIPLICITY	1661	#if EV_MULTIPLICITY
1666	struct ev_loop *loop = ev_default_loop_ptr;	1662	struct ev_loop *loop = ev_default_loop_ptr;
1667	#endif	1663	#endif
1668		1664
1669	if (backend)
1670	postfork = 1; /* must be in line with ev_loop_fork */	1665	postfork = 1; /* must be in line with ev_loop_fork */
1671	}	1666	}
1672		1667
1673	/*****************************************************************************/	1668	/*****************************************************************************/
1674		1669
1675	void	1670	void
…		…
1906	ev_unref (EV_P)	1901	ev_unref (EV_P)
1907	{	1902	{
1908	--activecnt;	1903	--activecnt;
1909	}	1904	}
1910		1905
		1906	void
		1907	ev_now_update (EV_P)
		1908	{
		1909	time_update (EV_A_ 1e100);
		1910	}
		1911
1911	static int loop_done;	1912	static int loop_done;
1912		1913
1913	void	1914	void
1914	ev_loop (EV_P_ int flags)	1915	ev_loop (EV_P_ int flags)
1915	{	1916	{
…		…
2124		2125
2125	if (expect_false (ev_is_active (w)))	2126	if (expect_false (ev_is_active (w)))
2126	return;	2127	return;
2127		2128
2128	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))));
2129		2131
2130	EV_FREQUENT_CHECK;	2132	EV_FREQUENT_CHECK;
2131		2133
2132	ev_start (EV_A_ (W)w, 1);	2134	ev_start (EV_A_ (W)w, 1);
2133	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2135	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2134	wlist_add (&anfds[fd].head, (WL)w);	2136	wlist_add (&anfds[fd].head, (WL)w);
2135		2137
2136	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2138	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2137	w->events &= ~EV_IOFDSET;	2139	w->events &= ~EV_IOFDSET;
2138		2140
…		…
2330	sigset_t full, prev;	2332	sigset_t full, prev;
2331	sigfillset (&full);	2333	sigfillset (&full);
2332	sigprocmask (SIG_SETMASK, &full, &prev);	2334	sigprocmask (SIG_SETMASK, &full, &prev);
2333	#endif	2335	#endif
2334		2336
2335	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2337	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2336		2338
2337	#ifndef _WIN32	2339	#ifndef _WIN32
2338	sigprocmask (SIG_SETMASK, &prev, 0);	2340	sigprocmask (SIG_SETMASK, &prev, 0);
2339	#endif	2341	#endif
2340	}	2342	}
…		…
2431	if (w->wd < 0)	2433	if (w->wd < 0)
2432	{	2434	{
2433	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */	2435	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2434		2436
2435	/* monitor some parent directory for speedup hints */	2437	/* monitor some parent directory for speedup hints */
2436	/* note that exceeding the hardcoded limit is not a correctness issue, */	2438	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2437	/* but an efficiency issue only */	2439	/* but an efficiency issue only */
2438	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2440	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2439	{	2441	{
2440	char path [4096];	2442	char path [4096];
2441	strcpy (path, w->path);	2443	strcpy (path, w->path);
…		…
2455	}	2457	}
2456	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2458	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2457	}	2459	}
2458	}	2460	}
2459	else	2461	else
		2462	todo, on nfs etc., we need to poll every 60s or so
2460	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */	2463	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2461		2464
2462	if (w->wd >= 0)	2465	if (w->wd >= 0)
2463	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2466	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2464	}	2467	}
…		…
2482		2485
2483	static void noinline	2486	static void noinline
2484	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2487	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2485	{	2488	{
2486	if (slot < 0)	2489	if (slot < 0)
2487	/* overflow, need to check for all hahs slots */	2490	/* overflow, need to check for all hash slots */
2488	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2491	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2489	infy_wd (EV_A_ slot, wd, ev);	2492	infy_wd (EV_A_ slot, wd, ev);
2490	else	2493	else
2491	{	2494	{
2492	WL w_;	2495	WL w_;
…		…
2526	infy_init (EV_P)	2529	infy_init (EV_P)
2527	{	2530	{
2528	if (fs_fd != -2)	2531	if (fs_fd != -2)
2529	return;	2532	return;
2530		2533
		2534	/* kernels < 2.6.25 are borked
		2535	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2536	*/
		2537	{
		2538	struct utsname buf;
		2539	int major, minor, micro;
		2540
		2541	fs_fd = -1;
		2542
		2543	if (uname (&buf))
		2544	return;
		2545
		2546	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2547	return;
		2548
		2549	if (major < 2
		2550	\|\| (major == 2 && minor < 6)
		2551	\|\| (major == 2 && minor == 6 && micro < 25))
		2552	return;
		2553	}
		2554
2531	fs_fd = inotify_init ();	2555	fs_fd = inotify_init ();
2532		2556
2533	if (fs_fd >= 0)	2557	if (fs_fd >= 0)
2534	{	2558	{
2535	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2559	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2564	if (fs_fd >= 0)	2588	if (fs_fd >= 0)
2565	infy_add (EV_A_ w); /* re-add, no matter what */	2589	infy_add (EV_A_ w); /* re-add, no matter what */
2566	else	2590	else
2567	ev_timer_start (EV_A_ &w->timer);	2591	ev_timer_start (EV_A_ &w->timer);
2568	}	2592	}
2569
2570	}	2593	}
2571	}	2594	}
2572		2595
2573	#endif	2596	#endif
2574		2597
…		…
2610	\|\| w->prev.st_atime != w->attr.st_atime	2633	\|\| w->prev.st_atime != w->attr.st_atime
2611	\|\| w->prev.st_mtime != w->attr.st_mtime	2634	\|\| w->prev.st_mtime != w->attr.st_mtime
2612	\|\| w->prev.st_ctime != w->attr.st_ctime	2635	\|\| w->prev.st_ctime != w->attr.st_ctime
2613	) {	2636	) {
2614	#if EV_USE_INOTIFY	2637	#if EV_USE_INOTIFY
		2638	if (fs_fd >= 0)
		2639	{
2615	infy_del (EV_A_ w);	2640	infy_del (EV_A_ w);
2616	infy_add (EV_A_ w);	2641	infy_add (EV_A_ w);
2617	ev_stat_stat (EV_A_ w); /* avoid race... */	2642	ev_stat_stat (EV_A_ w); /* avoid race... */
		2643	}
2618	#endif	2644	#endif
2619		2645
2620	ev_feed_event (EV_A_ w, EV_STAT);	2646	ev_feed_event (EV_A_ w, EV_STAT);
2621	}	2647	}
2622	}	2648	}
…		…
2824	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2850	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2825	}	2851	}
2826	}	2852	}
2827	}	2853	}
2828		2854
		2855	static void
		2856	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2857	{
		2858	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2859
		2860	{
		2861	struct ev_loop *loop = w->other;
		2862
		2863	ev_loop_fork (EV_A);
		2864	}
		2865	}
		2866
2829	#if 0	2867	#if 0
2830	static void	2868	static void
2831	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2869	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2832	{	2870	{
2833	ev_idle_stop (EV_A_ idle);	2871	ev_idle_stop (EV_A_ idle);
…		…
2853		2891
2854	ev_prepare_init (&w->prepare, embed_prepare_cb);	2892	ev_prepare_init (&w->prepare, embed_prepare_cb);
2855	ev_set_priority (&w->prepare, EV_MINPRI);	2893	ev_set_priority (&w->prepare, EV_MINPRI);
2856	ev_prepare_start (EV_A_ &w->prepare);	2894	ev_prepare_start (EV_A_ &w->prepare);
2857		2895
		2896	ev_fork_init (&w->fork, embed_fork_cb);
		2897	ev_fork_start (EV_A_ &w->fork);
		2898
2858	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2899	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2859		2900
2860	ev_start (EV_A_ (W)w, 1);	2901	ev_start (EV_A_ (W)w, 1);
2861		2902
2862	EV_FREQUENT_CHECK;	2903	EV_FREQUENT_CHECK;
…		…
2869	if (expect_false (!ev_is_active (w)))	2910	if (expect_false (!ev_is_active (w)))
2870	return;	2911	return;
2871		2912
2872	EV_FREQUENT_CHECK;	2913	EV_FREQUENT_CHECK;
2873		2914
2874	ev_io_stop (EV_A_ &w->io);	2915	ev_io_stop (EV_A_ &w->io);
2875	ev_prepare_stop (EV_A_ &w->prepare);	2916	ev_prepare_stop (EV_A_ &w->prepare);
2876		2917	ev_fork_stop (EV_A_ &w->fork);
2877	ev_stop (EV_A_ (W)w);
2878		2918
2879	EV_FREQUENT_CHECK;	2919	EV_FREQUENT_CHECK;
2880	}	2920	}
2881	#endif	2921	#endif
2882		2922
…		…
2979	once_cb (EV_P_ struct ev_once *once, int revents)	3019	once_cb (EV_P_ struct ev_once *once, int revents)
2980	{	3020	{
2981	void (cb)(int revents, void arg) = once->cb;	3021	void (cb)(int revents, void arg) = once->cb;
2982	void *arg = once->arg;	3022	void *arg = once->arg;
2983		3023
2984	ev_io_stop (EV_A_ &once->io);	3024	ev_io_stop (EV_A_ &once->io);
2985	ev_timer_stop (EV_A_ &once->to);	3025	ev_timer_stop (EV_A_ &once->to);
2986	ev_free (once);	3026	ev_free (once);
2987		3027
2988	cb (revents, arg);	3028	cb (revents, arg);
2989	}	3029	}
2990		3030
2991	static void	3031	static void
2992	once_cb_io (EV_P_ ev_io *w, int revents)	3032	once_cb_io (EV_P_ ev_io *w, int revents)
2993	{	3033	{
2994	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3034	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3035
		3036	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2995	}	3037	}
2996		3038
2997	static void	3039	static void
2998	once_cb_to (EV_P_ ev_timer *w, int revents)	3040	once_cb_to (EV_P_ ev_timer *w, int revents)
2999	{	3041	{
3000	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3042	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3043
		3044	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3001	}	3045	}
3002		3046
3003	void	3047	void
3004	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3048	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3005	{	3049	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs. Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.271 by root, Mon Nov 3 12:13:15 2008 UTC