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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 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
164	#endif	165	#endif
165		166
166	/* this block tries to deduce configuration from header-defined symbols and defaults */	167	/* this block tries to deduce configuration from header-defined symbols and defaults */
167		168
168	#ifndef EV_USE_MONOTONIC	169	#ifndef EV_USE_MONOTONIC
		170	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
		171	# define EV_USE_MONOTONIC 1
		172	# else
169	# define EV_USE_MONOTONIC 0	173	# define EV_USE_MONOTONIC 0
		174	# endif
170	#endif	175	#endif
171		176
172	#ifndef EV_USE_REALTIME	177	#ifndef EV_USE_REALTIME
173	# define EV_USE_REALTIME 0	178	# define EV_USE_REALTIME 0
174	#endif	179	#endif
175		180
176	#ifndef EV_USE_NANOSLEEP	181	#ifndef EV_USE_NANOSLEEP
		182	# if _POSIX_C_SOURCE >= 199309L
		183	# define EV_USE_NANOSLEEP 1
		184	# else
177	# define EV_USE_NANOSLEEP 0	185	# define EV_USE_NANOSLEEP 0
		186	# endif
178	#endif	187	#endif
179		188
180	#ifndef EV_USE_SELECT	189	#ifndef EV_USE_SELECT
181	# define EV_USE_SELECT 1	190	# define EV_USE_SELECT 1
182	#endif	191	#endif
…		…
277	# include <sys/select.h>	286	# include <sys/select.h>
278	# endif	287	# endif
279	#endif	288	#endif
280		289
281	#if EV_USE_INOTIFY	290	#if EV_USE_INOTIFY
		291	# include <sys/utsname.h>
282	# 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
283	#endif	298	#endif
284		299
285	#if EV_SELECT_IS_WINSOCKET	300	#if EV_SELECT_IS_WINSOCKET
286	# include <winsock.h>	301	# include <winsock.h>
287	#endif	302	#endif
…		…
434	typedef struct	449	typedef struct
435	{	450	{
436	WL head;	451	WL head;
437	unsigned char events;	452	unsigned char events;
438	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 */
439	#if EV_SELECT_IS_WINSOCKET	456	#if EV_SELECT_IS_WINSOCKET
440	SOCKET handle;	457	SOCKET handle;
441	#endif	458	#endif
442	} ANFD;	459	} ANFD;
443		460
…		…
556	struct timeval tv;	573	struct timeval tv;
557		574
558	tv.tv_sec = (time_t)delay;	575	tv.tv_sec = (time_t)delay;
559	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	576	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560		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 */
561	select (0, 0, 0, 0, &tv);	581	select (0, 0, 0, 0, &tv);
562	#endif	582	#endif
563	}	583	}
564	}	584	}
565		585
…		…
592	array_realloc (int elem, void base, int cur, int cnt)	612	array_realloc (int elem, void base, int cur, int cnt)
593	{	613	{
594	cur = array_nextsize (elem, cur, cnt);	614	cur = array_nextsize (elem, cur, cnt);
595	return ev_realloc (base, elem * *cur);	615	return ev_realloc (base, elem * *cur);
596	}	616	}
		617
		618	#define array_init_zero(base,count) \
		619	memset ((void )(base), 0, sizeof ((base)) * (count))
597		620
598	#define array_needsize(type,base,cur,cnt,init) \	621	#define array_needsize(type,base,cur,cnt,init) \
599	if (expect_false ((cnt) > (cur))) \	622	if (expect_false ((cnt) > (cur))) \
600	{ \	623	{ \
601	int ocur_ = (cur); \	624	int ocur_ = (cur); \
…		…
645	ev_feed_event (EV_A_ events [i], type);	668	ev_feed_event (EV_A_ events [i], type);
646	}	669	}
647		670
648	/*****************************************************************************/	671	/*****************************************************************************/
649		672
650	void inline_size
651	anfds_init (ANFD *base, int count)
652	{
653	while (count--)
654	{
655	base->head = 0;
656	base->events = EV_NONE;
657	base->reify = 0;
658
659	++base;
660	}
661	}
662
663	void inline_speed	673	void inline_speed
664	fd_event (EV_P_ int fd, int revents)	674	fd_event (EV_P_ int fd, int revents)
665	{	675	{
666	ANFD *anfd = anfds + fd;	676	ANFD *anfd = anfds + fd;
667	ev_io *w;	677	ev_io *w;
…		…
699	events \|= (unsigned char)w->events;	709	events \|= (unsigned char)w->events;
700		710
701	#if EV_SELECT_IS_WINSOCKET	711	#if EV_SELECT_IS_WINSOCKET
702	if (events)	712	if (events)
703	{	713	{
704	unsigned long argp;	714	unsigned long arg;
705	#ifdef EV_FD_TO_WIN32_HANDLE	715	#ifdef EV_FD_TO_WIN32_HANDLE
706	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	716	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707	#else	717	#else
708	anfd->handle = _get_osfhandle (fd);	718	anfd->handle = _get_osfhandle (fd);
709	#endif	719	#endif
710	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));	720	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711	}	721	}
712	#endif	722	#endif
713		723
714	{	724	{
715	unsigned char o_events = anfd->events;	725	unsigned char o_events = anfd->events;
…		…
768	{	778	{
769	int fd;	779	int fd;
770		780
771	for (fd = 0; fd < anfdmax; ++fd)	781	for (fd = 0; fd < anfdmax; ++fd)
772	if (anfds [fd].events)	782	if (anfds [fd].events)
773	if (!fd_valid (fd) == -1 && errno == EBADF)	783	if (!fd_valid (fd) && errno == EBADF)
774	fd_kill (EV_A_ fd);	784	fd_kill (EV_A_ fd);
775	}	785	}
776		786
777	/* called on ENOMEM in select/poll to kill some fds and retry */	787	/* called on ENOMEM in select/poll to kill some fds and retry */
778	static void noinline	788	static void noinline
…		…
796		806
797	for (fd = 0; fd < anfdmax; ++fd)	807	for (fd = 0; fd < anfdmax; ++fd)
798	if (anfds [fd].events)	808	if (anfds [fd].events)
799	{	809	{
800	anfds [fd].events = 0;	810	anfds [fd].events = 0;
		811	anfds [fd].emask = 0;
801	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	812	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
802	}	813	}
803	}	814	}
804		815
805	/*****************************************************************************/	816	/*****************************************************************************/
…		…
957	static ANSIG *signals;	968	static ANSIG *signals;
958	static int signalmax;	969	static int signalmax;
959		970
960	static EV_ATOMIC_T gotsig;	971	static EV_ATOMIC_T gotsig;
961		972
962	void inline_size
963	signals_init (ANSIG *base, int count)
964	{
965	while (count--)
966	{
967	base->head = 0;
968	base->gotsig = 0;
969
970	++base;
971	}
972	}
973
974	/*****************************************************************************/	973	/*****************************************************************************/
975		974
976	void inline_speed	975	void inline_speed
977	fd_intern (int fd)	976	fd_intern (int fd)
978	{	977	{
979	#ifdef _WIN32	978	#ifdef _WIN32
980	int arg = 1;	979	unsigned long arg = 1;
981	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	980	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982	#else	981	#else
983	fcntl (fd, F_SETFD, FD_CLOEXEC);	982	fcntl (fd, F_SETFD, FD_CLOEXEC);
984	fcntl (fd, F_SETFL, O_NONBLOCK);	983	fcntl (fd, F_SETFL, O_NONBLOCK);
985	#endif	984	#endif
…		…
1499	{	1498	{
1500	postfork = 1; /* must be in line with ev_default_fork */	1499	postfork = 1; /* must be in line with ev_default_fork */
1501	}	1500	}
1502		1501
1503	#if EV_VERIFY	1502	#if EV_VERIFY
1504	void noinline	1503	static void noinline
1505	verify_watcher (EV_P_ W w)	1504	verify_watcher (EV_P_ W w)
1506	{	1505	{
1507	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1506	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508		1507
1509	if (w->pending)	1508	if (w->pending)
…		…
1568		1567
1569	for (i = NUMPRI; i--; )	1568	for (i = NUMPRI; i--; )
1570	{	1569	{
1571	assert (pendingmax [i] >= pendingcnt [i]);	1570	assert (pendingmax [i] >= pendingcnt [i]);
1572	#if EV_IDLE_ENABLE	1571	#if EV_IDLE_ENABLE
		1572	assert (idleall >= 0);
1573	assert (idlemax [i] >= idlecnt [i]);	1573	assert (idlemax [i] >= idlecnt [i]);
1574	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);	1574	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575	#endif	1575	#endif
1576	}	1576	}
1577		1577
…		…
1638	ev_default_destroy (void)	1638	ev_default_destroy (void)
1639	{	1639	{
1640	#if EV_MULTIPLICITY	1640	#if EV_MULTIPLICITY
1641	struct ev_loop *loop = ev_default_loop_ptr;	1641	struct ev_loop *loop = ev_default_loop_ptr;
1642	#endif	1642	#endif
		1643
		1644	ev_default_loop_ptr = 0;
1643		1645
1644	#ifndef _WIN32	1646	#ifndef _WIN32
1645	ev_ref (EV_A); /* child watcher */	1647	ev_ref (EV_A); /* child watcher */
1646	ev_signal_stop (EV_A_ &childev);	1648	ev_signal_stop (EV_A_ &childev);
1647	#endif	1649	#endif
…		…
1896	ev_unref (EV_P)	1898	ev_unref (EV_P)
1897	{	1899	{
1898	--activecnt;	1900	--activecnt;
1899	}	1901	}
1900		1902
		1903	void
		1904	ev_now_update (EV_P)
		1905	{
		1906	time_update (EV_A_ 1e100);
		1907	}
		1908
1901	static int loop_done;	1909	static int loop_done;
1902		1910
1903	void	1911	void
1904	ev_loop (EV_P_ int flags)	1912	ev_loop (EV_P_ int flags)
1905	{	1913	{
…		…
2114		2122
2115	if (expect_false (ev_is_active (w)))	2123	if (expect_false (ev_is_active (w)))
2116	return;	2124	return;
2117		2125
2118	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))));
2119		2128
2120	EV_FREQUENT_CHECK;	2129	EV_FREQUENT_CHECK;
2121		2130
2122	ev_start (EV_A_ (W)w, 1);	2131	ev_start (EV_A_ (W)w, 1);
2123	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124	wlist_add (&anfds[fd].head, (WL)w);	2133	wlist_add (&anfds[fd].head, (WL)w);
2125		2134
2126	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2127	w->events &= ~EV_IOFDSET;	2136	w->events &= ~EV_IOFDSET;
2128		2137
…		…
2320	sigset_t full, prev;	2329	sigset_t full, prev;
2321	sigfillset (&full);	2330	sigfillset (&full);
2322	sigprocmask (SIG_SETMASK, &full, &prev);	2331	sigprocmask (SIG_SETMASK, &full, &prev);
2323	#endif	2332	#endif
2324		2333
2325	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2334	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2326		2335
2327	#ifndef _WIN32	2336	#ifndef _WIN32
2328	sigprocmask (SIG_SETMASK, &prev, 0);	2337	sigprocmask (SIG_SETMASK, &prev, 0);
2329	#endif	2338	#endif
2330	}	2339	}
…		…
2472		2481
2473	static void noinline	2482	static void noinline
2474	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)
2475	{	2484	{
2476	if (slot < 0)	2485	if (slot < 0)
2477	/* overflow, need to check for all hahs slots */	2486	/* overflow, need to check for all hash slots */
2478	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479	infy_wd (EV_A_ slot, wd, ev);	2488	infy_wd (EV_A_ slot, wd, ev);
2480	else	2489	else
2481	{	2490	{
2482	WL w_;	2491	WL w_;
…		…
2516	infy_init (EV_P)	2525	infy_init (EV_P)
2517	{	2526	{
2518	if (fs_fd != -2)	2527	if (fs_fd != -2)
2519	return;	2528	return;
2520		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
2521	fs_fd = inotify_init ();	2551	fs_fd = inotify_init ();
2522		2552
2523	if (fs_fd >= 0)	2553	if (fs_fd >= 0)
2524	{	2554	{
2525	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2555	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2554	if (fs_fd >= 0)	2584	if (fs_fd >= 0)
2555	infy_add (EV_A_ w); /* re-add, no matter what */	2585	infy_add (EV_A_ w); /* re-add, no matter what */
2556	else	2586	else
2557	ev_timer_start (EV_A_ &w->timer);	2587	ev_timer_start (EV_A_ &w->timer);
2558	}	2588	}
2559
2560	}	2589	}
2561	}	2590	}
2562		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)
2563	#endif	2598	#endif
2564		2599
2565	void	2600	void
2566	ev_stat_stat (EV_P_ ev_stat *w)	2601	ev_stat_stat (EV_P_ ev_stat *w)
2567	{	2602	{
…		…
2594	\|\| w->prev.st_atime != w->attr.st_atime	2629	\|\| w->prev.st_atime != w->attr.st_atime
2595	\|\| w->prev.st_mtime != w->attr.st_mtime	2630	\|\| w->prev.st_mtime != w->attr.st_mtime
2596	\|\| w->prev.st_ctime != w->attr.st_ctime	2631	\|\| w->prev.st_ctime != w->attr.st_ctime
2597	) {	2632	) {
2598	#if EV_USE_INOTIFY	2633	#if EV_USE_INOTIFY
		2634	if (fs_fd >= 0)
		2635	{
2599	infy_del (EV_A_ w);	2636	infy_del (EV_A_ w);
2600	infy_add (EV_A_ w);	2637	infy_add (EV_A_ w);
2601	ev_stat_stat (EV_A_ w); /* avoid race... */	2638	ev_stat_stat (EV_A_ w); /* avoid race... */
		2639	}
2602	#endif	2640	#endif
2603		2641
2604	ev_feed_event (EV_A_ w, EV_STAT);	2642	ev_feed_event (EV_A_ w, EV_STAT);
2605	}	2643	}
2606	}	2644	}
…		…
2808	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2846	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809	}	2847	}
2810	}	2848	}
2811	}	2849	}
2812		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
2813	#if 0	2863	#if 0
2814	static void	2864	static void
2815	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2865	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816	{	2866	{
2817	ev_idle_stop (EV_A_ idle);	2867	ev_idle_stop (EV_A_ idle);
…		…
2837		2887
2838	ev_prepare_init (&w->prepare, embed_prepare_cb);	2888	ev_prepare_init (&w->prepare, embed_prepare_cb);
2839	ev_set_priority (&w->prepare, EV_MINPRI);	2889	ev_set_priority (&w->prepare, EV_MINPRI);
2840	ev_prepare_start (EV_A_ &w->prepare);	2890	ev_prepare_start (EV_A_ &w->prepare);
2841		2891
		2892	ev_fork_init (&w->fork, embed_fork_cb);
		2893	ev_fork_start (EV_A_ &w->fork);
		2894
2842	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2895	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2843		2896
2844	ev_start (EV_A_ (W)w, 1);	2897	ev_start (EV_A_ (W)w, 1);
2845		2898
2846	EV_FREQUENT_CHECK;	2899	EV_FREQUENT_CHECK;
…		…
2853	if (expect_false (!ev_is_active (w)))	2906	if (expect_false (!ev_is_active (w)))
2854	return;	2907	return;
2855		2908
2856	EV_FREQUENT_CHECK;	2909	EV_FREQUENT_CHECK;
2857		2910
2858	ev_io_stop (EV_A_ &w->io);	2911	ev_io_stop (EV_A_ &w->io);
2859	ev_prepare_stop (EV_A_ &w->prepare);	2912	ev_prepare_stop (EV_A_ &w->prepare);
2860		2913	ev_fork_stop (EV_A_ &w->fork);
2861	ev_stop (EV_A_ (W)w);
2862		2914
2863	EV_FREQUENT_CHECK;	2915	EV_FREQUENT_CHECK;
2864	}	2916	}
2865	#endif	2917	#endif
2866		2918
…		…
2963	once_cb (EV_P_ struct ev_once *once, int revents)	3015	once_cb (EV_P_ struct ev_once *once, int revents)
2964	{	3016	{
2965	void (cb)(int revents, void arg) = once->cb;	3017	void (cb)(int revents, void arg) = once->cb;
2966	void *arg = once->arg;	3018	void *arg = once->arg;
2967		3019
2968	ev_io_stop (EV_A_ &once->io);	3020	ev_io_stop (EV_A_ &once->io);
2969	ev_timer_stop (EV_A_ &once->to);	3021	ev_timer_stop (EV_A_ &once->to);
2970	ev_free (once);	3022	ev_free (once);
2971		3023
2972	cb (revents, arg);	3024	cb (revents, arg);
2973	}	3025	}
2974		3026
2975	static void	3027	static void
2976	once_cb_io (EV_P_ ev_io *w, int revents)	3028	once_cb_io (EV_P_ ev_io *w, int revents)
2977	{	3029	{
2978	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));
2979	}	3033	}
2980		3034
2981	static void	3035	static void
2982	once_cb_to (EV_P_ ev_timer *w, int revents)	3036	once_cb_to (EV_P_ ev_timer *w, int revents)
2983	{	3037	{
2984	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));
2985	}	3041	}
2986		3042
2987	void	3043	void
2988	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)
2989	{	3045	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.251 by root, Thu May 22 03:42:34 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.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.268 by root, Mon Oct 27 13:39:18 2008 UTC