[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.268 by root, Mon Oct 27 13:39:18 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;
…		…
804		806
805	for (fd = 0; fd < anfdmax; ++fd)	807	for (fd = 0; fd < anfdmax; ++fd)
806	if (anfds [fd].events)	808	if (anfds [fd].events)
807	{	809	{
808	anfds [fd].events = 0;	810	anfds [fd].events = 0;
		811	anfds [fd].emask = 0;
809	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	812	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
810	}	813	}
811	}	814	}
812		815
813	/*****************************************************************************/	816	/*****************************************************************************/
…		…
965	static ANSIG *signals;	968	static ANSIG *signals;
966	static int signalmax;	969	static int signalmax;
967		970
968	static EV_ATOMIC_T gotsig;	971	static EV_ATOMIC_T gotsig;
969		972
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	/*****************************************************************************/	973	/*****************************************************************************/
983		974
984	void inline_speed	975	void inline_speed
985	fd_intern (int fd)	976	fd_intern (int fd)
986	{	977	{
…		…
1507	{	1498	{
1508	postfork = 1; /* must be in line with ev_default_fork */	1499	postfork = 1; /* must be in line with ev_default_fork */
1509	}	1500	}
1510		1501
1511	#if EV_VERIFY	1502	#if EV_VERIFY
1512	void noinline	1503	static void noinline
1513	verify_watcher (EV_P_ W w)	1504	verify_watcher (EV_P_ W w)
1514	{	1505	{
1515	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1506	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516		1507
1517	if (w->pending)	1508	if (w->pending)
…		…
1647	ev_default_destroy (void)	1638	ev_default_destroy (void)
1648	{	1639	{
1649	#if EV_MULTIPLICITY	1640	#if EV_MULTIPLICITY
1650	struct ev_loop *loop = ev_default_loop_ptr;	1641	struct ev_loop *loop = ev_default_loop_ptr;
1651	#endif	1642	#endif
		1643
		1644	ev_default_loop_ptr = 0;
1652		1645
1653	#ifndef _WIN32	1646	#ifndef _WIN32
1654	ev_ref (EV_A); /* child watcher */	1647	ev_ref (EV_A); /* child watcher */
1655	ev_signal_stop (EV_A_ &childev);	1648	ev_signal_stop (EV_A_ &childev);
1656	#endif	1649	#endif
…		…
1905	ev_unref (EV_P)	1898	ev_unref (EV_P)
1906	{	1899	{
1907	--activecnt;	1900	--activecnt;
1908	}	1901	}
1909		1902
		1903	void
		1904	ev_now_update (EV_P)
		1905	{
		1906	time_update (EV_A_ 1e100);
		1907	}
		1908
1910	static int loop_done;	1909	static int loop_done;
1911		1910
1912	void	1911	void
1913	ev_loop (EV_P_ int flags)	1912	ev_loop (EV_P_ int flags)
1914	{	1913	{
…		…
2123		2122
2124	if (expect_false (ev_is_active (w)))	2123	if (expect_false (ev_is_active (w)))
2125	return;	2124	return;
2126		2125
2127	assert (("ev_io_start called with negative fd", fd >= 0));	2126	assert (("ev_io_start called with negative fd", fd >= 0));
		2127	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2128		2128
2129	EV_FREQUENT_CHECK;	2129	EV_FREQUENT_CHECK;
2130		2130
2131	ev_start (EV_A_ (W)w, 1);	2131	ev_start (EV_A_ (W)w, 1);
2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133	wlist_add (&anfds[fd].head, (WL)w);	2133	wlist_add (&anfds[fd].head, (WL)w);
2134		2134
2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2136	w->events &= ~EV_IOFDSET;	2136	w->events &= ~EV_IOFDSET;
2137		2137
…		…
2329	sigset_t full, prev;	2329	sigset_t full, prev;
2330	sigfillset (&full);	2330	sigfillset (&full);
2331	sigprocmask (SIG_SETMASK, &full, &prev);	2331	sigprocmask (SIG_SETMASK, &full, &prev);
2332	#endif	2332	#endif
2333		2333
2334	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2334	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335		2335
2336	#ifndef _WIN32	2336	#ifndef _WIN32
2337	sigprocmask (SIG_SETMASK, &prev, 0);	2337	sigprocmask (SIG_SETMASK, &prev, 0);
2338	#endif	2338	#endif
2339	}	2339	}
…		…
2481		2481
2482	static void noinline	2482	static void noinline
2483	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2483	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484	{	2484	{
2485	if (slot < 0)	2485	if (slot < 0)
2486	/* overflow, need to check for all hahs slots */	2486	/* overflow, need to check for all hash slots */
2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488	infy_wd (EV_A_ slot, wd, ev);	2488	infy_wd (EV_A_ slot, wd, ev);
2489	else	2489	else
2490	{	2490	{
2491	WL w_;	2491	WL w_;
…		…
2525	infy_init (EV_P)	2525	infy_init (EV_P)
2526	{	2526	{
2527	if (fs_fd != -2)	2527	if (fs_fd != -2)
2528	return;	2528	return;
2529		2529
		2530	/* kernels < 2.6.25 are borked
		2531	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2532	*/
		2533	{
		2534	struct utsname buf;
		2535	int major, minor, micro;
		2536
		2537	fs_fd = -1;
		2538
		2539	if (uname (&buf))
		2540	return;
		2541
		2542	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2543	return;
		2544
		2545	if (major < 2
		2546	\|\| (major == 2 && minor < 6)
		2547	\|\| (major == 2 && minor == 6 && micro < 25))
		2548	return;
		2549	}
		2550
2530	fs_fd = inotify_init ();	2551	fs_fd = inotify_init ();
2531		2552
2532	if (fs_fd >= 0)	2553	if (fs_fd >= 0)
2533	{	2554	{
2534	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2555	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2563	if (fs_fd >= 0)	2584	if (fs_fd >= 0)
2564	infy_add (EV_A_ w); /* re-add, no matter what */	2585	infy_add (EV_A_ w); /* re-add, no matter what */
2565	else	2586	else
2566	ev_timer_start (EV_A_ &w->timer);	2587	ev_timer_start (EV_A_ &w->timer);
2567	}	2588	}
2568
2569	}	2589	}
2570	}	2590	}
2571		2591
		2592	#endif
		2593
		2594	#ifdef _WIN32
		2595	# define EV_LSTAT(p,b) _stati64 (p, b)
		2596	#else
		2597	# define EV_LSTAT(p,b) lstat (p, b)
2572	#endif	2598	#endif
2573		2599
2574	void	2600	void
2575	ev_stat_stat (EV_P_ ev_stat *w)	2601	ev_stat_stat (EV_P_ ev_stat *w)
2576	{	2602	{
…		…
2603	\|\| w->prev.st_atime != w->attr.st_atime	2629	\|\| w->prev.st_atime != w->attr.st_atime
2604	\|\| w->prev.st_mtime != w->attr.st_mtime	2630	\|\| w->prev.st_mtime != w->attr.st_mtime
2605	\|\| w->prev.st_ctime != w->attr.st_ctime	2631	\|\| w->prev.st_ctime != w->attr.st_ctime
2606	) {	2632	) {
2607	#if EV_USE_INOTIFY	2633	#if EV_USE_INOTIFY
		2634	if (fs_fd >= 0)
		2635	{
2608	infy_del (EV_A_ w);	2636	infy_del (EV_A_ w);
2609	infy_add (EV_A_ w);	2637	infy_add (EV_A_ w);
2610	ev_stat_stat (EV_A_ w); /* avoid race... */	2638	ev_stat_stat (EV_A_ w); /* avoid race... */
		2639	}
2611	#endif	2640	#endif
2612		2641
2613	ev_feed_event (EV_A_ w, EV_STAT);	2642	ev_feed_event (EV_A_ w, EV_STAT);
2614	}	2643	}
2615	}	2644	}
…		…
2817	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2846	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818	}	2847	}
2819	}	2848	}
2820	}	2849	}
2821		2850
		2851	static void
		2852	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2853	{
		2854	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2855
		2856	{
		2857	struct ev_loop *loop = w->other;
		2858
		2859	ev_loop_fork (EV_A);
		2860	}
		2861	}
		2862
2822	#if 0	2863	#if 0
2823	static void	2864	static void
2824	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2865	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825	{	2866	{
2826	ev_idle_stop (EV_A_ idle);	2867	ev_idle_stop (EV_A_ idle);
…		…
2846		2887
2847	ev_prepare_init (&w->prepare, embed_prepare_cb);	2888	ev_prepare_init (&w->prepare, embed_prepare_cb);
2848	ev_set_priority (&w->prepare, EV_MINPRI);	2889	ev_set_priority (&w->prepare, EV_MINPRI);
2849	ev_prepare_start (EV_A_ &w->prepare);	2890	ev_prepare_start (EV_A_ &w->prepare);
2850		2891
		2892	ev_fork_init (&w->fork, embed_fork_cb);
		2893	ev_fork_start (EV_A_ &w->fork);
		2894
2851	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2895	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2852		2896
2853	ev_start (EV_A_ (W)w, 1);	2897	ev_start (EV_A_ (W)w, 1);
2854		2898
2855	EV_FREQUENT_CHECK;	2899	EV_FREQUENT_CHECK;
…		…
2862	if (expect_false (!ev_is_active (w)))	2906	if (expect_false (!ev_is_active (w)))
2863	return;	2907	return;
2864		2908
2865	EV_FREQUENT_CHECK;	2909	EV_FREQUENT_CHECK;
2866		2910
2867	ev_io_stop (EV_A_ &w->io);	2911	ev_io_stop (EV_A_ &w->io);
2868	ev_prepare_stop (EV_A_ &w->prepare);	2912	ev_prepare_stop (EV_A_ &w->prepare);
2869		2913	ev_fork_stop (EV_A_ &w->fork);
2870	ev_stop (EV_A_ (W)w);
2871		2914
2872	EV_FREQUENT_CHECK;	2915	EV_FREQUENT_CHECK;
2873	}	2916	}
2874	#endif	2917	#endif
2875		2918
…		…
2972	once_cb (EV_P_ struct ev_once *once, int revents)	3015	once_cb (EV_P_ struct ev_once *once, int revents)
2973	{	3016	{
2974	void (cb)(int revents, void arg) = once->cb;	3017	void (cb)(int revents, void arg) = once->cb;
2975	void *arg = once->arg;	3018	void *arg = once->arg;
2976		3019
2977	ev_io_stop (EV_A_ &once->io);	3020	ev_io_stop (EV_A_ &once->io);
2978	ev_timer_stop (EV_A_ &once->to);	3021	ev_timer_stop (EV_A_ &once->to);
2979	ev_free (once);	3022	ev_free (once);
2980		3023
2981	cb (revents, arg);	3024	cb (revents, arg);
2982	}	3025	}
2983		3026
2984	static void	3027	static void
2985	once_cb_io (EV_P_ ev_io *w, int revents)	3028	once_cb_io (EV_P_ ev_io *w, int revents)
2986	{	3029	{
2987	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3030	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3031
		3032	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2988	}	3033	}
2989		3034
2990	static void	3035	static void
2991	once_cb_to (EV_P_ ev_timer *w, int revents)	3036	once_cb_to (EV_P_ ev_timer *w, int revents)
2992	{	3037	{
2993	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3038	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3039
		3040	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
2994	}	3041	}
2995		3042
2996	void	3043	void
2997	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3044	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
2998	{	3045	{

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.268 by root, Mon Oct 27 13:39:18 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.268 by root, Mon Oct 27 13:39:18 2008 UTC