[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.264 by root, Mon Oct 13 23:20:12 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
…		…
556	struct timeval tv;	571	struct timeval tv;
557		572
558	tv.tv_sec = (time_t)delay;	573	tv.tv_sec = (time_t)delay;
559	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	574	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560		575
		576	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		577	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		578	/* by older ones */
561	select (0, 0, 0, 0, &tv);	579	select (0, 0, 0, 0, &tv);
562	#endif	580	#endif
563	}	581	}
564	}	582	}
565		583
…		…
699	events \|= (unsigned char)w->events;	717	events \|= (unsigned char)w->events;
700		718
701	#if EV_SELECT_IS_WINSOCKET	719	#if EV_SELECT_IS_WINSOCKET
702	if (events)	720	if (events)
703	{	721	{
704	unsigned long argp;	722	unsigned long arg;
705	#ifdef EV_FD_TO_WIN32_HANDLE	723	#ifdef EV_FD_TO_WIN32_HANDLE
706	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	724	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707	#else	725	#else
708	anfd->handle = _get_osfhandle (fd);	726	anfd->handle = _get_osfhandle (fd);
709	#endif	727	#endif
710	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));	728	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711	}	729	}
712	#endif	730	#endif
713		731
714	{	732	{
715	unsigned char o_events = anfd->events;	733	unsigned char o_events = anfd->events;
…		…
768	{	786	{
769	int fd;	787	int fd;
770		788
771	for (fd = 0; fd < anfdmax; ++fd)	789	for (fd = 0; fd < anfdmax; ++fd)
772	if (anfds [fd].events)	790	if (anfds [fd].events)
773	if (!fd_valid (fd) == -1 && errno == EBADF)	791	if (!fd_valid (fd) && errno == EBADF)
774	fd_kill (EV_A_ fd);	792	fd_kill (EV_A_ fd);
775	}	793	}
776		794
777	/* called on ENOMEM in select/poll to kill some fds and retry */	795	/* called on ENOMEM in select/poll to kill some fds and retry */
778	static void noinline	796	static void noinline
…		…
975		993
976	void inline_speed	994	void inline_speed
977	fd_intern (int fd)	995	fd_intern (int fd)
978	{	996	{
979	#ifdef _WIN32	997	#ifdef _WIN32
980	int arg = 1;	998	unsigned long arg = 1;
981	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	999	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982	#else	1000	#else
983	fcntl (fd, F_SETFD, FD_CLOEXEC);	1001	fcntl (fd, F_SETFD, FD_CLOEXEC);
984	fcntl (fd, F_SETFL, O_NONBLOCK);	1002	fcntl (fd, F_SETFL, O_NONBLOCK);
985	#endif	1003	#endif
…		…
1499	{	1517	{
1500	postfork = 1; /* must be in line with ev_default_fork */	1518	postfork = 1; /* must be in line with ev_default_fork */
1501	}	1519	}
1502		1520
1503	#if EV_VERIFY	1521	#if EV_VERIFY
1504	void noinline	1522	static void noinline
1505	verify_watcher (EV_P_ W w)	1523	verify_watcher (EV_P_ W w)
1506	{	1524	{
1507	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1525	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508		1526
1509	if (w->pending)	1527	if (w->pending)
…		…
1568		1586
1569	for (i = NUMPRI; i--; )	1587	for (i = NUMPRI; i--; )
1570	{	1588	{
1571	assert (pendingmax [i] >= pendingcnt [i]);	1589	assert (pendingmax [i] >= pendingcnt [i]);
1572	#if EV_IDLE_ENABLE	1590	#if EV_IDLE_ENABLE
		1591	assert (idleall >= 0);
1573	assert (idlemax [i] >= idlecnt [i]);	1592	assert (idlemax [i] >= idlecnt [i]);
1574	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);	1593	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575	#endif	1594	#endif
1576	}	1595	}
1577		1596
…		…
1896	ev_unref (EV_P)	1915	ev_unref (EV_P)
1897	{	1916	{
1898	--activecnt;	1917	--activecnt;
1899	}	1918	}
1900		1919
		1920	void
		1921	ev_now_update (EV_P)
		1922	{
		1923	time_update (EV_A_ 1e100);
		1924	}
		1925
1901	static int loop_done;	1926	static int loop_done;
1902		1927
1903	void	1928	void
1904	ev_loop (EV_P_ int flags)	1929	ev_loop (EV_P_ int flags)
1905	{	1930	{
…		…
2472		2497
2473	static void noinline	2498	static void noinline
2474	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2499	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475	{	2500	{
2476	if (slot < 0)	2501	if (slot < 0)
2477	/* overflow, need to check for all hahs slots */	2502	/* overflow, need to check for all hash slots */
2478	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2503	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479	infy_wd (EV_A_ slot, wd, ev);	2504	infy_wd (EV_A_ slot, wd, ev);
2480	else	2505	else
2481	{	2506	{
2482	WL w_;	2507	WL w_;
…		…
2516	infy_init (EV_P)	2541	infy_init (EV_P)
2517	{	2542	{
2518	if (fs_fd != -2)	2543	if (fs_fd != -2)
2519	return;	2544	return;
2520		2545
		2546	/* kernels < 2.6.25 are borked
		2547	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2548	*/
		2549	{
		2550	struct utsname buf;
		2551	int major, minor, micro;
		2552
		2553	fs_fd = -1;
		2554
		2555	if (uname (&buf))
		2556	return;
		2557
		2558	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2559	return;
		2560
		2561	if (major < 2
		2562	\|\| (major == 2 && minor < 6)
		2563	\|\| (major == 2 && minor == 6 && micro < 25))
		2564	return;
		2565	}
		2566
2521	fs_fd = inotify_init ();	2567	fs_fd = inotify_init ();
2522		2568
2523	if (fs_fd >= 0)	2569	if (fs_fd >= 0)
2524	{	2570	{
2525	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2571	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2554	if (fs_fd >= 0)	2600	if (fs_fd >= 0)
2555	infy_add (EV_A_ w); /* re-add, no matter what */	2601	infy_add (EV_A_ w); /* re-add, no matter what */
2556	else	2602	else
2557	ev_timer_start (EV_A_ &w->timer);	2603	ev_timer_start (EV_A_ &w->timer);
2558	}	2604	}
2559
2560	}	2605	}
2561	}	2606	}
2562		2607
		2608	#endif
		2609
		2610	#ifdef _WIN32
		2611	# define EV_LSTAT(p,b) _stati64 (p, b)
		2612	#else
		2613	# define EV_LSTAT(p,b) lstat (p, b)
2563	#endif	2614	#endif
2564		2615
2565	void	2616	void
2566	ev_stat_stat (EV_P_ ev_stat *w)	2617	ev_stat_stat (EV_P_ ev_stat *w)
2567	{	2618	{
…		…
2594	\|\| w->prev.st_atime != w->attr.st_atime	2645	\|\| w->prev.st_atime != w->attr.st_atime
2595	\|\| w->prev.st_mtime != w->attr.st_mtime	2646	\|\| w->prev.st_mtime != w->attr.st_mtime
2596	\|\| w->prev.st_ctime != w->attr.st_ctime	2647	\|\| w->prev.st_ctime != w->attr.st_ctime
2597	) {	2648	) {
2598	#if EV_USE_INOTIFY	2649	#if EV_USE_INOTIFY
		2650	if (fs_fd >= 0)
		2651	{
2599	infy_del (EV_A_ w);	2652	infy_del (EV_A_ w);
2600	infy_add (EV_A_ w);	2653	infy_add (EV_A_ w);
2601	ev_stat_stat (EV_A_ w); /* avoid race... */	2654	ev_stat_stat (EV_A_ w); /* avoid race... */
		2655	}
2602	#endif	2656	#endif
2603		2657
2604	ev_feed_event (EV_A_ w, EV_STAT);	2658	ev_feed_event (EV_A_ w, EV_STAT);
2605	}	2659	}
2606	}	2660	}
…		…
2808	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2862	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809	}	2863	}
2810	}	2864	}
2811	}	2865	}
2812		2866
		2867	static void
		2868	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2869	{
		2870	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2871
		2872	{
		2873	struct ev_loop *loop = w->other;
		2874
		2875	ev_loop_fork (EV_A);
		2876	}
		2877	}
		2878
2813	#if 0	2879	#if 0
2814	static void	2880	static void
2815	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2881	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816	{	2882	{
2817	ev_idle_stop (EV_A_ idle);	2883	ev_idle_stop (EV_A_ idle);
…		…
2837		2903
2838	ev_prepare_init (&w->prepare, embed_prepare_cb);	2904	ev_prepare_init (&w->prepare, embed_prepare_cb);
2839	ev_set_priority (&w->prepare, EV_MINPRI);	2905	ev_set_priority (&w->prepare, EV_MINPRI);
2840	ev_prepare_start (EV_A_ &w->prepare);	2906	ev_prepare_start (EV_A_ &w->prepare);
2841		2907
		2908	ev_fork_init (&w->fork, embed_fork_cb);
		2909	ev_fork_start (EV_A_ &w->fork);
		2910
2842	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2911	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2843		2912
2844	ev_start (EV_A_ (W)w, 1);	2913	ev_start (EV_A_ (W)w, 1);
2845		2914
2846	EV_FREQUENT_CHECK;	2915	EV_FREQUENT_CHECK;
…		…
2853	if (expect_false (!ev_is_active (w)))	2922	if (expect_false (!ev_is_active (w)))
2854	return;	2923	return;
2855		2924
2856	EV_FREQUENT_CHECK;	2925	EV_FREQUENT_CHECK;
2857		2926
2858	ev_io_stop (EV_A_ &w->io);	2927	ev_io_stop (EV_A_ &w->io);
2859	ev_prepare_stop (EV_A_ &w->prepare);	2928	ev_prepare_stop (EV_A_ &w->prepare);
2860		2929	ev_fork_stop (EV_A_ &w->fork);
2861	ev_stop (EV_A_ (W)w);
2862		2930
2863	EV_FREQUENT_CHECK;	2931	EV_FREQUENT_CHECK;
2864	}	2932	}
2865	#endif	2933	#endif
2866		2934
…		…
2963	once_cb (EV_P_ struct ev_once *once, int revents)	3031	once_cb (EV_P_ struct ev_once *once, int revents)
2964	{	3032	{
2965	void (cb)(int revents, void arg) = once->cb;	3033	void (cb)(int revents, void arg) = once->cb;
2966	void *arg = once->arg;	3034	void *arg = once->arg;
2967		3035
2968	ev_io_stop (EV_A_ &once->io);	3036	ev_io_stop (EV_A_ &once->io);
2969	ev_timer_stop (EV_A_ &once->to);	3037	ev_timer_stop (EV_A_ &once->to);
2970	ev_free (once);	3038	ev_free (once);
2971		3039
2972	cb (revents, arg);	3040	cb (revents, arg);
2973	}	3041	}
2974		3042
2975	static void	3043	static void
2976	once_cb_io (EV_P_ ev_io *w, int revents)	3044	once_cb_io (EV_P_ ev_io *w, int revents)
2977	{	3045	{
2978	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3046	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3047
		3048	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2979	}	3049	}
2980		3050
2981	static void	3051	static void
2982	once_cb_to (EV_P_ ev_timer *w, int revents)	3052	once_cb_to (EV_P_ ev_timer *w, int revents)
2983	{	3053	{
2984	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3054	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3055
		3056	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
2985	}	3057	}
2986		3058
2987	void	3059	void
2988	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3060	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
2989	{	3061	{

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.264 by root, Mon Oct 13 23:20:12 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.264 by root, Mon Oct 13 23:20:12 2008 UTC