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

Comparing libev/ev.c (file contents):
Revision 1.77 by root, Thu Nov 8 00:44:17 2007 UTC vs.
Revision 1.116 by root, Thu Nov 15 09:19:42 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) */
127	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */	148	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */	149	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129	/#define CLEANUP_INTERVAL 300. / how often to try to free memory and re-check fds */	150	/#define CLEANUP_INTERVAL 300. / how often to try to free memory and re-check fds */
130		151
		152	#ifdef EV_H
		153	# include EV_H
		154	#else
131	#include "ev.h"	155	# include "ev.h"
		156	#endif
132		157
133	#if __GNUC__ >= 3	158	#if __GNUC__ >= 3
134	# define expect(expr,value) __builtin_expect ((expr),(value))	159	# define expect(expr,value) __builtin_expect ((expr),(value))
135	# define inline inline	160	# define inline inline
136	#else	161	#else
…		…
142	#define expect_true(expr) expect ((expr) != 0, 1)	167	#define expect_true(expr) expect ((expr) != 0, 1)
143		168
144	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)	169	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145	#define ABSPRI(w) ((w)->priority - EV_MINPRI)	170	#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146		171
		172	#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
		173	#define EMPTY2(a,b) /* used to suppress some warnings */
		174
147	typedef struct ev_watcher *W;	175	typedef struct ev_watcher *W;
148	typedef struct ev_watcher_list *WL;	176	typedef struct ev_watcher_list *WL;
149	typedef struct ev_watcher_time *WT;	177	typedef struct ev_watcher_time *WT;
150		178
151	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	179	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152		180
		181	#ifdef _WIN32
153	#include "ev_win32.c"	182	# include "ev_win32.c"
		183	#endif
154		184
155	/*****************************************************************************/	185	/*****************************************************************************/
156		186
157	static void (syserr_cb)(const char msg);	187	static void (syserr_cb)(const char msg);
158		188
…		…
205	typedef struct	235	typedef struct
206	{	236	{
207	WL head;	237	WL head;
208	unsigned char events;	238	unsigned char events;
209	unsigned char reify;	239	unsigned char reify;
		240	#if EV_SELECT_IS_WINSOCKET
		241	SOCKET handle;
		242	#endif
210	} ANFD;	243	} ANFD;
211		244
212	typedef struct	245	typedef struct
213	{	246	{
214	W w;	247	W w;
215	int events;	248	int events;
216	} ANPENDING;	249	} ANPENDING;
217		250
218	#if EV_MULTIPLICITY	251	#if EV_MULTIPLICITY
219		252
220	struct ev_loop	253	struct ev_loop
221	{	254	{
		255	ev_tstamp ev_rt_now;
		256	#define ev_rt_now ((loop)->ev_rt_now)
222	# define VAR(name,decl) decl;	257	#define VAR(name,decl) decl;
223	# include "ev_vars.h"	258	#include "ev_vars.h"
224	};
225	# undef VAR	259	#undef VAR
		260	};
226	# include "ev_wrap.h"	261	#include "ev_wrap.h"
		262
		263	static struct ev_loop default_loop_struct;
		264	struct ev_loop *ev_default_loop_ptr;
227		265
228	#else	266	#else
229		267
		268	ev_tstamp ev_rt_now;
230	# define VAR(name,decl) static decl;	269	#define VAR(name,decl) static decl;
231	# include "ev_vars.h"	270	#include "ev_vars.h"
232	# undef VAR	271	#undef VAR
		272
		273	static int ev_default_loop_ptr;
233		274
234	#endif	275	#endif
235		276
236	/*****************************************************************************/	277	/*****************************************************************************/
237		278
238	inline ev_tstamp	279	ev_tstamp
239	ev_time (void)	280	ev_time (void)
240	{	281	{
241	#if EV_USE_REALTIME	282	#if EV_USE_REALTIME
242	struct timespec ts;	283	struct timespec ts;
243	clock_gettime (CLOCK_REALTIME, &ts);	284	clock_gettime (CLOCK_REALTIME, &ts);
…		…
262	#endif	303	#endif
263		304
264	return ev_time ();	305	return ev_time ();
265	}	306	}
266		307
		308	#if EV_MULTIPLICITY
267	ev_tstamp	309	ev_tstamp
268	ev_now (EV_P)	310	ev_now (EV_P)
269	{	311	{
270	return rt_now;	312	return ev_rt_now;
271	}	313	}
		314	#endif
272		315
273	#define array_roundsize(type,n) ((n) \| 4 & ~3)	316	#define array_roundsize(type,n) (((n) \| 4) & ~3)
274		317
275	#define array_needsize(type,base,cur,cnt,init) \	318	#define array_needsize(type,base,cur,cnt,init) \
276	if (expect_false ((cnt) > cur)) \	319	if (expect_false ((cnt) > cur)) \
277	{ \	320	{ \
278	int newcnt = cur; \	321	int newcnt = cur; \
…		…
293	stem ## max = array_roundsize (stem ## cnt >> 1); \	336	stem ## max = array_roundsize (stem ## cnt >> 1); \
294	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\	337	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\
295	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\	338	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\
296	}	339	}
297		340
298	/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299	/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300	#define array_free_microshit(stem) \
301	ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303	#define array_free(stem, idx) \	341	#define array_free(stem, idx) \
304	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;
305		343
306	/*****************************************************************************/	344	/*****************************************************************************/
307		345
…		…
316		354
317	++base;	355	++base;
318	}	356	}
319	}	357	}
320		358
321	static void	359	void
322	event (EV_P_ W w, int events)	360	ev_feed_event (EV_P_ void *w, int revents)
323	{	361	{
		362	W w_ = (W)w;
		363
324	if (w->pending)	364	if (w_->pending)
325	{	365	{
326	pendings [ABSPRI (w)][w->pending - 1].events \|= events;	366	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;
327	return;	367	return;
328	}	368	}
329		369
330	w->pending = ++pendingcnt [ABSPRI (w)];	370	w_->pending = ++pendingcnt [ABSPRI (w_)];
331	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);
332	pendings [ABSPRI (w)][w->pending - 1].w = w;	372	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333	pendings [ABSPRI (w)][w->pending - 1].events = events;	373	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334	}	374	}
335		375
336	static void	376	static void
337	queue_events (EV_P_ W *events, int eventcnt, int type)	377	queue_events (EV_P_ W *events, int eventcnt, int type)
338	{	378	{
339	int i;	379	int i;
340		380
341	for (i = 0; i < eventcnt; ++i)	381	for (i = 0; i < eventcnt; ++i)
342	event (EV_A_ events [i], type);	382	ev_feed_event (EV_A_ events [i], type);
343	}	383	}
344		384
345	static void	385	inline void
346	fd_event (EV_P_ int fd, int events)	386	fd_event (EV_P_ int fd, int revents)
347	{	387	{
348	ANFD *anfd = anfds + fd;	388	ANFD *anfd = anfds + fd;
349	struct ev_io *w;	389	struct ev_io *w;
350		390
351	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)	391	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)
352	{	392	{
353	int ev = w->events & events;	393	int ev = w->events & revents;
354		394
355	if (ev)	395	if (ev)
356	event (EV_A_ (W)w, ev);	396	ev_feed_event (EV_A_ (W)w, ev);
357	}	397	}
		398	}
		399
		400	void
		401	ev_feed_fd_event (EV_P_ int fd, int revents)
		402	{
		403	fd_event (EV_A_ fd, revents);
358	}	404	}
359		405
360	/*****************************************************************************/	406	/*****************************************************************************/
361		407
362	static void	408	static void
…		…
373	int events = 0;	419	int events = 0;
374		420
375	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)
376	events \|= w->events;	422	events \|= w->events;
377		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
378	anfd->reify = 0;	433	anfd->reify = 0;
379		434
380	method_modify (EV_A_ fd, anfd->events, events);	435	method_modify (EV_A_ fd, anfd->events, events);
381	anfd->events = events;	436	anfd->events = events;
382	}	437	}
…		…
391	return;	446	return;
392		447
393	anfds [fd].reify = 1;	448	anfds [fd].reify = 1;
394		449
395	++fdchangecnt;	450	++fdchangecnt;
396	array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));	451	array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
397	fdchanges [fdchangecnt - 1] = fd;	452	fdchanges [fdchangecnt - 1] = fd;
398	}	453	}
399		454
400	static void	455	static void
401	fd_kill (EV_P_ int fd)	456	fd_kill (EV_P_ int fd)
…		…
403	struct ev_io *w;	458	struct ev_io *w;
404		459
405	while ((w = (struct ev_io *)anfds [fd].head))	460	while ((w = (struct ev_io *)anfds [fd].head))
406	{	461	{
407	ev_io_stop (EV_A_ w);	462	ev_io_stop (EV_A_ w);
408	event (EV_A_ (W)w, EV_ERROR \| EV_READ \| EV_WRITE);	463	ev_feed_event (EV_A_ (W)w, EV_ERROR \| EV_READ \| EV_WRITE);
409	}	464	}
410	}	465	}
411		466
412	static int	467	static int
413	fd_valid (int fd)	468	fd_valid (int fd)
414	{	469	{
415	#ifdef WIN32	470	#ifdef _WIN32
416	return !!win32_get_osfhandle (fd);	471	return _get_osfhandle (fd) != -1;
417	#else	472	#else
418	return fcntl (fd, F_GETFD) != -1;	473	return fcntl (fd, F_GETFD) != -1;
419	#endif	474	#endif
420	}	475	}
421		476
…		…
501		556
502	heap [k] = w;	557	heap [k] = w;
503	((W)heap [k])->active = k + 1;	558	((W)heap [k])->active = k + 1;
504	}	559	}
505		560
		561	inline void
		562	adjustheap (WT *heap, int N, int k)
		563	{
		564	upheap (heap, k);
		565	downheap (heap, N, k);
		566	}
		567
506	/*****************************************************************************/	568	/*****************************************************************************/
507		569
508	typedef struct	570	typedef struct
509	{	571	{
510	WL head;	572	WL head;
…		…
531	}	593	}
532		594
533	static void	595	static void
534	sighandler (int signum)	596	sighandler (int signum)
535	{	597	{
536	#if WIN32	598	#if _WIN32
537	signal (signum, sighandler);	599	signal (signum, sighandler);
538	#endif	600	#endif
539		601
540	signals [signum - 1].gotsig = 1;	602	signals [signum - 1].gotsig = 1;
541		603
542	if (!gotsig)	604	if (!gotsig)
543	{	605	{
544	int old_errno = errno;	606	int old_errno = errno;
545	gotsig = 1;	607	gotsig = 1;
546	#ifdef WIN32
547	send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548	#else
549	write (sigpipe [1], &signum, 1);	608	write (sigpipe [1], &signum, 1);
550	#endif
551	errno = old_errno;	609	errno = old_errno;
552	}	610	}
553	}	611	}
554		612
		613	void
		614	ev_feed_signal_event (EV_P_ int signum)
		615	{
		616	WL w;
		617
		618	#if EV_MULTIPLICITY
		619	assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
		620	#endif
		621
		622	--signum;
		623
		624	if (signum < 0 \|\| signum >= signalmax)
		625	return;
		626
		627	signals [signum].gotsig = 0;
		628
		629	for (w = signals [signum].head; w; w = w->next)
		630	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
		631	}
		632
555	static void	633	static void
556	sigcb (EV_P_ struct ev_io *iow, int revents)	634	sigcb (EV_P_ struct ev_io *iow, int revents)
557	{	635	{
558	WL w;
559	int signum;	636	int signum;
560		637
561	#ifdef WIN32
562	recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563	#else
564	read (sigpipe [0], &revents, 1);	638	read (sigpipe [0], &revents, 1);
565	#endif
566	gotsig = 0;	639	gotsig = 0;
567		640
568	for (signum = signalmax; signum--; )	641	for (signum = signalmax; signum--; )
569	if (signals [signum].gotsig)	642	if (signals [signum].gotsig)
570	{	643	ev_feed_signal_event (EV_A_ signum + 1);
571	signals [signum].gotsig = 0;	644	}
572		645
573	for (w = signals [signum].head; w; w = w->next)	646	inline void
574	event (EV_A_ (W)w, EV_SIGNAL);	647	fd_intern (int fd)
575	}	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
576	}	656	}
577		657
578	static void	658	static void
579	siginit (EV_P)	659	siginit (EV_P)
580	{	660	{
581	#ifndef WIN32	661	fd_intern (sigpipe [0]);
582	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	662	fd_intern (sigpipe [1]);
583	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
584
585	/* rather than sort out wether we really need nb, set it */
586	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
587	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
588	#endif
589		663
590	ev_io_set (&sigev, sigpipe [0], EV_READ);	664	ev_io_set (&sigev, sigpipe [0], EV_READ);
591	ev_io_start (EV_A_ &sigev);	665	ev_io_start (EV_A_ &sigev);
592	ev_unref (EV_A); /* child watcher should not keep loop alive */	666	ev_unref (EV_A); /* child watcher should not keep loop alive */
593	}	667	}
594		668
595	/*****************************************************************************/	669	/*****************************************************************************/
596		670
597	static struct ev_child *childs [PID_HASHSIZE];	671	static struct ev_child *childs [PID_HASHSIZE];
598		672
599	#ifndef WIN32	673	#ifndef _WIN32
600		674
601	static struct ev_signal childev;	675	static struct ev_signal childev;
602		676
603	#ifndef WCONTINUED	677	#ifndef WCONTINUED
604	# define WCONTINUED 0	678	# define WCONTINUED 0
…		…
613	if (w->pid == pid \|\| !w->pid)	687	if (w->pid == pid \|\| !w->pid)
614	{	688	{
615	ev_priority (w) = ev_priority (sw); /* need to do it now */	689	ev_priority (w) = ev_priority (sw); /* need to do it now */
616	w->rpid = pid;	690	w->rpid = pid;
617	w->rstatus = status;	691	w->rstatus = status;
618	event (EV_A_ (W)w, EV_CHILD);	692	ev_feed_event (EV_A_ (W)w, EV_CHILD);
619	}	693	}
620	}	694	}
621		695
622	static void	696	static void
623	childcb (EV_P_ struct ev_signal *sw, int revents)	697	childcb (EV_P_ struct ev_signal *sw, int revents)
…		…
625	int pid, status;	699	int pid, status;
626		700
627	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))	701	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))
628	{	702	{
629	/* make sure we are called again until all childs have been reaped */	703	/* make sure we are called again until all childs have been reaped */
630	event (EV_A_ (W)sw, EV_SIGNAL);	704	ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
631		705
632	child_reap (EV_A_ sw, pid, pid, status);	706	child_reap (EV_A_ sw, pid, pid, status);
633	child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */	707	child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
634	}	708	}
635	}	709	}
…		…
665		739
666	/* 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 */
667	static int	741	static int
668	enable_secure (void)	742	enable_secure (void)
669	{	743	{
670	#ifdef WIN32	744	#ifdef _WIN32
671	return 0;	745	return 0;
672	#else	746	#else
673	return getuid () != geteuid ()	747	return getuid () != geteuid ()
674	\|\| getgid () != getegid ();	748	\|\| getgid () != getegid ();
675	#endif	749	#endif
676	}	750	}
677		751
678	int	752	unsigned int
679	ev_method (EV_P)	753	ev_method (EV_P)
680	{	754	{
681	return method;	755	return method;
682	}	756	}
683		757
684	static void	758	static void
685	loop_init (EV_P_ int methods)	759	loop_init (EV_P_ unsigned int flags)
686	{	760	{
687	if (!method)	761	if (!method)
688	{	762	{
689	#if EV_USE_MONOTONIC	763	#if EV_USE_MONOTONIC
690	{	764	{
…		…
692	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	766	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
693	have_monotonic = 1;	767	have_monotonic = 1;
694	}	768	}
695	#endif	769	#endif
696		770
697	rt_now = ev_time ();	771	ev_rt_now = ev_time ();
698	mn_now = get_clock ();	772	mn_now = get_clock ();
699	now_floor = mn_now;	773	now_floor = mn_now;
700	rtmn_diff = rt_now - mn_now;	774	rtmn_diff = ev_rt_now - mn_now;
701		775
702	if (methods == EVMETHOD_AUTO)	776	if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
703	if (!enable_secure () && getenv ("LIBEV_METHODS"))
704	methods = atoi (getenv ("LIBEV_METHODS"));	777	flags = atoi (getenv ("LIBEV_FLAGS"));
705	else	778
706	methods = EVMETHOD_ANY;	779	if (!(flags & 0x0000ffff))
		780	flags \|= 0x0000ffff;
707		781
708	method = 0;	782	method = 0;
709	#if EV_USE_WIN32
710	if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
711	#endif
712	#if EV_USE_KQUEUE	783	#if EV_USE_KQUEUE
713	if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);	784	if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
714	#endif	785	#endif
715	#if EV_USE_EPOLL	786	#if EV_USE_EPOLL
716	if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);	787	if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
717	#endif	788	#endif
718	#if EV_USE_POLL	789	#if EV_USE_POLL
719	if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);	790	if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
720	#endif	791	#endif
721	#if EV_USE_SELECT	792	#if EV_USE_SELECT
722	if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);	793	if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
723	#endif	794	#endif
724		795
725	ev_watcher_init (&sigev, sigcb);	796	ev_init (&sigev, sigcb);
726	ev_set_priority (&sigev, EV_MAXPRI);	797	ev_set_priority (&sigev, EV_MAXPRI);
727	}	798	}
728	}	799	}
729		800
730	void	801	void
731	loop_destroy (EV_P)	802	loop_destroy (EV_P)
732	{	803	{
733	int i;	804	int i;
734		805
735	#if EV_USE_WIN32
736	if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
737	#endif
738	#if EV_USE_KQUEUE	806	#if EV_USE_KQUEUE
739	if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);	807	if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
740	#endif	808	#endif
741	#if EV_USE_EPOLL	809	#if EV_USE_EPOLL
742	if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);	810	if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
…		…
750		818
751	for (i = NUMPRI; i--; )	819	for (i = NUMPRI; i--; )
752	array_free (pending, [i]);	820	array_free (pending, [i]);
753		821
754	/* have to use the microsoft-never-gets-it-right macro */	822	/* have to use the microsoft-never-gets-it-right macro */
755	array_free_microshit (fdchange);	823	array_free (fdchange, EMPTY0);
756	array_free_microshit (timer);	824	array_free (timer, EMPTY0);
757	array_free_microshit (periodic);	825	#if EV_PERIODICS
758	array_free_microshit (idle);	826	array_free (periodic, EMPTY0);
759	array_free_microshit (prepare);	827	#endif
760	array_free_microshit (check);	828	array_free (idle, EMPTY0);
		829	array_free (prepare, EMPTY0);
		830	array_free (check, EMPTY0);
761		831
762	method = 0;	832	method = 0;
763	}	833	}
764		834
765	static void	835	static void
…		…
790	postfork = 0;	860	postfork = 0;
791	}	861	}
792		862
793	#if EV_MULTIPLICITY	863	#if EV_MULTIPLICITY
794	struct ev_loop *	864	struct ev_loop *
795	ev_loop_new (int methods)	865	ev_loop_new (unsigned int flags)
796	{	866	{
797	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));
798		868
799	memset (loop, 0, sizeof (struct ev_loop));	869	memset (loop, 0, sizeof (struct ev_loop));
800		870
801	loop_init (EV_A_ methods);	871	loop_init (EV_A_ flags);
802		872
803	if (ev_method (EV_A))	873	if (ev_method (EV_A))
804	return loop;	874	return loop;
805		875
806	return 0;	876	return 0;
…		…
820	}	890	}
821		891
822	#endif	892	#endif
823		893
824	#if EV_MULTIPLICITY	894	#if EV_MULTIPLICITY
825	struct ev_loop default_loop_struct;
826	static struct ev_loop *default_loop;
827
828	struct ev_loop *	895	struct ev_loop *
		896	ev_default_loop_ (unsigned int flags)
829	#else	897	#else
830	static int default_loop;
831
832	int	898	int
		899	ev_default_loop (unsigned int flags)
833	#endif	900	#endif
834	ev_default_loop (int methods)
835	{	901	{
836	if (sigpipe [0] == sigpipe [1])	902	if (sigpipe [0] == sigpipe [1])
837	if (pipe (sigpipe))	903	if (pipe (sigpipe))
838	return 0;	904	return 0;
839		905
840	if (!default_loop)	906	if (!ev_default_loop_ptr)
841	{	907	{
842	#if EV_MULTIPLICITY	908	#if EV_MULTIPLICITY
843	struct ev_loop *loop = default_loop = &default_loop_struct;	909	struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
844	#else	910	#else
845	default_loop = 1;	911	ev_default_default_loop_ptr = 1;
846	#endif	912	#endif
847		913
848	loop_init (EV_A_ methods);	914	loop_init (EV_A_ flags);
849		915
850	if (ev_method (EV_A))	916	if (ev_method (EV_A))
851	{	917	{
852	siginit (EV_A);	918	siginit (EV_A);
853		919
854	#ifndef WIN32	920	#ifndef _WIN32
855	ev_signal_init (&childev, childcb, SIGCHLD);	921	ev_signal_init (&childev, childcb, SIGCHLD);
856	ev_set_priority (&childev, EV_MAXPRI);	922	ev_set_priority (&childev, EV_MAXPRI);
857	ev_signal_start (EV_A_ &childev);	923	ev_signal_start (EV_A_ &childev);
858	ev_unref (EV_A); /* child watcher should not keep loop alive */	924	ev_unref (EV_A); /* child watcher should not keep loop alive */
859	#endif	925	#endif
860	}	926	}
861	else	927	else
862	default_loop = 0;	928	ev_default_loop_ptr = 0;
863	}	929	}
864		930
865	return default_loop;	931	return ev_default_loop_ptr;
866	}	932	}
867		933
868	void	934	void
869	ev_default_destroy (void)	935	ev_default_destroy (void)
870	{	936	{
871	#if EV_MULTIPLICITY	937	#if EV_MULTIPLICITY
872	struct ev_loop *loop = default_loop;	938	struct ev_loop *loop = ev_default_loop_ptr;
873	#endif	939	#endif
874		940
875	#ifndef WIN32	941	#ifndef _WIN32
876	ev_ref (EV_A); /* child watcher */	942	ev_ref (EV_A); /* child watcher */
877	ev_signal_stop (EV_A_ &childev);	943	ev_signal_stop (EV_A_ &childev);
878	#endif	944	#endif
879		945
880	ev_ref (EV_A); /* signal watcher */	946	ev_ref (EV_A); /* signal watcher */
…		…
888		954
889	void	955	void
890	ev_default_fork (void)	956	ev_default_fork (void)
891	{	957	{
892	#if EV_MULTIPLICITY	958	#if EV_MULTIPLICITY
893	struct ev_loop *loop = default_loop;	959	struct ev_loop *loop = ev_default_loop_ptr;
894	#endif	960	#endif
895		961
896	if (method)	962	if (method)
897	postfork = 1;	963	postfork = 1;
898	}	964	}
…		…
922	ANPENDING *p = pendings [pri] + --pendingcnt [pri];	988	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
923		989
924	if (p->w)	990	if (p->w)
925	{	991	{
926	p->w->pending = 0;	992	p->w->pending = 0;
927	p->w->cb (EV_A_ p->w, p->events);	993	EV_CB_INVOKE (p->w, p->events);
928	}	994	}
929	}	995	}
930	}	996	}
931		997
932	static void	998	static void
…		…
940		1006
941	/* first reschedule or stop timer */	1007	/* first reschedule or stop timer */
942	if (w->repeat)	1008	if (w->repeat)
943	{	1009	{
944	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));	1010	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
		1011
945	((WT)w)->at = mn_now + w->repeat;	1012	((WT)w)->at += w->repeat;
		1013	if (((WT)w)->at < mn_now)
		1014	((WT)w)->at = mn_now;
		1015
946	downheap ((WT *)timers, timercnt, 0);	1016	downheap ((WT *)timers, timercnt, 0);
947	}	1017	}
948	else	1018	else
949	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */	1019	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
950		1020
951	event (EV_A_ (W)w, EV_TIMEOUT);	1021	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
952	}	1022	}
953	}	1023	}
954		1024
		1025	#if EV_PERIODICS
955	static void	1026	static void
956	periodics_reify (EV_P)	1027	periodics_reify (EV_P)
957	{	1028	{
958	while (periodiccnt && ((WT)periodics [0])->at <= rt_now)	1029	while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
959	{	1030	{
960	struct ev_periodic *w = periodics [0];	1031	struct ev_periodic *w = periodics [0];
961		1032
962	assert (("inactive timer on periodic heap detected", ev_is_active (w)));	1033	assert (("inactive timer on periodic heap detected", ev_is_active (w)));
963		1034
964	/* first reschedule or stop timer */	1035	/* first reschedule or stop timer */
965	if (w->reschedule_cb)	1036	if (w->reschedule_cb)
966	{	1037	{
967	ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);	1038	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
968
969	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));	1039	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
970	downheap ((WT *)periodics, periodiccnt, 0);	1040	downheap ((WT *)periodics, periodiccnt, 0);
971	}	1041	}
972	else if (w->interval)	1042	else if (w->interval)
973	{	1043	{
974	((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;	1044	((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
975	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));	1045	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
976	downheap ((WT *)periodics, periodiccnt, 0);	1046	downheap ((WT *)periodics, periodiccnt, 0);
977	}	1047	}
978	else	1048	else
979	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1049	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
980		1050
981	event (EV_A_ (W)w, EV_PERIODIC);	1051	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
982	}	1052	}
983	}	1053	}
984		1054
985	static void	1055	static void
986	periodics_reschedule (EV_P)	1056	periodics_reschedule (EV_P)
…		…
991	for (i = 0; i < periodiccnt; ++i)	1061	for (i = 0; i < periodiccnt; ++i)
992	{	1062	{
993	struct ev_periodic *w = periodics [i];	1063	struct ev_periodic *w = periodics [i];
994		1064
995	if (w->reschedule_cb)	1065	if (w->reschedule_cb)
996	((WT)w)->at = w->reschedule_cb (w, rt_now);	1066	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
997	else if (w->interval)	1067	else if (w->interval)
998	((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;	1068	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
999	}	1069	}
1000		1070
1001	/* now rebuild the heap */	1071	/* now rebuild the heap */
1002	for (i = periodiccnt >> 1; i--; )	1072	for (i = periodiccnt >> 1; i--; )
1003	downheap ((WT *)periodics, periodiccnt, i);	1073	downheap ((WT *)periodics, periodiccnt, i);
1004	}	1074	}
		1075	#endif
1005		1076
1006	inline int	1077	inline int
1007	time_update_monotonic (EV_P)	1078	time_update_monotonic (EV_P)
1008	{	1079	{
1009	mn_now = get_clock ();	1080	mn_now = get_clock ();
1010		1081
1011	if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))	1082	if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1012	{	1083	{
1013	rt_now = rtmn_diff + mn_now;	1084	ev_rt_now = rtmn_diff + mn_now;
1014	return 0;	1085	return 0;
1015	}	1086	}
1016	else	1087	else
1017	{	1088	{
1018	now_floor = mn_now;	1089	now_floor = mn_now;
1019	rt_now = ev_time ();	1090	ev_rt_now = ev_time ();
1020	return 1;	1091	return 1;
1021	}	1092	}
1022	}	1093	}
1023		1094
1024	static void	1095	static void
…		…
1033	{	1104	{
1034	ev_tstamp odiff = rtmn_diff;	1105	ev_tstamp odiff = rtmn_diff;
1035		1106
1036	for (i = 4; --i; ) /* loop a few times, before making important decisions */	1107	for (i = 4; --i; ) /* loop a few times, before making important decisions */
1037	{	1108	{
1038	rtmn_diff = rt_now - mn_now;	1109	rtmn_diff = ev_rt_now - mn_now;
1039		1110
1040	if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)	1111	if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1041	return; /* all is well */	1112	return; /* all is well */
1042		1113
1043	rt_now = ev_time ();	1114	ev_rt_now = ev_time ();
1044	mn_now = get_clock ();	1115	mn_now = get_clock ();
1045	now_floor = mn_now;	1116	now_floor = mn_now;
1046	}	1117	}
1047		1118
		1119	# if EV_PERIODICS
1048	periodics_reschedule (EV_A);	1120	periodics_reschedule (EV_A);
		1121	# endif
1049	/* no timer adjustment, as the monotonic clock doesn't jump */	1122	/* no timer adjustment, as the monotonic clock doesn't jump */
1050	/* timers_reschedule (EV_A_ rtmn_diff - odiff) */	1123	/* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1051	}	1124	}
1052	}	1125	}
1053	else	1126	else
1054	#endif	1127	#endif
1055	{	1128	{
1056	rt_now = ev_time ();	1129	ev_rt_now = ev_time ();
1057		1130
1058	if (expect_false (mn_now > rt_now \|\| mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))	1131	if (expect_false (mn_now > ev_rt_now \|\| mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1059	{	1132	{
		1133	#if EV_PERIODICS
1060	periodics_reschedule (EV_A);	1134	periodics_reschedule (EV_A);
		1135	#endif
1061		1136
1062	/* adjust timers. this is easy, as the offset is the same for all */	1137	/* adjust timers. this is easy, as the offset is the same for all */
1063	for (i = 0; i < timercnt; ++i)	1138	for (i = 0; i < timercnt; ++i)
1064	((WT)timers [i])->at += rt_now - mn_now;	1139	((WT)timers [i])->at += ev_rt_now - mn_now;
1065	}	1140	}
1066		1141
1067	mn_now = rt_now;	1142	mn_now = ev_rt_now;
1068	}	1143	}
1069	}	1144	}
1070		1145
1071	void	1146	void
1072	ev_ref (EV_P)	1147	ev_ref (EV_P)
…		…
1086	ev_loop (EV_P_ int flags)	1161	ev_loop (EV_P_ int flags)
1087	{	1162	{
1088	double block;	1163	double block;
1089	loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	1164	loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
1090		1165
1091	do	1166	while (activecnt)
1092	{	1167	{
1093	/* queue check watchers (and execute them) */	1168	/* queue check watchers (and execute them) */
1094	if (expect_false (preparecnt))	1169	if (expect_false (preparecnt))
1095	{	1170	{
1096	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	1171	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
…		…
1112	if (expect_true (have_monotonic))	1187	if (expect_true (have_monotonic))
1113	time_update_monotonic (EV_A);	1188	time_update_monotonic (EV_A);
1114	else	1189	else
1115	#endif	1190	#endif
1116	{	1191	{
1117	rt_now = ev_time ();	1192	ev_rt_now = ev_time ();
1118	mn_now = rt_now;	1193	mn_now = ev_rt_now;
1119	}	1194	}
1120		1195
1121	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	1196	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
1122	block = 0.;	1197	block = 0.;
1123	else	1198	else
…		…
1128	{	1203	{
1129	ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;	1204	ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1130	if (block > to) block = to;	1205	if (block > to) block = to;
1131	}	1206	}
1132		1207
		1208	#if EV_PERIODICS
1133	if (periodiccnt)	1209	if (periodiccnt)
1134	{	1210	{
1135	ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;	1211	ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1136	if (block > to) block = to;	1212	if (block > to) block = to;
1137	}	1213	}
		1214	#endif
1138		1215
1139	if (block < 0.) block = 0.;	1216	if (block < 0.) block = 0.;
1140	}	1217	}
1141		1218
1142	method_poll (EV_A_ block);	1219	method_poll (EV_A_ block);
1143		1220
1144	/* update rt_now, do magic */	1221	/* update ev_rt_now, do magic */
1145	time_update (EV_A);	1222	time_update (EV_A);
1146		1223
1147	/* queue pending timers and reschedule them */	1224	/* queue pending timers and reschedule them */
1148	timers_reify (EV_A); /* relative timers called last */	1225	timers_reify (EV_A); /* relative timers called last */
		1226	#if EV_PERIODICS
1149	periodics_reify (EV_A); /* absolute timers called first */	1227	periodics_reify (EV_A); /* absolute timers called first */
		1228	#endif
1150		1229
1151	/* queue idle watchers unless io or timers are pending */	1230	/* queue idle watchers unless io or timers are pending */
1152	if (idlecnt && !any_pending (EV_A))	1231	if (idlecnt && !any_pending (EV_A))
1153	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);	1232	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1154		1233
1155	/* queue check watchers, to be executed first */	1234	/* queue check watchers, to be executed first */
1156	if (checkcnt)	1235	if (checkcnt)
1157	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);	1236	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1158		1237
1159	call_pending (EV_A);	1238	call_pending (EV_A);
		1239
		1240	if (loop_done)
		1241	break;
1160	}	1242	}
1161	while (activecnt && !loop_done);
1162		1243
1163	if (loop_done != 2)	1244	if (loop_done != 2)
1164	loop_done = 0;	1245	loop_done = 0;
1165	}	1246	}
1166		1247
…		…
1245	{	1326	{
1246	ev_clear_pending (EV_A_ (W)w);	1327	ev_clear_pending (EV_A_ (W)w);
1247	if (!ev_is_active (w))	1328	if (!ev_is_active (w))
1248	return;	1329	return;
1249		1330
		1331	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
		1332
1250	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	1333	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1251	ev_stop (EV_A_ (W)w);	1334	ev_stop (EV_A_ (W)w);
1252		1335
1253	fd_change (EV_A_ w->fd);	1336	fd_change (EV_A_ w->fd);
1254	}	1337	}
…		…
1262	((WT)w)->at += mn_now;	1345	((WT)w)->at += mn_now;
1263		1346
1264	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));	1347	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1265		1348
1266	ev_start (EV_A_ (W)w, ++timercnt);	1349	ev_start (EV_A_ (W)w, ++timercnt);
1267	array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));	1350	array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1268	timers [timercnt - 1] = w;	1351	timers [timercnt - 1] = w;
1269	upheap ((WT *)timers, timercnt - 1);	1352	upheap ((WT *)timers, timercnt - 1);
1270		1353
1271	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1354	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1272	}	1355	}
…		…
1281	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1364	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1282		1365
1283	if (((W)w)->active < timercnt--)	1366	if (((W)w)->active < timercnt--)
1284	{	1367	{
1285	timers [((W)w)->active - 1] = timers [timercnt];	1368	timers [((W)w)->active - 1] = timers [timercnt];
1286	downheap ((WT *)timers, timercnt, ((W)w)->active - 1);	1369	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1287	}	1370	}
1288		1371
1289	((WT)w)->at = w->repeat;	1372	((WT)w)->at -= mn_now;
1290		1373
1291	ev_stop (EV_A_ (W)w);	1374	ev_stop (EV_A_ (W)w);
1292	}	1375	}
1293		1376
1294	void	1377	void
…		…
1297	if (ev_is_active (w))	1380	if (ev_is_active (w))
1298	{	1381	{
1299	if (w->repeat)	1382	if (w->repeat)
1300	{	1383	{
1301	((WT)w)->at = mn_now + w->repeat;	1384	((WT)w)->at = mn_now + w->repeat;
1302	downheap ((WT *)timers, timercnt, ((W)w)->active - 1);	1385	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1303	}	1386	}
1304	else	1387	else
1305	ev_timer_stop (EV_A_ w);	1388	ev_timer_stop (EV_A_ w);
1306	}	1389	}
1307	else if (w->repeat)	1390	else if (w->repeat)
		1391	{
		1392	w->at = w->repeat;
1308	ev_timer_start (EV_A_ w);	1393	ev_timer_start (EV_A_ w);
		1394	}
1309	}	1395	}
1310		1396
		1397	#if EV_PERIODICS
1311	void	1398	void
1312	ev_periodic_start (EV_P_ struct ev_periodic *w)	1399	ev_periodic_start (EV_P_ struct ev_periodic *w)
1313	{	1400	{
1314	if (ev_is_active (w))	1401	if (ev_is_active (w))
1315	return;	1402	return;
1316		1403
1317	if (w->reschedule_cb)	1404	if (w->reschedule_cb)
1318	((WT)w)->at = w->reschedule_cb (w, rt_now);	1405	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1319	else if (w->interval)	1406	else if (w->interval)
1320	{	1407	{
1321	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));	1408	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1322	/* this formula differs from the one in periodic_reify because we do not always round up */	1409	/* this formula differs from the one in periodic_reify because we do not always round up */
1323	((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;	1410	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1324	}	1411	}
1325		1412
1326	ev_start (EV_A_ (W)w, ++periodiccnt);	1413	ev_start (EV_A_ (W)w, ++periodiccnt);
1327	array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));	1414	array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1328	periodics [periodiccnt - 1] = w;	1415	periodics [periodiccnt - 1] = w;
1329	upheap ((WT *)periodics, periodiccnt - 1);	1416	upheap ((WT *)periodics, periodiccnt - 1);
1330		1417
1331	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1418	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1332	}	1419	}
…		…
1341	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1428	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1342		1429
1343	if (((W)w)->active < periodiccnt--)	1430	if (((W)w)->active < periodiccnt--)
1344	{	1431	{
1345	periodics [((W)w)->active - 1] = periodics [periodiccnt];	1432	periodics [((W)w)->active - 1] = periodics [periodiccnt];
1346	downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);	1433	adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1347	}	1434	}
1348		1435
1349	ev_stop (EV_A_ (W)w);	1436	ev_stop (EV_A_ (W)w);
1350	}	1437	}
1351		1438
1352	void	1439	void
1353	ev_periodic_again (EV_P_ struct ev_periodic *w)	1440	ev_periodic_again (EV_P_ struct ev_periodic *w)
1354	{	1441	{
		1442	/* TODO: use adjustheap and recalculation */
1355	ev_periodic_stop (EV_A_ w);	1443	ev_periodic_stop (EV_A_ w);
1356	ev_periodic_start (EV_A_ w);	1444	ev_periodic_start (EV_A_ w);
1357	}	1445	}
		1446	#endif
1358		1447
1359	void	1448	void
1360	ev_idle_start (EV_P_ struct ev_idle *w)	1449	ev_idle_start (EV_P_ struct ev_idle *w)
1361	{	1450	{
1362	if (ev_is_active (w))	1451	if (ev_is_active (w))
1363	return;	1452	return;
1364		1453
1365	ev_start (EV_A_ (W)w, ++idlecnt);	1454	ev_start (EV_A_ (W)w, ++idlecnt);
1366	array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));	1455	array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1367	idles [idlecnt - 1] = w;	1456	idles [idlecnt - 1] = w;
1368	}	1457	}
1369		1458
1370	void	1459	void
1371	ev_idle_stop (EV_P_ struct ev_idle *w)	1460	ev_idle_stop (EV_P_ struct ev_idle *w)
1372	{	1461	{
1373	ev_clear_pending (EV_A_ (W)w);	1462	ev_clear_pending (EV_A_ (W)w);
1374	if (ev_is_active (w))	1463	if (!ev_is_active (w))
1375	return;	1464	return;
1376		1465
1377	idles [((W)w)->active - 1] = idles [--idlecnt];	1466	idles [((W)w)->active - 1] = idles [--idlecnt];
1378	ev_stop (EV_A_ (W)w);	1467	ev_stop (EV_A_ (W)w);
1379	}	1468	}
…		…
1383	{	1472	{
1384	if (ev_is_active (w))	1473	if (ev_is_active (w))
1385	return;	1474	return;
1386		1475
1387	ev_start (EV_A_ (W)w, ++preparecnt);	1476	ev_start (EV_A_ (W)w, ++preparecnt);
1388	array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));	1477	array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1389	prepares [preparecnt - 1] = w;	1478	prepares [preparecnt - 1] = w;
1390	}	1479	}
1391		1480
1392	void	1481	void
1393	ev_prepare_stop (EV_P_ struct ev_prepare *w)	1482	ev_prepare_stop (EV_P_ struct ev_prepare *w)
1394	{	1483	{
1395	ev_clear_pending (EV_A_ (W)w);	1484	ev_clear_pending (EV_A_ (W)w);
1396	if (ev_is_active (w))	1485	if (!ev_is_active (w))
1397	return;	1486	return;
1398		1487
1399	prepares [((W)w)->active - 1] = prepares [--preparecnt];	1488	prepares [((W)w)->active - 1] = prepares [--preparecnt];
1400	ev_stop (EV_A_ (W)w);	1489	ev_stop (EV_A_ (W)w);
1401	}	1490	}
…		…
1405	{	1494	{
1406	if (ev_is_active (w))	1495	if (ev_is_active (w))
1407	return;	1496	return;
1408		1497
1409	ev_start (EV_A_ (W)w, ++checkcnt);	1498	ev_start (EV_A_ (W)w, ++checkcnt);
1410	array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));	1499	array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1411	checks [checkcnt - 1] = w;	1500	checks [checkcnt - 1] = w;
1412	}	1501	}
1413		1502
1414	void	1503	void
1415	ev_check_stop (EV_P_ struct ev_check *w)	1504	ev_check_stop (EV_P_ struct ev_check *w)
1416	{	1505	{
1417	ev_clear_pending (EV_A_ (W)w);	1506	ev_clear_pending (EV_A_ (W)w);
1418	if (ev_is_active (w))	1507	if (!ev_is_active (w))
1419	return;	1508	return;
1420		1509
1421	checks [((W)w)->active - 1] = checks [--checkcnt];	1510	checks [((W)w)->active - 1] = checks [--checkcnt];
1422	ev_stop (EV_A_ (W)w);	1511	ev_stop (EV_A_ (W)w);
1423	}	1512	}
…		…
1428		1517
1429	void	1518	void
1430	ev_signal_start (EV_P_ struct ev_signal *w)	1519	ev_signal_start (EV_P_ struct ev_signal *w)
1431	{	1520	{
1432	#if EV_MULTIPLICITY	1521	#if EV_MULTIPLICITY
1433	assert (("signal watchers are only supported in the default loop", loop == default_loop));	1522	assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1434	#endif	1523	#endif
1435	if (ev_is_active (w))	1524	if (ev_is_active (w))
1436	return;	1525	return;
1437		1526
1438	assert (("ev_signal_start called with illegal signal number", w->signum > 0));	1527	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
…		…
1441	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	1530	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1442	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1531	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1443		1532
1444	if (!((WL)w)->next)	1533	if (!((WL)w)->next)
1445	{	1534	{
1446	#if WIN32	1535	#if _WIN32
1447	signal (w->signum, sighandler);	1536	signal (w->signum, sighandler);
1448	#else	1537	#else
1449	struct sigaction sa;	1538	struct sigaction sa;
1450	sa.sa_handler = sighandler;	1539	sa.sa_handler = sighandler;
1451	sigfillset (&sa.sa_mask);	1540	sigfillset (&sa.sa_mask);
…		…
1471		1560
1472	void	1561	void
1473	ev_child_start (EV_P_ struct ev_child *w)	1562	ev_child_start (EV_P_ struct ev_child *w)
1474	{	1563	{
1475	#if EV_MULTIPLICITY	1564	#if EV_MULTIPLICITY
1476	assert (("child watchers are only supported in the default loop", loop == default_loop));	1565	assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1477	#endif	1566	#endif
1478	if (ev_is_active (w))	1567	if (ev_is_active (w))
1479	return;	1568	return;
1480		1569
1481	ev_start (EV_A_ (W)w, 1);	1570	ev_start (EV_A_ (W)w, 1);
…		…
1484		1573
1485	void	1574	void
1486	ev_child_stop (EV_P_ struct ev_child *w)	1575	ev_child_stop (EV_P_ struct ev_child *w)
1487	{	1576	{
1488	ev_clear_pending (EV_A_ (W)w);	1577	ev_clear_pending (EV_A_ (W)w);
1489	if (ev_is_active (w))	1578	if (!ev_is_active (w))
1490	return;	1579	return;
1491		1580
1492	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);	1581	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1493	ev_stop (EV_A_ (W)w);	1582	ev_stop (EV_A_ (W)w);
1494	}	1583	}
…		…
1538	else	1627	else
1539	{	1628	{
1540	once->cb = cb;	1629	once->cb = cb;
1541	once->arg = arg;	1630	once->arg = arg;
1542		1631
1543	ev_watcher_init (&once->io, once_cb_io);	1632	ev_init (&once->io, once_cb_io);
1544	if (fd >= 0)	1633	if (fd >= 0)
1545	{	1634	{
1546	ev_io_set (&once->io, fd, events);	1635	ev_io_set (&once->io, fd, events);
1547	ev_io_start (EV_A_ &once->io);	1636	ev_io_start (EV_A_ &once->io);
1548	}	1637	}
1549		1638
1550	ev_watcher_init (&once->to, once_cb_to);	1639	ev_init (&once->to, once_cb_to);
1551	if (timeout >= 0.)	1640	if (timeout >= 0.)
1552	{	1641	{
1553	ev_timer_set (&once->to, timeout, 0.);	1642	ev_timer_set (&once->to, timeout, 0.);
1554	ev_timer_start (EV_A_ &once->to);	1643	ev_timer_start (EV_A_ &once->to);
1555	}	1644	}
1556	}	1645	}
1557	}	1646	}
1558		1647
		1648	#ifdef __cplusplus
		1649	}
		1650	#endif
		1651

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.77 by root, Thu Nov 8 00:44:17 2007 UTC vs. Revision 1.116 by root, Thu Nov 15 09:19:42 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.77 by root, Thu Nov 8 00:44:17 2007 UTC vs.
Revision 1.116 by root, Thu Nov 15 09:19:42 2007 UTC