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

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.272 by root, Mon Nov 3 12:17:40 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
…		…
382	{	388	{
383	syserr_cb = cb;	389	syserr_cb = cb;
384	}	390	}
385		391
386	static void noinline	392	static void noinline
387	syserr (const char *msg)	393	ev_syserr (const char *msg)
388	{	394	{
389	if (!msg)	395	if (!msg)
390	msg = "(libev) system error";	396	msg = "(libev) system error";
391		397
392	if (syserr_cb)	398	if (syserr_cb)
…		…
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;
		456	#if EV_USE_EPOLL
		457	unsigned int egen; /* generation counter to counter epoll bugs */
		458	#endif
448	#if EV_SELECT_IS_WINSOCKET	459	#if EV_SELECT_IS_WINSOCKET
449	SOCKET handle;	460	SOCKET handle;
450	#endif	461	#endif
451	} ANFD;	462	} ANFD;
452		463
…		…
565	struct timeval tv;	576	struct timeval tv;
566		577
567	tv.tv_sec = (time_t)delay;	578	tv.tv_sec = (time_t)delay;
568	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	579	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569		580
		581	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		582	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		583	/* by older ones */
570	select (0, 0, 0, 0, &tv);	584	select (0, 0, 0, 0, &tv);
571	#endif	585	#endif
572	}	586	}
573	}	587	}
574		588
…		…
601	array_realloc (int elem, void base, int cur, int cnt)	615	array_realloc (int elem, void base, int cur, int cnt)
602	{	616	{
603	cur = array_nextsize (elem, cur, cnt);	617	cur = array_nextsize (elem, cur, cnt);
604	return ev_realloc (base, elem * *cur);	618	return ev_realloc (base, elem * *cur);
605	}	619	}
		620
		621	#define array_init_zero(base,count) \
		622	memset ((void )(base), 0, sizeof ((base)) * (count))
606		623
607	#define array_needsize(type,base,cur,cnt,init) \	624	#define array_needsize(type,base,cur,cnt,init) \
608	if (expect_false ((cnt) > (cur))) \	625	if (expect_false ((cnt) > (cur))) \
609	{ \	626	{ \
610	int ocur_ = (cur); \	627	int ocur_ = (cur); \
…		…
653	for (i = 0; i < eventcnt; ++i)	670	for (i = 0; i < eventcnt; ++i)
654	ev_feed_event (EV_A_ events [i], type);	671	ev_feed_event (EV_A_ events [i], type);
655	}	672	}
656		673
657	/*****************************************************************************/	674	/*****************************************************************************/
658
659	void inline_size
660	anfds_init (ANFD *base, int count)
661	{
662	while (count--)
663	{
664	base->head = 0;
665	base->events = EV_NONE;
666	base->reify = 0;
667
668	++base;
669	}
670	}
671		675
672	void inline_speed	676	void inline_speed
673	fd_event (EV_P_ int fd, int revents)	677	fd_event (EV_P_ int fd, int revents)
674	{	678	{
675	ANFD *anfd = anfds + fd;	679	ANFD *anfd = anfds + fd;
…		…
805		809
806	for (fd = 0; fd < anfdmax; ++fd)	810	for (fd = 0; fd < anfdmax; ++fd)
807	if (anfds [fd].events)	811	if (anfds [fd].events)
808	{	812	{
809	anfds [fd].events = 0;	813	anfds [fd].events = 0;
		814	anfds [fd].emask = 0;
810	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	815	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
811	}	816	}
812	}	817	}
813		818
814	/*****************************************************************************/	819	/*****************************************************************************/
…		…
966	static ANSIG *signals;	971	static ANSIG *signals;
967	static int signalmax;	972	static int signalmax;
968		973
969	static EV_ATOMIC_T gotsig;	974	static EV_ATOMIC_T gotsig;
970		975
971	void inline_size
972	signals_init (ANSIG *base, int count)
973	{
974	while (count--)
975	{
976	base->head = 0;
977	base->gotsig = 0;
978
979	++base;
980	}
981	}
982
983	/*****************************************************************************/	976	/*****************************************************************************/
984		977
985	void inline_speed	978	void inline_speed
986	fd_intern (int fd)	979	fd_intern (int fd)
987	{	980	{
…		…
1008	}	1001	}
1009	else	1002	else
1010	#endif	1003	#endif
1011	{	1004	{
1012	while (pipe (evpipe))	1005	while (pipe (evpipe))
1013	syserr ("(libev) error creating signal/async pipe");	1006	ev_syserr ("(libev) error creating signal/async pipe");
1014		1007
1015	fd_intern (evpipe [0]);	1008	fd_intern (evpipe [0]);
1016	fd_intern (evpipe [1]);	1009	fd_intern (evpipe [1]);
1017	ev_io_set (&pipeev, evpipe [0], EV_READ);	1010	ev_io_set (&pipeev, evpipe [0], EV_READ);
1018	}	1011	}
…		…
1508	{	1501	{
1509	postfork = 1; /* must be in line with ev_default_fork */	1502	postfork = 1; /* must be in line with ev_default_fork */
1510	}	1503	}
1511		1504
1512	#if EV_VERIFY	1505	#if EV_VERIFY
1513	void noinline	1506	static void noinline
1514	verify_watcher (EV_P_ W w)	1507	verify_watcher (EV_P_ W w)
1515	{	1508	{
1516	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1509	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517		1510
1518	if (w->pending)	1511	if (w->pending)
…		…
1649	{	1642	{
1650	#if EV_MULTIPLICITY	1643	#if EV_MULTIPLICITY
1651	struct ev_loop *loop = ev_default_loop_ptr;	1644	struct ev_loop *loop = ev_default_loop_ptr;
1652	#endif	1645	#endif
1653		1646
		1647	ev_default_loop_ptr = 0;
		1648
1654	#ifndef _WIN32	1649	#ifndef _WIN32
1655	ev_ref (EV_A); /* child watcher */	1650	ev_ref (EV_A); /* child watcher */
1656	ev_signal_stop (EV_A_ &childev);	1651	ev_signal_stop (EV_A_ &childev);
1657	#endif	1652	#endif
1658		1653
…		…
1664	{	1659	{
1665	#if EV_MULTIPLICITY	1660	#if EV_MULTIPLICITY
1666	struct ev_loop *loop = ev_default_loop_ptr;	1661	struct ev_loop *loop = ev_default_loop_ptr;
1667	#endif	1662	#endif
1668		1663
1669	if (backend)
1670	postfork = 1; /* must be in line with ev_loop_fork */	1664	postfork = 1; /* must be in line with ev_loop_fork */
1671	}	1665	}
1672		1666
1673	/*****************************************************************************/	1667	/*****************************************************************************/
1674		1668
1675	void	1669	void
…		…
1906	ev_unref (EV_P)	1900	ev_unref (EV_P)
1907	{	1901	{
1908	--activecnt;	1902	--activecnt;
1909	}	1903	}
1910		1904
		1905	void
		1906	ev_now_update (EV_P)
		1907	{
		1908	time_update (EV_A_ 1e100);
		1909	}
		1910
1911	static int loop_done;	1911	static int loop_done;
1912		1912
1913	void	1913	void
1914	ev_loop (EV_P_ int flags)	1914	ev_loop (EV_P_ int flags)
1915	{	1915	{
…		…
2124		2124
2125	if (expect_false (ev_is_active (w)))	2125	if (expect_false (ev_is_active (w)))
2126	return;	2126	return;
2127		2127
2128	assert (("ev_io_start called with negative fd", fd >= 0));	2128	assert (("ev_io_start called with negative fd", fd >= 0));
		2129	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2129		2130
2130	EV_FREQUENT_CHECK;	2131	EV_FREQUENT_CHECK;
2131		2132
2132	ev_start (EV_A_ (W)w, 1);	2133	ev_start (EV_A_ (W)w, 1);
2133	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2134	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2134	wlist_add (&anfds[fd].head, (WL)w);	2135	wlist_add (&anfds[fd].head, (WL)w);
2135		2136
2136	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2137	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2137	w->events &= ~EV_IOFDSET;	2138	w->events &= ~EV_IOFDSET;
2138		2139
…		…
2330	sigset_t full, prev;	2331	sigset_t full, prev;
2331	sigfillset (&full);	2332	sigfillset (&full);
2332	sigprocmask (SIG_SETMASK, &full, &prev);	2333	sigprocmask (SIG_SETMASK, &full, &prev);
2333	#endif	2334	#endif
2334		2335
2335	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2336	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2336		2337
2337	#ifndef _WIN32	2338	#ifndef _WIN32
2338	sigprocmask (SIG_SETMASK, &prev, 0);	2339	sigprocmask (SIG_SETMASK, &prev, 0);
2339	#endif	2340	#endif
2340	}	2341	}
…		…
2431	if (w->wd < 0)	2432	if (w->wd < 0)
2432	{	2433	{
2433	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */	2434	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2434		2435
2435	/* monitor some parent directory for speedup hints */	2436	/* monitor some parent directory for speedup hints */
2436	/* note that exceeding the hardcoded limit is not a correctness issue, */	2437	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2437	/* but an efficiency issue only */	2438	/* but an efficiency issue only */
2438	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2439	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2439	{	2440	{
2440	char path [4096];	2441	char path [4096];
2441	strcpy (path, w->path);	2442	strcpy (path, w->path);
…		…
2482		2483
2483	static void noinline	2484	static void noinline
2484	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2485	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2485	{	2486	{
2486	if (slot < 0)	2487	if (slot < 0)
2487	/* overflow, need to check for all hahs slots */	2488	/* overflow, need to check for all hash slots */
2488	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2489	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2489	infy_wd (EV_A_ slot, wd, ev);	2490	infy_wd (EV_A_ slot, wd, ev);
2490	else	2491	else
2491	{	2492	{
2492	WL w_;	2493	WL w_;
…		…
2526	infy_init (EV_P)	2527	infy_init (EV_P)
2527	{	2528	{
2528	if (fs_fd != -2)	2529	if (fs_fd != -2)
2529	return;	2530	return;
2530		2531
		2532	/* kernels < 2.6.25 are borked
		2533	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2534	*/
		2535	{
		2536	struct utsname buf;
		2537	int major, minor, micro;
		2538
		2539	fs_fd = -1;
		2540
		2541	if (uname (&buf))
		2542	return;
		2543
		2544	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2545	return;
		2546
		2547	if (major < 2
		2548	\|\| (major == 2 && minor < 6)
		2549	\|\| (major == 2 && minor == 6 && micro < 25))
		2550	return;
		2551	}
		2552
2531	fs_fd = inotify_init ();	2553	fs_fd = inotify_init ();
2532		2554
2533	if (fs_fd >= 0)	2555	if (fs_fd >= 0)
2534	{	2556	{
2535	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2557	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2564	if (fs_fd >= 0)	2586	if (fs_fd >= 0)
2565	infy_add (EV_A_ w); /* re-add, no matter what */	2587	infy_add (EV_A_ w); /* re-add, no matter what */
2566	else	2588	else
2567	ev_timer_start (EV_A_ &w->timer);	2589	ev_timer_start (EV_A_ &w->timer);
2568	}	2590	}
2569
2570	}	2591	}
2571	}	2592	}
2572		2593
2573	#endif	2594	#endif
2574		2595
…		…
2610	\|\| w->prev.st_atime != w->attr.st_atime	2631	\|\| w->prev.st_atime != w->attr.st_atime
2611	\|\| w->prev.st_mtime != w->attr.st_mtime	2632	\|\| w->prev.st_mtime != w->attr.st_mtime
2612	\|\| w->prev.st_ctime != w->attr.st_ctime	2633	\|\| w->prev.st_ctime != w->attr.st_ctime
2613	) {	2634	) {
2614	#if EV_USE_INOTIFY	2635	#if EV_USE_INOTIFY
		2636	if (fs_fd >= 0)
		2637	{
2615	infy_del (EV_A_ w);	2638	infy_del (EV_A_ w);
2616	infy_add (EV_A_ w);	2639	infy_add (EV_A_ w);
2617	ev_stat_stat (EV_A_ w); /* avoid race... */	2640	ev_stat_stat (EV_A_ w); /* avoid race... */
		2641	}
2618	#endif	2642	#endif
2619		2643
2620	ev_feed_event (EV_A_ w, EV_STAT);	2644	ev_feed_event (EV_A_ w, EV_STAT);
2621	}	2645	}
2622	}	2646	}
…		…
2824	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2848	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2825	}	2849	}
2826	}	2850	}
2827	}	2851	}
2828		2852
		2853	static void
		2854	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2855	{
		2856	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2857
		2858	{
		2859	struct ev_loop *loop = w->other;
		2860
		2861	ev_loop_fork (EV_A);
		2862	}
		2863	}
		2864
2829	#if 0	2865	#if 0
2830	static void	2866	static void
2831	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2867	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2832	{	2868	{
2833	ev_idle_stop (EV_A_ idle);	2869	ev_idle_stop (EV_A_ idle);
…		…
2853		2889
2854	ev_prepare_init (&w->prepare, embed_prepare_cb);	2890	ev_prepare_init (&w->prepare, embed_prepare_cb);
2855	ev_set_priority (&w->prepare, EV_MINPRI);	2891	ev_set_priority (&w->prepare, EV_MINPRI);
2856	ev_prepare_start (EV_A_ &w->prepare);	2892	ev_prepare_start (EV_A_ &w->prepare);
2857		2893
		2894	ev_fork_init (&w->fork, embed_fork_cb);
		2895	ev_fork_start (EV_A_ &w->fork);
		2896
2858	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2897	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2859		2898
2860	ev_start (EV_A_ (W)w, 1);	2899	ev_start (EV_A_ (W)w, 1);
2861		2900
2862	EV_FREQUENT_CHECK;	2901	EV_FREQUENT_CHECK;
…		…
2869	if (expect_false (!ev_is_active (w)))	2908	if (expect_false (!ev_is_active (w)))
2870	return;	2909	return;
2871		2910
2872	EV_FREQUENT_CHECK;	2911	EV_FREQUENT_CHECK;
2873		2912
2874	ev_io_stop (EV_A_ &w->io);	2913	ev_io_stop (EV_A_ &w->io);
2875	ev_prepare_stop (EV_A_ &w->prepare);	2914	ev_prepare_stop (EV_A_ &w->prepare);
2876		2915	ev_fork_stop (EV_A_ &w->fork);
2877	ev_stop (EV_A_ (W)w);
2878		2916
2879	EV_FREQUENT_CHECK;	2917	EV_FREQUENT_CHECK;
2880	}	2918	}
2881	#endif	2919	#endif
2882		2920
…		…
2979	once_cb (EV_P_ struct ev_once *once, int revents)	3017	once_cb (EV_P_ struct ev_once *once, int revents)
2980	{	3018	{
2981	void (cb)(int revents, void arg) = once->cb;	3019	void (cb)(int revents, void arg) = once->cb;
2982	void *arg = once->arg;	3020	void *arg = once->arg;
2983		3021
2984	ev_io_stop (EV_A_ &once->io);	3022	ev_io_stop (EV_A_ &once->io);
2985	ev_timer_stop (EV_A_ &once->to);	3023	ev_timer_stop (EV_A_ &once->to);
2986	ev_free (once);	3024	ev_free (once);
2987		3025
2988	cb (revents, arg);	3026	cb (revents, arg);
2989	}	3027	}
2990		3028
2991	static void	3029	static void
2992	once_cb_io (EV_P_ ev_io *w, int revents)	3030	once_cb_io (EV_P_ ev_io *w, int revents)
2993	{	3031	{
2994	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3032	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3033
		3034	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2995	}	3035	}
2996		3036
2997	static void	3037	static void
2998	once_cb_to (EV_P_ ev_timer *w, int revents)	3038	once_cb_to (EV_P_ ev_timer *w, int revents)
2999	{	3039	{
3000	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3040	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3041
		3042	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3001	}	3043	}
3002		3044
3003	void	3045	void
3004	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3046	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3005	{	3047	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs. Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.272 by root, Mon Nov 3 12:17:40 2008 UTC