[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.270 by root, Thu Oct 30 13:07:10 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
…		…
605	{	616	{
606	cur = array_nextsize (elem, cur, cnt);	617	cur = array_nextsize (elem, cur, cnt);
607	return ev_realloc (base, elem * *cur);	618	return ev_realloc (base, elem * *cur);
608	}	619	}
609		620
		621	#define array_init_zero(base,count) \
		622	memset ((void )(base), 0, sizeof ((base)) * (count))
		623
610	#define array_needsize(type,base,cur,cnt,init) \	624	#define array_needsize(type,base,cur,cnt,init) \
611	if (expect_false ((cnt) > (cur))) \	625	if (expect_false ((cnt) > (cur))) \
612	{ \	626	{ \
613	int ocur_ = (cur); \	627	int ocur_ = (cur); \
614	(base) = (type *)array_realloc \	628	(base) = (type *)array_realloc \
…		…
656	for (i = 0; i < eventcnt; ++i)	670	for (i = 0; i < eventcnt; ++i)
657	ev_feed_event (EV_A_ events [i], type);	671	ev_feed_event (EV_A_ events [i], type);
658	}	672	}
659		673
660	/*****************************************************************************/	674	/*****************************************************************************/
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		675
675	void inline_speed	676	void inline_speed
676	fd_event (EV_P_ int fd, int revents)	677	fd_event (EV_P_ int fd, int revents)
677	{	678	{
678	ANFD *anfd = anfds + fd;	679	ANFD *anfd = anfds + fd;
…		…
808		809
809	for (fd = 0; fd < anfdmax; ++fd)	810	for (fd = 0; fd < anfdmax; ++fd)
810	if (anfds [fd].events)	811	if (anfds [fd].events)
811	{	812	{
812	anfds [fd].events = 0;	813	anfds [fd].events = 0;
		814	anfds [fd].emask = 0;
813	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	815	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
814	}	816	}
815	}	817	}
816		818
817	/*****************************************************************************/	819	/*****************************************************************************/
…		…
969	static ANSIG *signals;	971	static ANSIG *signals;
970	static int signalmax;	972	static int signalmax;
971		973
972	static EV_ATOMIC_T gotsig;	974	static EV_ATOMIC_T gotsig;
973		975
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	/*****************************************************************************/	976	/*****************************************************************************/
987		977
988	void inline_speed	978	void inline_speed
989	fd_intern (int fd)	979	fd_intern (int fd)
990	{	980	{
…		…
1011	}	1001	}
1012	else	1002	else
1013	#endif	1003	#endif
1014	{	1004	{
1015	while (pipe (evpipe))	1005	while (pipe (evpipe))
1016	syserr ("(libev) error creating signal/async pipe");	1006	ev_syserr ("(libev) error creating signal/async pipe");
1017		1007
1018	fd_intern (evpipe [0]);	1008	fd_intern (evpipe [0]);
1019	fd_intern (evpipe [1]);	1009	fd_intern (evpipe [1]);
1020	ev_io_set (&pipeev, evpipe [0], EV_READ);	1010	ev_io_set (&pipeev, evpipe [0], EV_READ);
1021	}	1011	}
…		…
1511	{	1501	{
1512	postfork = 1; /* must be in line with ev_default_fork */	1502	postfork = 1; /* must be in line with ev_default_fork */
1513	}	1503	}
1514		1504
1515	#if EV_VERIFY	1505	#if EV_VERIFY
1516	void noinline	1506	static void noinline
1517	verify_watcher (EV_P_ W w)	1507	verify_watcher (EV_P_ W w)
1518	{	1508	{
1519	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1509	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520		1510
1521	if (w->pending)	1511	if (w->pending)
…		…
1652	{	1642	{
1653	#if EV_MULTIPLICITY	1643	#if EV_MULTIPLICITY
1654	struct ev_loop *loop = ev_default_loop_ptr;	1644	struct ev_loop *loop = ev_default_loop_ptr;
1655	#endif	1645	#endif
1656		1646
		1647	ev_default_loop_ptr = 0;
		1648
1657	#ifndef _WIN32	1649	#ifndef _WIN32
1658	ev_ref (EV_A); /* child watcher */	1650	ev_ref (EV_A); /* child watcher */
1659	ev_signal_stop (EV_A_ &childev);	1651	ev_signal_stop (EV_A_ &childev);
1660	#endif	1652	#endif
1661		1653
…		…
1667	{	1659	{
1668	#if EV_MULTIPLICITY	1660	#if EV_MULTIPLICITY
1669	struct ev_loop *loop = ev_default_loop_ptr;	1661	struct ev_loop *loop = ev_default_loop_ptr;
1670	#endif	1662	#endif
1671		1663
1672	if (backend)
1673	postfork = 1; /* must be in line with ev_loop_fork */	1664	postfork = 1; /* must be in line with ev_loop_fork */
1674	}	1665	}
1675		1666
1676	/*****************************************************************************/	1667	/*****************************************************************************/
1677		1668
1678	void	1669	void
…		…
1909	ev_unref (EV_P)	1900	ev_unref (EV_P)
1910	{	1901	{
1911	--activecnt;	1902	--activecnt;
1912	}	1903	}
1913		1904
		1905	void
		1906	ev_now_update (EV_P)
		1907	{
		1908	time_update (EV_A_ 1e100);
		1909	}
		1910
1914	static int loop_done;	1911	static int loop_done;
1915		1912
1916	void	1913	void
1917	ev_loop (EV_P_ int flags)	1914	ev_loop (EV_P_ int flags)
1918	{	1915	{
…		…
2127		2124
2128	if (expect_false (ev_is_active (w)))	2125	if (expect_false (ev_is_active (w)))
2129	return;	2126	return;
2130		2127
2131	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))));
2132		2130
2133	EV_FREQUENT_CHECK;	2131	EV_FREQUENT_CHECK;
2134		2132
2135	ev_start (EV_A_ (W)w, 1);	2133	ev_start (EV_A_ (W)w, 1);
2136	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2134	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137	wlist_add (&anfds[fd].head, (WL)w);	2135	wlist_add (&anfds[fd].head, (WL)w);
2138		2136
2139	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2137	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2140	w->events &= ~EV_IOFDSET;	2138	w->events &= ~EV_IOFDSET;
2141		2139
…		…
2333	sigset_t full, prev;	2331	sigset_t full, prev;
2334	sigfillset (&full);	2332	sigfillset (&full);
2335	sigprocmask (SIG_SETMASK, &full, &prev);	2333	sigprocmask (SIG_SETMASK, &full, &prev);
2336	#endif	2334	#endif
2337		2335
2338	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2336	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339		2337
2340	#ifndef _WIN32	2338	#ifndef _WIN32
2341	sigprocmask (SIG_SETMASK, &prev, 0);	2339	sigprocmask (SIG_SETMASK, &prev, 0);
2342	#endif	2340	#endif
2343	}	2341	}
…		…
2485		2483
2486	static void noinline	2484	static void noinline
2487	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)
2488	{	2486	{
2489	if (slot < 0)	2487	if (slot < 0)
2490	/* overflow, need to check for all hahs slots */	2488	/* overflow, need to check for all hash slots */
2491	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2489	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492	infy_wd (EV_A_ slot, wd, ev);	2490	infy_wd (EV_A_ slot, wd, ev);
2493	else	2491	else
2494	{	2492	{
2495	WL w_;	2493	WL w_;
…		…
2529	infy_init (EV_P)	2527	infy_init (EV_P)
2530	{	2528	{
2531	if (fs_fd != -2)	2529	if (fs_fd != -2)
2532	return;	2530	return;
2533		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
2534	fs_fd = inotify_init ();	2553	fs_fd = inotify_init ();
2535		2554
2536	if (fs_fd >= 0)	2555	if (fs_fd >= 0)
2537	{	2556	{
2538	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2557	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2567	if (fs_fd >= 0)	2586	if (fs_fd >= 0)
2568	infy_add (EV_A_ w); /* re-add, no matter what */	2587	infy_add (EV_A_ w); /* re-add, no matter what */
2569	else	2588	else
2570	ev_timer_start (EV_A_ &w->timer);	2589	ev_timer_start (EV_A_ &w->timer);
2571	}	2590	}
2572
2573	}	2591	}
2574	}	2592	}
2575		2593
2576	#endif	2594	#endif
2577		2595
…		…
2613	\|\| w->prev.st_atime != w->attr.st_atime	2631	\|\| w->prev.st_atime != w->attr.st_atime
2614	\|\| w->prev.st_mtime != w->attr.st_mtime	2632	\|\| w->prev.st_mtime != w->attr.st_mtime
2615	\|\| w->prev.st_ctime != w->attr.st_ctime	2633	\|\| w->prev.st_ctime != w->attr.st_ctime
2616	) {	2634	) {
2617	#if EV_USE_INOTIFY	2635	#if EV_USE_INOTIFY
		2636	if (fs_fd >= 0)
		2637	{
2618	infy_del (EV_A_ w);	2638	infy_del (EV_A_ w);
2619	infy_add (EV_A_ w);	2639	infy_add (EV_A_ w);
2620	ev_stat_stat (EV_A_ w); /* avoid race... */	2640	ev_stat_stat (EV_A_ w); /* avoid race... */
		2641	}
2621	#endif	2642	#endif
2622		2643
2623	ev_feed_event (EV_A_ w, EV_STAT);	2644	ev_feed_event (EV_A_ w, EV_STAT);
2624	}	2645	}
2625	}	2646	}
…		…
2827	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2848	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828	}	2849	}
2829	}	2850	}
2830	}	2851	}
2831		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
2832	#if 0	2865	#if 0
2833	static void	2866	static void
2834	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2867	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835	{	2868	{
2836	ev_idle_stop (EV_A_ idle);	2869	ev_idle_stop (EV_A_ idle);
…		…
2856		2889
2857	ev_prepare_init (&w->prepare, embed_prepare_cb);	2890	ev_prepare_init (&w->prepare, embed_prepare_cb);
2858	ev_set_priority (&w->prepare, EV_MINPRI);	2891	ev_set_priority (&w->prepare, EV_MINPRI);
2859	ev_prepare_start (EV_A_ &w->prepare);	2892	ev_prepare_start (EV_A_ &w->prepare);
2860		2893
		2894	ev_fork_init (&w->fork, embed_fork_cb);
		2895	ev_fork_start (EV_A_ &w->fork);
		2896
2861	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2897	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2862		2898
2863	ev_start (EV_A_ (W)w, 1);	2899	ev_start (EV_A_ (W)w, 1);
2864		2900
2865	EV_FREQUENT_CHECK;	2901	EV_FREQUENT_CHECK;
…		…
2872	if (expect_false (!ev_is_active (w)))	2908	if (expect_false (!ev_is_active (w)))
2873	return;	2909	return;
2874		2910
2875	EV_FREQUENT_CHECK;	2911	EV_FREQUENT_CHECK;
2876		2912
2877	ev_io_stop (EV_A_ &w->io);	2913	ev_io_stop (EV_A_ &w->io);
2878	ev_prepare_stop (EV_A_ &w->prepare);	2914	ev_prepare_stop (EV_A_ &w->prepare);
2879		2915	ev_fork_stop (EV_A_ &w->fork);
2880	ev_stop (EV_A_ (W)w);
2881		2916
2882	EV_FREQUENT_CHECK;	2917	EV_FREQUENT_CHECK;
2883	}	2918	}
2884	#endif	2919	#endif
2885		2920
…		…
2982	once_cb (EV_P_ struct ev_once *once, int revents)	3017	once_cb (EV_P_ struct ev_once *once, int revents)
2983	{	3018	{
2984	void (cb)(int revents, void arg) = once->cb;	3019	void (cb)(int revents, void arg) = once->cb;
2985	void *arg = once->arg;	3020	void *arg = once->arg;
2986		3021
2987	ev_io_stop (EV_A_ &once->io);	3022	ev_io_stop (EV_A_ &once->io);
2988	ev_timer_stop (EV_A_ &once->to);	3023	ev_timer_stop (EV_A_ &once->to);
2989	ev_free (once);	3024	ev_free (once);
2990		3025
2991	cb (revents, arg);	3026	cb (revents, arg);
2992	}	3027	}
2993		3028
2994	static void	3029	static void
2995	once_cb_io (EV_P_ ev_io *w, int revents)	3030	once_cb_io (EV_P_ ev_io *w, int revents)
2996	{	3031	{
2997	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));
2998	}	3035	}
2999		3036
3000	static void	3037	static void
3001	once_cb_to (EV_P_ ev_timer *w, int revents)	3038	once_cb_to (EV_P_ ev_timer *w, int revents)
3002	{	3039	{
3003	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));
3004	}	3043	}
3005		3044
3006	void	3045	void
3007	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)
3008	{	3047	{

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.270 by root, Thu Oct 30 13:07:10 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.270 by root, Thu Oct 30 13:07:10 2008 UTC