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

Comparing libev/ev.c (file contents):
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs.
Revision 1.265 by root, Thu Oct 23 04:56:49 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 unused; /* currently unused padding */
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;
…		…
969	static ANSIG *signals;	967	static ANSIG *signals;
970	static int signalmax;	968	static int signalmax;
971		969
972	static EV_ATOMIC_T gotsig;	970	static EV_ATOMIC_T gotsig;
973		971
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	/*****************************************************************************/	972	/*****************************************************************************/
987		973
988	void inline_speed	974	void inline_speed
989	fd_intern (int fd)	975	fd_intern (int fd)
990	{	976	{
…		…
1511	{	1497	{
1512	postfork = 1; /* must be in line with ev_default_fork */	1498	postfork = 1; /* must be in line with ev_default_fork */
1513	}	1499	}
1514		1500
1515	#if EV_VERIFY	1501	#if EV_VERIFY
1516	void noinline	1502	static void noinline
1517	verify_watcher (EV_P_ W w)	1503	verify_watcher (EV_P_ W w)
1518	{	1504	{
1519	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1505	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520		1506
1521	if (w->pending)	1507	if (w->pending)
…		…
1909	ev_unref (EV_P)	1895	ev_unref (EV_P)
1910	{	1896	{
1911	--activecnt;	1897	--activecnt;
1912	}	1898	}
1913		1899
		1900	void
		1901	ev_now_update (EV_P)
		1902	{
		1903	time_update (EV_A_ 1e100);
		1904	}
		1905
1914	static int loop_done;	1906	static int loop_done;
1915		1907
1916	void	1908	void
1917	ev_loop (EV_P_ int flags)	1909	ev_loop (EV_P_ int flags)
1918	{	1910	{
…		…
2127		2119
2128	if (expect_false (ev_is_active (w)))	2120	if (expect_false (ev_is_active (w)))
2129	return;	2121	return;
2130		2122
2131	assert (("ev_io_start called with negative fd", fd >= 0));	2123	assert (("ev_io_start called with negative fd", fd >= 0));
		2124	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2132		2125
2133	EV_FREQUENT_CHECK;	2126	EV_FREQUENT_CHECK;
2134		2127
2135	ev_start (EV_A_ (W)w, 1);	2128	ev_start (EV_A_ (W)w, 1);
2136	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2129	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137	wlist_add (&anfds[fd].head, (WL)w);	2130	wlist_add (&anfds[fd].head, (WL)w);
2138		2131
2139	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2132	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2140	w->events &= ~EV_IOFDSET;	2133	w->events &= ~EV_IOFDSET;
2141		2134
…		…
2333	sigset_t full, prev;	2326	sigset_t full, prev;
2334	sigfillset (&full);	2327	sigfillset (&full);
2335	sigprocmask (SIG_SETMASK, &full, &prev);	2328	sigprocmask (SIG_SETMASK, &full, &prev);
2336	#endif	2329	#endif
2337		2330
2338	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2331	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339		2332
2340	#ifndef _WIN32	2333	#ifndef _WIN32
2341	sigprocmask (SIG_SETMASK, &prev, 0);	2334	sigprocmask (SIG_SETMASK, &prev, 0);
2342	#endif	2335	#endif
2343	}	2336	}
…		…
2485		2478
2486	static void noinline	2479	static void noinline
2487	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2480	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2488	{	2481	{
2489	if (slot < 0)	2482	if (slot < 0)
2490	/* overflow, need to check for all hahs slots */	2483	/* overflow, need to check for all hash slots */
2491	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2484	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492	infy_wd (EV_A_ slot, wd, ev);	2485	infy_wd (EV_A_ slot, wd, ev);
2493	else	2486	else
2494	{	2487	{
2495	WL w_;	2488	WL w_;
…		…
2529	infy_init (EV_P)	2522	infy_init (EV_P)
2530	{	2523	{
2531	if (fs_fd != -2)	2524	if (fs_fd != -2)
2532	return;	2525	return;
2533		2526
		2527	/* kernels < 2.6.25 are borked
		2528	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2529	*/
		2530	{
		2531	struct utsname buf;
		2532	int major, minor, micro;
		2533
		2534	fs_fd = -1;
		2535
		2536	if (uname (&buf))
		2537	return;
		2538
		2539	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2540	return;
		2541
		2542	if (major < 2
		2543	\|\| (major == 2 && minor < 6)
		2544	\|\| (major == 2 && minor == 6 && micro < 25))
		2545	return;
		2546	}
		2547
2534	fs_fd = inotify_init ();	2548	fs_fd = inotify_init ();
2535		2549
2536	if (fs_fd >= 0)	2550	if (fs_fd >= 0)
2537	{	2551	{
2538	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2552	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2567	if (fs_fd >= 0)	2581	if (fs_fd >= 0)
2568	infy_add (EV_A_ w); /* re-add, no matter what */	2582	infy_add (EV_A_ w); /* re-add, no matter what */
2569	else	2583	else
2570	ev_timer_start (EV_A_ &w->timer);	2584	ev_timer_start (EV_A_ &w->timer);
2571	}	2585	}
2572
2573	}	2586	}
2574	}	2587	}
2575		2588
2576	#endif	2589	#endif
2577		2590
…		…
2613	\|\| w->prev.st_atime != w->attr.st_atime	2626	\|\| w->prev.st_atime != w->attr.st_atime
2614	\|\| w->prev.st_mtime != w->attr.st_mtime	2627	\|\| w->prev.st_mtime != w->attr.st_mtime
2615	\|\| w->prev.st_ctime != w->attr.st_ctime	2628	\|\| w->prev.st_ctime != w->attr.st_ctime
2616	) {	2629	) {
2617	#if EV_USE_INOTIFY	2630	#if EV_USE_INOTIFY
		2631	if (fs_fd >= 0)
		2632	{
2618	infy_del (EV_A_ w);	2633	infy_del (EV_A_ w);
2619	infy_add (EV_A_ w);	2634	infy_add (EV_A_ w);
2620	ev_stat_stat (EV_A_ w); /* avoid race... */	2635	ev_stat_stat (EV_A_ w); /* avoid race... */
		2636	}
2621	#endif	2637	#endif
2622		2638
2623	ev_feed_event (EV_A_ w, EV_STAT);	2639	ev_feed_event (EV_A_ w, EV_STAT);
2624	}	2640	}
2625	}	2641	}
…		…
2827	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2843	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828	}	2844	}
2829	}	2845	}
2830	}	2846	}
2831		2847
		2848	static void
		2849	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2850	{
		2851	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2852
		2853	{
		2854	struct ev_loop *loop = w->other;
		2855
		2856	ev_loop_fork (EV_A);
		2857	}
		2858	}
		2859
2832	#if 0	2860	#if 0
2833	static void	2861	static void
2834	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2862	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835	{	2863	{
2836	ev_idle_stop (EV_A_ idle);	2864	ev_idle_stop (EV_A_ idle);
…		…
2856		2884
2857	ev_prepare_init (&w->prepare, embed_prepare_cb);	2885	ev_prepare_init (&w->prepare, embed_prepare_cb);
2858	ev_set_priority (&w->prepare, EV_MINPRI);	2886	ev_set_priority (&w->prepare, EV_MINPRI);
2859	ev_prepare_start (EV_A_ &w->prepare);	2887	ev_prepare_start (EV_A_ &w->prepare);
2860		2888
		2889	ev_fork_init (&w->fork, embed_fork_cb);
		2890	ev_fork_start (EV_A_ &w->fork);
		2891
2861	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2892	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2862		2893
2863	ev_start (EV_A_ (W)w, 1);	2894	ev_start (EV_A_ (W)w, 1);
2864		2895
2865	EV_FREQUENT_CHECK;	2896	EV_FREQUENT_CHECK;
…		…
2872	if (expect_false (!ev_is_active (w)))	2903	if (expect_false (!ev_is_active (w)))
2873	return;	2904	return;
2874		2905
2875	EV_FREQUENT_CHECK;	2906	EV_FREQUENT_CHECK;
2876		2907
2877	ev_io_stop (EV_A_ &w->io);	2908	ev_io_stop (EV_A_ &w->io);
2878	ev_prepare_stop (EV_A_ &w->prepare);	2909	ev_prepare_stop (EV_A_ &w->prepare);
2879		2910	ev_fork_stop (EV_A_ &w->fork);
2880	ev_stop (EV_A_ (W)w);
2881		2911
2882	EV_FREQUENT_CHECK;	2912	EV_FREQUENT_CHECK;
2883	}	2913	}
2884	#endif	2914	#endif
2885		2915
…		…
2982	once_cb (EV_P_ struct ev_once *once, int revents)	3012	once_cb (EV_P_ struct ev_once *once, int revents)
2983	{	3013	{
2984	void (cb)(int revents, void arg) = once->cb;	3014	void (cb)(int revents, void arg) = once->cb;
2985	void *arg = once->arg;	3015	void *arg = once->arg;
2986		3016
2987	ev_io_stop (EV_A_ &once->io);	3017	ev_io_stop (EV_A_ &once->io);
2988	ev_timer_stop (EV_A_ &once->to);	3018	ev_timer_stop (EV_A_ &once->to);
2989	ev_free (once);	3019	ev_free (once);
2990		3020
2991	cb (revents, arg);	3021	cb (revents, arg);
2992	}	3022	}
2993		3023
2994	static void	3024	static void
2995	once_cb_io (EV_P_ ev_io *w, int revents)	3025	once_cb_io (EV_P_ ev_io *w, int revents)
2996	{	3026	{
2997	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3027	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3028
		3029	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2998	}	3030	}
2999		3031
3000	static void	3032	static void
3001	once_cb_to (EV_P_ ev_timer *w, int revents)	3033	once_cb_to (EV_P_ ev_timer *w, int revents)
3002	{	3034	{
3003	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3035	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3036
		3037	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3004	}	3038	}
3005		3039
3006	void	3040	void
3007	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3041	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3008	{	3042	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs. Revision 1.265 by root, Thu Oct 23 04:56:49 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs.
Revision 1.265 by root, Thu Oct 23 04:56:49 2008 UTC