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

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 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
…		…
937	/* rebuild the heap: this function is used only once and executed rarely */	955	/* rebuild the heap: this function is used only once and executed rarely */
938	void inline_size	956	void inline_size
939	reheap (ANHE *heap, int N)	957	reheap (ANHE *heap, int N)
940	{	958	{
941	int i;	959	int i;
		960
942	/* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */	961	/* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
943	/* also, this is easy to implement and correct for both 2-heaps and 4-heaps */	962	/* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944	for (i = 0; i < N; ++i)	963	for (i = 0; i < N; ++i)
945	upheap (heap, i + HEAP0);	964	upheap (heap, i + HEAP0);
946	}	965	}
947		966
948	#if EV_VERIFY
949	static void
950	checkheap (ANHE *heap, int N)
951	{
952	int i;
953
954	for (i = HEAP0; i < N + HEAP0; ++i)
955	{
956	assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
957	assert (("heap condition violated", i == HEAP0 \|\| ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
958	assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
959	}
960	}
961	#endif
962
963	/*****************************************************************************/	967	/*****************************************************************************/
964		968
965	typedef struct	969	typedef struct
966	{	970	{
967	WL head;	971	WL head;
…		…
989		993
990	void inline_speed	994	void inline_speed
991	fd_intern (int fd)	995	fd_intern (int fd)
992	{	996	{
993	#ifdef _WIN32	997	#ifdef _WIN32
994	int arg = 1;	998	unsigned long arg = 1;
995	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	999	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996	#else	1000	#else
997	fcntl (fd, F_SETFD, FD_CLOEXEC);	1001	fcntl (fd, F_SETFD, FD_CLOEXEC);
998	fcntl (fd, F_SETFL, O_NONBLOCK);	1002	fcntl (fd, F_SETFL, O_NONBLOCK);
999	#endif	1003	#endif
…		…
1513	{	1517	{
1514	postfork = 1; /* must be in line with ev_default_fork */	1518	postfork = 1; /* must be in line with ev_default_fork */
1515	}	1519	}
1516		1520
1517	#if EV_VERIFY	1521	#if EV_VERIFY
1518	static void	1522	static void noinline
		1523	verify_watcher (EV_P_ W w)
		1524	{
		1525	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
		1526
		1527	if (w->pending)
		1528	assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
		1529	}
		1530
		1531	static void noinline
		1532	verify_heap (EV_P_ ANHE *heap, int N)
		1533	{
		1534	int i;
		1535
		1536	for (i = HEAP0; i < N + HEAP0; ++i)
		1537	{
		1538	assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
		1539	assert (("heap condition violated", i == HEAP0 \|\| ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
		1540	assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
		1541
		1542	verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
		1543	}
		1544	}
		1545
		1546	static void noinline
1519	array_check (W **ws, int cnt)	1547	array_verify (EV_P_ W *ws, int cnt)
1520	{	1548	{
1521	while (cnt--)	1549	while (cnt--)
		1550	{
1522	assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));	1551	assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
		1552	verify_watcher (EV_A_ ws [cnt]);
		1553	}
1523	}	1554	}
1524	#endif	1555	#endif
1525		1556
1526	void	1557	void
1527	ev_loop_verify (EV_P)	1558	ev_loop_verify (EV_P)
1528	{	1559	{
1529	#if EV_VERIFY	1560	#if EV_VERIFY
1530	int i;	1561	int i;
		1562	WL w;
1531		1563
		1564	assert (activecnt >= -1);
		1565
		1566	assert (fdchangemax >= fdchangecnt);
		1567	for (i = 0; i < fdchangecnt; ++i)
		1568	assert (("negative fd in fdchanges", fdchanges [i] >= 0));
		1569
		1570	assert (anfdmax >= 0);
		1571	for (i = 0; i < anfdmax; ++i)
		1572	for (w = anfds [i].head; w; w = w->next)
		1573	{
		1574	verify_watcher (EV_A_ (W)w);
		1575	assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
		1576	assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
		1577	}
		1578
		1579	assert (timermax >= timercnt);
1532	checkheap (timers, timercnt);	1580	verify_heap (EV_A_ timers, timercnt);
		1581
1533	#if EV_PERIODIC_ENABLE	1582	#if EV_PERIODIC_ENABLE
		1583	assert (periodicmax >= periodiccnt);
1534	checkheap (periodics, periodiccnt);	1584	verify_heap (EV_A_ periodics, periodiccnt);
1535	#endif	1585	#endif
1536		1586
		1587	for (i = NUMPRI; i--; )
		1588	{
		1589	assert (pendingmax [i] >= pendingcnt [i]);
1537	#if EV_IDLE_ENABLE	1590	#if EV_IDLE_ENABLE
1538	for (i = NUMPRI; i--; )	1591	assert (idleall >= 0);
		1592	assert (idlemax [i] >= idlecnt [i]);
1539	array_check ((W **)idles [i], idlecnt [i]);	1593	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540	#endif	1594	#endif
		1595	}
		1596
1541	#if EV_FORK_ENABLE	1597	#if EV_FORK_ENABLE
		1598	assert (forkmax >= forkcnt);
1542	array_check ((W **)forks, forkcnt);	1599	array_verify (EV_A_ (W *)forks, forkcnt);
1543	#endif	1600	#endif
		1601
1544	#if EV_ASYNC_ENABLE	1602	#if EV_ASYNC_ENABLE
		1603	assert (asyncmax >= asynccnt);
1545	array_check ((W **)asyncs, asynccnt);	1604	array_verify (EV_A_ (W *)asyncs, asynccnt);
		1605	#endif
		1606
		1607	assert (preparemax >= preparecnt);
		1608	array_verify (EV_A_ (W *)prepares, preparecnt);
		1609
		1610	assert (checkmax >= checkcnt);
		1611	array_verify (EV_A_ (W *)checks, checkcnt);
		1612
		1613	# if 0
		1614	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
		1615	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546	#endif	1616	# endif
1547	array_check ((W **)prepares, preparecnt);
1548	array_check ((W **)checks, checkcnt);
1549	#endif	1617	#endif
1550	}	1618	}
1551		1619
1552	#endif /* multiplicity */	1620	#endif /* multiplicity */
1553		1621
…		…
1847	ev_unref (EV_P)	1915	ev_unref (EV_P)
1848	{	1916	{
1849	--activecnt;	1917	--activecnt;
1850	}	1918	}
1851		1919
		1920	void
		1921	ev_now_update (EV_P)
		1922	{
		1923	time_update (EV_A_ 1e100);
		1924	}
		1925
1852	static int loop_done;	1926	static int loop_done;
1853		1927
1854	void	1928	void
1855	ev_loop (EV_P_ int flags)	1929	ev_loop (EV_P_ int flags)
1856	{	1930	{
…		…
2423		2497
2424	static void noinline	2498	static void noinline
2425	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)
2426	{	2500	{
2427	if (slot < 0)	2501	if (slot < 0)
2428	/* overflow, need to check for all hahs slots */	2502	/* overflow, need to check for all hash slots */
2429	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2503	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430	infy_wd (EV_A_ slot, wd, ev);	2504	infy_wd (EV_A_ slot, wd, ev);
2431	else	2505	else
2432	{	2506	{
2433	WL w_;	2507	WL w_;
…		…
2467	infy_init (EV_P)	2541	infy_init (EV_P)
2468	{	2542	{
2469	if (fs_fd != -2)	2543	if (fs_fd != -2)
2470	return;	2544	return;
2471		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
2472	fs_fd = inotify_init ();	2567	fs_fd = inotify_init ();
2473		2568
2474	if (fs_fd >= 0)	2569	if (fs_fd >= 0)
2475	{	2570	{
2476	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2571	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2505	if (fs_fd >= 0)	2600	if (fs_fd >= 0)
2506	infy_add (EV_A_ w); /* re-add, no matter what */	2601	infy_add (EV_A_ w); /* re-add, no matter what */
2507	else	2602	else
2508	ev_timer_start (EV_A_ &w->timer);	2603	ev_timer_start (EV_A_ &w->timer);
2509	}	2604	}
2510
2511	}	2605	}
2512	}	2606	}
2513		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)
2514	#endif	2614	#endif
2515		2615
2516	void	2616	void
2517	ev_stat_stat (EV_P_ ev_stat *w)	2617	ev_stat_stat (EV_P_ ev_stat *w)
2518	{	2618	{
…		…
2545	\|\| w->prev.st_atime != w->attr.st_atime	2645	\|\| w->prev.st_atime != w->attr.st_atime
2546	\|\| w->prev.st_mtime != w->attr.st_mtime	2646	\|\| w->prev.st_mtime != w->attr.st_mtime
2547	\|\| w->prev.st_ctime != w->attr.st_ctime	2647	\|\| w->prev.st_ctime != w->attr.st_ctime
2548	) {	2648	) {
2549	#if EV_USE_INOTIFY	2649	#if EV_USE_INOTIFY
		2650	if (fs_fd >= 0)
		2651	{
2550	infy_del (EV_A_ w);	2652	infy_del (EV_A_ w);
2551	infy_add (EV_A_ w);	2653	infy_add (EV_A_ w);
2552	ev_stat_stat (EV_A_ w); /* avoid race... */	2654	ev_stat_stat (EV_A_ w); /* avoid race... */
		2655	}
2553	#endif	2656	#endif
2554		2657
2555	ev_feed_event (EV_A_ w, EV_STAT);	2658	ev_feed_event (EV_A_ w, EV_STAT);
2556	}	2659	}
2557	}	2660	}
…		…
2759	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2862	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760	}	2863	}
2761	}	2864	}
2762	}	2865	}
2763		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
2764	#if 0	2879	#if 0
2765	static void	2880	static void
2766	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2881	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767	{	2882	{
2768	ev_idle_stop (EV_A_ idle);	2883	ev_idle_stop (EV_A_ idle);
…		…
2788		2903
2789	ev_prepare_init (&w->prepare, embed_prepare_cb);	2904	ev_prepare_init (&w->prepare, embed_prepare_cb);
2790	ev_set_priority (&w->prepare, EV_MINPRI);	2905	ev_set_priority (&w->prepare, EV_MINPRI);
2791	ev_prepare_start (EV_A_ &w->prepare);	2906	ev_prepare_start (EV_A_ &w->prepare);
2792		2907
		2908	ev_fork_init (&w->fork, embed_fork_cb);
		2909	ev_fork_start (EV_A_ &w->fork);
		2910
2793	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2911	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2794		2912
2795	ev_start (EV_A_ (W)w, 1);	2913	ev_start (EV_A_ (W)w, 1);
2796		2914
2797	EV_FREQUENT_CHECK;	2915	EV_FREQUENT_CHECK;
…		…
2804	if (expect_false (!ev_is_active (w)))	2922	if (expect_false (!ev_is_active (w)))
2805	return;	2923	return;
2806		2924
2807	EV_FREQUENT_CHECK;	2925	EV_FREQUENT_CHECK;
2808		2926
2809	ev_io_stop (EV_A_ &w->io);	2927	ev_io_stop (EV_A_ &w->io);
2810	ev_prepare_stop (EV_A_ &w->prepare);	2928	ev_prepare_stop (EV_A_ &w->prepare);
2811		2929	ev_fork_stop (EV_A_ &w->fork);
2812	ev_stop (EV_A_ (W)w);
2813		2930
2814	EV_FREQUENT_CHECK;	2931	EV_FREQUENT_CHECK;
2815	}	2932	}
2816	#endif	2933	#endif
2817		2934
…		…
2914	once_cb (EV_P_ struct ev_once *once, int revents)	3031	once_cb (EV_P_ struct ev_once *once, int revents)
2915	{	3032	{
2916	void (cb)(int revents, void arg) = once->cb;	3033	void (cb)(int revents, void arg) = once->cb;
2917	void *arg = once->arg;	3034	void *arg = once->arg;
2918		3035
2919	ev_io_stop (EV_A_ &once->io);	3036	ev_io_stop (EV_A_ &once->io);
2920	ev_timer_stop (EV_A_ &once->to);	3037	ev_timer_stop (EV_A_ &once->to);
2921	ev_free (once);	3038	ev_free (once);
2922		3039
2923	cb (revents, arg);	3040	cb (revents, arg);
2924	}	3041	}
2925		3042
2926	static void	3043	static void
2927	once_cb_io (EV_P_ ev_io *w, int revents)	3044	once_cb_io (EV_P_ ev_io *w, int revents)
2928	{	3045	{
2929	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));
2930	}	3049	}
2931		3050
2932	static void	3051	static void
2933	once_cb_to (EV_P_ ev_timer *w, int revents)	3052	once_cb_to (EV_P_ ev_timer *w, int revents)
2934	{	3053	{
2935	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));
2936	}	3057	}
2937		3058
2938	void	3059	void
2939	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)
2940	{	3061	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.250 by root, Thu May 22 02:44:57 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.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC