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

Comparing libev/ev.c (file contents):
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

…		…
1	/*	1	/*
2	* libev event processing core, watcher management	2	* libev event processing core, watcher management
3	*	3	*
4	* Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
110	# define EV_USE_EPOLL 0	110	# define EV_USE_EPOLL 0
111	# endif	111	# endif
112	# endif	112	# endif
113		113
114	# ifndef EV_USE_KQUEUE	114	# ifndef EV_USE_KQUEUE
115	# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H	115	# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116	# define EV_USE_KQUEUE 1	116	# define EV_USE_KQUEUE 1
117	# else	117	# else
118	# define EV_USE_KQUEUE 0	118	# define EV_USE_KQUEUE 0
119	# endif	119	# endif
120	# endif	120	# endif
…		…
153		153
154	#endif	154	#endif
155		155
156	#include <math.h>	156	#include <math.h>
157	#include <stdlib.h>	157	#include <stdlib.h>
		158	#include <string.h>
158	#include <fcntl.h>	159	#include <fcntl.h>
159	#include <stddef.h>	160	#include <stddef.h>
160		161
161	#include <stdio.h>	162	#include <stdio.h>
162		163
163	#include <assert.h>	164	#include <assert.h>
164	#include <errno.h>	165	#include <errno.h>
165	#include <sys/types.h>	166	#include <sys/types.h>
166	#include <time.h>	167	#include <time.h>
		168	#include <limits.h>
167		169
168	#include <signal.h>	170	#include <signal.h>
169		171
170	#ifdef EV_H	172	#ifdef EV_H
171	# include EV_H	173	# include EV_H
…		…
343	# endif	345	# endif
344	#endif	346	#endif
345		347
346	/* this block fixes any misconfiguration where we know we run into trouble otherwise */	348	/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347		349
		350	#ifdef _AIX
		351	/* AIX has a completely broken poll.h header */
		352	# undef EV_USE_POLL
		353	# define EV_USE_POLL 0
		354	#endif
		355
348	#ifndef CLOCK_MONOTONIC	356	#ifndef CLOCK_MONOTONIC
349	# undef EV_USE_MONOTONIC	357	# undef EV_USE_MONOTONIC
350	# define EV_USE_MONOTONIC 0	358	# define EV_USE_MONOTONIC 0
351	#endif	359	#endif
352		360
…		…
395	# endif	403	# endif
396	# endif	404	# endif
397	# ifdef __cplusplus	405	# ifdef __cplusplus
398	extern "C" {	406	extern "C" {
399	# endif	407	# endif
400	int eventfd (unsigned int initval, int flags);	408	int (eventfd) (unsigned int initval, int flags);
401	# ifdef __cplusplus	409	# ifdef __cplusplus
402	}	410	}
403	# endif	411	# endif
404	#endif	412	#endif
405		413
…		…
504		512
505	#ifndef EV_FD_TO_WIN32_HANDLE	513	#ifndef EV_FD_TO_WIN32_HANDLE
506	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)	514	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507	#endif	515	#endif
508	#ifndef EV_WIN32_HANDLE_TO_FD	516	#ifndef EV_WIN32_HANDLE_TO_FD
509	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)	517	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510	#endif	518	#endif
511	#ifndef EV_WIN32_CLOSE_FD	519	#ifndef EV_WIN32_CLOSE_FD
512	# define EV_WIN32_CLOSE_FD(fd) close (fd)	520	# define EV_WIN32_CLOSE_FD(fd) close (fd)
513	#endif	521	#endif
514		522
…		…
534		542
535	if (syserr_cb)	543	if (syserr_cb)
536	syserr_cb (msg);	544	syserr_cb (msg);
537	else	545	else
538	{	546	{
		547	#if EV_AVOID_STDIO
		548	write (STDERR_FILENO, msg, strlen (msg));
		549	write (STDERR_FILENO, ": ", 2);
		550	msg = strerror (errno);
		551	write (STDERR_FILENO, msg, strlen (msg));
		552	write (STDERR_FILENO, "\n", 1);
		553	#else
539	perror (msg);	554	perror (msg);
		555	#endif
540	abort ();	556	abort ();
541	}	557	}
542	}	558	}
543		559
544	static void *	560	static void *
…		…
569	{	585	{
570	ptr = alloc (ptr, size);	586	ptr = alloc (ptr, size);
571		587
572	if (!ptr && size)	588	if (!ptr && size)
573	{	589	{
		590	#if EV_AVOID_STDIO
		591	write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
		592	sizeof ("libev: memory allocation failed, aborting.") - 1);
		593	#else
574	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);	594	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		595	#endif
575	abort ();	596	abort ();
576	}	597	}
577		598
578	return ptr;	599	return ptr;
579	}	600	}
…		…
963	/* check whether the given fd is atcually valid, for error recovery */	984	/* check whether the given fd is atcually valid, for error recovery */
964	inline_size int	985	inline_size int
965	fd_valid (int fd)	986	fd_valid (int fd)
966	{	987	{
967	#ifdef _WIN32	988	#ifdef _WIN32
968	return _get_osfhandle (fd) != -1;	989	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969	#else	990	#else
970	return fcntl (fd, F_GETFD) != -1;	991	return fcntl (fd, F_GETFD) != -1;
971	#endif	992	#endif
972	}	993	}
973		994
…		…
1178	inline_speed void	1199	inline_speed void
1179	fd_intern (int fd)	1200	fd_intern (int fd)
1180	{	1201	{
1181	#ifdef _WIN32	1202	#ifdef _WIN32
1182	unsigned long arg = 1;	1203	unsigned long arg = 1;
1183	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1204	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184	#else	1205	#else
1185	fcntl (fd, F_SETFD, FD_CLOEXEC);	1206	fcntl (fd, F_SETFD, FD_CLOEXEC);
1186	fcntl (fd, F_SETFL, O_NONBLOCK);	1207	fcntl (fd, F_SETFL, O_NONBLOCK);
1187	#endif	1208	#endif
1188	}	1209	}
…		…
1293	{	1314	{
1294	#if EV_MULTIPLICITY	1315	#if EV_MULTIPLICITY
1295	EV_P = signals [signum - 1].loop;	1316	EV_P = signals [signum - 1].loop;
1296	#endif	1317	#endif
1297		1318
1298	#if _WIN32	1319	#ifdef _WIN32
1299	signal (signum, ev_sighandler);	1320	signal (signum, ev_sighandler);
1300	#endif	1321	#endif
1301		1322
1302	signals [signum - 1].pending = 1;	1323	signals [signum - 1].pending = 1;
1303	evpipe_write (EV_A_ &sig_pending);	1324	evpipe_write (EV_A_ &sig_pending);
…		…
1604	#endif	1625	#endif
1605	#if EV_USE_INOTIFY	1626	#if EV_USE_INOTIFY
1606	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1627	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607	#endif	1628	#endif
1608	#if EV_USE_SIGNALFD	1629	#if EV_USE_SIGNALFD
1609	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1630	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610	#endif	1631	#endif
1611		1632
1612	if (!(flags & 0x0000ffffU))	1633	if (!(flags & 0x0000ffffU))
1613	flags \|= ev_recommended_backends ();	1634	flags \|= ev_recommended_backends ();
1614		1635
…		…
2156	ANHE_at_cache (*he);	2177	ANHE_at_cache (*he);
2157	}	2178	}
2158	}	2179	}
2159		2180
2160	/* fetch new monotonic and realtime times from the kernel */	2181	/* fetch new monotonic and realtime times from the kernel */
2161	/* also detetc if there was a timejump, and act accordingly */	2182	/* also detect if there was a timejump, and act accordingly */
2162	inline_speed void	2183	inline_speed void
2163	time_update (EV_P_ ev_tstamp max_block)	2184	time_update (EV_P_ ev_tstamp max_block)
2164	{	2185	{
2165	#if EV_USE_MONOTONIC	2186	#if EV_USE_MONOTONIC
2166	if (expect_true (have_monotonic))	2187	if (expect_true (have_monotonic))
…		…
2500		2521
2501	if (expect_false (ev_is_active (w)))	2522	if (expect_false (ev_is_active (w)))
2502	return;	2523	return;
2503		2524
2504	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2525	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505	assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));	2526	assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));
2506		2527
2507	EV_FREQUENT_CHECK;	2528	EV_FREQUENT_CHECK;
2508		2529
2509	ev_start (EV_A_ (W)w, 1);	2530	ev_start (EV_A_ (W)w, 1);
2510	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2531	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2580	timers [active] = timers [timercnt + HEAP0];	2601	timers [active] = timers [timercnt + HEAP0];
2581	adjustheap (timers, timercnt, active);	2602	adjustheap (timers, timercnt, active);
2582	}	2603	}
2583	}	2604	}
2584		2605
2585	EV_FREQUENT_CHECK;
2586
2587	ev_at (w) -= mn_now;	2606	ev_at (w) -= mn_now;
2588		2607
2589	ev_stop (EV_A_ (W)w);	2608	ev_stop (EV_A_ (W)w);
		2609
		2610	EV_FREQUENT_CHECK;
2590	}	2611	}
2591		2612
2592	void noinline	2613	void noinline
2593	ev_timer_again (EV_P_ ev_timer *w)	2614	ev_timer_again (EV_P_ ev_timer *w)
2594	{	2615	{
…		…
2673	periodics [active] = periodics [periodiccnt + HEAP0];	2694	periodics [active] = periodics [periodiccnt + HEAP0];
2674	adjustheap (periodics, periodiccnt, active);	2695	adjustheap (periodics, periodiccnt, active);
2675	}	2696	}
2676	}	2697	}
2677		2698
2678	EV_FREQUENT_CHECK;
2679
2680	ev_stop (EV_A_ (W)w);	2699	ev_stop (EV_A_ (W)w);
		2700
		2701	EV_FREQUENT_CHECK;
2681	}	2702	}
2682		2703
2683	void noinline	2704	void noinline
2684	ev_periodic_again (EV_P_ ev_periodic *w)	2705	ev_periodic_again (EV_P_ ev_periodic *w)
2685	{	2706	{
…		…
2746	if (!((WL)w)->next)	2767	if (!((WL)w)->next)
2747	# if EV_USE_SIGNALFD	2768	# if EV_USE_SIGNALFD
2748	if (sigfd < 0) /TODO/	2769	if (sigfd < 0) /TODO/
2749	# endif	2770	# endif
2750	{	2771	{
2751	# if _WIN32	2772	# ifdef _WIN32
2752	evpipe_init (EV_A);	2773	evpipe_init (EV_A);
2753		2774
2754	signal (w->signum, ev_sighandler);	2775	signal (w->signum, ev_sighandler);
2755	# else	2776	# else
2756	struct sigaction sa;	2777	struct sigaction sa;
…		…
2789	signals [w->signum - 1].loop = 0; /* unattach from signal */	2810	signals [w->signum - 1].loop = 0; /* unattach from signal */
2790	#endif	2811	#endif
2791	#if EV_USE_SIGNALFD	2812	#if EV_USE_SIGNALFD
2792	if (sigfd >= 0)	2813	if (sigfd >= 0)
2793	{	2814	{
2794	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2815	sigset_t ss;
		2816
		2817	sigemptyset (&ss);
		2818	sigaddset (&ss, w->signum);
2795	sigdelset (&sigfd_set, w->signum);	2819	sigdelset (&sigfd_set, w->signum);
		2820
2796	signalfd (sigfd, &sigfd_set, 0);	2821	signalfd (sigfd, &sigfd_set, 0);
2797	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2822	sigprocmask (SIG_UNBLOCK, &ss, 0);
2798	/TODO: maybe unblock signal? /
2799	}	2823	}
2800	else	2824	else
2801	#endif	2825	#endif
2802	signal (w->signum, SIG_DFL);	2826	signal (w->signum, SIG_DFL);
2803	}	2827	}
…		…
2849	#define MIN_STAT_INTERVAL 0.1074891	2873	#define MIN_STAT_INTERVAL 0.1074891
2850		2874
2851	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2875	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2852		2876
2853	#if EV_USE_INOTIFY	2877	#if EV_USE_INOTIFY
2854	# define EV_INOTIFY_BUFSIZE 8192	2878
		2879	/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
		2880	# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2855		2881
2856	static void noinline	2882	static void noinline
2857	infy_add (EV_P_ ev_stat *w)	2883	infy_add (EV_P_ ev_stat *w)
2858	{	2884	{
2859	w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB \| IN_DELETE_SELF \| IN_MOVE_SELF \| IN_MODIFY \| IN_DONT_FOLLOW \| IN_MASK_ADD);	2885	w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB \| IN_DELETE_SELF \| IN_MOVE_SELF \| IN_MODIFY \| IN_DONT_FOLLOW \| IN_MASK_ADD);
…		…
2968		2994
2969	static void	2995	static void
2970	infy_cb (EV_P_ ev_io *w, int revents)	2996	infy_cb (EV_P_ ev_io *w, int revents)
2971	{	2997	{
2972	char buf [EV_INOTIFY_BUFSIZE];	2998	char buf [EV_INOTIFY_BUFSIZE];
2973	struct inotify_event ev = (struct inotify_event )buf;
2974	int ofs;	2999	int ofs;
2975	int len = read (fs_fd, buf, sizeof (buf));	3000	int len = read (fs_fd, buf, sizeof (buf));
2976		3001
2977	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	3002	for (ofs = 0; ofs < len; )
		3003	{
		3004	struct inotify_event ev = (struct inotify_event )(buf + ofs);
2978	infy_wd (EV_A_ ev->wd, ev->wd, ev);	3005	infy_wd (EV_A_ ev->wd, ev->wd, ev);
		3006	ofs += sizeof (struct inotify_event) + ev->len;
		3007	}
		3008	}
		3009
		3010	inline_size unsigned int
		3011	ev_linux_version (void)
		3012	{
		3013	struct utsname buf;
		3014	unsigned int v;
		3015	int i;
		3016	char *p = buf.release;
		3017
		3018	if (uname (&buf))
		3019	return 0;
		3020
		3021	for (i = 3+1; --i; )
		3022	{
		3023	unsigned int c = 0;
		3024
		3025	for (;;)
		3026	{
		3027	if (p >= '0' && p <= '9')
		3028	c = c * 10 + *p++ - '0';
		3029	else
		3030	{
		3031	p += *p == '.';
		3032	break;
		3033	}
		3034	}
		3035
		3036	v = (v << 8) \| c;
		3037	}
		3038
		3039	return v;
2979	}	3040	}
2980		3041
2981	inline_size void	3042	inline_size void
2982	check_2625 (EV_P)	3043	ev_check_2625 (EV_P)
2983	{	3044	{
2984	/* kernels < 2.6.25 are borked	3045	/* kernels < 2.6.25 are borked
2985	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	3046	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2986	*/	3047	*/
2987	struct utsname buf;	3048	if (ev_linux_version () < 0x020619)
2988	int major, minor, micro;
2989
2990	if (uname (&buf))
2991	return;
2992
2993	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2994	return;
2995
2996	if (major < 2
2997	\|\| (major == 2 && minor < 6)
2998	\|\| (major == 2 && minor == 6 && micro < 25))
2999	return;	3049	return;
3000		3050
3001	fs_2625 = 1;	3051	fs_2625 = 1;
3002	}	3052	}
3003		3053
…		…
3018	if (fs_fd != -2)	3068	if (fs_fd != -2)
3019	return;	3069	return;
3020		3070
3021	fs_fd = -1;	3071	fs_fd = -1;
3022		3072
3023	check_2625 (EV_A);	3073	ev_check_2625 (EV_A);
3024		3074
3025	fs_fd = infy_newfd ();	3075	fs_fd = infy_newfd ();
3026		3076
3027	if (fs_fd >= 0)	3077	if (fs_fd >= 0)
3028	{	3078	{
…		…
3100	static void noinline	3150	static void noinline
3101	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3151	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3102	{	3152	{
3103	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3153	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3104		3154
3105	/* we copy this here each the time so that */	3155	ev_statdata prev = w->attr;
3106	/* prev has the old value when the callback gets invoked */
3107	w->prev = w->attr;
3108	ev_stat_stat (EV_A_ w);	3156	ev_stat_stat (EV_A_ w);
3109		3157
3110	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */	3158	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3111	if (	3159	if (
3112	w->prev.st_dev != w->attr.st_dev	3160	prev.st_dev != w->attr.st_dev
3113	\|\| w->prev.st_ino != w->attr.st_ino	3161	\|\| prev.st_ino != w->attr.st_ino
3114	\|\| w->prev.st_mode != w->attr.st_mode	3162	\|\| prev.st_mode != w->attr.st_mode
3115	\|\| w->prev.st_nlink != w->attr.st_nlink	3163	\|\| prev.st_nlink != w->attr.st_nlink
3116	\|\| w->prev.st_uid != w->attr.st_uid	3164	\|\| prev.st_uid != w->attr.st_uid
3117	\|\| w->prev.st_gid != w->attr.st_gid	3165	\|\| prev.st_gid != w->attr.st_gid
3118	\|\| w->prev.st_rdev != w->attr.st_rdev	3166	\|\| prev.st_rdev != w->attr.st_rdev
3119	\|\| w->prev.st_size != w->attr.st_size	3167	\|\| prev.st_size != w->attr.st_size
3120	\|\| w->prev.st_atime != w->attr.st_atime	3168	\|\| prev.st_atime != w->attr.st_atime
3121	\|\| w->prev.st_mtime != w->attr.st_mtime	3169	\|\| prev.st_mtime != w->attr.st_mtime
3122	\|\| w->prev.st_ctime != w->attr.st_ctime	3170	\|\| prev.st_ctime != w->attr.st_ctime
3123	) {	3171	) {
		3172	/* we only update w->prev on actual differences */
		3173	/* in case we test more often than invoke the callback, */
		3174	/* to ensure that prev is always different to attr */
		3175	w->prev = prev;
		3176
3124	#if EV_USE_INOTIFY	3177	#if EV_USE_INOTIFY
3125	if (fs_fd >= 0)	3178	if (fs_fd >= 0)
3126	{	3179	{
3127	infy_del (EV_A_ w);	3180	infy_del (EV_A_ w);
3128	infy_add (EV_A_ w);	3181	infy_add (EV_A_ w);
…		…
3409	EV_FREQUENT_CHECK;	3462	EV_FREQUENT_CHECK;
3410		3463
3411	ev_io_stop (EV_A_ &w->io);	3464	ev_io_stop (EV_A_ &w->io);
3412	ev_prepare_stop (EV_A_ &w->prepare);	3465	ev_prepare_stop (EV_A_ &w->prepare);
3413	ev_fork_stop (EV_A_ &w->fork);	3466	ev_fork_stop (EV_A_ &w->fork);
		3467
		3468	ev_stop (EV_A_ (W)w);
3414		3469
3415	EV_FREQUENT_CHECK;	3470	EV_FREQUENT_CHECK;
3416	}	3471	}
3417	#endif	3472	#endif
3418		3473

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC vs. Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.318 by root, Tue Nov 17 00:22:28 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC