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

Comparing libev/ev.c (file contents):
Revision 1.260 by root, Mon Sep 8 17:24:39 2008 UTC vs.
Revision 1.268 by root, Mon Oct 27 13:39:18 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>
291	# 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
292	#endif	298	#endif
293		299
294	#if EV_SELECT_IS_WINSOCKET	300	#if EV_SELECT_IS_WINSOCKET
295	# include <winsock.h>	301	# include <winsock.h>
296	#endif	302	#endif
…		…
443	typedef struct	449	typedef struct
444	{	450	{
445	WL head;	451	WL head;
446	unsigned char events;	452	unsigned char events;
447	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 */
448	#if EV_SELECT_IS_WINSOCKET	456	#if EV_SELECT_IS_WINSOCKET
449	SOCKET handle;	457	SOCKET handle;
450	#endif	458	#endif
451	} ANFD;	459	} ANFD;
452		460
…		…
605	{	613	{
606	cur = array_nextsize (elem, cur, cnt);	614	cur = array_nextsize (elem, cur, cnt);
607	return ev_realloc (base, elem * *cur);	615	return ev_realloc (base, elem * *cur);
608	}	616	}
609		617
		618	#define array_init_zero(base,count) \
		619	memset ((void )(base), 0, sizeof ((base)) * (count))
		620
610	#define array_needsize(type,base,cur,cnt,init) \	621	#define array_needsize(type,base,cur,cnt,init) \
611	if (expect_false ((cnt) > (cur))) \	622	if (expect_false ((cnt) > (cur))) \
612	{ \	623	{ \
613	int ocur_ = (cur); \	624	int ocur_ = (cur); \
614	(base) = (type *)array_realloc \	625	(base) = (type *)array_realloc \
…		…
656	for (i = 0; i < eventcnt; ++i)	667	for (i = 0; i < eventcnt; ++i)
657	ev_feed_event (EV_A_ events [i], type);	668	ev_feed_event (EV_A_ events [i], type);
658	}	669	}
659		670
660	/*****************************************************************************/	671	/*****************************************************************************/
661
662	void inline_size
663	anfds_init (ANFD *base, int count)
664	{
665	while (count--)
666	{
667	base->head = 0;
668	base->events = EV_NONE;
669	base->reify = 0;
670
671	++base;
672	}
673	}
674		672
675	void inline_speed	673	void inline_speed
676	fd_event (EV_P_ int fd, int revents)	674	fd_event (EV_P_ int fd, int revents)
677	{	675	{
678	ANFD *anfd = anfds + fd;	676	ANFD *anfd = anfds + fd;
…		…
808		806
809	for (fd = 0; fd < anfdmax; ++fd)	807	for (fd = 0; fd < anfdmax; ++fd)
810	if (anfds [fd].events)	808	if (anfds [fd].events)
811	{	809	{
812	anfds [fd].events = 0;	810	anfds [fd].events = 0;
		811	anfds [fd].emask = 0;
813	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	812	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
814	}	813	}
815	}	814	}
816		815
817	/*****************************************************************************/	816	/*****************************************************************************/
…		…
969	static ANSIG *signals;	968	static ANSIG *signals;
970	static int signalmax;	969	static int signalmax;
971		970
972	static EV_ATOMIC_T gotsig;	971	static EV_ATOMIC_T gotsig;
973		972
974	void inline_size
975	signals_init (ANSIG *base, int count)
976	{
977	while (count--)
978	{
979	base->head = 0;
980	base->gotsig = 0;
981
982	++base;
983	}
984	}
985
986	/*****************************************************************************/	973	/*****************************************************************************/
987		974
988	void inline_speed	975	void inline_speed
989	fd_intern (int fd)	976	fd_intern (int fd)
990	{	977	{
…		…
1651	ev_default_destroy (void)	1638	ev_default_destroy (void)
1652	{	1639	{
1653	#if EV_MULTIPLICITY	1640	#if EV_MULTIPLICITY
1654	struct ev_loop *loop = ev_default_loop_ptr;	1641	struct ev_loop *loop = ev_default_loop_ptr;
1655	#endif	1642	#endif
		1643
		1644	ev_default_loop_ptr = 0;
1656		1645
1657	#ifndef _WIN32	1646	#ifndef _WIN32
1658	ev_ref (EV_A); /* child watcher */	1647	ev_ref (EV_A); /* child watcher */
1659	ev_signal_stop (EV_A_ &childev);	1648	ev_signal_stop (EV_A_ &childev);
1660	#endif	1649	#endif
…		…
2133		2122
2134	if (expect_false (ev_is_active (w)))	2123	if (expect_false (ev_is_active (w)))
2135	return;	2124	return;
2136		2125
2137	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))));
2138		2128
2139	EV_FREQUENT_CHECK;	2129	EV_FREQUENT_CHECK;
2140		2130
2141	ev_start (EV_A_ (W)w, 1);	2131	ev_start (EV_A_ (W)w, 1);
2142	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143	wlist_add (&anfds[fd].head, (WL)w);	2133	wlist_add (&anfds[fd].head, (WL)w);
2144		2134
2145	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2146	w->events &= ~EV_IOFDSET;	2136	w->events &= ~EV_IOFDSET;
2147		2137
…		…
2339	sigset_t full, prev;	2329	sigset_t full, prev;
2340	sigfillset (&full);	2330	sigfillset (&full);
2341	sigprocmask (SIG_SETMASK, &full, &prev);	2331	sigprocmask (SIG_SETMASK, &full, &prev);
2342	#endif	2332	#endif
2343		2333
2344	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2334	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2345		2335
2346	#ifndef _WIN32	2336	#ifndef _WIN32
2347	sigprocmask (SIG_SETMASK, &prev, 0);	2337	sigprocmask (SIG_SETMASK, &prev, 0);
2348	#endif	2338	#endif
2349	}	2339	}
…		…
2491		2481
2492	static void noinline	2482	static void noinline
2493	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)
2494	{	2484	{
2495	if (slot < 0)	2485	if (slot < 0)
2496	/* overflow, need to check for all hahs slots */	2486	/* overflow, need to check for all hash slots */
2497	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498	infy_wd (EV_A_ slot, wd, ev);	2488	infy_wd (EV_A_ slot, wd, ev);
2499	else	2489	else
2500	{	2490	{
2501	WL w_;	2491	WL w_;
…		…
2535	infy_init (EV_P)	2525	infy_init (EV_P)
2536	{	2526	{
2537	if (fs_fd != -2)	2527	if (fs_fd != -2)
2538	return;	2528	return;
2539		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
2540	fs_fd = inotify_init ();	2551	fs_fd = inotify_init ();
2541		2552
2542	if (fs_fd >= 0)	2553	if (fs_fd >= 0)
2543	{	2554	{
2544	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2555	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2573	if (fs_fd >= 0)	2584	if (fs_fd >= 0)
2574	infy_add (EV_A_ w); /* re-add, no matter what */	2585	infy_add (EV_A_ w); /* re-add, no matter what */
2575	else	2586	else
2576	ev_timer_start (EV_A_ &w->timer);	2587	ev_timer_start (EV_A_ &w->timer);
2577	}	2588	}
2578
2579	}	2589	}
2580	}	2590	}
2581		2591
2582	#endif	2592	#endif
2583		2593
…		…
2619	\|\| w->prev.st_atime != w->attr.st_atime	2629	\|\| w->prev.st_atime != w->attr.st_atime
2620	\|\| w->prev.st_mtime != w->attr.st_mtime	2630	\|\| w->prev.st_mtime != w->attr.st_mtime
2621	\|\| w->prev.st_ctime != w->attr.st_ctime	2631	\|\| w->prev.st_ctime != w->attr.st_ctime
2622	) {	2632	) {
2623	#if EV_USE_INOTIFY	2633	#if EV_USE_INOTIFY
		2634	if (fs_fd >= 0)
		2635	{
2624	infy_del (EV_A_ w);	2636	infy_del (EV_A_ w);
2625	infy_add (EV_A_ w);	2637	infy_add (EV_A_ w);
2626	ev_stat_stat (EV_A_ w); /* avoid race... */	2638	ev_stat_stat (EV_A_ w); /* avoid race... */
		2639	}
2627	#endif	2640	#endif
2628		2641
2629	ev_feed_event (EV_A_ w, EV_STAT);	2642	ev_feed_event (EV_A_ w, EV_STAT);
2630	}	2643	}
2631	}	2644	}
…		…
2833	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2846	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2834	}	2847	}
2835	}	2848	}
2836	}	2849	}
2837		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
2838	#if 0	2863	#if 0
2839	static void	2864	static void
2840	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2865	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2841	{	2866	{
2842	ev_idle_stop (EV_A_ idle);	2867	ev_idle_stop (EV_A_ idle);
…		…
2862		2887
2863	ev_prepare_init (&w->prepare, embed_prepare_cb);	2888	ev_prepare_init (&w->prepare, embed_prepare_cb);
2864	ev_set_priority (&w->prepare, EV_MINPRI);	2889	ev_set_priority (&w->prepare, EV_MINPRI);
2865	ev_prepare_start (EV_A_ &w->prepare);	2890	ev_prepare_start (EV_A_ &w->prepare);
2866		2891
		2892	ev_fork_init (&w->fork, embed_fork_cb);
		2893	ev_fork_start (EV_A_ &w->fork);
		2894
2867	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2895	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2868		2896
2869	ev_start (EV_A_ (W)w, 1);	2897	ev_start (EV_A_ (W)w, 1);
2870		2898
2871	EV_FREQUENT_CHECK;	2899	EV_FREQUENT_CHECK;
…		…
2878	if (expect_false (!ev_is_active (w)))	2906	if (expect_false (!ev_is_active (w)))
2879	return;	2907	return;
2880		2908
2881	EV_FREQUENT_CHECK;	2909	EV_FREQUENT_CHECK;
2882		2910
2883	ev_io_stop (EV_A_ &w->io);	2911	ev_io_stop (EV_A_ &w->io);
2884	ev_prepare_stop (EV_A_ &w->prepare);	2912	ev_prepare_stop (EV_A_ &w->prepare);
2885		2913	ev_fork_stop (EV_A_ &w->fork);
2886	ev_stop (EV_A_ (W)w);
2887		2914
2888	EV_FREQUENT_CHECK;	2915	EV_FREQUENT_CHECK;
2889	}	2916	}
2890	#endif	2917	#endif
2891		2918
…		…
2998	}	3025	}
2999		3026
3000	static void	3027	static void
3001	once_cb_io (EV_P_ ev_io *w, int revents)	3028	once_cb_io (EV_P_ ev_io *w, int revents)
3002	{	3029	{
3003	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));
3004	}	3033	}
3005		3034
3006	static void	3035	static void
3007	once_cb_to (EV_P_ ev_timer *w, int revents)	3036	once_cb_to (EV_P_ ev_timer *w, int revents)
3008	{	3037	{
3009	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));
3010	}	3041	}
3011		3042
3012	void	3043	void
3013	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)
3014	{	3045	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.260 by root, Mon Sep 8 17:24:39 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.260 by root, Mon Sep 8 17:24:39 2008 UTC vs.
Revision 1.268 by root, Mon Oct 27 13:39:18 2008 UTC