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

Comparing libev/ev.c (file contents):
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58: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
…		…
163		163
164	#include <assert.h>	164	#include <assert.h>
165	#include <errno.h>	165	#include <errno.h>
166	#include <sys/types.h>	166	#include <sys/types.h>
167	#include <time.h>	167	#include <time.h>
		168	#include <limits.h>
168		169
169	#include <signal.h>	170	#include <signal.h>
170		171
171	#ifdef EV_H	172	#ifdef EV_H
172	# include EV_H	173	# include EV_H
…		…
183	# define WIN32_LEAN_AND_MEAN	184	# define WIN32_LEAN_AND_MEAN
184	# include <windows.h>	185	# include <windows.h>
185	# ifndef EV_SELECT_IS_WINSOCKET	186	# ifndef EV_SELECT_IS_WINSOCKET
186	# define EV_SELECT_IS_WINSOCKET 1	187	# define EV_SELECT_IS_WINSOCKET 1
187	# endif	188	# endif
		189	# undef EV_AVOID_STDIO
188	#endif	190	#endif
189		191
190	/* this block tries to deduce configuration from header-defined symbols and defaults */	192	/* this block tries to deduce configuration from header-defined symbols and defaults */
191		193
192	/* try to deduce the maximum number of signals on this platform */	194	/* try to deduce the maximum number of signals on this platform */
…		…
344	# endif	346	# endif
345	#endif	347	#endif
346		348
347	/* this block fixes any misconfiguration where we know we run into trouble otherwise */	349	/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348		350
		351	#ifdef _AIX
		352	/* AIX has a completely broken poll.h header */
		353	# undef EV_USE_POLL
		354	# define EV_USE_POLL 0
		355	#endif
		356
349	#ifndef CLOCK_MONOTONIC	357	#ifndef CLOCK_MONOTONIC
350	# undef EV_USE_MONOTONIC	358	# undef EV_USE_MONOTONIC
351	# define EV_USE_MONOTONIC 0	359	# define EV_USE_MONOTONIC 0
352	#endif	360	#endif
353		361
…		…
396	# endif	404	# endif
397	# endif	405	# endif
398	# ifdef __cplusplus	406	# ifdef __cplusplus
399	extern "C" {	407	extern "C" {
400	# endif	408	# endif
401	int eventfd (unsigned int initval, int flags);	409	int (eventfd) (unsigned int initval, int flags);
402	# ifdef __cplusplus	410	# ifdef __cplusplus
403	}	411	}
404	# endif	412	# endif
405	#endif	413	#endif
406		414
…		…
505		513
506	#ifndef EV_FD_TO_WIN32_HANDLE	514	#ifndef EV_FD_TO_WIN32_HANDLE
507	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)	515	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508	#endif	516	#endif
509	#ifndef EV_WIN32_HANDLE_TO_FD	517	#ifndef EV_WIN32_HANDLE_TO_FD
510	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)	518	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511	#endif	519	#endif
512	#ifndef EV_WIN32_CLOSE_FD	520	#ifndef EV_WIN32_CLOSE_FD
513	# define EV_WIN32_CLOSE_FD(fd) close (fd)	521	# define EV_WIN32_CLOSE_FD(fd) close (fd)
514	#endif	522	#endif
515		523
516	#ifdef _WIN32	524	#ifdef _WIN32
517	# include "ev_win32.c"	525	# include "ev_win32.c"
518	#endif	526	#endif
519		527
520	/*****************************************************************************/	528	/*****************************************************************************/
		529
		530	#if EV_AVOID_STDIO
		531	static void noinline
		532	ev_printerr (const char *msg)
		533	{
		534	write (STDERR_FILENO, msg, strlen (msg));
		535	}
		536	#endif
521		537
522	static void (syserr_cb)(const char msg);	538	static void (syserr_cb)(const char msg);
523		539
524	void	540	void
525	ev_set_syserr_cb (void (cb)(const char msg))	541	ev_set_syserr_cb (void (cb)(const char msg))
…		…
535		551
536	if (syserr_cb)	552	if (syserr_cb)
537	syserr_cb (msg);	553	syserr_cb (msg);
538	else	554	else
539	{	555	{
		556	#if EV_AVOID_STDIO
		557	const char *err = strerror (errno);
		558
		559	ev_printerr (msg);
		560	ev_printerr (": ");
		561	ev_printerr (err);
		562	ev_printerr ("\n");
		563	#else
540	perror (msg);	564	perror (msg);
		565	#endif
541	abort ();	566	abort ();
542	}	567	}
543	}	568	}
544		569
545	static void *	570	static void *
…		…
547	{	572	{
548	/* some systems, notably openbsd and darwin, fail to properly	573	/* some systems, notably openbsd and darwin, fail to properly
549	* implement realloc (x, 0) (as required by both ansi c-98 and	574	* implement realloc (x, 0) (as required by both ansi c-98 and
550	* the single unix specification, so work around them here.	575	* the single unix specification, so work around them here.
551	*/	576	*/
552
553	if (size)	577	if (size)
554	return realloc (ptr, size);	578	return realloc (ptr, size);
555		579
556	free (ptr);	580	free (ptr);
557	return 0;	581	return 0;
…		…
570	{	594	{
571	ptr = alloc (ptr, size);	595	ptr = alloc (ptr, size);
572		596
573	if (!ptr && size)	597	if (!ptr && size)
574	{	598	{
		599	#if EV_AVOID_STDIO
		600	ev_printerr ("libev: memory allocation failed, aborting.\n");
		601	#else
575	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);	602	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		603	#endif
576	abort ();	604	abort ();
577	}	605	}
578		606
579	return ptr;	607	return ptr;
580	}	608	}
…		…
964	/* check whether the given fd is atcually valid, for error recovery */	992	/* check whether the given fd is atcually valid, for error recovery */
965	inline_size int	993	inline_size int
966	fd_valid (int fd)	994	fd_valid (int fd)
967	{	995	{
968	#ifdef _WIN32	996	#ifdef _WIN32
969	return _get_osfhandle (fd) != -1;	997	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970	#else	998	#else
971	return fcntl (fd, F_GETFD) != -1;	999	return fcntl (fd, F_GETFD) != -1;
972	#endif	1000	#endif
973	}	1001	}
974		1002
…		…
1179	inline_speed void	1207	inline_speed void
1180	fd_intern (int fd)	1208	fd_intern (int fd)
1181	{	1209	{
1182	#ifdef _WIN32	1210	#ifdef _WIN32
1183	unsigned long arg = 1;	1211	unsigned long arg = 1;
1184	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1212	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185	#else	1213	#else
1186	fcntl (fd, F_SETFD, FD_CLOEXEC);	1214	fcntl (fd, F_SETFD, FD_CLOEXEC);
1187	fcntl (fd, F_SETFL, O_NONBLOCK);	1215	fcntl (fd, F_SETFL, O_NONBLOCK);
1188	#endif	1216	#endif
1189	}	1217	}
…		…
1294	{	1322	{
1295	#if EV_MULTIPLICITY	1323	#if EV_MULTIPLICITY
1296	EV_P = signals [signum - 1].loop;	1324	EV_P = signals [signum - 1].loop;
1297	#endif	1325	#endif
1298		1326
1299	#if _WIN32	1327	#ifdef _WIN32
1300	signal (signum, ev_sighandler);	1328	signal (signum, ev_sighandler);
1301	#endif	1329	#endif
1302		1330
1303	signals [signum - 1].pending = 1;	1331	signals [signum - 1].pending = 1;
1304	evpipe_write (EV_A_ &sig_pending);	1332	evpipe_write (EV_A_ &sig_pending);
…		…
1605	#endif	1633	#endif
1606	#if EV_USE_INOTIFY	1634	#if EV_USE_INOTIFY
1607	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1635	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608	#endif	1636	#endif
1609	#if EV_USE_SIGNALFD	1637	#if EV_USE_SIGNALFD
1610	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1638	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611	#endif	1639	#endif
1612		1640
1613	if (!(flags & 0x0000ffffU))	1641	if (!(flags & 0x0000ffffU))
1614	flags \|= ev_recommended_backends ();	1642	flags \|= ev_recommended_backends ();
1615		1643
…		…
2157	ANHE_at_cache (*he);	2185	ANHE_at_cache (*he);
2158	}	2186	}
2159	}	2187	}
2160		2188
2161	/* fetch new monotonic and realtime times from the kernel */	2189	/* fetch new monotonic and realtime times from the kernel */
2162	/* also detetc if there was a timejump, and act accordingly */	2190	/* also detect if there was a timejump, and act accordingly */
2163	inline_speed void	2191	inline_speed void
2164	time_update (EV_P_ ev_tstamp max_block)	2192	time_update (EV_P_ ev_tstamp max_block)
2165	{	2193	{
2166	#if EV_USE_MONOTONIC	2194	#if EV_USE_MONOTONIC
2167	if (expect_true (have_monotonic))	2195	if (expect_true (have_monotonic))
…		…
2501		2529
2502	if (expect_false (ev_is_active (w)))	2530	if (expect_false (ev_is_active (w)))
2503	return;	2531	return;
2504		2532
2505	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2533	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506	assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));	2534	assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));
2507		2535
2508	EV_FREQUENT_CHECK;	2536	EV_FREQUENT_CHECK;
2509		2537
2510	ev_start (EV_A_ (W)w, 1);	2538	ev_start (EV_A_ (W)w, 1);
2511	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2539	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2581	timers [active] = timers [timercnt + HEAP0];	2609	timers [active] = timers [timercnt + HEAP0];
2582	adjustheap (timers, timercnt, active);	2610	adjustheap (timers, timercnt, active);
2583	}	2611	}
2584	}	2612	}
2585		2613
2586	EV_FREQUENT_CHECK;
2587
2588	ev_at (w) -= mn_now;	2614	ev_at (w) -= mn_now;
2589		2615
2590	ev_stop (EV_A_ (W)w);	2616	ev_stop (EV_A_ (W)w);
		2617
		2618	EV_FREQUENT_CHECK;
2591	}	2619	}
2592		2620
2593	void noinline	2621	void noinline
2594	ev_timer_again (EV_P_ ev_timer *w)	2622	ev_timer_again (EV_P_ ev_timer *w)
2595	{	2623	{
…		…
2674	periodics [active] = periodics [periodiccnt + HEAP0];	2702	periodics [active] = periodics [periodiccnt + HEAP0];
2675	adjustheap (periodics, periodiccnt, active);	2703	adjustheap (periodics, periodiccnt, active);
2676	}	2704	}
2677	}	2705	}
2678		2706
2679	EV_FREQUENT_CHECK;
2680
2681	ev_stop (EV_A_ (W)w);	2707	ev_stop (EV_A_ (W)w);
		2708
		2709	EV_FREQUENT_CHECK;
2682	}	2710	}
2683		2711
2684	void noinline	2712	void noinline
2685	ev_periodic_again (EV_P_ ev_periodic *w)	2713	ev_periodic_again (EV_P_ ev_periodic *w)
2686	{	2714	{
…		…
2747	if (!((WL)w)->next)	2775	if (!((WL)w)->next)
2748	# if EV_USE_SIGNALFD	2776	# if EV_USE_SIGNALFD
2749	if (sigfd < 0) /TODO/	2777	if (sigfd < 0) /TODO/
2750	# endif	2778	# endif
2751	{	2779	{
2752	# if _WIN32	2780	# ifdef _WIN32
2753	evpipe_init (EV_A);	2781	evpipe_init (EV_A);
2754		2782
2755	signal (w->signum, ev_sighandler);	2783	signal (w->signum, ev_sighandler);
2756	# else	2784	# else
2757	struct sigaction sa;	2785	struct sigaction sa;
…		…
2790	signals [w->signum - 1].loop = 0; /* unattach from signal */	2818	signals [w->signum - 1].loop = 0; /* unattach from signal */
2791	#endif	2819	#endif
2792	#if EV_USE_SIGNALFD	2820	#if EV_USE_SIGNALFD
2793	if (sigfd >= 0)	2821	if (sigfd >= 0)
2794	{	2822	{
2795	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2823	sigset_t ss;
		2824
		2825	sigemptyset (&ss);
		2826	sigaddset (&ss, w->signum);
2796	sigdelset (&sigfd_set, w->signum);	2827	sigdelset (&sigfd_set, w->signum);
		2828
2797	signalfd (sigfd, &sigfd_set, 0);	2829	signalfd (sigfd, &sigfd_set, 0);
2798	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2830	sigprocmask (SIG_UNBLOCK, &ss, 0);
2799	/TODO: maybe unblock signal? /
2800	}	2831	}
2801	else	2832	else
2802	#endif	2833	#endif
2803	signal (w->signum, SIG_DFL);	2834	signal (w->signum, SIG_DFL);
2804	}	2835	}
…		…
2850	#define MIN_STAT_INTERVAL 0.1074891	2881	#define MIN_STAT_INTERVAL 0.1074891
2851		2882
2852	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2883	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2853		2884
2854	#if EV_USE_INOTIFY	2885	#if EV_USE_INOTIFY
2855	# define EV_INOTIFY_BUFSIZE 8192	2886
		2887	/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
		2888	# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2856		2889
2857	static void noinline	2890	static void noinline
2858	infy_add (EV_P_ ev_stat *w)	2891	infy_add (EV_P_ ev_stat *w)
2859	{	2892	{
2860	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);	2893	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);
…		…
2969		3002
2970	static void	3003	static void
2971	infy_cb (EV_P_ ev_io *w, int revents)	3004	infy_cb (EV_P_ ev_io *w, int revents)
2972	{	3005	{
2973	char buf [EV_INOTIFY_BUFSIZE];	3006	char buf [EV_INOTIFY_BUFSIZE];
2974	struct inotify_event ev = (struct inotify_event )buf;
2975	int ofs;	3007	int ofs;
2976	int len = read (fs_fd, buf, sizeof (buf));	3008	int len = read (fs_fd, buf, sizeof (buf));
2977		3009
2978	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	3010	for (ofs = 0; ofs < len; )
		3011	{
		3012	struct inotify_event ev = (struct inotify_event )(buf + ofs);
2979	infy_wd (EV_A_ ev->wd, ev->wd, ev);	3013	infy_wd (EV_A_ ev->wd, ev->wd, ev);
		3014	ofs += sizeof (struct inotify_event) + ev->len;
		3015	}
		3016	}
		3017
		3018	inline_size unsigned int
		3019	ev_linux_version (void)
		3020	{
		3021	struct utsname buf;
		3022	unsigned int v;
		3023	int i;
		3024	char *p = buf.release;
		3025
		3026	if (uname (&buf))
		3027	return 0;
		3028
		3029	for (i = 3+1; --i; )
		3030	{
		3031	unsigned int c = 0;
		3032
		3033	for (;;)
		3034	{
		3035	if (p >= '0' && p <= '9')
		3036	c = c * 10 + *p++ - '0';
		3037	else
		3038	{
		3039	p += *p == '.';
		3040	break;
		3041	}
		3042	}
		3043
		3044	v = (v << 8) \| c;
		3045	}
		3046
		3047	return v;
2980	}	3048	}
2981		3049
2982	inline_size void	3050	inline_size void
2983	check_2625 (EV_P)	3051	ev_check_2625 (EV_P)
2984	{	3052	{
2985	/* kernels < 2.6.25 are borked	3053	/* kernels < 2.6.25 are borked
2986	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	3054	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2987	*/	3055	*/
2988	struct utsname buf;	3056	if (ev_linux_version () < 0x020619)
2989	int major, minor, micro;
2990
2991	if (uname (&buf))
2992	return;
2993
2994	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2995	return;
2996
2997	if (major < 2
2998	\|\| (major == 2 && minor < 6)
2999	\|\| (major == 2 && minor == 6 && micro < 25))
3000	return;	3057	return;
3001		3058
3002	fs_2625 = 1;	3059	fs_2625 = 1;
3003	}	3060	}
3004		3061
…		…
3019	if (fs_fd != -2)	3076	if (fs_fd != -2)
3020	return;	3077	return;
3021		3078
3022	fs_fd = -1;	3079	fs_fd = -1;
3023		3080
3024	check_2625 (EV_A);	3081	ev_check_2625 (EV_A);
3025		3082
3026	fs_fd = infy_newfd ();	3083	fs_fd = infy_newfd ();
3027		3084
3028	if (fs_fd >= 0)	3085	if (fs_fd >= 0)
3029	{	3086	{
…		…
3414		3471
3415	ev_io_stop (EV_A_ &w->io);	3472	ev_io_stop (EV_A_ &w->io);
3416	ev_prepare_stop (EV_A_ &w->prepare);	3473	ev_prepare_stop (EV_A_ &w->prepare);
3417	ev_fork_stop (EV_A_ &w->fork);	3474	ev_fork_stop (EV_A_ &w->fork);
3418		3475
		3476	ev_stop (EV_A_ (W)w);
		3477
3419	EV_FREQUENT_CHECK;	3478	EV_FREQUENT_CHECK;
3420	}	3479	}
3421	#endif	3480	#endif
3422		3481
3423	#if EV_FORK_ENABLE	3482	#if EV_FORK_ENABLE

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs. Revision 1.332 by root, Tue Mar 9 08:58:17 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58:17 2010 UTC