[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.47 by root, Sat Nov 3 11:44:44 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
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); \
…		…
139	/*****************************************************************************/	176	/*****************************************************************************/
140		177
141	typedef struct	178	typedef struct
142	{	179	{
143	struct ev_io *head;	180	struct ev_io *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	{
…		…
219	int events = 0;	265	int events = 0;
220		266
221	for (w = anfd->head; w; w = w->next)	267	for (w = anfd->head; w; w = 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	printf ("killing fd %d\n", fd);//D
		301	while ((w = anfds [fd].head))
		302	{
		303	ev_io_stop (w);
		304	event ((W)w, EV_ERROR \| EV_READ \| EV_WRITE);
		305	}
		306	}
		307
249	/* called on EBADF to verify fds */	308	/* called on EBADF to verify fds */
250	static void	309	static void
251	fd_recheck (void)	310	fd_ebadf (void)
252	{	311	{
253	int fd;	312	int fd;
254		313
255	for (fd = 0; fd < anfdmax; ++fd)	314	for (fd = 0; fd < anfdmax; ++fd)
256	if (anfds [fd].events)	315	if (anfds [fd].events)
257	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)	316	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
258	while (anfds [fd].head)	317	fd_kill (fd);
		318	}
		319
		320	/* called on ENOMEM in select/poll to kill some fds and retry */
		321	static void
		322	fd_enomem (void)
		323	{
		324	int fd = anfdmax;
		325
		326	while (fd--)
		327	if (anfds [fd].events)
259	{	328	{
260	event ((W)anfds [fd].head, EV_ERROR \| EV_READ \| EV_WRITE \| EV_TIMEOUT);	329	close (fd);
261	ev_io_stop (anfds [fd].head);	330	fd_kill (fd);
		331	return;
262	}	332	}
263	}	333	}
264		334
265	/*****************************************************************************/	335	/*****************************************************************************/
266		336
267	static struct ev_timer **timers;	337	static struct ev_timer **timers;
…		…
314	/*****************************************************************************/	384	/*****************************************************************************/
315		385
316	typedef struct	386	typedef struct
317	{	387	{
318	struct ev_signal *head;	388	struct ev_signal *head;
319	sig_atomic_t gotsig;	389	sig_atomic_t volatile gotsig;
320	} ANSIG;	390	} ANSIG;
321		391
322	static ANSIG *signals;	392	static ANSIG *signals;
323	static int signalmax;	393	static int signalmax;
324		394
325	static int sigpipe [2];	395	static int sigpipe [2];
326	static sig_atomic_t gotsig;	396	static sig_atomic_t volatile gotsig;
327	static struct ev_io sigev;	397	static struct ev_io sigev;
328		398
329	static void	399	static void
330	signals_init (ANSIG *base, int count)	400	signals_init (ANSIG *base, int count)
331	{	401	{
332	while (count--)	402	while (count--)
333	{	403	{
334	base->head = 0;	404	base->head = 0;
335	base->gotsig = 0;	405	base->gotsig = 0;
		406
336	++base;	407	++base;
337	}	408	}
338	}	409	}
339		410
340	static void	411	static void
…		…
343	signals [signum - 1].gotsig = 1;	414	signals [signum - 1].gotsig = 1;
344		415
345	if (!gotsig)	416	if (!gotsig)
346	{	417	{
347	gotsig = 1;	418	gotsig = 1;
348	write (sigpipe [1], &gotsig, 1);	419	write (sigpipe [1], &signum, 1);
349	}	420	}
350	}	421	}
351		422
352	static void	423	static void
353	sigcb (struct ev_io *iow, int revents)	424	sigcb (struct ev_io *iow, int revents)
354	{	425	{
355	struct ev_signal *w;	426	struct ev_signal *w;
356	int sig;	427	int signum;
357		428
		429	read (sigpipe [0], &revents, 1);
358	gotsig = 0;	430	gotsig = 0;
359	read (sigpipe [0], &revents, 1);
360		431
361	for (sig = signalmax; sig--; )	432	for (signum = signalmax; signum--; )
362	if (signals [sig].gotsig)	433	if (signals [signum].gotsig)
363	{	434	{
364	signals [sig].gotsig = 0;	435	signals [signum].gotsig = 0;
365		436
366	for (w = signals [sig].head; w; w = w->next)	437	for (w = signals [signum].head; w; w = w->next)
367	event ((W)w, EV_SIGNAL);	438	event ((W)w, EV_SIGNAL);
368	}	439	}
369	}	440	}
370		441
371	static void	442	static void
372	siginit (void)	443	siginit (void)
373	{	444	{
		445	#ifndef WIN32
374	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	446	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
375	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	447	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
376		448
377	/* rather than sort out wether we really need nb, set it */	449	/* rather than sort out wether we really need nb, set it */
378	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	450	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
379	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	451	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		452	#endif
380		453
381	ev_io_set (&sigev, sigpipe [0], EV_READ);	454	ev_io_set (&sigev, sigpipe [0], EV_READ);
382	ev_io_start (&sigev);	455	ev_io_start (&sigev);
383	}	456	}
384		457
…		…
396	/*****************************************************************************/	469	/*****************************************************************************/
397		470
398	static struct ev_child *childs [PID_HASHSIZE];	471	static struct ev_child *childs [PID_HASHSIZE];
399	static struct ev_signal childev;	472	static struct ev_signal childev;
400		473
		474	#ifndef WIN32
		475
401	#ifndef WCONTINUED	476	#ifndef WCONTINUED
402	# define WCONTINUED 0	477	# define WCONTINUED 0
403	#endif	478	#endif
404		479
405	static void	480	static void
		481	child_reap (struct ev_signal *sw, int chain, int pid, int status)
		482	{
		483	struct ev_child *w;
		484
		485	for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
		486	if (w->pid == pid \|\| !w->pid)
		487	{
		488	w->priority = sw->priority; /* need to do it now */
		489	w->rpid = pid;
		490	w->rstatus = status;
		491	printf ("rpid %p %d %d\n", w, pid, w->pid);//D
		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
		501	printf ("chld %x\n", revents);//D
411	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)	502	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))
412	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)	503	{
413	if (w->pid == pid \|\| w->pid == -1)	504	/* make sure we are called again until all childs have been reaped */
414	{
415	w->status = status;
416	event ((W)w, EV_CHILD);	505	event ((W)sw, EV_SIGNAL);
417	}	506
		507	child_reap (sw, pid, pid, status);
		508	child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
		509	}
418	}	510	}
		511
		512	#endif
419		513
420	/*****************************************************************************/	514	/*****************************************************************************/
421		515
		516	#if EV_USE_KQUEUE
		517	# include "ev_kqueue.c"
		518	#endif
422	#if EV_USE_EPOLL	519	#if EV_USE_EPOLL
423	# include "ev_epoll.c"	520	# include "ev_epoll.c"
424	#endif	521	#endif
		522	#if EV_USE_POLL
		523	# include "ev_poll.c"
		524	#endif
425	#if EV_USE_SELECT	525	#if EV_USE_SELECT
426	# include "ev_select.c"	526	# include "ev_select.c"
427	#endif	527	#endif
428		528
429	int	529	int
…		…
436	ev_version_minor (void)	536	ev_version_minor (void)
437	{	537	{
438	return EV_VERSION_MINOR;	538	return EV_VERSION_MINOR;
439	}	539	}
440		540
		541	/* return true if we are running with elevated privileges and ignore env variables */
		542	static int
		543	enable_secure ()
		544	{
		545	return getuid () != geteuid ()
		546	\|\| getgid () != getegid ();
		547	}
		548
441	int ev_init (int flags)	549	int ev_init (int methods)
442	{	550	{
443	if (!ev_method)	551	if (!ev_method)
444	{	552	{
445	#if EV_USE_MONOTONIC	553	#if EV_USE_MONOTONIC
446	{	554	{
…		…
448	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	556	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
449	have_monotonic = 1;	557	have_monotonic = 1;
450	}	558	}
451	#endif	559	#endif
452		560
453	ev_now = ev_time ();	561	ev_now = ev_time ();
454	now = get_clock ();	562	now = get_clock ();
		563	now_floor = now;
455	diff = ev_now - now;	564	diff = ev_now - now;
456		565
457	if (pipe (sigpipe))	566	if (pipe (sigpipe))
458	return 0;	567	return 0;
459		568
		569	if (methods == EVMETHOD_AUTO)
		570	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		571	methods = atoi (getenv ("LIBEV_METHODS"));
		572	else
460	ev_method = EVMETHOD_NONE;	573	methods = EVMETHOD_ANY;
		574
		575	ev_method = 0;
		576	#if EV_USE_KQUEUE
		577	if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
		578	#endif
461	#if EV_USE_EPOLL	579	#if EV_USE_EPOLL
462	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	580	if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
		581	#endif
		582	#if EV_USE_POLL
		583	if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
463	#endif	584	#endif
464	#if EV_USE_SELECT	585	#if EV_USE_SELECT
465	if (ev_method == EVMETHOD_NONE) select_init (flags);	586	if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
466	#endif	587	#endif
467		588
468	if (ev_method)	589	if (ev_method)
469	{	590	{
470	ev_watcher_init (&sigev, sigcb);	591	ev_watcher_init (&sigev, sigcb);
		592	ev_set_priority (&sigev, EV_MAXPRI);
471	siginit ();	593	siginit ();
472		594
		595	#ifndef WIN32
473	ev_signal_init (&childev, childcb, SIGCHLD);	596	ev_signal_init (&childev, childcb, SIGCHLD);
		597	ev_set_priority (&childev, EV_MAXPRI);
474	ev_signal_start (&childev);	598	ev_signal_start (&childev);
		599	#endif
475	}	600	}
476	}	601	}
477		602
478	return ev_method;	603	return ev_method;
479	}	604	}
480		605
481	/*****************************************************************************/	606	/*****************************************************************************/
482		607
483	void	608	void
484	ev_prefork (void)	609	ev_fork_prepare (void)
485	{	610	{
486	/* nop */	611	/* nop */
487	}	612	}
488		613
489	void	614	void
490	ev_postfork_parent (void)	615	ev_fork_parent (void)
491	{	616	{
492	/* nop */	617	/* nop */
493	}	618	}
494		619
495	void	620	void
496	ev_postfork_child (void)	621	ev_fork_child (void)
497	{	622	{
498	#if EV_USE_EPOLL	623	#if EV_USE_EPOLL
499	if (ev_method == EVMETHOD_EPOLL)	624	if (ev_method == EVMETHOD_EPOLL)
500	epoll_postfork_child ();	625	epoll_postfork_child ();
501	#endif	626	#endif
…		…
510	/*****************************************************************************/	635	/*****************************************************************************/
511		636
512	static void	637	static void
513	call_pending (void)	638	call_pending (void)
514	{	639	{
		640	int pri;
		641
		642	for (pri = NUMPRI; pri--; )
515	while (pendingcnt)	643	while (pendingcnt [pri])
516	{	644	{
517	ANPENDING *p = pendings + --pendingcnt;	645	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
518		646
519	if (p->w)	647	if (p->w)
520	{	648	{
521	p->w->pending = 0;	649	p->w->pending = 0;
522	p->w->cb (p->w, p->events);	650	p->w->cb (p->w, p->events);
523	}	651	}
524	}	652	}
525	}	653	}
526		654
527	static void	655	static void
528	timers_reify (void)	656	timers_reify (void)
529	{	657	{
…		…
532	struct ev_timer *w = timers [0];	660	struct ev_timer *w = timers [0];
533		661
534	/* first reschedule or stop timer */	662	/* first reschedule or stop timer */
535	if (w->repeat)	663	if (w->repeat)
536	{	664	{
		665	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
537	w->at = now + w->repeat;	666	w->at = now + w->repeat;
538	assert (("timer timeout in the past, negative repeat?", w->at > now));
539	downheap ((WT *)timers, timercnt, 0);	667	downheap ((WT *)timers, timercnt, 0);
540	}	668	}
541	else	669	else
542	ev_timer_stop (w); /* nonrepeating: stop timer */	670	ev_timer_stop (w); /* nonrepeating: stop timer */
543		671
…		…
554		682
555	/* first reschedule or stop timer */	683	/* first reschedule or stop timer */
556	if (w->interval)	684	if (w->interval)
557	{	685	{
558	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;	686	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));	687	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
560	downheap ((WT *)periodics, periodiccnt, 0);	688	downheap ((WT *)periodics, periodiccnt, 0);
561	}	689	}
562	else	690	else
563	ev_periodic_stop (w); /* nonrepeating: stop timer */	691	ev_periodic_stop (w); /* nonrepeating: stop timer */
564		692
565	event ((W)w, EV_TIMEOUT);	693	event ((W)w, EV_PERIODIC);
566	}	694	}
567	}	695	}
568		696
569	static void	697	static void
570	periodics_reschedule (ev_tstamp diff)	698	periodics_reschedule (ev_tstamp diff)
…		…
589	}	717	}
590	}	718	}
591	}	719	}
592	}	720	}
593		721
		722	static int
		723	time_update_monotonic (void)
		724	{
		725	now = get_clock ();
		726
		727	if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
		728	{
		729	ev_now = now + diff;
		730	return 0;
		731	}
		732	else
		733	{
		734	now_floor = now;
		735	ev_now = ev_time ();
		736	return 1;
		737	}
		738	}
		739
594	static void	740	static void
595	time_update (void)	741	time_update (void)
596	{	742	{
597	int i;	743	int i;
598		744
599	ev_now = ev_time ();	745	#if EV_USE_MONOTONIC
600
601	if (have_monotonic)	746	if (expect_true (have_monotonic))
602	{	747	{
603	ev_tstamp odiff = diff;	748	if (time_update_monotonic ())
604
605	for (i = 4; --i; ) /* loop a few times, before making important decisions */
606	{	749	{
607	now = get_clock ();	750	ev_tstamp odiff = diff;
		751
		752	for (i = 4; --i; ) /* loop a few times, before making important decisions */
		753	{
608	diff = ev_now - now;	754	diff = ev_now - now;
609		755
610	if (fabs (odiff - diff) < MIN_TIMEJUMP)	756	if (fabs (odiff - diff) < MIN_TIMEJUMP)
611	return; /* all is well */	757	return; /* all is well */
612		758
613	ev_now = ev_time ();	759	ev_now = ev_time ();
		760	now = get_clock ();
		761	now_floor = now;
		762	}
		763
		764	periodics_reschedule (diff - odiff);
		765	/* no timer adjustment, as the monotonic clock doesn't jump */
614	}	766	}
615
616	periodics_reschedule (diff - odiff);
617	/* no timer adjustment, as the monotonic clock doesn't jump */
618	}	767	}
619	else	768	else
		769	#endif
620	{	770	{
		771	ev_now = ev_time ();
		772
621	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)	773	if (expect_false (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
622	{	774	{
623	periodics_reschedule (ev_now - now);	775	periodics_reschedule (ev_now - now);
624		776
625	/* adjust timers. this is easy, as the offset is the same for all */	777	/* adjust timers. this is easy, as the offset is the same for all */
626	for (i = 0; i < timercnt; ++i)	778	for (i = 0; i < timercnt; ++i)
…		…
639	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	791	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
640		792
641	do	793	do
642	{	794	{
643	/* queue check watchers (and execute them) */	795	/* queue check watchers (and execute them) */
644	if (preparecnt)	796	if (expect_false (preparecnt))
645	{	797	{
646	queue_events ((W *)prepares, preparecnt, EV_PREPARE);	798	queue_events ((W *)prepares, preparecnt, EV_PREPARE);
647	call_pending ();	799	call_pending ();
648	}	800	}
649		801
…		…
652		804
653	/* calculate blocking time */	805	/* calculate blocking time */
654		806
655	/* we only need this for !monotonic clockor timers, but as we basically	807	/* we only need this for !monotonic clockor timers, but as we basically
656	always have timers, we just calculate it always */	808	always have timers, we just calculate it always */
		809	#if EV_USE_MONOTONIC
		810	if (expect_true (have_monotonic))
		811	time_update_monotonic ();
		812	else
		813	#endif
		814	{
657	ev_now = ev_time ();	815	ev_now = ev_time ();
		816	now = ev_now;
		817	}
658		818
659	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	819	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
660	block = 0.;	820	block = 0.;
661	else	821	else
662	{	822	{
663	block = MAX_BLOCKTIME;	823	block = MAX_BLOCKTIME;
664		824
665	if (timercnt)	825	if (timercnt)
666	{	826	{
667	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	827	ev_tstamp to = timers [0]->at - now + method_fudge;
668	if (block > to) block = to;	828	if (block > to) block = to;
669	}	829	}
670		830
671	if (periodiccnt)	831	if (periodiccnt)
672	{	832	{
…		…
725	head = &(*head)->next;	885	head = &(*head)->next;
726	}	886	}
727	}	887	}
728		888
729	static void	889	static void
730	ev_clear (W w)	890	ev_clear_pending (W w)
731	{	891	{
732	if (w->pending)	892	if (w->pending)
733	{	893	{
734	pendings [w->pending - 1].w = 0;	894	pendings [ABSPRI (w)][w->pending - 1].w = 0;
735	w->pending = 0;	895	w->pending = 0;
736	}	896	}
737	}	897	}
738		898
739	static void	899	static void
740	ev_start (W w, int active)	900	ev_start (W w, int active)
741	{	901	{
		902	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		903	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		904
742	w->active = active;	905	w->active = active;
743	}	906	}
744		907
745	static void	908	static void
746	ev_stop (W w)	909	ev_stop (W w)
…		…
751	/*****************************************************************************/	914	/*****************************************************************************/
752		915
753	void	916	void
754	ev_io_start (struct ev_io *w)	917	ev_io_start (struct ev_io *w)
755	{	918	{
		919	int fd = w->fd;
		920
756	if (ev_is_active (w))	921	if (ev_is_active (w))
757	return;	922	return;
758		923
759	int fd = w->fd;	924	assert (("ev_io_start called with negative fd", fd >= 0));
760		925
761	ev_start ((W)w, 1);	926	ev_start ((W)w, 1);
762	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	927	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
763	wlist_add ((WL *)&anfds[fd].head, (WL)w);	928	wlist_add ((WL *)&anfds[fd].head, (WL)w);
764		929
…		…
766	}	931	}
767		932
768	void	933	void
769	ev_io_stop (struct ev_io *w)	934	ev_io_stop (struct ev_io *w)
770	{	935	{
771	ev_clear ((W)w);	936	ev_clear_pending ((W)w);
772	if (!ev_is_active (w))	937	if (!ev_is_active (w))
773	return;	938	return;
774		939
775	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	940	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
776	ev_stop ((W)w);	941	ev_stop ((W)w);
…		…
784	if (ev_is_active (w))	949	if (ev_is_active (w))
785	return;	950	return;
786		951
787	w->at += now;	952	w->at += now;
788		953
789	assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));	954	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
790		955
791	ev_start ((W)w, ++timercnt);	956	ev_start ((W)w, ++timercnt);
792	array_needsize (timers, timermax, timercnt, );	957	array_needsize (timers, timermax, timercnt, );
793	timers [timercnt - 1] = w;	958	timers [timercnt - 1] = w;
794	upheap ((WT *)timers, timercnt - 1);	959	upheap ((WT *)timers, timercnt - 1);
795	}	960	}
796		961
797	void	962	void
798	ev_timer_stop (struct ev_timer *w)	963	ev_timer_stop (struct ev_timer *w)
799	{	964	{
800	ev_clear ((W)w);	965	ev_clear_pending ((W)w);
801	if (!ev_is_active (w))	966	if (!ev_is_active (w))
802	return;	967	return;
803		968
804	if (w->active < timercnt--)	969	if (w->active < timercnt--)
805	{	970	{
…		…
833	ev_periodic_start (struct ev_periodic *w)	998	ev_periodic_start (struct ev_periodic *w)
834	{	999	{
835	if (ev_is_active (w))	1000	if (ev_is_active (w))
836	return;	1001	return;
837		1002
838	assert (("periodic interval value less than zero not allowed", w->interval >= 0.));	1003	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
839		1004
840	/* this formula differs from the one in periodic_reify because we do not always round up */	1005	/* this formula differs from the one in periodic_reify because we do not always round up */
841	if (w->interval)	1006	if (w->interval)
842	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;	1007	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
843		1008
…		…
848	}	1013	}
849		1014
850	void	1015	void
851	ev_periodic_stop (struct ev_periodic *w)	1016	ev_periodic_stop (struct ev_periodic *w)
852	{	1017	{
853	ev_clear ((W)w);	1018	ev_clear_pending ((W)w);
854	if (!ev_is_active (w))	1019	if (!ev_is_active (w))
855	return;	1020	return;
856		1021
857	if (w->active < periodiccnt--)	1022	if (w->active < periodiccnt--)
858	{	1023	{
…		…
861	}	1026	}
862		1027
863	ev_stop ((W)w);	1028	ev_stop ((W)w);
864	}	1029	}
865		1030
		1031	#ifndef SA_RESTART
		1032	# define SA_RESTART 0
		1033	#endif
		1034
866	void	1035	void
867	ev_signal_start (struct ev_signal *w)	1036	ev_signal_start (struct ev_signal *w)
868	{	1037	{
869	if (ev_is_active (w))	1038	if (ev_is_active (w))
870	return;	1039	return;
		1040
		1041	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
871		1042
872	ev_start ((W)w, 1);	1043	ev_start ((W)w, 1);
873	array_needsize (signals, signalmax, w->signum, signals_init);	1044	array_needsize (signals, signalmax, w->signum, signals_init);
874	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1045	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
875		1046
876	if (!w->next)	1047	if (!w->next)
877	{	1048	{
878	struct sigaction sa;	1049	struct sigaction sa;
879	sa.sa_handler = sighandler;	1050	sa.sa_handler = sighandler;
880	sigfillset (&sa.sa_mask);	1051	sigfillset (&sa.sa_mask);
881	sa.sa_flags = 0;	1052	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
882	sigaction (w->signum, &sa, 0);	1053	sigaction (w->signum, &sa, 0);
883	}	1054	}
884	}	1055	}
885		1056
886	void	1057	void
887	ev_signal_stop (struct ev_signal *w)	1058	ev_signal_stop (struct ev_signal *w)
888	{	1059	{
889	ev_clear ((W)w);	1060	ev_clear_pending ((W)w);
890	if (!ev_is_active (w))	1061	if (!ev_is_active (w))
891	return;	1062	return;
892		1063
893	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1064	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
894	ev_stop ((W)w);	1065	ev_stop ((W)w);
…		…
909	}	1080	}
910		1081
911	void	1082	void
912	ev_idle_stop (struct ev_idle *w)	1083	ev_idle_stop (struct ev_idle *w)
913	{	1084	{
914	ev_clear ((W)w);	1085	ev_clear_pending ((W)w);
915	if (ev_is_active (w))	1086	if (ev_is_active (w))
916	return;	1087	return;
917		1088
918	idles [w->active - 1] = idles [--idlecnt];	1089	idles [w->active - 1] = idles [--idlecnt];
919	ev_stop ((W)w);	1090	ev_stop ((W)w);
…		…
931	}	1102	}
932		1103
933	void	1104	void
934	ev_prepare_stop (struct ev_prepare *w)	1105	ev_prepare_stop (struct ev_prepare *w)
935	{	1106	{
936	ev_clear ((W)w);	1107	ev_clear_pending ((W)w);
937	if (ev_is_active (w))	1108	if (ev_is_active (w))
938	return;	1109	return;
939		1110
940	prepares [w->active - 1] = prepares [--preparecnt];	1111	prepares [w->active - 1] = prepares [--preparecnt];
941	ev_stop ((W)w);	1112	ev_stop ((W)w);
…		…
953	}	1124	}
954		1125
955	void	1126	void
956	ev_check_stop (struct ev_check *w)	1127	ev_check_stop (struct ev_check *w)
957	{	1128	{
958	ev_clear ((W)w);	1129	ev_clear_pending ((W)w);
959	if (ev_is_active (w))	1130	if (ev_is_active (w))
960	return;	1131	return;
961		1132
962	checks [w->active - 1] = checks [--checkcnt];	1133	checks [w->active - 1] = checks [--checkcnt];
963	ev_stop ((W)w);	1134	ev_stop ((W)w);
…		…
974	}	1145	}
975		1146
976	void	1147	void
977	ev_child_stop (struct ev_child *w)	1148	ev_child_stop (struct ev_child *w)
978	{	1149	{
979	ev_clear ((W)w);	1150	ev_clear_pending ((W)w);
980	if (ev_is_active (w))	1151	if (ev_is_active (w))
981	return;	1152	return;
982		1153
983	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);	1154	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
984	ev_stop ((W)w);	1155	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.47 by root, Sat Nov 3 11:44:44 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.47 by root, Sat Nov 3 11:44:44 2007 UTC