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

Comparing libev/ev.c (file contents):
Revision 1.32 by root, Thu Nov 1 09:21:51 2007 UTC vs.
Revision 1.46 by root, Sat Nov 3 09:20:12 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	{
173	if (w->pending)	213	if (w->pending)
174	{	214	{
175	pendings [w->pending - 1].events \|= events;	215	pendings [ABSPRI (w)][w->pending - 1].events \|= events;
176	return;	216	return;
177	}	217	}
178		218
179	w->pending = ++pendingcnt;	219	w->pending = ++pendingcnt [ABSPRI (w)];
180	array_needsize (pendings, pendingmax, pendingcnt, );	220	array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
181	pendings [pendingcnt - 1].w = w;	221	pendings [ABSPRI (w)][w->pending - 1].w = w;
182	pendings [pendingcnt - 1].events = events;	222	pendings [ABSPRI (w)][w->pending - 1].events = events;
183	}	223	}
184		224
185	static void	225	static void
186	queue_events (W *events, int eventcnt, int type)	226	queue_events (W *events, int eventcnt, int type)
187	{	227	{
…		…
225	int events = 0;	265	int events = 0;
226		266
227	for (w = anfd->head; w; w = w->next)	267	for (w = anfd->head; w; w = w->next)
228	events \|= w->events;	268	events \|= w->events;
229		269
230	anfd->events &= ~EV_REIFY;	270	anfd->reify = 0;
231		271
232	if (anfd->events != events)	272	if (anfd->events != events)
233	{	273	{
234	method_modify (fd, anfd->events, events);	274	method_modify (fd, anfd->events, events);
235	anfd->events = events;	275	anfd->events = events;
…		…
240	}	280	}
241		281
242	static void	282	static void
243	fd_change (int fd)	283	fd_change (int fd)
244	{	284	{
245	if (anfds [fd].events & EV_REIFY \|\| fdchangecnt < 0)	285	if (anfds [fd].reify \|\| fdchangecnt < 0)
246	return;	286	return;
247		287
248	anfds [fd].events \|= EV_REIFY;	288	anfds [fd].reify = 1;
249		289
250	++fdchangecnt;	290	++fdchangecnt;
251	array_needsize (fdchanges, fdchangemax, fdchangecnt, );	291	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
252	fdchanges [fdchangecnt - 1] = fd;	292	fdchanges [fdchangecnt - 1] = fd;
253	}	293	}
254		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
255	/* called on EBADF to verify fds */	308	/* called on EBADF to verify fds */
256	static void	309	static void
257	fd_recheck (void)	310	fd_ebadf (void)
258	{	311	{
259	int fd;	312	int fd;
260		313
261	for (fd = 0; fd < anfdmax; ++fd)	314	for (fd = 0; fd < anfdmax; ++fd)
262	if (anfds [fd].events)	315	if (anfds [fd].events)
263	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)	316	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
264	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)
265	{	328	{
266	ev_io_stop (anfds [fd].head);	329	close (fd);
267	event ((W)anfds [fd].head, EV_ERROR \| EV_READ \| EV_WRITE \| EV_TIMEOUT);	330	fd_kill (fd);
		331	return;
268	}	332	}
269	}	333	}
270		334
271	/*****************************************************************************/	335	/*****************************************************************************/
272		336
273	static struct ev_timer **timers;	337	static struct ev_timer **timers;
…		…
320	/*****************************************************************************/	384	/*****************************************************************************/
321		385
322	typedef struct	386	typedef struct
323	{	387	{
324	struct ev_signal *head;	388	struct ev_signal *head;
325	sig_atomic_t gotsig;	389	sig_atomic_t volatile gotsig;
326	} ANSIG;	390	} ANSIG;
327		391
328	static ANSIG *signals;	392	static ANSIG *signals;
329	static int signalmax;	393	static int signalmax;
330		394
331	static int sigpipe [2];	395	static int sigpipe [2];
332	static sig_atomic_t gotsig;	396	static sig_atomic_t volatile gotsig;
333	static struct ev_io sigev;	397	static struct ev_io sigev;
334		398
335	static void	399	static void
336	signals_init (ANSIG *base, int count)	400	signals_init (ANSIG *base, int count)
337	{	401	{
338	while (count--)	402	while (count--)
339	{	403	{
340	base->head = 0;	404	base->head = 0;
341	base->gotsig = 0;	405	base->gotsig = 0;
		406
342	++base;	407	++base;
343	}	408	}
344	}	409	}
345		410
346	static void	411	static void
…		…
349	signals [signum - 1].gotsig = 1;	414	signals [signum - 1].gotsig = 1;
350		415
351	if (!gotsig)	416	if (!gotsig)
352	{	417	{
353	gotsig = 1;	418	gotsig = 1;
354	write (sigpipe [1], &gotsig, 1);	419	write (sigpipe [1], &signum, 1);
355	}	420	}
356	}	421	}
357		422
358	static void	423	static void
359	sigcb (struct ev_io *iow, int revents)	424	sigcb (struct ev_io *iow, int revents)
360	{	425	{
361	struct ev_signal *w;	426	struct ev_signal *w;
362	int sig;	427	int signum;
363		428
		429	read (sigpipe [0], &revents, 1);
364	gotsig = 0;	430	gotsig = 0;
365	read (sigpipe [0], &revents, 1);
366		431
367	for (sig = signalmax; sig--; )	432	for (signum = signalmax; signum--; )
368	if (signals [sig].gotsig)	433	if (signals [signum].gotsig)
369	{	434	{
370	signals [sig].gotsig = 0;	435	signals [signum].gotsig = 0;
371		436
372	for (w = signals [sig].head; w; w = w->next)	437	for (w = signals [signum].head; w; w = w->next)
373	event ((W)w, EV_SIGNAL);	438	event ((W)w, EV_SIGNAL);
374	}	439	}
375	}	440	}
376		441
377	static void	442	static void
378	siginit (void)	443	siginit (void)
379	{	444	{
		445	#ifndef WIN32
380	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	446	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
381	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	447	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
382		448
383	/* rather than sort out wether we really need nb, set it */	449	/* rather than sort out wether we really need nb, set it */
384	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	450	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
385	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	451	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		452	#endif
386		453
387	ev_io_set (&sigev, sigpipe [0], EV_READ);	454	ev_io_set (&sigev, sigpipe [0], EV_READ);
388	ev_io_start (&sigev);	455	ev_io_start (&sigev);
389	}	456	}
390		457
…		…
402	/*****************************************************************************/	469	/*****************************************************************************/
403		470
404	static struct ev_child *childs [PID_HASHSIZE];	471	static struct ev_child *childs [PID_HASHSIZE];
405	static struct ev_signal childev;	472	static struct ev_signal childev;
406		473
		474	#ifndef WIN32
		475
407	#ifndef WCONTINUED	476	#ifndef WCONTINUED
408	# define WCONTINUED 0	477	# define WCONTINUED 0
409	#endif	478	#endif
410		479
411	static void	480	static void
…		…
414	struct ev_child *w;	483	struct ev_child *w;
415	int pid, status;	484	int pid, status;
416		485
417	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)	486	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)
418	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)	487	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
419	if (w->pid == pid \|\| w->pid == -1)	488	if (w->pid == pid \|\| !w->pid)
420	{	489	{
		490	w->rpid = pid;
421	w->status = status;	491	w->rstatus = status;
422	event ((W)w, EV_CHILD);	492	event ((W)w, EV_CHILD);
423	}	493	}
424	}	494	}
425		495
426	/*****************************************************************************/	496	#endif
427		497
		498	/*****************************************************************************/
		499
		500	#if EV_USE_KQUEUE
		501	# include "ev_kqueue.c"
		502	#endif
428	#if EV_USE_EPOLL	503	#if EV_USE_EPOLL
429	# include "ev_epoll.c"	504	# include "ev_epoll.c"
430	#endif	505	#endif
		506	#if EV_USE_POLL
		507	# include "ev_poll.c"
		508	#endif
431	#if EV_USE_SELECT	509	#if EV_USE_SELECT
432	# include "ev_select.c"	510	# include "ev_select.c"
433	#endif	511	#endif
434		512
435	int	513	int
…		…
442	ev_version_minor (void)	520	ev_version_minor (void)
443	{	521	{
444	return EV_VERSION_MINOR;	522	return EV_VERSION_MINOR;
445	}	523	}
446		524
		525	/* return true if we are running with elevated privileges and ignore env variables */
		526	static int
		527	enable_secure ()
		528	{
		529	return getuid () != geteuid ()
		530	\|\| getgid () != getegid ();
		531	}
		532
447	int ev_init (int flags)	533	int ev_init (int methods)
448	{	534	{
449	if (!ev_method)	535	if (!ev_method)
450	{	536	{
451	#if EV_USE_MONOTONIC	537	#if EV_USE_MONOTONIC
452	{	538	{
…		…
454	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	540	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
455	have_monotonic = 1;	541	have_monotonic = 1;
456	}	542	}
457	#endif	543	#endif
458		544
459	ev_now = ev_time ();	545	ev_now = ev_time ();
460	now = get_clock ();	546	now = get_clock ();
		547	now_floor = now;
461	diff = ev_now - now;	548	diff = ev_now - now;
462		549
463	if (pipe (sigpipe))	550	if (pipe (sigpipe))
464	return 0;	551	return 0;
465		552
		553	if (methods == EVMETHOD_AUTO)
		554	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		555	methods = atoi (getenv ("LIBEV_METHODS"));
		556	else
466	ev_method = EVMETHOD_NONE;	557	methods = EVMETHOD_ANY;
		558
		559	ev_method = 0;
		560	#if EV_USE_KQUEUE
		561	if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
		562	#endif
467	#if EV_USE_EPOLL	563	#if EV_USE_EPOLL
468	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	564	if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
		565	#endif
		566	#if EV_USE_POLL
		567	if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
469	#endif	568	#endif
470	#if EV_USE_SELECT	569	#if EV_USE_SELECT
471	if (ev_method == EVMETHOD_NONE) select_init (flags);	570	if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
472	#endif	571	#endif
473		572
474	if (ev_method)	573	if (ev_method)
475	{	574	{
476	ev_watcher_init (&sigev, sigcb);	575	ev_watcher_init (&sigev, sigcb);
477	siginit ();	576	siginit ();
478		577
		578	#ifndef WIN32
479	ev_signal_init (&childev, childcb, SIGCHLD);	579	ev_signal_init (&childev, childcb, SIGCHLD);
480	ev_signal_start (&childev);	580	ev_signal_start (&childev);
		581	#endif
481	}	582	}
482	}	583	}
483		584
484	return ev_method;	585	return ev_method;
485	}	586	}
486		587
487	/*****************************************************************************/	588	/*****************************************************************************/
488		589
489	void	590	void
490	ev_prefork (void)	591	ev_fork_prepare (void)
491	{	592	{
492	/* nop */	593	/* nop */
493	}	594	}
494		595
495	void	596	void
496	ev_postfork_parent (void)	597	ev_fork_parent (void)
497	{	598	{
498	/* nop */	599	/* nop */
499	}	600	}
500		601
501	void	602	void
502	ev_postfork_child (void)	603	ev_fork_child (void)
503	{	604	{
504	#if EV_USE_EPOLL	605	#if EV_USE_EPOLL
505	if (ev_method == EVMETHOD_EPOLL)	606	if (ev_method == EVMETHOD_EPOLL)
506	epoll_postfork_child ();	607	epoll_postfork_child ();
507	#endif	608	#endif
…		…
516	/*****************************************************************************/	617	/*****************************************************************************/
517		618
518	static void	619	static void
519	call_pending (void)	620	call_pending (void)
520	{	621	{
		622	int pri;
		623
		624	for (pri = NUMPRI; pri--; )
521	while (pendingcnt)	625	while (pendingcnt [pri])
522	{	626	{
523	ANPENDING *p = pendings + --pendingcnt;	627	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
524		628
525	if (p->w)	629	if (p->w)
526	{	630	{
527	p->w->pending = 0;	631	p->w->pending = 0;
528	p->w->cb (p->w, p->events);	632	p->w->cb (p->w, p->events);
529	}	633	}
530	}	634	}
531	}	635	}
532		636
533	static void	637	static void
534	timers_reify (void)	638	timers_reify (void)
535	{	639	{
…		…
538	struct ev_timer *w = timers [0];	642	struct ev_timer *w = timers [0];
539		643
540	/* first reschedule or stop timer */	644	/* first reschedule or stop timer */
541	if (w->repeat)	645	if (w->repeat)
542	{	646	{
		647	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
543	w->at = now + w->repeat;	648	w->at = now + w->repeat;
544	assert (("timer timeout in the past, negative repeat?", w->at > now));
545	downheap ((WT *)timers, timercnt, 0);	649	downheap ((WT *)timers, timercnt, 0);
546	}	650	}
547	else	651	else
548	ev_timer_stop (w); /* nonrepeating: stop timer */	652	ev_timer_stop (w); /* nonrepeating: stop timer */
549		653
…		…
560		664
561	/* first reschedule or stop timer */	665	/* first reschedule or stop timer */
562	if (w->interval)	666	if (w->interval)
563	{	667	{
564	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;	668	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
565	assert (("periodic timeout in the past, negative interval?", w->at > ev_now));	669	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
566	downheap ((WT *)periodics, periodiccnt, 0);	670	downheap ((WT *)periodics, periodiccnt, 0);
567	}	671	}
568	else	672	else
569	ev_periodic_stop (w); /* nonrepeating: stop timer */	673	ev_periodic_stop (w); /* nonrepeating: stop timer */
570		674
571	event ((W)w, EV_TIMEOUT);	675	event ((W)w, EV_PERIODIC);
572	}	676	}
573	}	677	}
574		678
575	static void	679	static void
576	periodics_reschedule (ev_tstamp diff)	680	periodics_reschedule (ev_tstamp diff)
…		…
595	}	699	}
596	}	700	}
597	}	701	}
598	}	702	}
599		703
		704	static int
		705	time_update_monotonic (void)
		706	{
		707	now = get_clock ();
		708
		709	if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
		710	{
		711	ev_now = now + diff;
		712	return 0;
		713	}
		714	else
		715	{
		716	now_floor = now;
		717	ev_now = ev_time ();
		718	return 1;
		719	}
		720	}
		721
600	static void	722	static void
601	time_update (void)	723	time_update (void)
602	{	724	{
603	int i;	725	int i;
604		726
605	ev_now = ev_time ();	727	#if EV_USE_MONOTONIC
606
607	if (have_monotonic)	728	if (expect_true (have_monotonic))
608	{	729	{
		730	if (time_update_monotonic ())
		731	{
609	ev_tstamp odiff = diff;	732	ev_tstamp odiff = diff;
610		733
611	for (i = 4; --i; ) /* loop a few times, before making important decisions */	734	for (i = 4; --i; ) /* loop a few times, before making important decisions */
612	{	735	{
613	now = get_clock ();
614	diff = ev_now - now;	736	diff = ev_now - now;
615		737
616	if (fabs (odiff - diff) < MIN_TIMEJUMP)	738	if (fabs (odiff - diff) < MIN_TIMEJUMP)
617	return; /* all is well */	739	return; /* all is well */
618		740
619	ev_now = ev_time ();	741	ev_now = ev_time ();
		742	now = get_clock ();
		743	now_floor = now;
620	}	744	}
621		745
622	periodics_reschedule (diff - odiff);	746	periodics_reschedule (diff - odiff);
623	/* no timer adjustment, as the monotonic clock doesn't jump */	747	/* no timer adjustment, as the monotonic clock doesn't jump */
		748	}
624	}	749	}
625	else	750	else
		751	#endif
626	{	752	{
		753	ev_now = ev_time ();
		754
627	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)	755	if (expect_false (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
628	{	756	{
629	periodics_reschedule (ev_now - now);	757	periodics_reschedule (ev_now - now);
630		758
631	/* adjust timers. this is easy, as the offset is the same for all */	759	/* adjust timers. this is easy, as the offset is the same for all */
632	for (i = 0; i < timercnt; ++i)	760	for (i = 0; i < timercnt; ++i)
…		…
645	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	773	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
646		774
647	do	775	do
648	{	776	{
649	/* queue check watchers (and execute them) */	777	/* queue check watchers (and execute them) */
650	if (preparecnt)	778	if (expect_false (preparecnt))
651	{	779	{
652	queue_events ((W *)prepares, preparecnt, EV_PREPARE);	780	queue_events ((W *)prepares, preparecnt, EV_PREPARE);
653	call_pending ();	781	call_pending ();
654	}	782	}
655		783
…		…
658		786
659	/* calculate blocking time */	787	/* calculate blocking time */
660		788
661	/* we only need this for !monotonic clockor timers, but as we basically	789	/* we only need this for !monotonic clockor timers, but as we basically
662	always have timers, we just calculate it always */	790	always have timers, we just calculate it always */
		791	#if EV_USE_MONOTONIC
		792	if (expect_true (have_monotonic))
		793	time_update_monotonic ();
		794	else
		795	#endif
		796	{
663	ev_now = ev_time ();	797	ev_now = ev_time ();
		798	now = ev_now;
		799	}
664		800
665	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	801	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
666	block = 0.;	802	block = 0.;
667	else	803	else
668	{	804	{
669	block = MAX_BLOCKTIME;	805	block = MAX_BLOCKTIME;
670		806
671	if (timercnt)	807	if (timercnt)
672	{	808	{
673	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	809	ev_tstamp to = timers [0]->at - now + method_fudge;
674	if (block > to) block = to;	810	if (block > to) block = to;
675	}	811	}
676		812
677	if (periodiccnt)	813	if (periodiccnt)
678	{	814	{
…		…
731	head = &(*head)->next;	867	head = &(*head)->next;
732	}	868	}
733	}	869	}
734		870
735	static void	871	static void
736	ev_clear (W w)	872	ev_clear_pending (W w)
737	{	873	{
738	if (w->pending)	874	if (w->pending)
739	{	875	{
740	pendings [w->pending - 1].w = 0;	876	pendings [ABSPRI (w)][w->pending - 1].w = 0;
741	w->pending = 0;	877	w->pending = 0;
742	}	878	}
743	}	879	}
744		880
745	static void	881	static void
746	ev_start (W w, int active)	882	ev_start (W w, int active)
747	{	883	{
		884	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		885	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		886
748	w->active = active;	887	w->active = active;
749	}	888	}
750		889
751	static void	890	static void
752	ev_stop (W w)	891	ev_stop (W w)
…		…
757	/*****************************************************************************/	896	/*****************************************************************************/
758		897
759	void	898	void
760	ev_io_start (struct ev_io *w)	899	ev_io_start (struct ev_io *w)
761	{	900	{
		901	int fd = w->fd;
		902
762	if (ev_is_active (w))	903	if (ev_is_active (w))
763	return;	904	return;
764		905
765	int fd = w->fd;	906	assert (("ev_io_start called with negative fd", fd >= 0));
766		907
767	ev_start ((W)w, 1);	908	ev_start ((W)w, 1);
768	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	909	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
769	wlist_add ((WL *)&anfds[fd].head, (WL)w);	910	wlist_add ((WL *)&anfds[fd].head, (WL)w);
770		911
…		…
772	}	913	}
773		914
774	void	915	void
775	ev_io_stop (struct ev_io *w)	916	ev_io_stop (struct ev_io *w)
776	{	917	{
777	ev_clear ((W)w);	918	ev_clear_pending ((W)w);
778	if (!ev_is_active (w))	919	if (!ev_is_active (w))
779	return;	920	return;
780		921
781	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	922	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
782	ev_stop ((W)w);	923	ev_stop ((W)w);
…		…
790	if (ev_is_active (w))	931	if (ev_is_active (w))
791	return;	932	return;
792		933
793	w->at += now;	934	w->at += now;
794		935
795	assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));	936	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
796		937
797	ev_start ((W)w, ++timercnt);	938	ev_start ((W)w, ++timercnt);
798	array_needsize (timers, timermax, timercnt, );	939	array_needsize (timers, timermax, timercnt, );
799	timers [timercnt - 1] = w;	940	timers [timercnt - 1] = w;
800	upheap ((WT *)timers, timercnt - 1);	941	upheap ((WT *)timers, timercnt - 1);
801	}	942	}
802		943
803	void	944	void
804	ev_timer_stop (struct ev_timer *w)	945	ev_timer_stop (struct ev_timer *w)
805	{	946	{
806	ev_clear ((W)w);	947	ev_clear_pending ((W)w);
807	if (!ev_is_active (w))	948	if (!ev_is_active (w))
808	return;	949	return;
809		950
810	if (w->active < timercnt--)	951	if (w->active < timercnt--)
811	{	952	{
…		…
839	ev_periodic_start (struct ev_periodic *w)	980	ev_periodic_start (struct ev_periodic *w)
840	{	981	{
841	if (ev_is_active (w))	982	if (ev_is_active (w))
842	return;	983	return;
843		984
844	assert (("periodic interval value less than zero not allowed", w->interval >= 0.));	985	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
845		986
846	/* this formula differs from the one in periodic_reify because we do not always round up */	987	/* this formula differs from the one in periodic_reify because we do not always round up */
847	if (w->interval)	988	if (w->interval)
848	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;	989	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
849		990
…		…
854	}	995	}
855		996
856	void	997	void
857	ev_periodic_stop (struct ev_periodic *w)	998	ev_periodic_stop (struct ev_periodic *w)
858	{	999	{
859	ev_clear ((W)w);	1000	ev_clear_pending ((W)w);
860	if (!ev_is_active (w))	1001	if (!ev_is_active (w))
861	return;	1002	return;
862		1003
863	if (w->active < periodiccnt--)	1004	if (w->active < periodiccnt--)
864	{	1005	{
…		…
872	void	1013	void
873	ev_signal_start (struct ev_signal *w)	1014	ev_signal_start (struct ev_signal *w)
874	{	1015	{
875	if (ev_is_active (w))	1016	if (ev_is_active (w))
876	return;	1017	return;
		1018
		1019	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
877		1020
878	ev_start ((W)w, 1);	1021	ev_start ((W)w, 1);
879	array_needsize (signals, signalmax, w->signum, signals_init);	1022	array_needsize (signals, signalmax, w->signum, signals_init);
880	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1023	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
881		1024
…		…
890	}	1033	}
891		1034
892	void	1035	void
893	ev_signal_stop (struct ev_signal *w)	1036	ev_signal_stop (struct ev_signal *w)
894	{	1037	{
895	ev_clear ((W)w);	1038	ev_clear_pending ((W)w);
896	if (!ev_is_active (w))	1039	if (!ev_is_active (w))
897	return;	1040	return;
898		1041
899	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1042	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
900	ev_stop ((W)w);	1043	ev_stop ((W)w);
…		…
915	}	1058	}
916		1059
917	void	1060	void
918	ev_idle_stop (struct ev_idle *w)	1061	ev_idle_stop (struct ev_idle *w)
919	{	1062	{
920	ev_clear ((W)w);	1063	ev_clear_pending ((W)w);
921	if (ev_is_active (w))	1064	if (ev_is_active (w))
922	return;	1065	return;
923		1066
924	idles [w->active - 1] = idles [--idlecnt];	1067	idles [w->active - 1] = idles [--idlecnt];
925	ev_stop ((W)w);	1068	ev_stop ((W)w);
…		…
937	}	1080	}
938		1081
939	void	1082	void
940	ev_prepare_stop (struct ev_prepare *w)	1083	ev_prepare_stop (struct ev_prepare *w)
941	{	1084	{
942	ev_clear ((W)w);	1085	ev_clear_pending ((W)w);
943	if (ev_is_active (w))	1086	if (ev_is_active (w))
944	return;	1087	return;
945		1088
946	prepares [w->active - 1] = prepares [--preparecnt];	1089	prepares [w->active - 1] = prepares [--preparecnt];
947	ev_stop ((W)w);	1090	ev_stop ((W)w);
…		…
959	}	1102	}
960		1103
961	void	1104	void
962	ev_check_stop (struct ev_check *w)	1105	ev_check_stop (struct ev_check *w)
963	{	1106	{
964	ev_clear ((W)w);	1107	ev_clear_pending ((W)w);
965	if (ev_is_active (w))	1108	if (ev_is_active (w))
966	return;	1109	return;
967		1110
968	checks [w->active - 1] = checks [--checkcnt];	1111	checks [w->active - 1] = checks [--checkcnt];
969	ev_stop ((W)w);	1112	ev_stop ((W)w);
…		…
980	}	1123	}
981		1124
982	void	1125	void
983	ev_child_stop (struct ev_child *w)	1126	ev_child_stop (struct ev_child *w)
984	{	1127	{
985	ev_clear ((W)w);	1128	ev_clear_pending ((W)w);
986	if (ev_is_active (w))	1129	if (ev_is_active (w))
987	return;	1130	return;
988		1131
989	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);	1132	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
990	ev_stop ((W)w);	1133	ev_stop ((W)w);

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.32 by root, Thu Nov 1 09:21:51 2007 UTC vs. Revision 1.46 by root, Sat Nov 3 09:20:12 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.32 by root, Thu Nov 1 09:21:51 2007 UTC vs.
Revision 1.46 by root, Sat Nov 3 09:20:12 2007 UTC