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

Comparing libev/ev.c (file contents):
Revision 1.1 by root, Tue Oct 30 20:59:31 2007 UTC vs.
Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC

…		…
1	#include <math.h>	1	#include <math.h>
2	#include <stdlib.h>	2	#include <stdlib.h>
		3	#include <unistd.h>
		4	#include <fcntl.h>
		5	#include <signal.h>
3		6
4	#include <stdio.h>	7	#include <stdio.h>
5		8
		9	#include <assert.h>
6	#include <errno.h>	10	#include <errno.h>
7	#include <sys/time.h>	11	#include <sys/time.h>
8	#include <time.h>	12	#include <time.h>
9		13
10	#ifdef CLOCK_MONOTONIC
11	# define HAVE_MONOTONIC 1
12	#endif
13
14	#define HAVE_EPOLL 1	14	#define HAVE_EPOLL 1
15	#define HAVE_REALTIME 1	15
		16	#ifndef HAVE_MONOTONIC
		17	# ifdef CLOCK_MONOTONIC
		18	# define HAVE_MONOTONIC 1
		19	# endif
		20	#endif
		21
		22	#ifndef HAVE_SELECT
16	#define HAVE_SELECT 0	23	# define HAVE_SELECT 1
		24	#endif
17		25
		26	#ifndef HAVE_EPOLL
		27	# define HAVE_EPOLL 0
		28	#endif
		29
		30	#ifndef HAVE_REALTIME
		31	# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
		32	#endif
		33
		34	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
18	#define MAX_BLOCKTIME 60.	35	#define MAX_BLOCKTIME 60.
19		36
20	#include "ev.h"	37	#include "ev.h"
21		38
22	struct ev_watcher {	39	typedef struct ev_watcher *W;
23	EV_WATCHER (ev_watcher);
24	};
25
26	struct ev_watcher_list {	40	typedef struct ev_watcher_list *WL;
27	EV_WATCHER_LIST (ev_watcher_list);	41	typedef struct ev_watcher_time *WT;
28	};
29		42
		43	static ev_tstamp now, diff; /* monotonic clock */
30	ev_tstamp ev_now;	44	ev_tstamp ev_now;
31	int ev_method;	45	int ev_method;
32		46
33	static int have_monotonic; /* runtime */	47	static int have_monotonic; /* runtime */
34		48
35	static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */	49	static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
36	static void (*method_reify)(void);	50	static void (*method_modify)(int fd, int oev, int nev);
37	static void (*method_poll)(ev_tstamp timeout);	51	static void (*method_poll)(ev_tstamp timeout);
		52
		53	/*****************************************************************************/
38		54
39	ev_tstamp	55	ev_tstamp
40	ev_time (void)	56	ev_time (void)
41	{	57	{
42	#if HAVE_REALTIME	58	#if HAVE_REALTIME
66	}	82	}
67		83
68	#define array_needsize(base,cur,cnt,init) \	84	#define array_needsize(base,cur,cnt,init) \
69	if ((cnt) > cur) \	85	if ((cnt) > cur) \
70	{ \	86	{ \
71	int newcnt = cur; \	87	int newcnt = cur ? cur << 1 : 16; \
72	do \
73	{ \
74	newcnt += (newcnt >> 1) + 16; \
75	} \
76	while ((cnt) > newcnt); \
77	fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\	88	fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
78	base = realloc (base, sizeof (base) (newcnt)); \	89	base = realloc (base, sizeof (base) (newcnt)); \
79	init (base + cur, newcnt - cur); \	90	init (base + cur, newcnt - cur); \
80	cur = newcnt; \	91	cur = newcnt; \
81	}	92	}
82		93
		94	/*****************************************************************************/
		95
83	typedef struct	96	typedef struct
84	{	97	{
85	struct ev_io *head;	98	struct ev_io *head;
86	unsigned char wev, rev; /* want, received event set */	99	unsigned char wev, rev; /* want, received event set */
87	} ANFD;	100	} ANFD;
…		…
103	}	116	}
104	}	117	}
105		118
106	typedef struct	119	typedef struct
107	{	120	{
108	struct ev_watcher *w;	121	W w;
109	int events;	122	int events;
110	} ANPENDING;	123	} ANPENDING;
111		124
112	static ANPENDING *pendings;	125	static ANPENDING *pendings;
113	static int pendingmax, pendingcnt;	126	static int pendingmax, pendingcnt;
114		127
115	static void	128	static void
116	event (struct ev_watcher *w, int events)	129	event (W w, int events)
117	{	130	{
118	w->pending = ++pendingcnt;	131	w->pending = ++pendingcnt;
119	array_needsize (pendings, pendingmax, pendingcnt, );	132	array_needsize (pendings, pendingmax, pendingcnt, );
120	pendings [pendingcnt - 1].w = w;	133	pendings [pendingcnt - 1].w = w;
121	pendings [pendingcnt - 1].events = events;	134	pendings [pendingcnt - 1].events = events;
…		…
130	for (w = anfd->head; w; w = w->next)	143	for (w = anfd->head; w; w = w->next)
131	{	144	{
132	int ev = w->events & events;	145	int ev = w->events & events;
133		146
134	if (ev)	147	if (ev)
135	event ((struct ev_watcher *)w, ev);	148	event ((W)w, ev);
136	}	149	}
137	}	150	}
		151
		152	static void
		153	queue_events (W *events, int eventcnt, int type)
		154	{
		155	int i;
		156
		157	for (i = 0; i < eventcnt; ++i)
		158	event (events [i], type);
		159	}
		160
		161	/*****************************************************************************/
138		162
139	static struct ev_timer **timers;	163	static struct ev_timer **timers;
140	static int timermax, timercnt;	164	static int timermax, timercnt;
141		165
		166	static struct ev_periodic **periodics;
		167	static int periodicmax, periodiccnt;
		168
142	static void	169	static void
143	upheap (int k)	170	upheap (WT *timers, int k)
144	{	171	{
145	struct ev_timer *w = timers [k];	172	WT w = timers [k];
146		173
147	while (k && timers [k >> 1]->at > w->at)	174	while (k && timers [k >> 1]->at > w->at)
148	{	175	{
149	timers [k] = timers [k >> 1];	176	timers [k] = timers [k >> 1];
150	timers [k]->active = k + 1;	177	timers [k]->active = k + 1;
…		…
155	timers [k]->active = k + 1;	182	timers [k]->active = k + 1;
156		183
157	}	184	}
158		185
159	static void	186	static void
160	downheap (int k)	187	downheap (WT *timers, int N, int k)
161	{	188	{
162	struct ev_timer *w = timers [k];	189	WT w = timers [k];
163		190
164	while (k <= (timercnt >> 1))	191	while (k < (N >> 1))
165	{	192	{
166	int j = k << 1;	193	int j = k << 1;
167		194
168	if (j + 1 < timercnt && timers [j]->at > timers [j + 1]->at)	195	if (j + 1 < N && timers [j]->at > timers [j + 1]->at)
169	++j;	196	++j;
170		197
171	if (w->at <= timers [j]->at)	198	if (w->at <= timers [j]->at)
172	break;	199	break;
173		200
174	timers [k] = timers [j];	201	timers [k] = timers [j];
175	timers [k]->active = k;	202	timers [k]->active = k + 1;
176	k = j;	203	k = j;
177	}	204	}
178		205
179	timers [k] = w;	206	timers [k] = w;
180	timers [k]->active = k + 1;	207	timers [k]->active = k + 1;
181	}	208	}
182		209
183	static struct ev_signal **signals;	210	/*****************************************************************************/
		211
		212	typedef struct
		213	{
		214	struct ev_signal *head;
		215	sig_atomic_t gotsig;
		216	} ANSIG;
		217
		218	static ANSIG *signals;
184	static int signalmax, signalcnt;	219	static int signalmax;
185		220
		221	static int sigpipe [2];
		222	static sig_atomic_t gotsig;
		223	static struct ev_io sigev;
		224
186	static void	225	static void
187	signals_init (struct ev_signal **base, int count)	226	signals_init (ANSIG *base, int count)
188	{	227	{
189	while (count--)	228	while (count--)
190	*base++ = 0;	229	{
		230	base->head = 0;
		231	base->gotsig = 0;
		232	++base;
		233	}
191	}	234	}
		235
		236	static void
		237	sighandler (int signum)
		238	{
		239	signals [signum - 1].gotsig = 1;
		240
		241	if (!gotsig)
		242	{
		243	gotsig = 1;
		244	write (sigpipe [1], &gotsig, 1);
		245	}
		246	}
		247
		248	static void
		249	sigcb (struct ev_io *iow, int revents)
		250	{
		251	struct ev_signal *w;
		252	int sig;
		253
		254	gotsig = 0;
		255	read (sigpipe [0], &revents, 1);
		256
		257	for (sig = signalmax; sig--; )
		258	if (signals [sig].gotsig)
		259	{
		260	signals [sig].gotsig = 0;
		261
		262	for (w = signals [sig].head; w; w = w->next)
		263	event ((W)w, EV_SIGNAL);
		264	}
		265	}
		266
		267	static void
		268	siginit (void)
		269	{
		270	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
		271	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
		272
		273	/* rather than sort out wether we really need nb, set it */
		274	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
		275	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		276
		277	evio_set (&sigev, sigpipe [0], EV_READ);
		278	evio_start (&sigev);
		279	}
		280
		281	/*****************************************************************************/
		282
		283	static struct ev_idle **idles;
		284	static int idlemax, idlecnt;
		285
		286	static struct ev_check **checks;
		287	static int checkmax, checkcnt;
		288
		289	/*****************************************************************************/
192		290
193	#if HAVE_EPOLL	291	#if HAVE_EPOLL
194	# include "ev_epoll.c"	292	# include "ev_epoll.c"
195	#endif	293	#endif
196	#if HAVE_SELECT	294	#if HAVE_SELECT
…		…
206	have_monotonic = 1;	304	have_monotonic = 1;
207	}	305	}
208	#endif	306	#endif
209		307
210	ev_now = ev_time ();	308	ev_now = ev_time ();
		309	now = get_clock ();
		310	diff = ev_now - now;
211		311
		312	if (pipe (sigpipe))
		313	return 0;
		314
		315	ev_method = EVMETHOD_NONE;
212	#if HAVE_EPOLL	316	#if HAVE_EPOLL
213	if (epoll_init (flags))	317	if (ev_method == EVMETHOD_NONE) epoll_init (flags);
214	return ev_method;
215	#endif	318	#endif
216	#if HAVE_SELECT	319	#if HAVE_SELECT
217	if (select_init (flags))	320	if (ev_method == EVMETHOD_NONE) select_init (flags);
218	return ev_method;
219	#endif	321	#endif
220		322
221	ev_method = EVMETHOD_NONE;	323	if (ev_method)
		324	{
		325	evw_init (&sigev, sigcb);
		326	siginit ();
		327	}
		328
222	return ev_method;	329	return ev_method;
223	}	330	}
224		331
		332	/*****************************************************************************/
		333
225	void ev_prefork (void)	334	void ev_prefork (void)
226	{	335	{
		336	/* nop */
227	}	337	}
228		338
229	void ev_postfork_parent (void)	339	void ev_postfork_parent (void)
230	{	340	{
		341	/* nop */
231	}	342	}
232		343
233	void ev_postfork_child (void)	344	void ev_postfork_child (void)
234	{	345	{
235	#if HAVE_EPOLL	346	#if HAVE_EPOLL
		347	if (ev_method == EVMETHOD_EPOLL)
236	epoll_postfork_child ();	348	epoll_postfork_child ();
237	#endif	349	#endif
		350
		351	evio_stop (&sigev);
		352	close (sigpipe [0]);
		353	close (sigpipe [1]);
		354	pipe (sigpipe);
		355	siginit ();
		356	}
		357
		358	/*****************************************************************************/
		359
		360	static void
		361	fd_reify (void)
		362	{
		363	int i;
		364
		365	for (i = 0; i < fdchangecnt; ++i)
		366	{
		367	int fd = fdchanges [i];
		368	ANFD *anfd = anfds + fd;
		369	struct ev_io *w;
		370
		371	int wev = 0;
		372
		373	for (w = anfd->head; w; w = w->next)
		374	wev \|= w->events;
		375
		376	if (anfd->wev != wev)
		377	{
		378	method_modify (fd, anfd->wev, wev);
		379	anfd->wev = wev;
		380	}
		381	}
		382
		383	fdchangecnt = 0;
238	}	384	}
239		385
240	static void	386	static void
241	call_pending ()	387	call_pending ()
242	{	388	{
…		…
255		401
256	pendingcnt = 0;	402	pendingcnt = 0;
257	}	403	}
258		404
259	static void	405	static void
260	timer_reify (void)	406	timers_reify ()
261	{	407	{
262	while (timercnt && timers [0]->at <= ev_now)	408	while (timercnt && timers [0]->at <= now)
263	{	409	{
264	struct ev_timer *w = timers [0];	410	struct ev_timer *w = timers [0];
265		411
266	/* first reschedule timer */	412	/* first reschedule or stop timer */
267	if (w->repeat)	413	if (w->repeat)
268	{	414	{
269	fprintf (stderr, "a %f now %f repeat %f, %f\n", w->at, ev_now, w->repeat, w->repeat *1e30);//D
270	if (w->is_abs)
271	w->at += floor ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
272	else
273	w->at = ev_now + w->repeat;	415	w->at = now + w->repeat;
274		416	assert (("timer timeout in the past, negative repeat?", w->at > now));
275	fprintf (stderr, "b %f\n", w->at);//D	417	downheap ((WT *)timers, timercnt, 0);
276
277	downheap (0);
278	}	418	}
279	else	419	else
280	evtimer_stop (w); /* nonrepeating: stop timer */	420	evtimer_stop (w); /* nonrepeating: stop timer */
281		421
282	event ((struct ev_watcher *)w, EV_TIMEOUT);	422	event ((W)w, EV_TIMEOUT);
		423	}
		424	}
		425
		426	static void
		427	periodics_reify ()
		428	{
		429	while (periodiccnt && periodics [0]->at <= ev_now)
		430	{
		431	struct ev_periodic *w = periodics [0];
		432
		433	/* first reschedule or stop timer */
		434	if (w->interval)
		435	{
		436	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
		437	assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
		438	downheap ((WT *)periodics, periodiccnt, 0);
		439	}
		440	else
		441	evperiodic_stop (w); /* nonrepeating: stop timer */
		442
		443	event ((W)w, EV_TIMEOUT);
		444	}
		445	}
		446
		447	static void
		448	periodics_reschedule (ev_tstamp diff)
		449	{
		450	int i;
		451
		452	/* adjust periodics after time jump */
		453	for (i = 0; i < periodiccnt; ++i)
		454	{
		455	struct ev_periodic *w = periodics [i];
		456
		457	if (w->interval)
		458	{
		459	ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
		460
		461	if (fabs (diff) >= 1e-4)
		462	{
		463	evperiodic_stop (w);
		464	evperiodic_start (w);
		465
		466	i = 0; /* restart loop, inefficient, but time jumps should be rare */
		467	}
		468	}
		469	}
		470	}
		471
		472	static void
		473	time_update ()
		474	{
		475	int i;
		476
		477	ev_now = ev_time ();
		478
		479	if (have_monotonic)
		480	{
		481	ev_tstamp odiff = diff;
		482
		483	for (i = 4; --i; ) /* loop a few times, before making important decisions */
		484	{
		485	now = get_clock ();
		486	diff = ev_now - now;
		487
		488	if (fabs (odiff - diff) < MIN_TIMEJUMP)
		489	return; /* all is well */
		490
		491	ev_now = ev_time ();
		492	}
		493
		494	periodics_reschedule (diff - odiff);
		495	/* no timer adjustment, as the monotonic clock doesn't jump */
		496	}
		497	else
		498	{
		499	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
		500	{
		501	periodics_reschedule (ev_now - now);
		502
		503	/* adjust timers. this is easy, as the offset is the same for all */
		504	for (i = 0; i < timercnt; ++i)
		505	timers [i]->at += diff;
		506	}
		507
		508	now = ev_now;
283	}	509	}
284	}	510	}
285		511
286	int ev_loop_done;	512	int ev_loop_done;
287		513
288	int ev_loop (int flags)	514	void ev_loop (int flags)
289	{	515	{
290	double block;	516	double block;
291	ev_loop_done = flags & EVLOOP_ONESHOT;	517	ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
		518
		519	if (checkcnt)
		520	{
		521	queue_events ((W *)checks, checkcnt, EV_CHECK);
		522	call_pending ();
		523	}
292		524
293	do	525	do
294	{	526	{
295	/* update fd-related kernel structures */	527	/* update fd-related kernel structures */
296	method_reify (); fdchangecnt = 0;	528	fd_reify ();
297		529
298	/* calculate blocking time */	530	/* calculate blocking time */
		531
		532	/* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
299	ev_now = ev_time ();	533	ev_now = ev_time ();
300		534
301	if (flags & EVLOOP_NONBLOCK)	535	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
302	block = 0.;	536	block = 0.;
303	else if (!timercnt)
304	block = MAX_BLOCKTIME;
305	else	537	else
306	{	538	{
		539	block = MAX_BLOCKTIME;
		540
		541	if (timercnt)
		542	{
		543	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
		544	if (block > to) block = to;
		545	}
		546
		547	if (periodiccnt)
		548	{
307	block = timers [0]->at - ev_now + method_fudge;	549	ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
		550	if (block > to) block = to;
		551	}
		552
308	if (block < 0.) block = 0.;	553	if (block < 0.) block = 0.;
309	else if (block > MAX_BLOCKTIME) block = MAX_BLOCKTIME;
310	}	554	}
311		555
312	fprintf (stderr, "block %f\n", block);//D
313	method_poll (block);	556	method_poll (block);
314		557
		558	/* update ev_now, do magic */
		559	time_update ();
		560
315	/* put pending timers into pendign queue and reschedule them */	561	/* queue pending timers and reschedule them */
316	timer_reify ();	562	periodics_reify (); /* absolute timers first */
		563	timers_reify (); /* relative timers second */
317		564
318	ev_now = ev_time ();	565	/* queue idle watchers unless io or timers are pending */
		566	if (!pendingcnt)
		567	queue_events ((W *)idles, idlecnt, EV_IDLE);
		568
		569	/* queue check and possibly idle watchers */
		570	queue_events ((W *)checks, checkcnt, EV_CHECK);
		571
319	call_pending ();	572	call_pending ();
320	}	573	}
321	while (!ev_loop_done);	574	while (!ev_loop_done);
322	}
323		575
		576	if (ev_loop_done != 2)
		577	ev_loop_done = 0;
		578	}
		579
		580	/*****************************************************************************/
		581
324	static void	582	static void
325	wlist_add (struct ev_watcher_list *head, struct ev_watcher_list elem)	583	wlist_add (WL *head, WL elem)
326	{	584	{
327	elem->next = *head;	585	elem->next = *head;
328	*head = elem;	586	*head = elem;
329	}	587	}
330		588
331	static void	589	static void
332	wlist_del (struct ev_watcher_list *head, struct ev_watcher_list elem)	590	wlist_del (WL *head, WL elem)
333	{	591	{
334	while (*head)	592	while (*head)
335	{	593	{
336	if (*head == elem)	594	if (*head == elem)
337	{	595	{
…		…
342	head = &(*head)->next;	600	head = &(*head)->next;
343	}	601	}
344	}	602	}
345		603
346	static void	604	static void
347	ev_start (struct ev_watcher *w, int active)	605	ev_start (W w, int active)
348	{	606	{
349	w->pending = 0;	607	w->pending = 0;
350	w->active = active;	608	w->active = active;
351	}	609	}
352		610
353	static void	611	static void
354	ev_stop (struct ev_watcher *w)	612	ev_stop (W w)
355	{	613	{
356	if (w->pending)	614	if (w->pending)
357	pendings [w->pending - 1].w = 0;	615	pendings [w->pending - 1].w = 0;
358		616
359	w->active = 0;	617	w->active = 0;
360	/* nop */
361	}	618	}
		619
		620	/*****************************************************************************/
362		621
363	void	622	void
364	evio_start (struct ev_io *w)	623	evio_start (struct ev_io *w)
365	{	624	{
366	if (ev_is_active (w))	625	if (ev_is_active (w))
367	return;	626	return;
368		627
369	int fd = w->fd;	628	int fd = w->fd;
370		629
371	ev_start ((struct ev_watcher *)w, 1);	630	ev_start ((W)w, 1);
372	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	631	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
373	wlist_add ((struct ev_watcher_list *)&anfds[fd].head, (struct ev_watcher_list )w);	632	wlist_add ((WL *)&anfds[fd].head, (WL)w);
374		633
375	++fdchangecnt;	634	++fdchangecnt;
376	array_needsize (fdchanges, fdchangemax, fdchangecnt, );	635	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
377	fdchanges [fdchangecnt - 1] = fd;	636	fdchanges [fdchangecnt - 1] = fd;
378	}	637	}
…		…
381	evio_stop (struct ev_io *w)	640	evio_stop (struct ev_io *w)
382	{	641	{
383	if (!ev_is_active (w))	642	if (!ev_is_active (w))
384	return;	643	return;
385		644
386	wlist_del ((struct ev_watcher_list *)&anfds[w->fd].head, (struct ev_watcher_list )w);	645	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
387	ev_stop ((struct ev_watcher *)w);	646	ev_stop ((W)w);
388		647
389	++fdchangecnt;	648	++fdchangecnt;
390	array_needsize (fdchanges, fdchangemax, fdchangecnt, );	649	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
391	fdchanges [fdchangecnt - 1] = w->fd;	650	fdchanges [fdchangecnt - 1] = w->fd;
392	}	651	}
393		652
		653
394	void	654	void
395	evtimer_start (struct ev_timer *w)	655	evtimer_start (struct ev_timer *w)
396	{	656	{
397	if (ev_is_active (w))	657	if (ev_is_active (w))
398	return;	658	return;
399		659
400	fprintf (stderr, "t1 %f a %d\n", w->at, w->is_abs);//D
401	if (w->is_abs)
402	{
403	if (w->repeat)
404	w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
405	}
406	else
407	w->at += ev_now;	660	w->at += now;
408	fprintf (stderr, "t2 %f a %d\n", w->at, w->is_abs);//D
409		661
410	ev_start ((struct ev_watcher *)w, ++timercnt);	662	assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
		663
		664	ev_start ((W)w, ++timercnt);
411	array_needsize (timers, timermax, timercnt, );	665	array_needsize (timers, timermax, timercnt, );
412	timers [timercnt - 1] = w;	666	timers [timercnt - 1] = w;
413	upheap (timercnt - 1);	667	upheap ((WT *)timers, timercnt - 1);
414	}	668	}
415		669
416	void	670	void
417	evtimer_stop (struct ev_timer *w)	671	evtimer_stop (struct ev_timer *w)
418	{	672	{
419	if (!ev_is_active (w))	673	if (!ev_is_active (w))
420	return;	674	return;
421		675
		676	if (w->active < timercnt--)
		677	{
422	timers [w->active - 1] = timers [--timercnt];	678	timers [w->active - 1] = timers [timercnt];
423	downheap (w->active - 1);	679	downheap ((WT *)timers, timercnt, w->active - 1);
424	ev_stop ((struct ev_watcher *)w);	680	}
		681
		682	w->at = w->repeat;
		683
		684	ev_stop ((W)w);
		685	}
		686
		687	void
		688	evtimer_again (struct ev_timer *w)
		689	{
		690	if (ev_is_active (w))
		691	{
		692	if (w->repeat)
		693	{
		694	w->at = now + w->repeat;
		695	downheap ((WT *)timers, timercnt, w->active - 1);
		696	}
		697	else
		698	evtimer_stop (w);
		699	}
		700	else if (w->repeat)
		701	evtimer_start (w);
		702	}
		703
		704	void
		705	evperiodic_start (struct ev_periodic *w)
		706	{
		707	if (ev_is_active (w))
		708	return;
		709
		710	assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
		711
		712	/* this formula differs from the one in periodic_reify because we do not always round up */
		713	if (w->interval)
		714	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
		715
		716	ev_start ((W)w, ++periodiccnt);
		717	array_needsize (periodics, periodicmax, periodiccnt, );
		718	periodics [periodiccnt - 1] = w;
		719	upheap ((WT *)periodics, periodiccnt - 1);
		720	}
		721
		722	void
		723	evperiodic_stop (struct ev_periodic *w)
		724	{
		725	if (!ev_is_active (w))
		726	return;
		727
		728	if (w->active < periodiccnt--)
		729	{
		730	periodics [w->active - 1] = periodics [periodiccnt];
		731	downheap ((WT *)periodics, periodiccnt, w->active - 1);
		732	}
		733
		734	ev_stop ((W)w);
425	}	735	}
426		736
427	void	737	void
428	evsignal_start (struct ev_signal *w)	738	evsignal_start (struct ev_signal *w)
429	{	739	{
430	if (ev_is_active (w))	740	if (ev_is_active (w))
431	return;	741	return;
432		742
433	ev_start ((struct ev_watcher *)w, 1);	743	ev_start ((W)w, 1);
434	array_needsize (signals, signalmax, w->signum, signals_init);	744	array_needsize (signals, signalmax, w->signum, signals_init);
435	wlist_add ((struct ev_watcher_list *)&signals [w->signum - 1], (struct ev_watcher_list )w);	745	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
		746
		747	if (!w->next)
		748	{
		749	struct sigaction sa;
		750	sa.sa_handler = sighandler;
		751	sigfillset (&sa.sa_mask);
		752	sa.sa_flags = 0;
		753	sigaction (w->signum, &sa, 0);
		754	}
436	}	755	}
437		756
438	void	757	void
439	evsignal_stop (struct ev_signal *w)	758	evsignal_stop (struct ev_signal *w)
440	{	759	{
441	if (!ev_is_active (w))	760	if (!ev_is_active (w))
442	return;	761	return;
443		762
444	wlist_del ((struct ev_watcher_list *)&signals [w->signum - 1], (struct ev_watcher_list )w);	763	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
445	ev_stop ((struct ev_watcher *)w);	764	ev_stop ((W)w);
446	}
447		765
		766	if (!signals [w->signum - 1].head)
		767	signal (w->signum, SIG_DFL);
		768	}
		769
		770	void evidle_start (struct ev_idle *w)
		771	{
		772	if (ev_is_active (w))
		773	return;
		774
		775	ev_start ((W)w, ++idlecnt);
		776	array_needsize (idles, idlemax, idlecnt, );
		777	idles [idlecnt - 1] = w;
		778	}
		779
		780	void evidle_stop (struct ev_idle *w)
		781	{
		782	idles [w->active - 1] = idles [--idlecnt];
		783	ev_stop ((W)w);
		784	}
		785
		786	void evcheck_start (struct ev_check *w)
		787	{
		788	if (ev_is_active (w))
		789	return;
		790
		791	ev_start ((W)w, ++checkcnt);
		792	array_needsize (checks, checkmax, checkcnt, );
		793	checks [checkcnt - 1] = w;
		794	}
		795
		796	void evcheck_stop (struct ev_check *w)
		797	{
		798	checks [w->active - 1] = checks [--checkcnt];
		799	ev_stop ((W)w);
		800	}
		801
448	/*****************************************************************************/	802	/*****************************************************************************/
		803
449	#if 1	804	#if 0
		805
		806	struct ev_io wio;
450		807
451	static void	808	static void
452	sin_cb (struct ev_io *w, int revents)	809	sin_cb (struct ev_io *w, int revents)
453	{	810	{
454	fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);	811	fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
455	}	812	}
456		813
457	static void	814	static void
458	ocb (struct ev_timer *w, int revents)	815	ocb (struct ev_timer *w, int revents)
459	{	816	{
460	fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);	817	//fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
		818	evtimer_stop (w);
		819	evtimer_start (w);
		820	}
		821
		822	static void
		823	scb (struct ev_signal *w, int revents)
		824	{
		825	fprintf (stderr, "signal %x,%d\n", revents, w->signum);
		826	evio_stop (&wio);
		827	evio_start (&wio);
		828	}
		829
		830	static void
		831	gcb (struct ev_signal *w, int revents)
		832	{
		833	fprintf (stderr, "generic %x\n", revents);
		834
461	}	835	}
462		836
463	int main (void)	837	int main (void)
464	{	838	{
465	struct ev_io sin;
466
467	ev_init (0);	839	ev_init (0);
468		840
469	evw_init (&sin, sin_cb, 55);
470	evio_set (&sin, 0, EV_READ);	841	evio_init (&wio, sin_cb, 0, EV_READ);
471	evio_start (&sin);	842	evio_start (&wio);
		843
		844	struct ev_timer t[10000];
		845
		846	#if 0
		847	int i;
		848	for (i = 0; i < 10000; ++i)
		849	{
		850	struct ev_timer *w = t + i;
		851	evw_init (w, ocb, i);
		852	evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
		853	evtimer_start (w);
		854	if (drand48 () < 0.5)
		855	evtimer_stop (w);
		856	}
		857	#endif
472		858
473	struct ev_timer t1;	859	struct ev_timer t1;
474	evw_init (&t1, ocb, 1);	860	evtimer_init (&t1, ocb, 5, 10);
475	evtimer_set_rel (&t1, 1, 0);
476	evtimer_start (&t1);	861	evtimer_start (&t1);
477		862
478	struct ev_timer t2;	863	struct ev_signal sig;
479	evw_init (&t2, ocb, 2);	864	evsignal_init (&sig, scb, SIGQUIT);
480	evtimer_set_abs (&t2, ev_time () + 2, 0);	865	evsignal_start (&sig);
		866
		867	struct ev_check cw;
		868	evcheck_init (&cw, gcb);
		869	evcheck_start (&cw);
		870
		871	struct ev_idle iw;
		872	evidle_init (&iw, gcb);
481	evtimer_start (&t2);	873	evidle_start (&iw);
482		874
483	ev_loop (0);	875	ev_loop (0);
484		876
485	return 0;	877	return 0;
486	}	878	}

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.1 by root, Tue Oct 30 20:59:31 2007 UTC vs. Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.1 by root, Tue Oct 30 20:59:31 2007 UTC vs.
Revision 1.14 by root, Wed Oct 31 11:52:12 2007 UTC