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

Comparing libev/ev.c (file contents):
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs.
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC

…		…
1	/*	1	/*
		2	* libev event processing core, watcher management
		3	*
2	* Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>	4	* Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3	* All rights reserved.	5	* All rights reserved.
4	*	6	*
5	* Redistribution and use in source and binary forms, with or without	7	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are	8	* modification, are permitted provided that the following conditions are
24	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	26	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	27	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26	* (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
27	* 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.
28	*/	30	*/
29	#if EV_USE_CONFIG_H	31	#ifndef EV_STANDALONE
30	# include "config.h"	32	# include "config.h"
31	#endif	33	#endif
32		34
33	#include <math.h>	35	#include <math.h>
34	#include <stdlib.h>	36	#include <stdlib.h>
…		…
40	#include <stdio.h>	42	#include <stdio.h>
41		43
42	#include <assert.h>	44	#include <assert.h>
43	#include <errno.h>	45	#include <errno.h>
44	#include <sys/types.h>	46	#include <sys/types.h>
		47	#ifndef WIN32
45	#include <sys/wait.h>	48	# include <sys/wait.h>
		49	#endif
46	#include <sys/time.h>	50	#include <sys/time.h>
47	#include <time.h>	51	#include <time.h>
48		52
		53	/**/
		54
49	#ifndef EV_USE_MONOTONIC	55	#ifndef EV_USE_MONOTONIC
50	# ifdef CLOCK_MONOTONIC
51	# define EV_USE_MONOTONIC 1	56	# define EV_USE_MONOTONIC 1
52	# endif
53	#endif	57	#endif
54		58
55	#ifndef EV_USE_SELECT	59	#ifndef EV_USE_SELECT
56	# define EV_USE_SELECT 1	60	# define EV_USE_SELECT 1
57	#endif	61	#endif
58		62
		63	#ifndef EV_USE_POLL
		64	# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
		65	#endif
		66
59	#ifndef EV_USE_EPOLL	67	#ifndef EV_USE_EPOLL
60	# define EV_USE_EPOLL 0	68	# define EV_USE_EPOLL 0
61	#endif	69	#endif
62		70
		71	#ifndef EV_USE_KQUEUE
		72	# define EV_USE_KQUEUE 0
		73	#endif
		74
		75	#ifndef EV_USE_REALTIME
		76	# define EV_USE_REALTIME 1
		77	#endif
		78
		79	/**/
		80
		81	#ifndef CLOCK_MONOTONIC
		82	# undef EV_USE_MONOTONIC
		83	# define EV_USE_MONOTONIC 0
		84	#endif
		85
63	#ifndef CLOCK_REALTIME	86	#ifndef CLOCK_REALTIME
		87	# undef EV_USE_REALTIME
64	# define EV_USE_REALTIME 0	88	# define EV_USE_REALTIME 0
65	#endif	89	#endif
66	#ifndef EV_USE_REALTIME	90
67	# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */	91	/**/
68	#endif
69		92
70	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	93	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
71	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */	94	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
72	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */	95	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
73	#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */	96	/#define CLEANUP_INTERVAL 300. / how often to try to free memory and re-check fds */
74		97
75	#include "ev.h"	98	#include "ev.h"
		99
		100	#if __GNUC__ >= 3
		101	# define expect(expr,value) __builtin_expect ((expr),(value))
		102	# define inline inline
		103	#else
		104	# define expect(expr,value) (expr)
		105	# define inline static
		106	#endif
		107
		108	#define expect_false(expr) expect ((expr) != 0, 0)
		109	#define expect_true(expr) expect ((expr) != 0, 1)
		110
		111	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
		112	#define ABSPRI(w) ((w)->priority - EV_MINPRI)
76		113
77	typedef struct ev_watcher *W;	114	typedef struct ev_watcher *W;
78	typedef struct ev_watcher_list *WL;	115	typedef struct ev_watcher_list *WL;
79	typedef struct ev_watcher_time *WT;	116	typedef struct ev_watcher_time *WT;
80		117
81	static ev_tstamp now, diff; /* monotonic clock */	118	static ev_tstamp now_floor, now, diff; /* monotonic clock */
82	ev_tstamp ev_now;	119	ev_tstamp ev_now;
83	int ev_method;	120	int ev_method;
84		121
85	static int have_monotonic; /* runtime */	122	static int have_monotonic; /* runtime */
86		123
…		…
106		143
107	static ev_tstamp	144	static ev_tstamp
108	get_clock (void)	145	get_clock (void)
109	{	146	{
110	#if EV_USE_MONOTONIC	147	#if EV_USE_MONOTONIC
111	if (have_monotonic)	148	if (expect_true (have_monotonic))
112	{	149	{
113	struct timespec ts;	150	struct timespec ts;
114	clock_gettime (CLOCK_MONOTONIC, &ts);	151	clock_gettime (CLOCK_MONOTONIC, &ts);
115	return ts.tv_sec + ts.tv_nsec * 1e-9;	152	return ts.tv_sec + ts.tv_nsec * 1e-9;
116	}	153	}
…		…
120	}	157	}
121		158
122	#define array_roundsize(base,n) ((n) \| 4 & ~3)	159	#define array_roundsize(base,n) ((n) \| 4 & ~3)
123		160
124	#define array_needsize(base,cur,cnt,init) \	161	#define array_needsize(base,cur,cnt,init) \
125	if ((cnt) > cur) \	162	if (expect_false ((cnt) > cur)) \
126	{ \	163	{ \
127	int newcnt = cur; \	164	int newcnt = cur; \
128	do \	165	do \
129	{ \	166	{ \
130	newcnt = array_roundsize (base, newcnt << 1); \	167	newcnt = array_roundsize (base, newcnt << 1); \
…		…
138		175
139	/*****************************************************************************/	176	/*****************************************************************************/
140		177
141	typedef struct	178	typedef struct
142	{	179	{
143	struct ev_io *head;	180	struct ev_watcher_list *head;
144	int events;	181	unsigned char events;
		182	unsigned char reify;
145	} ANFD;	183	} ANFD;
146		184
147	static ANFD *anfds;	185	static ANFD *anfds;
148	static int anfdmax;	186	static int anfdmax;
149		187
…		…
152	{	190	{
153	while (count--)	191	while (count--)
154	{	192	{
155	base->head = 0;	193	base->head = 0;
156	base->events = EV_NONE;	194	base->events = EV_NONE;
		195	base->reify = 0;
		196
157	++base;	197	++base;
158	}	198	}
159	}	199	}
160		200
161	typedef struct	201	typedef struct
162	{	202	{
163	W w;	203	W w;
164	int events;	204	int events;
165	} ANPENDING;	205	} ANPENDING;
166		206
167	static ANPENDING *pendings;	207	static ANPENDING *pendings [NUMPRI];
168	static int pendingmax, pendingcnt;	208	static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
169		209
170	static void	210	static void
171	event (W w, int events)	211	event (W w, int events)
172	{	212	{
		213	if (w->pending)
		214	{
		215	pendings [ABSPRI (w)][w->pending - 1].events \|= events;
		216	return;
		217	}
		218
173	w->pending = ++pendingcnt;	219	w->pending = ++pendingcnt [ABSPRI (w)];
174	array_needsize (pendings, pendingmax, pendingcnt, );	220	array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
175	pendings [pendingcnt - 1].w = w;	221	pendings [ABSPRI (w)][w->pending - 1].w = w;
176	pendings [pendingcnt - 1].events = events;	222	pendings [ABSPRI (w)][w->pending - 1].events = events;
177	}	223	}
178		224
179	static void	225	static void
180	queue_events (W *events, int eventcnt, int type)	226	queue_events (W *events, int eventcnt, int type)
181	{	227	{
…		…
189	fd_event (int fd, int events)	235	fd_event (int fd, int events)
190	{	236	{
191	ANFD *anfd = anfds + fd;	237	ANFD *anfd = anfds + fd;
192	struct ev_io *w;	238	struct ev_io *w;
193		239
194	for (w = anfd->head; w; w = w->next)	240	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)
195	{	241	{
196	int ev = w->events & events;	242	int ev = w->events & events;
197		243
198	if (ev)	244	if (ev)
199	event ((W)w, ev);	245	event ((W)w, ev);
…		…
216	ANFD *anfd = anfds + fd;	262	ANFD *anfd = anfds + fd;
217	struct ev_io *w;	263	struct ev_io *w;
218		264
219	int events = 0;	265	int events = 0;
220		266
221	for (w = anfd->head; w; w = w->next)	267	for (w = (struct ev_io )anfd->head; w; w = (struct ev_io )((WL)w)->next)
222	events \|= w->events;	268	events \|= w->events;
223		269
224	anfd->events &= ~EV_REIFY;	270	anfd->reify = 0;
225		271
226	if (anfd->events != events)	272	if (anfd->events != events)
227	{	273	{
228	method_modify (fd, anfd->events, events);	274	method_modify (fd, anfd->events, events);
229	anfd->events = events;	275	anfd->events = events;
…		…
234	}	280	}
235		281
236	static void	282	static void
237	fd_change (int fd)	283	fd_change (int fd)
238	{	284	{
239	if (anfds [fd].events & EV_REIFY \|\| fdchangecnt < 0)	285	if (anfds [fd].reify \|\| fdchangecnt < 0)
240	return;	286	return;
241		287
242	anfds [fd].events \|= EV_REIFY;	288	anfds [fd].reify = 1;
243		289
244	++fdchangecnt;	290	++fdchangecnt;
245	array_needsize (fdchanges, fdchangemax, fdchangecnt, );	291	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
246	fdchanges [fdchangecnt - 1] = fd;	292	fdchanges [fdchangecnt - 1] = fd;
247	}	293	}
248		294
		295	static void
		296	fd_kill (int fd)
		297	{
		298	struct ev_io *w;
		299
		300	while ((w = (struct ev_io *)anfds [fd].head))
		301	{
		302	ev_io_stop (w);
		303	event ((W)w, EV_ERROR \| EV_READ \| EV_WRITE);
		304	}
		305	}
		306
249	/* called on EBADF to verify fds */	307	/* called on EBADF to verify fds */
250	static void	308	static void
251	fd_recheck (void)	309	fd_ebadf (void)
252	{	310	{
253	int fd;	311	int fd;
254		312
255	for (fd = 0; fd < anfdmax; ++fd)	313	for (fd = 0; fd < anfdmax; ++fd)
256	if (anfds [fd].events)	314	if (anfds [fd].events)
257	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)	315	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
258	while (anfds [fd].head)	316	fd_kill (fd);
		317	}
		318
		319	/* called on ENOMEM in select/poll to kill some fds and retry */
		320	static void
		321	fd_enomem (void)
		322	{
		323	int fd = anfdmax;
		324
		325	while (fd--)
		326	if (anfds [fd].events)
259	{	327	{
260	event ((W)anfds [fd].head, EV_ERROR \| EV_READ \| EV_WRITE \| EV_TIMEOUT);	328	close (fd);
261	ev_io_stop (anfds [fd].head);	329	fd_kill (fd);
		330	return;
262	}	331	}
263	}	332	}
264		333
265	/*****************************************************************************/	334	/*****************************************************************************/
266		335
267	static struct ev_timer **timers;	336	static struct ev_timer **timers;
…		…
313		382
314	/*****************************************************************************/	383	/*****************************************************************************/
315		384
316	typedef struct	385	typedef struct
317	{	386	{
318	struct ev_signal *head;	387	struct ev_watcher_list *head;
319	sig_atomic_t gotsig;	388	sig_atomic_t volatile gotsig;
320	} ANSIG;	389	} ANSIG;
321		390
322	static ANSIG *signals;	391	static ANSIG *signals;
323	static int signalmax;	392	static int signalmax;
324		393
325	static int sigpipe [2];	394	static int sigpipe [2];
326	static sig_atomic_t gotsig;	395	static sig_atomic_t volatile gotsig;
327	static struct ev_io sigev;	396	static struct ev_io sigev;
328		397
329	static void	398	static void
330	signals_init (ANSIG *base, int count)	399	signals_init (ANSIG *base, int count)
331	{	400	{
332	while (count--)	401	while (count--)
333	{	402	{
334	base->head = 0;	403	base->head = 0;
335	base->gotsig = 0;	404	base->gotsig = 0;
		405
336	++base;	406	++base;
337	}	407	}
338	}	408	}
339		409
340	static void	410	static void
…		…
342	{	412	{
343	signals [signum - 1].gotsig = 1;	413	signals [signum - 1].gotsig = 1;
344		414
345	if (!gotsig)	415	if (!gotsig)
346	{	416	{
		417	int old_errno = errno;
347	gotsig = 1;	418	gotsig = 1;
348	write (sigpipe [1], &gotsig, 1);	419	write (sigpipe [1], &signum, 1);
		420	errno = old_errno;
349	}	421	}
350	}	422	}
351		423
352	static void	424	static void
353	sigcb (struct ev_io *iow, int revents)	425	sigcb (struct ev_io *iow, int revents)
354	{	426	{
355	struct ev_signal *w;	427	struct ev_watcher_list *w;
356	int sig;	428	int signum;
357		429
		430	read (sigpipe [0], &revents, 1);
358	gotsig = 0;	431	gotsig = 0;
359	read (sigpipe [0], &revents, 1);
360		432
361	for (sig = signalmax; sig--; )	433	for (signum = signalmax; signum--; )
362	if (signals [sig].gotsig)	434	if (signals [signum].gotsig)
363	{	435	{
364	signals [sig].gotsig = 0;	436	signals [signum].gotsig = 0;
365		437
366	for (w = signals [sig].head; w; w = w->next)	438	for (w = signals [signum].head; w; w = w->next)
367	event ((W)w, EV_SIGNAL);	439	event ((W)w, EV_SIGNAL);
368	}	440	}
369	}	441	}
370		442
371	static void	443	static void
372	siginit (void)	444	siginit (void)
373	{	445	{
		446	#ifndef WIN32
374	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	447	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
375	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	448	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
376		449
377	/* rather than sort out wether we really need nb, set it */	450	/* rather than sort out wether we really need nb, set it */
378	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	451	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
379	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	452	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		453	#endif
380		454
381	ev_io_set (&sigev, sigpipe [0], EV_READ);	455	ev_io_set (&sigev, sigpipe [0], EV_READ);
382	ev_io_start (&sigev);	456	ev_io_start (&sigev);
383	}	457	}
384		458
…		…
396	/*****************************************************************************/	470	/*****************************************************************************/
397		471
398	static struct ev_child *childs [PID_HASHSIZE];	472	static struct ev_child *childs [PID_HASHSIZE];
399	static struct ev_signal childev;	473	static struct ev_signal childev;
400		474
		475	#ifndef WIN32
		476
401	#ifndef WCONTINUED	477	#ifndef WCONTINUED
402	# define WCONTINUED 0	478	# define WCONTINUED 0
403	#endif	479	#endif
404		480
405	static void	481	static void
		482	child_reap (struct ev_signal *sw, int chain, int pid, int status)
		483	{
		484	struct ev_child *w;
		485
		486	for (w = (struct ev_child )childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child )((WL)w)->next)
		487	if (w->pid == pid \|\| !w->pid)
		488	{
		489	w->priority = sw->priority; /* need to do it now */
		490	w->rpid = pid;
		491	w->rstatus = status;
		492	event ((W)w, EV_CHILD);
		493	}
		494	}
		495
		496	static void
406	childcb (struct ev_signal *sw, int revents)	497	childcb (struct ev_signal *sw, int revents)
407	{	498	{
408	struct ev_child *w;
409	int pid, status;	499	int pid, status;
410		500
411	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)	501	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))
412	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)	502	{
413	if (w->pid == pid \|\| w->pid == -1)	503	/* make sure we are called again until all childs have been reaped */
414	{
415	w->status = status;
416	event ((W)w, EV_CHILD);	504	event ((W)sw, EV_SIGNAL);
417	}	505
		506	child_reap (sw, pid, pid, status);
		507	child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
		508	}
418	}	509	}
		510
		511	#endif
419		512
420	/*****************************************************************************/	513	/*****************************************************************************/
421		514
		515	#if EV_USE_KQUEUE
		516	# include "ev_kqueue.c"
		517	#endif
422	#if EV_USE_EPOLL	518	#if EV_USE_EPOLL
423	# include "ev_epoll.c"	519	# include "ev_epoll.c"
424	#endif	520	#endif
		521	#if EV_USE_POLL
		522	# include "ev_poll.c"
		523	#endif
425	#if EV_USE_SELECT	524	#if EV_USE_SELECT
426	# include "ev_select.c"	525	# include "ev_select.c"
427	#endif	526	#endif
428		527
429	int	528	int
…		…
436	ev_version_minor (void)	535	ev_version_minor (void)
437	{	536	{
438	return EV_VERSION_MINOR;	537	return EV_VERSION_MINOR;
439	}	538	}
440		539
		540	/* return true if we are running with elevated privileges and should ignore env variables */
		541	static int
		542	enable_secure ()
		543	{
		544	#ifdef WIN32
		545	return 0;
		546	#else
		547	return getuid () != geteuid ()
		548	\|\| getgid () != getegid ();
		549	#endif
		550	}
		551
441	int ev_init (int flags)	552	int ev_init (int methods)
442	{	553	{
443	if (!ev_method)	554	if (!ev_method)
444	{	555	{
445	#if EV_USE_MONOTONIC	556	#if EV_USE_MONOTONIC
446	{	557	{
…		…
448	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	559	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
449	have_monotonic = 1;	560	have_monotonic = 1;
450	}	561	}
451	#endif	562	#endif
452		563
453	ev_now = ev_time ();	564	ev_now = ev_time ();
454	now = get_clock ();	565	now = get_clock ();
		566	now_floor = now;
455	diff = ev_now - now;	567	diff = ev_now - now;
456		568
457	if (pipe (sigpipe))	569	if (pipe (sigpipe))
458	return 0;	570	return 0;
459		571
		572	if (methods == EVMETHOD_AUTO)
		573	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		574	methods = atoi (getenv ("LIBEV_METHODS"));
		575	else
460	ev_method = EVMETHOD_NONE;	576	methods = EVMETHOD_ANY;
		577
		578	ev_method = 0;
		579	#if EV_USE_KQUEUE
		580	if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
		581	#endif
461	#if EV_USE_EPOLL	582	#if EV_USE_EPOLL
462	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	583	if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
		584	#endif
		585	#if EV_USE_POLL
		586	if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
463	#endif	587	#endif
464	#if EV_USE_SELECT	588	#if EV_USE_SELECT
465	if (ev_method == EVMETHOD_NONE) select_init (flags);	589	if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
466	#endif	590	#endif
467		591
468	if (ev_method)	592	if (ev_method)
469	{	593	{
470	ev_watcher_init (&sigev, sigcb);	594	ev_watcher_init (&sigev, sigcb);
		595	ev_set_priority (&sigev, EV_MAXPRI);
471	siginit ();	596	siginit ();
472		597
		598	#ifndef WIN32
473	ev_signal_init (&childev, childcb, SIGCHLD);	599	ev_signal_init (&childev, childcb, SIGCHLD);
		600	ev_set_priority (&childev, EV_MAXPRI);
474	ev_signal_start (&childev);	601	ev_signal_start (&childev);
		602	#endif
475	}	603	}
476	}	604	}
477		605
478	return ev_method;	606	return ev_method;
479	}	607	}
480		608
481	/*****************************************************************************/	609	/*****************************************************************************/
482		610
483	void	611	void
484	ev_prefork (void)	612	ev_fork_prepare (void)
485	{	613	{
486	/* nop */	614	/* nop */
487	}	615	}
488		616
489	void	617	void
490	ev_postfork_parent (void)	618	ev_fork_parent (void)
491	{	619	{
492	/* nop */	620	/* nop */
493	}	621	}
494		622
495	void	623	void
496	ev_postfork_child (void)	624	ev_fork_child (void)
497	{	625	{
498	#if EV_USE_EPOLL	626	#if EV_USE_EPOLL
499	if (ev_method == EVMETHOD_EPOLL)	627	if (ev_method == EVMETHOD_EPOLL)
500	epoll_postfork_child ();	628	epoll_postfork_child ();
501	#endif	629	#endif
…		…
510	/*****************************************************************************/	638	/*****************************************************************************/
511		639
512	static void	640	static void
513	call_pending (void)	641	call_pending (void)
514	{	642	{
		643	int pri;
		644
		645	for (pri = NUMPRI; pri--; )
515	while (pendingcnt)	646	while (pendingcnt [pri])
516	{	647	{
517	ANPENDING *p = pendings + --pendingcnt;	648	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
518		649
519	if (p->w)	650	if (p->w)
520	{	651	{
521	p->w->pending = 0;	652	p->w->pending = 0;
522	p->w->cb (p->w, p->events);	653	p->w->cb (p->w, p->events);
523	}	654	}
524	}	655	}
525	}	656	}
526		657
527	static void	658	static void
528	timers_reify (void)	659	timers_reify (void)
529	{	660	{
…		…
532	struct ev_timer *w = timers [0];	663	struct ev_timer *w = timers [0];
533		664
534	/* first reschedule or stop timer */	665	/* first reschedule or stop timer */
535	if (w->repeat)	666	if (w->repeat)
536	{	667	{
		668	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
537	w->at = now + w->repeat;	669	w->at = now + w->repeat;
538	assert (("timer timeout in the past, negative repeat?", w->at > now));
539	downheap ((WT *)timers, timercnt, 0);	670	downheap ((WT *)timers, timercnt, 0);
540	}	671	}
541	else	672	else
542	ev_timer_stop (w); /* nonrepeating: stop timer */	673	ev_timer_stop (w); /* nonrepeating: stop timer */
543		674
…		…
554		685
555	/* first reschedule or stop timer */	686	/* first reschedule or stop timer */
556	if (w->interval)	687	if (w->interval)
557	{	688	{
558	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;	689	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
559	assert (("periodic timeout in the past, negative interval?", w->at > ev_now));	690	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
560	downheap ((WT *)periodics, periodiccnt, 0);	691	downheap ((WT *)periodics, periodiccnt, 0);
561	}	692	}
562	else	693	else
563	ev_periodic_stop (w); /* nonrepeating: stop timer */	694	ev_periodic_stop (w); /* nonrepeating: stop timer */
564		695
565	event ((W)w, EV_TIMEOUT);	696	event ((W)w, EV_PERIODIC);
566	}	697	}
567	}	698	}
568		699
569	static void	700	static void
570	periodics_reschedule (ev_tstamp diff)	701	periodics_reschedule (ev_tstamp diff)
…		…
589	}	720	}
590	}	721	}
591	}	722	}
592	}	723	}
593		724
		725	static int
		726	time_update_monotonic (void)
		727	{
		728	now = get_clock ();
		729
		730	if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
		731	{
		732	ev_now = now + diff;
		733	return 0;
		734	}
		735	else
		736	{
		737	now_floor = now;
		738	ev_now = ev_time ();
		739	return 1;
		740	}
		741	}
		742
594	static void	743	static void
595	time_update (void)	744	time_update (void)
596	{	745	{
597	int i;	746	int i;
598		747
599	ev_now = ev_time ();	748	#if EV_USE_MONOTONIC
600
601	if (have_monotonic)	749	if (expect_true (have_monotonic))
602	{	750	{
603	ev_tstamp odiff = diff;	751	if (time_update_monotonic ())
604
605	for (i = 4; --i; ) /* loop a few times, before making important decisions */
606	{	752	{
607	now = get_clock ();	753	ev_tstamp odiff = diff;
		754
		755	for (i = 4; --i; ) /* loop a few times, before making important decisions */
		756	{
608	diff = ev_now - now;	757	diff = ev_now - now;
609		758
610	if (fabs (odiff - diff) < MIN_TIMEJUMP)	759	if (fabs (odiff - diff) < MIN_TIMEJUMP)
611	return; /* all is well */	760	return; /* all is well */
612		761
613	ev_now = ev_time ();	762	ev_now = ev_time ();
		763	now = get_clock ();
		764	now_floor = now;
		765	}
		766
		767	periodics_reschedule (diff - odiff);
		768	/* no timer adjustment, as the monotonic clock doesn't jump */
614	}	769	}
615
616	periodics_reschedule (diff - odiff);
617	/* no timer adjustment, as the monotonic clock doesn't jump */
618	}	770	}
619	else	771	else
		772	#endif
620	{	773	{
		774	ev_now = ev_time ();
		775
621	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)	776	if (expect_false (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
622	{	777	{
623	periodics_reschedule (ev_now - now);	778	periodics_reschedule (ev_now - now);
624		779
625	/* adjust timers. this is easy, as the offset is the same for all */	780	/* adjust timers. this is easy, as the offset is the same for all */
626	for (i = 0; i < timercnt; ++i)	781	for (i = 0; i < timercnt; ++i)
…		…
639	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	794	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
640		795
641	do	796	do
642	{	797	{
643	/* queue check watchers (and execute them) */	798	/* queue check watchers (and execute them) */
644	if (preparecnt)	799	if (expect_false (preparecnt))
645	{	800	{
646	queue_events ((W *)prepares, preparecnt, EV_PREPARE);	801	queue_events ((W *)prepares, preparecnt, EV_PREPARE);
647	call_pending ();	802	call_pending ();
648	}	803	}
649		804
…		…
652		807
653	/* calculate blocking time */	808	/* calculate blocking time */
654		809
655	/* we only need this for !monotonic clockor timers, but as we basically	810	/* we only need this for !monotonic clockor timers, but as we basically
656	always have timers, we just calculate it always */	811	always have timers, we just calculate it always */
		812	#if EV_USE_MONOTONIC
		813	if (expect_true (have_monotonic))
		814	time_update_monotonic ();
		815	else
		816	#endif
		817	{
657	ev_now = ev_time ();	818	ev_now = ev_time ();
		819	now = ev_now;
		820	}
658		821
659	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	822	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
660	block = 0.;	823	block = 0.;
661	else	824	else
662	{	825	{
663	block = MAX_BLOCKTIME;	826	block = MAX_BLOCKTIME;
664		827
665	if (timercnt)	828	if (timercnt)
666	{	829	{
667	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	830	ev_tstamp to = timers [0]->at - now + method_fudge;
668	if (block > to) block = to;	831	if (block > to) block = to;
669	}	832	}
670		833
671	if (periodiccnt)	834	if (periodiccnt)
672	{	835	{
…		…
725	head = &(*head)->next;	888	head = &(*head)->next;
726	}	889	}
727	}	890	}
728		891
729	static void	892	static void
730	ev_clear (W w)	893	ev_clear_pending (W w)
731	{	894	{
732	if (w->pending)	895	if (w->pending)
733	{	896	{
734	pendings [w->pending - 1].w = 0;	897	pendings [ABSPRI (w)][w->pending - 1].w = 0;
735	w->pending = 0;	898	w->pending = 0;
736	}	899	}
737	}	900	}
738		901
739	static void	902	static void
740	ev_start (W w, int active)	903	ev_start (W w, int active)
741	{	904	{
		905	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		906	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		907
742	w->active = active;	908	w->active = active;
743	}	909	}
744		910
745	static void	911	static void
746	ev_stop (W w)	912	ev_stop (W w)
…		…
751	/*****************************************************************************/	917	/*****************************************************************************/
752		918
753	void	919	void
754	ev_io_start (struct ev_io *w)	920	ev_io_start (struct ev_io *w)
755	{	921	{
		922	int fd = w->fd;
		923
756	if (ev_is_active (w))	924	if (ev_is_active (w))
757	return;	925	return;
758		926
759	int fd = w->fd;	927	assert (("ev_io_start called with negative fd", fd >= 0));
760		928
761	ev_start ((W)w, 1);	929	ev_start ((W)w, 1);
762	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	930	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
763	wlist_add ((WL *)&anfds[fd].head, (WL)w);	931	wlist_add ((WL *)&anfds[fd].head, (WL)w);
764		932
…		…
766	}	934	}
767		935
768	void	936	void
769	ev_io_stop (struct ev_io *w)	937	ev_io_stop (struct ev_io *w)
770	{	938	{
771	ev_clear ((W)w);	939	ev_clear_pending ((W)w);
772	if (!ev_is_active (w))	940	if (!ev_is_active (w))
773	return;	941	return;
774		942
775	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	943	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
776	ev_stop ((W)w);	944	ev_stop ((W)w);
…		…
784	if (ev_is_active (w))	952	if (ev_is_active (w))
785	return;	953	return;
786		954
787	w->at += now;	955	w->at += now;
788		956
789	assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));	957	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
790		958
791	ev_start ((W)w, ++timercnt);	959	ev_start ((W)w, ++timercnt);
792	array_needsize (timers, timermax, timercnt, );	960	array_needsize (timers, timermax, timercnt, );
793	timers [timercnt - 1] = w;	961	timers [timercnt - 1] = w;
794	upheap ((WT *)timers, timercnt - 1);	962	upheap ((WT *)timers, timercnt - 1);
795	}	963	}
796		964
797	void	965	void
798	ev_timer_stop (struct ev_timer *w)	966	ev_timer_stop (struct ev_timer *w)
799	{	967	{
800	ev_clear ((W)w);	968	ev_clear_pending ((W)w);
801	if (!ev_is_active (w))	969	if (!ev_is_active (w))
802	return;	970	return;
803		971
804	if (w->active < timercnt--)	972	if (w->active < timercnt--)
805	{	973	{
…		…
833	ev_periodic_start (struct ev_periodic *w)	1001	ev_periodic_start (struct ev_periodic *w)
834	{	1002	{
835	if (ev_is_active (w))	1003	if (ev_is_active (w))
836	return;	1004	return;
837		1005
838	assert (("periodic interval value less than zero not allowed", w->interval >= 0.));	1006	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
839		1007
840	/* this formula differs from the one in periodic_reify because we do not always round up */	1008	/* this formula differs from the one in periodic_reify because we do not always round up */
841	if (w->interval)	1009	if (w->interval)
842	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;	1010	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
843		1011
…		…
848	}	1016	}
849		1017
850	void	1018	void
851	ev_periodic_stop (struct ev_periodic *w)	1019	ev_periodic_stop (struct ev_periodic *w)
852	{	1020	{
853	ev_clear ((W)w);	1021	ev_clear_pending ((W)w);
854	if (!ev_is_active (w))	1022	if (!ev_is_active (w))
855	return;	1023	return;
856		1024
857	if (w->active < periodiccnt--)	1025	if (w->active < periodiccnt--)
858	{	1026	{
…		…
861	}	1029	}
862		1030
863	ev_stop ((W)w);	1031	ev_stop ((W)w);
864	}	1032	}
865		1033
		1034	#ifndef SA_RESTART
		1035	# define SA_RESTART 0
		1036	#endif
		1037
866	void	1038	void
867	ev_signal_start (struct ev_signal *w)	1039	ev_signal_start (struct ev_signal *w)
868	{	1040	{
869	if (ev_is_active (w))	1041	if (ev_is_active (w))
870	return;	1042	return;
		1043
		1044	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
871		1045
872	ev_start ((W)w, 1);	1046	ev_start ((W)w, 1);
873	array_needsize (signals, signalmax, w->signum, signals_init);	1047	array_needsize (signals, signalmax, w->signum, signals_init);
874	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1048	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
875		1049
876	if (!w->next)	1050	if (!w->next)
877	{	1051	{
878	struct sigaction sa;	1052	struct sigaction sa;
879	sa.sa_handler = sighandler;	1053	sa.sa_handler = sighandler;
880	sigfillset (&sa.sa_mask);	1054	sigfillset (&sa.sa_mask);
881	sa.sa_flags = 0;	1055	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
882	sigaction (w->signum, &sa, 0);	1056	sigaction (w->signum, &sa, 0);
883	}	1057	}
884	}	1058	}
885		1059
886	void	1060	void
887	ev_signal_stop (struct ev_signal *w)	1061	ev_signal_stop (struct ev_signal *w)
888	{	1062	{
889	ev_clear ((W)w);	1063	ev_clear_pending ((W)w);
890	if (!ev_is_active (w))	1064	if (!ev_is_active (w))
891	return;	1065	return;
892		1066
893	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1067	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
894	ev_stop ((W)w);	1068	ev_stop ((W)w);
…		…
909	}	1083	}
910		1084
911	void	1085	void
912	ev_idle_stop (struct ev_idle *w)	1086	ev_idle_stop (struct ev_idle *w)
913	{	1087	{
914	ev_clear ((W)w);	1088	ev_clear_pending ((W)w);
915	if (ev_is_active (w))	1089	if (ev_is_active (w))
916	return;	1090	return;
917		1091
918	idles [w->active - 1] = idles [--idlecnt];	1092	idles [w->active - 1] = idles [--idlecnt];
919	ev_stop ((W)w);	1093	ev_stop ((W)w);
…		…
931	}	1105	}
932		1106
933	void	1107	void
934	ev_prepare_stop (struct ev_prepare *w)	1108	ev_prepare_stop (struct ev_prepare *w)
935	{	1109	{
936	ev_clear ((W)w);	1110	ev_clear_pending ((W)w);
937	if (ev_is_active (w))	1111	if (ev_is_active (w))
938	return;	1112	return;
939		1113
940	prepares [w->active - 1] = prepares [--preparecnt];	1114	prepares [w->active - 1] = prepares [--preparecnt];
941	ev_stop ((W)w);	1115	ev_stop ((W)w);
…		…
953	}	1127	}
954		1128
955	void	1129	void
956	ev_check_stop (struct ev_check *w)	1130	ev_check_stop (struct ev_check *w)
957	{	1131	{
958	ev_clear ((W)w);	1132	ev_clear_pending ((W)w);
959	if (ev_is_active (w))	1133	if (ev_is_active (w))
960	return;	1134	return;
961		1135
962	checks [w->active - 1] = checks [--checkcnt];	1136	checks [w->active - 1] = checks [--checkcnt];
963	ev_stop ((W)w);	1137	ev_stop ((W)w);
…		…
974	}	1148	}
975		1149
976	void	1150	void
977	ev_child_stop (struct ev_child *w)	1151	ev_child_stop (struct ev_child *w)
978	{	1152	{
979	ev_clear ((W)w);	1153	ev_clear_pending ((W)w);
980	if (ev_is_active (w))	1154	if (ev_is_active (w))
981	return;	1155	return;
982		1156
983	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);	1157	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
984	ev_stop ((W)w);	1158	ev_stop ((W)w);

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs. Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs.
Revision 1.50 by root, Sat Nov 3 19:41:55 2007 UTC