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

Comparing libev/ev.c (file contents):
Revision 1.254 by root, Wed Jun 4 20:26:55 2008 UTC vs.
Revision 1.267 by root, Mon Oct 27 11:08:29 2008 UTC

…		…
154	#ifndef _WIN32	154	#ifndef _WIN32
155	# include <sys/time.h>	155	# include <sys/time.h>
156	# include <sys/wait.h>	156	# include <sys/wait.h>
157	# include <unistd.h>	157	# include <unistd.h>
158	#else	158	#else
		159	# include <io.h>
159	# define WIN32_LEAN_AND_MEAN	160	# define WIN32_LEAN_AND_MEAN
160	# include <windows.h>	161	# include <windows.h>
161	# ifndef EV_SELECT_IS_WINSOCKET	162	# ifndef EV_SELECT_IS_WINSOCKET
162	# define EV_SELECT_IS_WINSOCKET 1	163	# define EV_SELECT_IS_WINSOCKET 1
163	# endif	164	# endif
…		…
285	# include <sys/select.h>	286	# include <sys/select.h>
286	# endif	287	# endif
287	#endif	288	#endif
288		289
289	#if EV_USE_INOTIFY	290	#if EV_USE_INOTIFY
		291	# include <sys/utsname.h>
290	# include <sys/inotify.h>	292	# include <sys/inotify.h>
		293	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
		294	# ifndef IN_DONT_FOLLOW
		295	# undef EV_USE_INOTIFY
		296	# define EV_USE_INOTIFY 0
		297	# endif
291	#endif	298	#endif
292		299
293	#if EV_SELECT_IS_WINSOCKET	300	#if EV_SELECT_IS_WINSOCKET
294	# include <winsock.h>	301	# include <winsock.h>
295	#endif	302	#endif
…		…
442	typedef struct	449	typedef struct
443	{	450	{
444	WL head;	451	WL head;
445	unsigned char events;	452	unsigned char events;
446	unsigned char reify;	453	unsigned char reify;
		454	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
		455	unsigned char egen; /* generation counter to counter epoll bugs */
447	#if EV_SELECT_IS_WINSOCKET	456	#if EV_SELECT_IS_WINSOCKET
448	SOCKET handle;	457	SOCKET handle;
449	#endif	458	#endif
450	} ANFD;	459	} ANFD;
451		460
…		…
564	struct timeval tv;	573	struct timeval tv;
565		574
566	tv.tv_sec = (time_t)delay;	575	tv.tv_sec = (time_t)delay;
567	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	576	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568		577
		578	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		579	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		580	/* by older ones */
569	select (0, 0, 0, 0, &tv);	581	select (0, 0, 0, 0, &tv);
570	#endif	582	#endif
571	}	583	}
572	}	584	}
573		585
…		…
600	array_realloc (int elem, void base, int cur, int cnt)	612	array_realloc (int elem, void base, int cur, int cnt)
601	{	613	{
602	cur = array_nextsize (elem, cur, cnt);	614	cur = array_nextsize (elem, cur, cnt);
603	return ev_realloc (base, elem * *cur);	615	return ev_realloc (base, elem * *cur);
604	}	616	}
		617
		618	#define array_init_zero(base,count) \
		619	memset ((void )(base), 0, sizeof ((base)) * (count))
605		620
606	#define array_needsize(type,base,cur,cnt,init) \	621	#define array_needsize(type,base,cur,cnt,init) \
607	if (expect_false ((cnt) > (cur))) \	622	if (expect_false ((cnt) > (cur))) \
608	{ \	623	{ \
609	int ocur_ = (cur); \	624	int ocur_ = (cur); \
…		…
652	for (i = 0; i < eventcnt; ++i)	667	for (i = 0; i < eventcnt; ++i)
653	ev_feed_event (EV_A_ events [i], type);	668	ev_feed_event (EV_A_ events [i], type);
654	}	669	}
655		670
656	/*****************************************************************************/	671	/*****************************************************************************/
657
658	void inline_size
659	anfds_init (ANFD *base, int count)
660	{
661	while (count--)
662	{
663	base->head = 0;
664	base->events = EV_NONE;
665	base->reify = 0;
666
667	++base;
668	}
669	}
670		672
671	void inline_speed	673	void inline_speed
672	fd_event (EV_P_ int fd, int revents)	674	fd_event (EV_P_ int fd, int revents)
673	{	675	{
674	ANFD *anfd = anfds + fd;	676	ANFD *anfd = anfds + fd;
…		…
965	static ANSIG *signals;	967	static ANSIG *signals;
966	static int signalmax;	968	static int signalmax;
967		969
968	static EV_ATOMIC_T gotsig;	970	static EV_ATOMIC_T gotsig;
969		971
970	void inline_size
971	signals_init (ANSIG *base, int count)
972	{
973	while (count--)
974	{
975	base->head = 0;
976	base->gotsig = 0;
977
978	++base;
979	}
980	}
981
982	/*****************************************************************************/	972	/*****************************************************************************/
983		973
984	void inline_speed	974	void inline_speed
985	fd_intern (int fd)	975	fd_intern (int fd)
986	{	976	{
…		…
1507	{	1497	{
1508	postfork = 1; /* must be in line with ev_default_fork */	1498	postfork = 1; /* must be in line with ev_default_fork */
1509	}	1499	}
1510		1500
1511	#if EV_VERIFY	1501	#if EV_VERIFY
1512	void noinline	1502	static void noinline
1513	verify_watcher (EV_P_ W w)	1503	verify_watcher (EV_P_ W w)
1514	{	1504	{
1515	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1505	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516		1506
1517	if (w->pending)	1507	if (w->pending)
…		…
1647	ev_default_destroy (void)	1637	ev_default_destroy (void)
1648	{	1638	{
1649	#if EV_MULTIPLICITY	1639	#if EV_MULTIPLICITY
1650	struct ev_loop *loop = ev_default_loop_ptr;	1640	struct ev_loop *loop = ev_default_loop_ptr;
1651	#endif	1641	#endif
		1642
		1643	ev_default_loop_ptr = 0;
1652		1644
1653	#ifndef _WIN32	1645	#ifndef _WIN32
1654	ev_ref (EV_A); /* child watcher */	1646	ev_ref (EV_A); /* child watcher */
1655	ev_signal_stop (EV_A_ &childev);	1647	ev_signal_stop (EV_A_ &childev);
1656	#endif	1648	#endif
…		…
1905	ev_unref (EV_P)	1897	ev_unref (EV_P)
1906	{	1898	{
1907	--activecnt;	1899	--activecnt;
1908	}	1900	}
1909		1901
		1902	void
		1903	ev_now_update (EV_P)
		1904	{
		1905	time_update (EV_A_ 1e100);
		1906	}
		1907
1910	static int loop_done;	1908	static int loop_done;
1911		1909
1912	void	1910	void
1913	ev_loop (EV_P_ int flags)	1911	ev_loop (EV_P_ int flags)
1914	{	1912	{
…		…
2123		2121
2124	if (expect_false (ev_is_active (w)))	2122	if (expect_false (ev_is_active (w)))
2125	return;	2123	return;
2126		2124
2127	assert (("ev_io_start called with negative fd", fd >= 0));	2125	assert (("ev_io_start called with negative fd", fd >= 0));
		2126	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2128		2127
2129	EV_FREQUENT_CHECK;	2128	EV_FREQUENT_CHECK;
2130		2129
2131	ev_start (EV_A_ (W)w, 1);	2130	ev_start (EV_A_ (W)w, 1);
2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2131	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133	wlist_add (&anfds[fd].head, (WL)w);	2132	wlist_add (&anfds[fd].head, (WL)w);
2134		2133
2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2134	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2136	w->events &= ~EV_IOFDSET;	2135	w->events &= ~EV_IOFDSET;
2137		2136
…		…
2329	sigset_t full, prev;	2328	sigset_t full, prev;
2330	sigfillset (&full);	2329	sigfillset (&full);
2331	sigprocmask (SIG_SETMASK, &full, &prev);	2330	sigprocmask (SIG_SETMASK, &full, &prev);
2332	#endif	2331	#endif
2333		2332
2334	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2333	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335		2334
2336	#ifndef _WIN32	2335	#ifndef _WIN32
2337	sigprocmask (SIG_SETMASK, &prev, 0);	2336	sigprocmask (SIG_SETMASK, &prev, 0);
2338	#endif	2337	#endif
2339	}	2338	}
…		…
2481		2480
2482	static void noinline	2481	static void noinline
2483	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2482	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484	{	2483	{
2485	if (slot < 0)	2484	if (slot < 0)
2486	/* overflow, need to check for all hahs slots */	2485	/* overflow, need to check for all hash slots */
2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2486	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488	infy_wd (EV_A_ slot, wd, ev);	2487	infy_wd (EV_A_ slot, wd, ev);
2489	else	2488	else
2490	{	2489	{
2491	WL w_;	2490	WL w_;
…		…
2525	infy_init (EV_P)	2524	infy_init (EV_P)
2526	{	2525	{
2527	if (fs_fd != -2)	2526	if (fs_fd != -2)
2528	return;	2527	return;
2529		2528
		2529	/* kernels < 2.6.25 are borked
		2530	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2531	*/
		2532	{
		2533	struct utsname buf;
		2534	int major, minor, micro;
		2535
		2536	fs_fd = -1;
		2537
		2538	if (uname (&buf))
		2539	return;
		2540
		2541	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2542	return;
		2543
		2544	if (major < 2
		2545	\|\| (major == 2 && minor < 6)
		2546	\|\| (major == 2 && minor == 6 && micro < 25))
		2547	return;
		2548	}
		2549
2530	fs_fd = inotify_init ();	2550	fs_fd = inotify_init ();
2531		2551
2532	if (fs_fd >= 0)	2552	if (fs_fd >= 0)
2533	{	2553	{
2534	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2554	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2563	if (fs_fd >= 0)	2583	if (fs_fd >= 0)
2564	infy_add (EV_A_ w); /* re-add, no matter what */	2584	infy_add (EV_A_ w); /* re-add, no matter what */
2565	else	2585	else
2566	ev_timer_start (EV_A_ &w->timer);	2586	ev_timer_start (EV_A_ &w->timer);
2567	}	2587	}
2568
2569	}	2588	}
2570	}	2589	}
2571		2590
		2591	#endif
		2592
		2593	#ifdef _WIN32
		2594	# define EV_LSTAT(p,b) _stati64 (p, b)
		2595	#else
		2596	# define EV_LSTAT(p,b) lstat (p, b)
2572	#endif	2597	#endif
2573		2598
2574	void	2599	void
2575	ev_stat_stat (EV_P_ ev_stat *w)	2600	ev_stat_stat (EV_P_ ev_stat *w)
2576	{	2601	{
…		…
2603	\|\| w->prev.st_atime != w->attr.st_atime	2628	\|\| w->prev.st_atime != w->attr.st_atime
2604	\|\| w->prev.st_mtime != w->attr.st_mtime	2629	\|\| w->prev.st_mtime != w->attr.st_mtime
2605	\|\| w->prev.st_ctime != w->attr.st_ctime	2630	\|\| w->prev.st_ctime != w->attr.st_ctime
2606	) {	2631	) {
2607	#if EV_USE_INOTIFY	2632	#if EV_USE_INOTIFY
		2633	if (fs_fd >= 0)
		2634	{
2608	infy_del (EV_A_ w);	2635	infy_del (EV_A_ w);
2609	infy_add (EV_A_ w);	2636	infy_add (EV_A_ w);
2610	ev_stat_stat (EV_A_ w); /* avoid race... */	2637	ev_stat_stat (EV_A_ w); /* avoid race... */
		2638	}
2611	#endif	2639	#endif
2612		2640
2613	ev_feed_event (EV_A_ w, EV_STAT);	2641	ev_feed_event (EV_A_ w, EV_STAT);
2614	}	2642	}
2615	}	2643	}
…		…
2817	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2845	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818	}	2846	}
2819	}	2847	}
2820	}	2848	}
2821		2849
		2850	static void
		2851	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2852	{
		2853	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2854
		2855	{
		2856	struct ev_loop *loop = w->other;
		2857
		2858	ev_loop_fork (EV_A);
		2859	}
		2860	}
		2861
2822	#if 0	2862	#if 0
2823	static void	2863	static void
2824	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2864	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825	{	2865	{
2826	ev_idle_stop (EV_A_ idle);	2866	ev_idle_stop (EV_A_ idle);
…		…
2846		2886
2847	ev_prepare_init (&w->prepare, embed_prepare_cb);	2887	ev_prepare_init (&w->prepare, embed_prepare_cb);
2848	ev_set_priority (&w->prepare, EV_MINPRI);	2888	ev_set_priority (&w->prepare, EV_MINPRI);
2849	ev_prepare_start (EV_A_ &w->prepare);	2889	ev_prepare_start (EV_A_ &w->prepare);
2850		2890
		2891	ev_fork_init (&w->fork, embed_fork_cb);
		2892	ev_fork_start (EV_A_ &w->fork);
		2893
2851	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2894	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2852		2895
2853	ev_start (EV_A_ (W)w, 1);	2896	ev_start (EV_A_ (W)w, 1);
2854		2897
2855	EV_FREQUENT_CHECK;	2898	EV_FREQUENT_CHECK;
…		…
2862	if (expect_false (!ev_is_active (w)))	2905	if (expect_false (!ev_is_active (w)))
2863	return;	2906	return;
2864		2907
2865	EV_FREQUENT_CHECK;	2908	EV_FREQUENT_CHECK;
2866		2909
2867	ev_io_stop (EV_A_ &w->io);	2910	ev_io_stop (EV_A_ &w->io);
2868	ev_prepare_stop (EV_A_ &w->prepare);	2911	ev_prepare_stop (EV_A_ &w->prepare);
2869		2912	ev_fork_stop (EV_A_ &w->fork);
2870	ev_stop (EV_A_ (W)w);
2871		2913
2872	EV_FREQUENT_CHECK;	2914	EV_FREQUENT_CHECK;
2873	}	2915	}
2874	#endif	2916	#endif
2875		2917
…		…
2972	once_cb (EV_P_ struct ev_once *once, int revents)	3014	once_cb (EV_P_ struct ev_once *once, int revents)
2973	{	3015	{
2974	void (cb)(int revents, void arg) = once->cb;	3016	void (cb)(int revents, void arg) = once->cb;
2975	void *arg = once->arg;	3017	void *arg = once->arg;
2976		3018
2977	ev_io_stop (EV_A_ &once->io);	3019	ev_io_stop (EV_A_ &once->io);
2978	ev_timer_stop (EV_A_ &once->to);	3020	ev_timer_stop (EV_A_ &once->to);
2979	ev_free (once);	3021	ev_free (once);
2980		3022
2981	cb (revents, arg);	3023	cb (revents, arg);
2982	}	3024	}
2983		3025
2984	static void	3026	static void
2985	once_cb_io (EV_P_ ev_io *w, int revents)	3027	once_cb_io (EV_P_ ev_io *w, int revents)
2986	{	3028	{
2987	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3029	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3030
		3031	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2988	}	3032	}
2989		3033
2990	static void	3034	static void
2991	once_cb_to (EV_P_ ev_timer *w, int revents)	3035	once_cb_to (EV_P_ ev_timer *w, int revents)
2992	{	3036	{
2993	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3037	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3038
		3039	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
2994	}	3040	}
2995		3041
2996	void	3042	void
2997	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3043	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
2998	{	3044	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.254 by root, Wed Jun 4 20:26:55 2008 UTC vs. Revision 1.267 by root, Mon Oct 27 11:08:29 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.254 by root, Wed Jun 4 20:26:55 2008 UTC vs.
Revision 1.267 by root, Mon Oct 27 11:08:29 2008 UTC