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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.114 by root, Mon Nov 12 20:03:39 2007 UTC

…		…
26	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	26	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	27	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	28	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	29	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30	*/	30	*/
		31
		32	#ifdef __cplusplus
		33	extern "C" {
		34	#endif
		35
31	#ifndef EV_STANDALONE	36	#ifndef EV_STANDALONE
32	# include "config.h"	37	# include "config.h"
33		38
34	# if HAVE_CLOCK_GETTIME	39	# if HAVE_CLOCK_GETTIME
		40	# ifndef EV_USE_MONOTONIC
35	# define EV_USE_MONOTONIC 1	41	# define EV_USE_MONOTONIC 1
		42	# endif
		43	# ifndef EV_USE_REALTIME
36	# define EV_USE_REALTIME 1	44	# define EV_USE_REALTIME 1
		45	# endif
37	# endif	46	# endif
38		47
39	# if HAVE_SELECT && HAVE_SYS_SELECT_H	48	# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40	# define EV_USE_SELECT 1	49	# define EV_USE_SELECT 1
41	# endif	50	# endif
42		51
43	# if HAVE_POLL && HAVE_POLL_H	52	# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44	# define EV_USE_POLL 1	53	# define EV_USE_POLL 1
45	# endif	54	# endif
46		55
47	# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H	56	# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48	# define EV_USE_EPOLL 1	57	# define EV_USE_EPOLL 1
49	# endif	58	# endif
50		59
51	# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H	60	# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52	# define EV_USE_KQUEUE 1	61	# define EV_USE_KQUEUE 1
53	# endif	62	# endif
54		63
55	#endif	64	#endif
56		65
…		…
66	#include <sys/types.h>	75	#include <sys/types.h>
67	#include <time.h>	76	#include <time.h>
68		77
69	#include <signal.h>	78	#include <signal.h>
70		79
71	#ifndef WIN32	80	#ifndef _WIN32
72	# include <unistd.h>	81	# include <unistd.h>
73	# include <sys/time.h>	82	# include <sys/time.h>
74	# include <sys/wait.h>	83	# include <sys/wait.h>
		84	#else
		85	# define WIN32_LEAN_AND_MEAN
		86	# include <windows.h>
		87	# ifndef EV_SELECT_IS_WINSOCKET
		88	# define EV_SELECT_IS_WINSOCKET 1
75	#endif	89	# endif
		90	#endif
		91
76	/**/	92	/**/
77		93
78	#ifndef EV_USE_MONOTONIC	94	#ifndef EV_USE_MONOTONIC
79	# define EV_USE_MONOTONIC 1	95	# define EV_USE_MONOTONIC 1
80	#endif	96	#endif
81		97
82	#ifndef EV_USE_SELECT	98	#ifndef EV_USE_SELECT
83	# define EV_USE_SELECT 1	99	# define EV_USE_SELECT 1
		100	# define EV_SELECT_USE_FD_SET 1
84	#endif	101	#endif
85		102
86	#ifndef EV_USE_POLL	103	#ifndef EV_USE_POLL
87	# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */	104	# ifdef _WIN32
		105	# define EV_USE_POLL 0
		106	# else
		107	# define EV_USE_POLL 1
		108	# endif
88	#endif	109	#endif
89		110
90	#ifndef EV_USE_EPOLL	111	#ifndef EV_USE_EPOLL
91	# define EV_USE_EPOLL 0	112	# define EV_USE_EPOLL 0
92	#endif	113	#endif
93		114
94	#ifndef EV_USE_KQUEUE	115	#ifndef EV_USE_KQUEUE
95	# define EV_USE_KQUEUE 0	116	# define EV_USE_KQUEUE 0
96	#endif	117	#endif
97		118
98	#ifndef EV_USE_WIN32
99	# ifdef WIN32
100	# define EV_USE_WIN32 0 /* it does not exist, use select */
101	# undef EV_USE_SELECT
102	# define EV_USE_SELECT 1
103	# else
104	# define EV_USE_WIN32 0
105	# endif
106	#endif
107
108	#ifndef EV_USE_REALTIME	119	#ifndef EV_USE_REALTIME
109	# define EV_USE_REALTIME 1	120	# define EV_USE_REALTIME 1
110	#endif	121	#endif
111		122
112	/**/	123	/**/
		124
		125	/* darwin simply cannot be helped */
		126	#ifdef __APPLE__
		127	# undef EV_USE_POLL
		128	# undef EV_USE_KQUEUE
		129	#endif
113		130
114	#ifndef CLOCK_MONOTONIC	131	#ifndef CLOCK_MONOTONIC
115	# undef EV_USE_MONOTONIC	132	# undef EV_USE_MONOTONIC
116	# define EV_USE_MONOTONIC 0	133	# define EV_USE_MONOTONIC 0
117	#endif	134	#endif
118		135
119	#ifndef CLOCK_REALTIME	136	#ifndef CLOCK_REALTIME
120	# undef EV_USE_REALTIME	137	# undef EV_USE_REALTIME
121	# define EV_USE_REALTIME 0	138	# define EV_USE_REALTIME 0
		139	#endif
		140
		141	#if EV_SELECT_IS_WINSOCKET
		142	# include <winsock.h>
122	#endif	143	#endif
123		144
124	/**/	145	/**/
125		146
126	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	147	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
…		…
146	#define expect_true(expr) expect ((expr) != 0, 1)	167	#define expect_true(expr) expect ((expr) != 0, 1)
147		168
148	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)	169	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149	#define ABSPRI(w) ((w)->priority - EV_MINPRI)	170	#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150		171
		172	#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
		173	#define EMPTY2(a,b) /* used to suppress some warnings */
		174
151	typedef struct ev_watcher *W;	175	typedef struct ev_watcher *W;
152	typedef struct ev_watcher_list *WL;	176	typedef struct ev_watcher_list *WL;
153	typedef struct ev_watcher_time *WT;	177	typedef struct ev_watcher_time *WT;
154		178
155	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	179	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156		180
		181	#ifdef _WIN32
157	#include "ev_win32.c"	182	# include "ev_win32.c"
		183	#endif
158		184
159	/*****************************************************************************/	185	/*****************************************************************************/
160		186
161	static void (syserr_cb)(const char msg);	187	static void (syserr_cb)(const char msg);
162		188
…		…
209	typedef struct	235	typedef struct
210	{	236	{
211	WL head;	237	WL head;
212	unsigned char events;	238	unsigned char events;
213	unsigned char reify;	239	unsigned char reify;
		240	#if EV_SELECT_IS_WINSOCKET
		241	SOCKET handle;
		242	#endif
214	} ANFD;	243	} ANFD;
215		244
216	typedef struct	245	typedef struct
217	{	246	{
218	W w;	247	W w;
…		…
221		250
222	#if EV_MULTIPLICITY	251	#if EV_MULTIPLICITY
223		252
224	struct ev_loop	253	struct ev_loop
225	{	254	{
		255	ev_tstamp ev_rt_now;
		256	#define ev_rt_now ((loop)->ev_rt_now)
226	#define VAR(name,decl) decl;	257	#define VAR(name,decl) decl;
227	#include "ev_vars.h"	258	#include "ev_vars.h"
228	#undef VAR	259	#undef VAR
229	};	260	};
230	#include "ev_wrap.h"	261	#include "ev_wrap.h"
…		…
232	struct ev_loop default_loop_struct;	263	struct ev_loop default_loop_struct;
233	static struct ev_loop *default_loop;	264	static struct ev_loop *default_loop;
234		265
235	#else	266	#else
236		267
		268	ev_tstamp ev_rt_now;
237	#define VAR(name,decl) static decl;	269	#define VAR(name,decl) static decl;
238	#include "ev_vars.h"	270	#include "ev_vars.h"
239	#undef VAR	271	#undef VAR
240		272
241	static int default_loop;	273	static int default_loop;
242		274
243	#endif	275	#endif
244		276
245	/*****************************************************************************/	277	/*****************************************************************************/
246		278
247	inline ev_tstamp	279	ev_tstamp
248	ev_time (void)	280	ev_time (void)
249	{	281	{
250	#if EV_USE_REALTIME	282	#if EV_USE_REALTIME
251	struct timespec ts;	283	struct timespec ts;
252	clock_gettime (CLOCK_REALTIME, &ts);	284	clock_gettime (CLOCK_REALTIME, &ts);
…		…
279	{	311	{
280	return ev_rt_now;	312	return ev_rt_now;
281	}	313	}
282	#endif	314	#endif
283		315
284	#define array_roundsize(type,n) ((n) \| 4 & ~3)	316	#define array_roundsize(type,n) (((n) \| 4) & ~3)
285		317
286	#define array_needsize(type,base,cur,cnt,init) \	318	#define array_needsize(type,base,cur,cnt,init) \
287	if (expect_false ((cnt) > cur)) \	319	if (expect_false ((cnt) > cur)) \
288	{ \	320	{ \
289	int newcnt = cur; \	321	int newcnt = cur; \
…		…
304	stem ## max = array_roundsize (stem ## cnt >> 1); \	336	stem ## max = array_roundsize (stem ## cnt >> 1); \
305	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\	337	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\
306	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\	338	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\
307	}	339	}
308		340
309	/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310	/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311	#define array_free_microshit(stem) \
312	ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314	#define array_free(stem, idx) \	341	#define array_free(stem, idx) \
315	ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;	342	ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316		343
317	/*****************************************************************************/	344	/*****************************************************************************/
318		345
…		…
339	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;	366	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;
340	return;	367	return;
341	}	368	}
342		369
343	w_->pending = ++pendingcnt [ABSPRI (w_)];	370	w_->pending = ++pendingcnt [ABSPRI (w_)];
344	array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));	371	array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
345	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;	372	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
346	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;	373	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
347	}	374	}
348		375
349	static void	376	static void
…		…
392	int events = 0;	419	int events = 0;
393		420
394	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)	421	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)
395	events \|= w->events;	422	events \|= w->events;
396		423
		424	#if EV_SELECT_IS_WINSOCKET
		425	if (events)
		426	{
		427	unsigned long argp;
		428	anfd->handle = _get_osfhandle (fd);
		429	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
		430	}
		431	#endif
		432
397	anfd->reify = 0;	433	anfd->reify = 0;
398		434
399	method_modify (EV_A_ fd, anfd->events, events);	435	method_modify (EV_A_ fd, anfd->events, events);
400	anfd->events = events;	436	anfd->events = events;
401	}	437	}
…		…
410	return;	446	return;
411		447
412	anfds [fd].reify = 1;	448	anfds [fd].reify = 1;
413		449
414	++fdchangecnt;	450	++fdchangecnt;
415	array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));	451	array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
416	fdchanges [fdchangecnt - 1] = fd;	452	fdchanges [fdchangecnt - 1] = fd;
417	}	453	}
418		454
419	static void	455	static void
420	fd_kill (EV_P_ int fd)	456	fd_kill (EV_P_ int fd)
…		…
429	}	465	}
430		466
431	static int	467	static int
432	fd_valid (int fd)	468	fd_valid (int fd)
433	{	469	{
434	#ifdef WIN32	470	#ifdef _WIN32
435	return !!win32_get_osfhandle (fd);	471	return _get_osfhandle (fd) != -1;
436	#else	472	#else
437	return fcntl (fd, F_GETFD) != -1;	473	return fcntl (fd, F_GETFD) != -1;
438	#endif	474	#endif
439	}	475	}
440		476
…		…
521	heap [k] = w;	557	heap [k] = w;
522	((W)heap [k])->active = k + 1;	558	((W)heap [k])->active = k + 1;
523	}	559	}
524		560
525	inline void	561	inline void
526	adjustheap (WT *heap, int N, int k, ev_tstamp at)	562	adjustheap (WT *heap, int N, int k)
527	{	563	{
528	ev_tstamp old_at = heap [k]->at;	564	upheap (heap, k);
529	heap [k]->at = at;
530
531	if (old_at < at)
532	downheap (heap, N, k);	565	downheap (heap, N, k);
533	else
534	upheap (heap, k);
535	}	566	}
536		567
537	/*****************************************************************************/	568	/*****************************************************************************/
538		569
539	typedef struct	570	typedef struct
…		…
562	}	593	}
563		594
564	static void	595	static void
565	sighandler (int signum)	596	sighandler (int signum)
566	{	597	{
567	#if WIN32	598	#if _WIN32
568	signal (signum, sighandler);	599	signal (signum, sighandler);
569	#endif	600	#endif
570		601
571	signals [signum - 1].gotsig = 1;	602	signals [signum - 1].gotsig = 1;
572		603
573	if (!gotsig)	604	if (!gotsig)
574	{	605	{
575	int old_errno = errno;	606	int old_errno = errno;
576	gotsig = 1;	607	gotsig = 1;
577	#ifdef WIN32
578	send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579	#else
580	write (sigpipe [1], &signum, 1);	608	write (sigpipe [1], &signum, 1);
581	#endif
582	errno = old_errno;	609	errno = old_errno;
583	}	610	}
584	}	611	}
585		612
586	void	613	void
…		…
606	static void	633	static void
607	sigcb (EV_P_ struct ev_io *iow, int revents)	634	sigcb (EV_P_ struct ev_io *iow, int revents)
608	{	635	{
609	int signum;	636	int signum;
610		637
611	#ifdef WIN32
612	recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613	#else
614	read (sigpipe [0], &revents, 1);	638	read (sigpipe [0], &revents, 1);
615	#endif
616	gotsig = 0;	639	gotsig = 0;
617		640
618	for (signum = signalmax; signum--; )	641	for (signum = signalmax; signum--; )
619	if (signals [signum].gotsig)	642	if (signals [signum].gotsig)
620	ev_feed_signal_event (EV_A_ signum + 1);	643	ev_feed_signal_event (EV_A_ signum + 1);
621	}	644	}
622		645
		646	inline void
		647	fd_intern (int fd)
		648	{
		649	#ifdef _WIN32
		650	int arg = 1;
		651	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
		652	#else
		653	fcntl (fd, F_SETFD, FD_CLOEXEC);
		654	fcntl (fd, F_SETFL, O_NONBLOCK);
		655	#endif
		656	}
		657
623	static void	658	static void
624	siginit (EV_P)	659	siginit (EV_P)
625	{	660	{
626	#ifndef WIN32	661	fd_intern (sigpipe [0]);
627	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	662	fd_intern (sigpipe [1]);
628	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630	/* rather than sort out wether we really need nb, set it */
631	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633	#endif
634		663
635	ev_io_set (&sigev, sigpipe [0], EV_READ);	664	ev_io_set (&sigev, sigpipe [0], EV_READ);
636	ev_io_start (EV_A_ &sigev);	665	ev_io_start (EV_A_ &sigev);
637	ev_unref (EV_A); /* child watcher should not keep loop alive */	666	ev_unref (EV_A); /* child watcher should not keep loop alive */
638	}	667	}
639		668
640	/*****************************************************************************/	669	/*****************************************************************************/
641		670
642	static struct ev_child *childs [PID_HASHSIZE];	671	static struct ev_child *childs [PID_HASHSIZE];
643		672
644	#ifndef WIN32	673	#ifndef _WIN32
645		674
646	static struct ev_signal childev;	675	static struct ev_signal childev;
647		676
648	#ifndef WCONTINUED	677	#ifndef WCONTINUED
649	# define WCONTINUED 0	678	# define WCONTINUED 0
…		…
710		739
711	/* return true if we are running with elevated privileges and should ignore env variables */	740	/* return true if we are running with elevated privileges and should ignore env variables */
712	static int	741	static int
713	enable_secure (void)	742	enable_secure (void)
714	{	743	{
715	#ifdef WIN32	744	#ifdef _WIN32
716	return 0;	745	return 0;
717	#else	746	#else
718	return getuid () != geteuid ()	747	return getuid () != geteuid ()
719	\|\| getgid () != getegid ();	748	\|\| getgid () != getegid ();
720	#endif	749	#endif
721	}	750	}
722		751
723	int	752	unsigned int
724	ev_method (EV_P)	753	ev_method (EV_P)
725	{	754	{
726	return method;	755	return method;
727	}	756	}
728		757
729	static void	758	static void
730	loop_init (EV_P_ int methods)	759	loop_init (EV_P_ unsigned int flags)
731	{	760	{
732	if (!method)	761	if (!method)
733	{	762	{
734	#if EV_USE_MONOTONIC	763	#if EV_USE_MONOTONIC
735	{	764	{
…		…
742	ev_rt_now = ev_time ();	771	ev_rt_now = ev_time ();
743	mn_now = get_clock ();	772	mn_now = get_clock ();
744	now_floor = mn_now;	773	now_floor = mn_now;
745	rtmn_diff = ev_rt_now - mn_now;	774	rtmn_diff = ev_rt_now - mn_now;
746		775
747	if (methods == EVMETHOD_AUTO)	776	if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
748	if (!enable_secure () && getenv ("LIBEV_METHODS"))
749	methods = atoi (getenv ("LIBEV_METHODS"));	777	flags = atoi (getenv ("LIBEV_FLAGS"));
750	else	778
751	methods = EVMETHOD_ANY;	779	if (!(flags & 0x0000ffff))
		780	flags \|= 0x0000ffff;
752		781
753	method = 0;	782	method = 0;
754	#if EV_USE_WIN32
755	if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
756	#endif
757	#if EV_USE_KQUEUE	783	#if EV_USE_KQUEUE
758	if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);	784	if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
759	#endif	785	#endif
760	#if EV_USE_EPOLL	786	#if EV_USE_EPOLL
761	if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);	787	if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
762	#endif	788	#endif
763	#if EV_USE_POLL	789	#if EV_USE_POLL
764	if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);	790	if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
765	#endif	791	#endif
766	#if EV_USE_SELECT	792	#if EV_USE_SELECT
767	if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);	793	if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
768	#endif	794	#endif
769		795
770	ev_init (&sigev, sigcb);	796	ev_init (&sigev, sigcb);
771	ev_set_priority (&sigev, EV_MAXPRI);	797	ev_set_priority (&sigev, EV_MAXPRI);
772	}	798	}
…		…
775	void	801	void
776	loop_destroy (EV_P)	802	loop_destroy (EV_P)
777	{	803	{
778	int i;	804	int i;
779		805
780	#if EV_USE_WIN32
781	if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
782	#endif
783	#if EV_USE_KQUEUE	806	#if EV_USE_KQUEUE
784	if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);	807	if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
785	#endif	808	#endif
786	#if EV_USE_EPOLL	809	#if EV_USE_EPOLL
787	if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);	810	if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
…		…
795		818
796	for (i = NUMPRI; i--; )	819	for (i = NUMPRI; i--; )
797	array_free (pending, [i]);	820	array_free (pending, [i]);
798		821
799	/* have to use the microsoft-never-gets-it-right macro */	822	/* have to use the microsoft-never-gets-it-right macro */
800	array_free_microshit (fdchange);	823	array_free (fdchange, EMPTY0);
801	array_free_microshit (timer);	824	array_free (timer, EMPTY0);
802	array_free_microshit (periodic);	825	#if EV_PERIODICS
803	array_free_microshit (idle);	826	array_free (periodic, EMPTY0);
804	array_free_microshit (prepare);	827	#endif
805	array_free_microshit (check);	828	array_free (idle, EMPTY0);
		829	array_free (prepare, EMPTY0);
		830	array_free (check, EMPTY0);
806		831
807	method = 0;	832	method = 0;
808	}	833	}
809		834
810	static void	835	static void
…		…
835	postfork = 0;	860	postfork = 0;
836	}	861	}
837		862
838	#if EV_MULTIPLICITY	863	#if EV_MULTIPLICITY
839	struct ev_loop *	864	struct ev_loop *
840	ev_loop_new (int methods)	865	ev_loop_new (unsigned int flags)
841	{	866	{
842	struct ev_loop loop = (struct ev_loop )ev_malloc (sizeof (struct ev_loop));	867	struct ev_loop loop = (struct ev_loop )ev_malloc (sizeof (struct ev_loop));
843		868
844	memset (loop, 0, sizeof (struct ev_loop));	869	memset (loop, 0, sizeof (struct ev_loop));
845		870
846	loop_init (EV_A_ methods);	871	loop_init (EV_A_ flags);
847		872
848	if (ev_method (EV_A))	873	if (ev_method (EV_A))
849	return loop;	874	return loop;
850		875
851	return 0;	876	return 0;
…		…
869	#if EV_MULTIPLICITY	894	#if EV_MULTIPLICITY
870	struct ev_loop *	895	struct ev_loop *
871	#else	896	#else
872	int	897	int
873	#endif	898	#endif
874	ev_default_loop (int methods)	899	ev_default_loop (unsigned int flags)
875	{	900	{
876	if (sigpipe [0] == sigpipe [1])	901	if (sigpipe [0] == sigpipe [1])
877	if (pipe (sigpipe))	902	if (pipe (sigpipe))
878	return 0;	903	return 0;
879		904
…		…
883	struct ev_loop *loop = default_loop = &default_loop_struct;	908	struct ev_loop *loop = default_loop = &default_loop_struct;
884	#else	909	#else
885	default_loop = 1;	910	default_loop = 1;
886	#endif	911	#endif
887		912
888	loop_init (EV_A_ methods);	913	loop_init (EV_A_ flags);
889		914
890	if (ev_method (EV_A))	915	if (ev_method (EV_A))
891	{	916	{
892	siginit (EV_A);	917	siginit (EV_A);
893		918
894	#ifndef WIN32	919	#ifndef _WIN32
895	ev_signal_init (&childev, childcb, SIGCHLD);	920	ev_signal_init (&childev, childcb, SIGCHLD);
896	ev_set_priority (&childev, EV_MAXPRI);	921	ev_set_priority (&childev, EV_MAXPRI);
897	ev_signal_start (EV_A_ &childev);	922	ev_signal_start (EV_A_ &childev);
898	ev_unref (EV_A); /* child watcher should not keep loop alive */	923	ev_unref (EV_A); /* child watcher should not keep loop alive */
899	#endif	924	#endif
…		…
910	{	935	{
911	#if EV_MULTIPLICITY	936	#if EV_MULTIPLICITY
912	struct ev_loop *loop = default_loop;	937	struct ev_loop *loop = default_loop;
913	#endif	938	#endif
914		939
915	#ifndef WIN32	940	#ifndef _WIN32
916	ev_ref (EV_A); /* child watcher */	941	ev_ref (EV_A); /* child watcher */
917	ev_signal_stop (EV_A_ &childev);	942	ev_signal_stop (EV_A_ &childev);
918	#endif	943	#endif
919		944
920	ev_ref (EV_A); /* signal watcher */	945	ev_ref (EV_A); /* signal watcher */
…		…
980		1005
981	/* first reschedule or stop timer */	1006	/* first reschedule or stop timer */
982	if (w->repeat)	1007	if (w->repeat)
983	{	1008	{
984	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));	1009	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
		1010
985	((WT)w)->at = mn_now + w->repeat;	1011	((WT)w)->at += w->repeat;
		1012	if (((WT)w)->at < mn_now)
		1013	((WT)w)->at = mn_now;
		1014
986	downheap ((WT *)timers, timercnt, 0);	1015	downheap ((WT *)timers, timercnt, 0);
987	}	1016	}
988	else	1017	else
989	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */	1018	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990		1019
991	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);	1020	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992	}	1021	}
993	}	1022	}
994		1023
		1024	#if EV_PERIODICS
995	static void	1025	static void
996	periodics_reify (EV_P)	1026	periodics_reify (EV_P)
997	{	1027	{
998	while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)	1028	while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999	{	1029	{
…		…
1002	assert (("inactive timer on periodic heap detected", ev_is_active (w)));	1032	assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1003		1033
1004	/* first reschedule or stop timer */	1034	/* first reschedule or stop timer */
1005	if (w->reschedule_cb)	1035	if (w->reschedule_cb)
1006	{	1036	{
1007	ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);	1037	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));	1038	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010	downheap ((WT *)periodics, periodiccnt, 0);	1039	downheap ((WT *)periodics, periodiccnt, 0);
1011	}	1040	}
1012	else if (w->interval)	1041	else if (w->interval)
1013	{	1042	{
…		…
1040		1069
1041	/* now rebuild the heap */	1070	/* now rebuild the heap */
1042	for (i = periodiccnt >> 1; i--; )	1071	for (i = periodiccnt >> 1; i--; )
1043	downheap ((WT *)periodics, periodiccnt, i);	1072	downheap ((WT *)periodics, periodiccnt, i);
1044	}	1073	}
		1074	#endif
1045		1075
1046	inline int	1076	inline int
1047	time_update_monotonic (EV_P)	1077	time_update_monotonic (EV_P)
1048	{	1078	{
1049	mn_now = get_clock ();	1079	mn_now = get_clock ();
…		…
1083	ev_rt_now = ev_time ();	1113	ev_rt_now = ev_time ();
1084	mn_now = get_clock ();	1114	mn_now = get_clock ();
1085	now_floor = mn_now;	1115	now_floor = mn_now;
1086	}	1116	}
1087		1117
		1118	# if EV_PERIODICS
1088	periodics_reschedule (EV_A);	1119	periodics_reschedule (EV_A);
		1120	# endif
1089	/* no timer adjustment, as the monotonic clock doesn't jump */	1121	/* no timer adjustment, as the monotonic clock doesn't jump */
1090	/* timers_reschedule (EV_A_ rtmn_diff - odiff) */	1122	/* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091	}	1123	}
1092	}	1124	}
1093	else	1125	else
…		…
1095	{	1127	{
1096	ev_rt_now = ev_time ();	1128	ev_rt_now = ev_time ();
1097		1129
1098	if (expect_false (mn_now > ev_rt_now \|\| mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))	1130	if (expect_false (mn_now > ev_rt_now \|\| mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099	{	1131	{
		1132	#if EV_PERIODICS
1100	periodics_reschedule (EV_A);	1133	periodics_reschedule (EV_A);
		1134	#endif
1101		1135
1102	/* adjust timers. this is easy, as the offset is the same for all */	1136	/* adjust timers. this is easy, as the offset is the same for all */
1103	for (i = 0; i < timercnt; ++i)	1137	for (i = 0; i < timercnt; ++i)
1104	((WT)timers [i])->at += ev_rt_now - mn_now;	1138	((WT)timers [i])->at += ev_rt_now - mn_now;
1105	}	1139	}
…		…
1168	{	1202	{
1169	ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;	1203	ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170	if (block > to) block = to;	1204	if (block > to) block = to;
1171	}	1205	}
1172		1206
		1207	#if EV_PERIODICS
1173	if (periodiccnt)	1208	if (periodiccnt)
1174	{	1209	{
1175	ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;	1210	ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1176	if (block > to) block = to;	1211	if (block > to) block = to;
1177	}	1212	}
		1213	#endif
1178		1214
1179	if (block < 0.) block = 0.;	1215	if (block < 0.) block = 0.;
1180	}	1216	}
1181		1217
1182	method_poll (EV_A_ block);	1218	method_poll (EV_A_ block);
…		…
1184	/* update ev_rt_now, do magic */	1220	/* update ev_rt_now, do magic */
1185	time_update (EV_A);	1221	time_update (EV_A);
1186		1222
1187	/* queue pending timers and reschedule them */	1223	/* queue pending timers and reschedule them */
1188	timers_reify (EV_A); /* relative timers called last */	1224	timers_reify (EV_A); /* relative timers called last */
		1225	#if EV_PERIODICS
1189	periodics_reify (EV_A); /* absolute timers called first */	1226	periodics_reify (EV_A); /* absolute timers called first */
		1227	#endif
1190		1228
1191	/* queue idle watchers unless io or timers are pending */	1229	/* queue idle watchers unless io or timers are pending */
1192	if (idlecnt && !any_pending (EV_A))	1230	if (idlecnt && !any_pending (EV_A))
1193	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);	1231	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194		1232
…		…
1285	{	1323	{
1286	ev_clear_pending (EV_A_ (W)w);	1324	ev_clear_pending (EV_A_ (W)w);
1287	if (!ev_is_active (w))	1325	if (!ev_is_active (w))
1288	return;	1326	return;
1289		1327
		1328	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
		1329
1290	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	1330	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291	ev_stop (EV_A_ (W)w);	1331	ev_stop (EV_A_ (W)w);
1292		1332
1293	fd_change (EV_A_ w->fd);	1333	fd_change (EV_A_ w->fd);
1294	}	1334	}
…		…
1302	((WT)w)->at += mn_now;	1342	((WT)w)->at += mn_now;
1303		1343
1304	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));	1344	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1305		1345
1306	ev_start (EV_A_ (W)w, ++timercnt);	1346	ev_start (EV_A_ (W)w, ++timercnt);
1307	array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));	1347	array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1308	timers [timercnt - 1] = w;	1348	timers [timercnt - 1] = w;
1309	upheap ((WT *)timers, timercnt - 1);	1349	upheap ((WT *)timers, timercnt - 1);
1310		1350
1311	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1351	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1312	}	1352	}
…		…
1321	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1361	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322		1362
1323	if (((W)w)->active < timercnt--)	1363	if (((W)w)->active < timercnt--)
1324	{	1364	{
1325	timers [((W)w)->active - 1] = timers [timercnt];	1365	timers [((W)w)->active - 1] = timers [timercnt];
1326	downheap ((WT *)timers, timercnt, ((W)w)->active - 1);	1366	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327	}	1367	}
1328		1368
1329	((WT)w)->at = w->repeat;	1369	((WT)w)->at -= mn_now;
1330		1370
1331	ev_stop (EV_A_ (W)w);	1371	ev_stop (EV_A_ (W)w);
1332	}	1372	}
1333		1373
1334	void	1374	void
1335	ev_timer_again (EV_P_ struct ev_timer *w)	1375	ev_timer_again (EV_P_ struct ev_timer *w)
1336	{	1376	{
1337	if (ev_is_active (w))	1377	if (ev_is_active (w))
1338	{	1378	{
1339	if (w->repeat)	1379	if (w->repeat)
		1380	{
		1381	((WT)w)->at = mn_now + w->repeat;
1340	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);	1382	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
		1383	}
1341	else	1384	else
1342	ev_timer_stop (EV_A_ w);	1385	ev_timer_stop (EV_A_ w);
1343	}	1386	}
1344	else if (w->repeat)	1387	else if (w->repeat)
		1388	{
		1389	w->at = w->repeat;
1345	ev_timer_start (EV_A_ w);	1390	ev_timer_start (EV_A_ w);
		1391	}
1346	}	1392	}
1347		1393
		1394	#if EV_PERIODICS
1348	void	1395	void
1349	ev_periodic_start (EV_P_ struct ev_periodic *w)	1396	ev_periodic_start (EV_P_ struct ev_periodic *w)
1350	{	1397	{
1351	if (ev_is_active (w))	1398	if (ev_is_active (w))
1352	return;	1399	return;
…		…
1359	/* this formula differs from the one in periodic_reify because we do not always round up */	1406	/* this formula differs from the one in periodic_reify because we do not always round up */
1360	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;	1407	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361	}	1408	}
1362		1409
1363	ev_start (EV_A_ (W)w, ++periodiccnt);	1410	ev_start (EV_A_ (W)w, ++periodiccnt);
1364	array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));	1411	array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1365	periodics [periodiccnt - 1] = w;	1412	periodics [periodiccnt - 1] = w;
1366	upheap ((WT *)periodics, periodiccnt - 1);	1413	upheap ((WT *)periodics, periodiccnt - 1);
1367		1414
1368	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1415	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1369	}	1416	}
…		…
1378	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1425	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379		1426
1380	if (((W)w)->active < periodiccnt--)	1427	if (((W)w)->active < periodiccnt--)
1381	{	1428	{
1382	periodics [((W)w)->active - 1] = periodics [periodiccnt];	1429	periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383	downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);	1430	adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384	}	1431	}
1385		1432
1386	ev_stop (EV_A_ (W)w);	1433	ev_stop (EV_A_ (W)w);
1387	}	1434	}
1388		1435
…		…
1391	{	1438	{
1392	/* TODO: use adjustheap and recalculation */	1439	/* TODO: use adjustheap and recalculation */
1393	ev_periodic_stop (EV_A_ w);	1440	ev_periodic_stop (EV_A_ w);
1394	ev_periodic_start (EV_A_ w);	1441	ev_periodic_start (EV_A_ w);
1395	}	1442	}
		1443	#endif
1396		1444
1397	void	1445	void
1398	ev_idle_start (EV_P_ struct ev_idle *w)	1446	ev_idle_start (EV_P_ struct ev_idle *w)
1399	{	1447	{
1400	if (ev_is_active (w))	1448	if (ev_is_active (w))
1401	return;	1449	return;
1402		1450
1403	ev_start (EV_A_ (W)w, ++idlecnt);	1451	ev_start (EV_A_ (W)w, ++idlecnt);
1404	array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));	1452	array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1405	idles [idlecnt - 1] = w;	1453	idles [idlecnt - 1] = w;
1406	}	1454	}
1407		1455
1408	void	1456	void
1409	ev_idle_stop (EV_P_ struct ev_idle *w)	1457	ev_idle_stop (EV_P_ struct ev_idle *w)
1410	{	1458	{
1411	ev_clear_pending (EV_A_ (W)w);	1459	ev_clear_pending (EV_A_ (W)w);
1412	if (ev_is_active (w))	1460	if (!ev_is_active (w))
1413	return;	1461	return;
1414		1462
1415	idles [((W)w)->active - 1] = idles [--idlecnt];	1463	idles [((W)w)->active - 1] = idles [--idlecnt];
1416	ev_stop (EV_A_ (W)w);	1464	ev_stop (EV_A_ (W)w);
1417	}	1465	}
…		…
1421	{	1469	{
1422	if (ev_is_active (w))	1470	if (ev_is_active (w))
1423	return;	1471	return;
1424		1472
1425	ev_start (EV_A_ (W)w, ++preparecnt);	1473	ev_start (EV_A_ (W)w, ++preparecnt);
1426	array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));	1474	array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1427	prepares [preparecnt - 1] = w;	1475	prepares [preparecnt - 1] = w;
1428	}	1476	}
1429		1477
1430	void	1478	void
1431	ev_prepare_stop (EV_P_ struct ev_prepare *w)	1479	ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432	{	1480	{
1433	ev_clear_pending (EV_A_ (W)w);	1481	ev_clear_pending (EV_A_ (W)w);
1434	if (ev_is_active (w))	1482	if (!ev_is_active (w))
1435	return;	1483	return;
1436		1484
1437	prepares [((W)w)->active - 1] = prepares [--preparecnt];	1485	prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438	ev_stop (EV_A_ (W)w);	1486	ev_stop (EV_A_ (W)w);
1439	}	1487	}
…		…
1443	{	1491	{
1444	if (ev_is_active (w))	1492	if (ev_is_active (w))
1445	return;	1493	return;
1446		1494
1447	ev_start (EV_A_ (W)w, ++checkcnt);	1495	ev_start (EV_A_ (W)w, ++checkcnt);
1448	array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));	1496	array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1449	checks [checkcnt - 1] = w;	1497	checks [checkcnt - 1] = w;
1450	}	1498	}
1451		1499
1452	void	1500	void
1453	ev_check_stop (EV_P_ struct ev_check *w)	1501	ev_check_stop (EV_P_ struct ev_check *w)
1454	{	1502	{
1455	ev_clear_pending (EV_A_ (W)w);	1503	ev_clear_pending (EV_A_ (W)w);
1456	if (ev_is_active (w))	1504	if (!ev_is_active (w))
1457	return;	1505	return;
1458		1506
1459	checks [((W)w)->active - 1] = checks [--checkcnt];	1507	checks [((W)w)->active - 1] = checks [--checkcnt];
1460	ev_stop (EV_A_ (W)w);	1508	ev_stop (EV_A_ (W)w);
1461	}	1509	}
…		…
1479	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	1527	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1528	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481		1529
1482	if (!((WL)w)->next)	1530	if (!((WL)w)->next)
1483	{	1531	{
1484	#if WIN32	1532	#if _WIN32
1485	signal (w->signum, sighandler);	1533	signal (w->signum, sighandler);
1486	#else	1534	#else
1487	struct sigaction sa;	1535	struct sigaction sa;
1488	sa.sa_handler = sighandler;	1536	sa.sa_handler = sighandler;
1489	sigfillset (&sa.sa_mask);	1537	sigfillset (&sa.sa_mask);
…		…
1522		1570
1523	void	1571	void
1524	ev_child_stop (EV_P_ struct ev_child *w)	1572	ev_child_stop (EV_P_ struct ev_child *w)
1525	{	1573	{
1526	ev_clear_pending (EV_A_ (W)w);	1574	ev_clear_pending (EV_A_ (W)w);
1527	if (ev_is_active (w))	1575	if (!ev_is_active (w))
1528	return;	1576	return;
1529		1577
1530	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);	1578	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531	ev_stop (EV_A_ (W)w);	1579	ev_stop (EV_A_ (W)w);
1532	}	1580	}
…		…
1592	ev_timer_start (EV_A_ &once->to);	1640	ev_timer_start (EV_A_ &once->to);
1593	}	1641	}
1594	}	1642	}
1595	}	1643	}
1596		1644
		1645	#ifdef __cplusplus
		1646	}
		1647	#endif
		1648

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs. Revision 1.114 by root, Mon Nov 12 20:03:39 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.114 by root, Mon Nov 12 20:03:39 2007 UTC