ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.16 by root, Wed Oct 31 13:57:34 2007 UTC vs.
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC

		1	/*
		2	* libev event processing core, watcher management
		3	*
		4	* Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
		5	* All rights reserved.
		6	*
		7	* Redistribution and use in source and binary forms, with or without
		8	* modification, are permitted provided that the following conditions are
		9	* met:
		10	*
		11	* * Redistributions of source code must retain the above copyright
		12	* notice, this list of conditions and the following disclaimer.
		13	*
		14	* * Redistributions in binary form must reproduce the above
		15	* copyright notice, this list of conditions and the following
		16	* disclaimer in the documentation and/or other materials provided
		17	* with the distribution.
		18	*
		19	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		20	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		21	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		22	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		23	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		24	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		25	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		26	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		27	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		28	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		29	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		30	*/
		31	#ifndef EV_STANDALONE
		32	# include "config.h"
		33
		34	# if HAVE_CLOCK_GETTIME
		35	# define EV_USE_MONOTONIC 1
		36	# define EV_USE_REALTIME 1
		37	# endif
		38
		39	# if HAVE_SELECT && HAVE_SYS_SELECT_H
		40	# define EV_USE_SELECT 1
		41	# endif
		42
		43	# if HAVE_POLL && HAVE_POLL_H
		44	# define EV_USE_POLL 1
		45	# endif
		46
		47	# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
		48	# define EV_USE_EPOLL 1
		49	# endif
		50
		51	# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
		52	# define EV_USE_KQUEUE 1
		53	# endif
		54
		55	#endif
		56
1	#include <math.h>	57	#include <math.h>
2	#include <stdlib.h>	58	#include <stdlib.h>
3	#include <unistd.h>
4	#include <fcntl.h>	59	#include <fcntl.h>
5	#include <signal.h>
6	#include <stddef.h>	60	#include <stddef.h>
7		61
8	#include <stdio.h>	62	#include <stdio.h>
9		63
10	#include <assert.h>	64	#include <assert.h>
11	#include <errno.h>	65	#include <errno.h>
12	#include <sys/time.h>	66	#include <sys/types.h>
13	#include <time.h>	67	#include <time.h>
14		68
15	#define HAVE_EPOLL 1	69	#include <signal.h>
16		70
		71	#ifndef WIN32
		72	# include <unistd.h>
		73	# include <sys/time.h>
		74	# include <sys/wait.h>
		75	#endif
		76	/**/
		77
17	#ifndef HAVE_MONOTONIC	78	#ifndef EV_USE_MONOTONIC
18	# ifdef CLOCK_MONOTONIC
19	# define HAVE_MONOTONIC 1	79	# define EV_USE_MONOTONIC 1
		80	#endif
		81
		82	#ifndef EV_USE_SELECT
		83	# define EV_USE_SELECT 1
		84	#endif
		85
		86	#ifndef EV_USE_POLL
		87	# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
		88	#endif
		89
		90	#ifndef EV_USE_EPOLL
		91	# define EV_USE_EPOLL 0
		92	#endif
		93
		94	#ifndef EV_USE_KQUEUE
		95	# define EV_USE_KQUEUE 0
		96	#endif
		97
		98	#ifndef EV_USE_WIN32
		99	# ifdef WIN32
		100	# define EV_USE_WIN32 0 /* it does not exist, use select */
		101	# undef EV_USE_SELECT
		102	# define EV_USE_SELECT 1
		103	# else
		104	# define EV_USE_WIN32 0
20	# endif	105	# endif
21	#endif	106	#endif
22		107
23	#ifndef HAVE_SELECT
24	# define HAVE_SELECT 1
25	#endif
26
27	#ifndef HAVE_EPOLL
28	# define HAVE_EPOLL 0
29	#endif
30
31	#ifndef HAVE_REALTIME	108	#ifndef EV_USE_REALTIME
32	# define HAVE_REALTIME 1 /* posix requirement, but might be slower */	109	# define EV_USE_REALTIME 1
33	#endif	110	#endif
		111
		112	/**/
		113
		114	#ifndef CLOCK_MONOTONIC
		115	# undef EV_USE_MONOTONIC
		116	# define EV_USE_MONOTONIC 0
		117	#endif
		118
		119	#ifndef CLOCK_REALTIME
		120	# undef EV_USE_REALTIME
		121	# define EV_USE_REALTIME 0
		122	#endif
		123
		124	/**/
34		125
35	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	126	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
36	#define MAX_BLOCKTIME 60.	127	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
		128	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
		129	/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
37		130
		131	#ifdef EV_H
		132	# include EV_H
		133	#else
38	#include "ev.h"	134	# include "ev.h"
		135	#endif
		136
		137	#if __GNUC__ >= 3
		138	# define expect(expr,value) __builtin_expect ((expr),(value))
		139	# define inline inline
		140	#else
		141	# define expect(expr,value) (expr)
		142	# define inline static
		143	#endif
		144
		145	#define expect_false(expr) expect ((expr) != 0, 0)
		146	#define expect_true(expr) expect ((expr) != 0, 1)
		147
		148	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
		149	#define ABSPRI(w) ((w)->priority - EV_MINPRI)
39		150
40	typedef struct ev_watcher *W;	151	typedef struct ev_watcher *W;
41	typedef struct ev_watcher_list *WL;	152	typedef struct ev_watcher_list *WL;
42	typedef struct ev_watcher_time *WT;	153	typedef struct ev_watcher_time *WT;
43		154
44	static ev_tstamp now, diff; /* monotonic clock */	155	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
45	ev_tstamp ev_now;
46	int ev_method;
47		156
48	static int have_monotonic; /* runtime */	157	#include "ev_win32.c"
49
50	static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
51	static void (*method_modify)(int fd, int oev, int nev);
52	static void (*method_poll)(ev_tstamp timeout);
53		158
54	/*****************************************************************************/	159	/*****************************************************************************/
55		160
56	ev_tstamp	161	static void (*syserr_cb)(const char *msg);
		162
		163	void ev_set_syserr_cb (void (*cb)(const char *msg))
		164	{
		165	syserr_cb = cb;
		166	}
		167
		168	static void
		169	syserr (const char *msg)
		170	{
		171	if (!msg)
		172	msg = "(libev) system error";
		173
		174	if (syserr_cb)
		175	syserr_cb (msg);
		176	else
		177	{
		178	perror (msg);
		179	abort ();
		180	}
		181	}
		182
		183	static void *(*alloc)(void *ptr, long size);
		184
		185	void ev_set_allocator (void *(*cb)(void *ptr, long size))
		186	{
		187	alloc = cb;
		188	}
		189
		190	static void *
		191	ev_realloc (void *ptr, long size)
		192	{
		193	ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
		194
		195	if (!ptr && size)
		196	{
		197	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		198	abort ();
		199	}
		200
		201	return ptr;
		202	}
		203
		204	#define ev_malloc(size) ev_realloc (0, (size))
		205	#define ev_free(ptr) ev_realloc ((ptr), 0)
		206
		207	/*****************************************************************************/
		208
		209	typedef struct
		210	{
		211	WL head;
		212	unsigned char events;
		213	unsigned char reify;
		214	} ANFD;
		215
		216	typedef struct
		217	{
		218	W w;
		219	int events;
		220	} ANPENDING;
		221
		222	#if EV_MULTIPLICITY
		223
		224	struct ev_loop
		225	{
		226	#define VAR(name,decl) decl;
		227	#include "ev_vars.h"
		228	#undef VAR
		229	};
		230	#include "ev_wrap.h"
		231
		232	struct ev_loop default_loop_struct;
		233	static struct ev_loop *default_loop;
		234
		235	#else
		236
		237	#define VAR(name,decl) static decl;
		238	#include "ev_vars.h"
		239	#undef VAR
		240
		241	static int default_loop;
		242
		243	#endif
		244
		245	/*****************************************************************************/
		246
		247	inline ev_tstamp
57	ev_time (void)	248	ev_time (void)
58	{	249	{
59	#if HAVE_REALTIME	250	#if EV_USE_REALTIME
60	struct timespec ts;	251	struct timespec ts;
61	clock_gettime (CLOCK_REALTIME, &ts);	252	clock_gettime (CLOCK_REALTIME, &ts);
62	return ts.tv_sec + ts.tv_nsec * 1e-9;	253	return ts.tv_sec + ts.tv_nsec * 1e-9;
63	#else	254	#else
64	struct timeval tv;	255	struct timeval tv;
65	gettimeofday (&tv, 0);	256	gettimeofday (&tv, 0);
66	return tv.tv_sec + tv.tv_usec * 1e-6;	257	return tv.tv_sec + tv.tv_usec * 1e-6;
67	#endif	258	#endif
68	}	259	}
69		260
70	static ev_tstamp	261	inline ev_tstamp
71	get_clock (void)	262	get_clock (void)
72	{	263	{
73	#if HAVE_MONOTONIC	264	#if EV_USE_MONOTONIC
74	if (have_monotonic)	265	if (expect_true (have_monotonic))
75	{	266	{
76	struct timespec ts;	267	struct timespec ts;
77	clock_gettime (CLOCK_MONOTONIC, &ts);	268	clock_gettime (CLOCK_MONOTONIC, &ts);
78	return ts.tv_sec + ts.tv_nsec * 1e-9;	269	return ts.tv_sec + ts.tv_nsec * 1e-9;
79	}	270	}
80	#endif	271	#endif
81		272
82	return ev_time ();	273	return ev_time ();
83	}	274	}
84		275
		276	ev_tstamp
		277	ev_now (EV_P)
		278	{
		279	return rt_now;
		280	}
		281
		282	#define array_roundsize(type,n) ((n) | 4 & ~3)
		283
85	#define array_needsize(base,cur,cnt,init) \	284	#define array_needsize(type,base,cur,cnt,init) \
86	if ((cnt) > cur) \	285	if (expect_false ((cnt) > cur)) \
87	{ \	286	{ \
88	int newcnt = cur ? cur << 1 : 16; \	287	int newcnt = cur; \
		288	do \
		289	{ \
		290	newcnt = array_roundsize (type, newcnt << 1); \
		291	} \
		292	while ((cnt) > newcnt); \
		293	\
89	base = realloc (base, sizeof (*base) * (newcnt)); \	294	base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
90	init (base + cur, newcnt - cur); \	295	init (base + cur, newcnt - cur); \
91	cur = newcnt; \	296	cur = newcnt; \
92	}	297	}
		298
		299	#define array_slim(type,stem) \
		300	if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
		301	{ \
		302	stem ## max = array_roundsize (stem ## cnt >> 1); \
		303	base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
		304	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
		305	}
		306
		307	/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
		308	/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
		309	#define array_free_microshit(stem) \
		310	ev_free (stem ## s); stem ## cnt = stem ## max = 0;
		311
		312	#define array_free(stem, idx) \
		313	ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
93		314
94	/*****************************************************************************/	315	/*****************************************************************************/
95		316
96	typedef struct
97	{
98	struct ev_io *head;
99	unsigned char wev, rev; /* want, received event set */
100	} ANFD;
101
102	static ANFD *anfds;
103	static int anfdmax;
104
105	static int *fdchanges;
106	static int fdchangemax, fdchangecnt;
107
108	static void	317	static void
109	anfds_init (ANFD *base, int count)	318	anfds_init (ANFD *base, int count)
110	{	319	{
111	while (count--)	320	while (count--)
112	{	321	{
113	base->head = 0;	322	base->head = 0;
114	base->wev = base->rev = EV_NONE;	323	base->events = EV_NONE;
		324	base->reify = 0;
		325
115	++base;	326	++base;
116	}	327	}
117	}	328	}
118		329
119	typedef struct	330	void
		331	ev_feed_event (EV_P_ void *w, int revents)
120	{	332	{
121	W w;	333	W w_ = (W)w;
122	int events;
123	} ANPENDING;
124		334
125	static ANPENDING *pendings;	335	if (w_->pending)
126	static int pendingmax, pendingcnt;
127
128	static void
129	event (W w, int events)
130	{
131	if (w->active)
132	{	336	{
133	w->pending = ++pendingcnt;
134	array_needsize (pendings, pendingmax, pendingcnt, );
135	pendings [pendingcnt - 1].w = w;
136	pendings [pendingcnt - 1].events = events;	337	pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
		338	return;
137	}	339	}
138	}
139		340
		341	w_->pending = ++pendingcnt [ABSPRI (w_)];
		342	array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
		343	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
		344	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
		345	}
		346
140	static void	347	static void
		348	queue_events (EV_P_ W *events, int eventcnt, int type)
		349	{
		350	int i;
		351
		352	for (i = 0; i < eventcnt; ++i)
		353	ev_feed_event (EV_A_ events [i], type);
		354	}
		355
		356	inline void
141	fd_event (int fd, int events)	357	fd_event (EV_P_ int fd, int revents)
142	{	358	{
143	ANFD *anfd = anfds + fd;	359	ANFD *anfd = anfds + fd;
144	struct ev_io *w;	360	struct ev_io *w;
145		361
146	for (w = anfd->head; w; w = w->next)	362	for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
147	{	363	{
148	int ev = w->events & events;	364	int ev = w->events & revents;
149		365
150	if (ev)	366	if (ev)
151	event ((W)w, ev);	367	ev_feed_event (EV_A_ (W)w, ev);
152	}	368	}
153	}	369	}
154		370
		371	void
		372	ev_feed_fd_event (EV_P_ int fd, int revents)
		373	{
		374	fd_event (EV_A_ fd, revents);
		375	}
		376
		377	/*****************************************************************************/
		378
155	static void	379	static void
156	queue_events (W *events, int eventcnt, int type)	380	fd_reify (EV_P)
157	{	381	{
158	int i;	382	int i;
159		383
160	for (i = 0; i < eventcnt; ++i)	384	for (i = 0; i < fdchangecnt; ++i)
161	event (events [i], type);	385	{
		386	int fd = fdchanges [i];
		387	ANFD *anfd = anfds + fd;
		388	struct ev_io *w;
		389
		390	int events = 0;
		391
		392	for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
		393	events |= w->events;
		394
		395	anfd->reify = 0;
		396
		397	method_modify (EV_A_ fd, anfd->events, events);
		398	anfd->events = events;
		399	}
		400
		401	fdchangecnt = 0;
		402	}
		403
		404	static void
		405	fd_change (EV_P_ int fd)
		406	{
		407	if (anfds [fd].reify)
		408	return;
		409
		410	anfds [fd].reify = 1;
		411
		412	++fdchangecnt;
		413	array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
		414	fdchanges [fdchangecnt - 1] = fd;
		415	}
		416
		417	static void
		418	fd_kill (EV_P_ int fd)
		419	{
		420	struct ev_io *w;
		421
		422	while ((w = (struct ev_io *)anfds [fd].head))
		423	{
		424	ev_io_stop (EV_A_ w);
		425	ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
		426	}
		427	}
		428
		429	static int
		430	fd_valid (int fd)
		431	{
		432	#ifdef WIN32
		433	return !!win32_get_osfhandle (fd);
		434	#else
		435	return fcntl (fd, F_GETFD) != -1;
		436	#endif
		437	}
		438
		439	/* called on EBADF to verify fds */
		440	static void
		441	fd_ebadf (EV_P)
		442	{
		443	int fd;
		444
		445	for (fd = 0; fd < anfdmax; ++fd)
		446	if (anfds [fd].events)
		447	if (!fd_valid (fd) == -1 && errno == EBADF)
		448	fd_kill (EV_A_ fd);
		449	}
		450
		451	/* called on ENOMEM in select/poll to kill some fds and retry */
		452	static void
		453	fd_enomem (EV_P)
		454	{
		455	int fd;
		456
		457	for (fd = anfdmax; fd--; )
		458	if (anfds [fd].events)
		459	{
		460	fd_kill (EV_A_ fd);
		461	return;
		462	}
		463	}
		464
		465	/* usually called after fork if method needs to re-arm all fds from scratch */
		466	static void
		467	fd_rearm_all (EV_P)
		468	{
		469	int fd;
		470
		471	/* this should be highly optimised to not do anything but set a flag */
		472	for (fd = 0; fd < anfdmax; ++fd)
		473	if (anfds [fd].events)
		474	{
		475	anfds [fd].events = 0;
		476	fd_change (EV_A_ fd);
		477	}
162	}	478	}
163		479
164	/*****************************************************************************/	480	/*****************************************************************************/
165		481
166	static struct ev_timer **timers;
167	static int timermax, timercnt;
168
169	static struct ev_periodic **periodics;
170	static int periodicmax, periodiccnt;
171
172	static void	482	static void
173	upheap (WT *timers, int k)	483	upheap (WT *heap, int k)
174	{	484	{
175	WT w = timers [k];	485	WT w = heap [k];
176		486
177	while (k && timers [k >> 1]->at > w->at)	487	while (k && heap [k >> 1]->at > w->at)
178	{	488	{
179	timers [k] = timers [k >> 1];	489	heap [k] = heap [k >> 1];
180	timers [k]->active = k + 1;	490	((W)heap [k])->active = k + 1;
181	k >>= 1;	491	k >>= 1;
182	}	492	}
183		493
184	timers [k] = w;	494	heap [k] = w;
185	timers [k]->active = k + 1;	495	((W)heap [k])->active = k + 1;
186		496
187	}	497	}
188		498
189	static void	499	static void
190	downheap (WT *timers, int N, int k)	500	downheap (WT *heap, int N, int k)
191	{	501	{
192	WT w = timers [k];	502	WT w = heap [k];
193		503
194	while (k < (N >> 1))	504	while (k < (N >> 1))
195	{	505	{
196	int j = k << 1;	506	int j = k << 1;
197		507
198	if (j + 1 < N && timers [j]->at > timers [j + 1]->at)	508	if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
199	++j;	509	++j;
200		510
201	if (w->at <= timers [j]->at)	511	if (w->at <= heap [j]->at)
202	break;	512	break;
203		513
204	timers [k] = timers [j];	514	heap [k] = heap [j];
205	timers [k]->active = k + 1;	515	((W)heap [k])->active = k + 1;
206	k = j;	516	k = j;
207	}	517	}
208		518
209	timers [k] = w;	519	heap [k] = w;
210	timers [k]->active = k + 1;	520	((W)heap [k])->active = k + 1;
		521	}
		522
		523	inline void
		524	adjustheap (WT *heap, int N, int k, ev_tstamp at)
		525	{
		526	ev_tstamp old_at = heap [k]->at;
		527	heap [k]->at = at;
		528
		529	if (old_at < at)
		530	downheap (heap, N, k);
		531	else
		532	upheap (heap, k);
211	}	533	}
212		534
213	/*****************************************************************************/	535	/*****************************************************************************/
214		536
215	typedef struct	537	typedef struct
216	{	538	{
217	struct ev_signal *head;	539	WL head;
218	sig_atomic_t gotsig;	540	sig_atomic_t volatile gotsig;
219	} ANSIG;	541	} ANSIG;
220		542
221	static ANSIG *signals;	543	static ANSIG *signals;
222	static int signalmax;	544	static int signalmax;
223		545
224	static int sigpipe [2];	546	static int sigpipe [2];
225	static sig_atomic_t gotsig;	547	static sig_atomic_t volatile gotsig;
226	static struct ev_io sigev;	548	static struct ev_io sigev;
227		549
228	static void	550	static void
229	signals_init (ANSIG *base, int count)	551	signals_init (ANSIG *base, int count)
230	{	552	{
231	while (count--)	553	while (count--)
232	{	554	{
233	base->head = 0;	555	base->head = 0;
234	base->gotsig = 0;	556	base->gotsig = 0;
		557
235	++base;	558	++base;
236	}	559	}
237	}	560	}
238		561
239	static void	562	static void
240	sighandler (int signum)	563	sighandler (int signum)
241	{	564	{
		565	#if WIN32
		566	signal (signum, sighandler);
		567	#endif
		568
242	signals [signum - 1].gotsig = 1;	569	signals [signum - 1].gotsig = 1;
243		570
244	if (!gotsig)	571	if (!gotsig)
245	{	572	{
		573	int old_errno = errno;
246	gotsig = 1;	574	gotsig = 1;
		575	#ifdef WIN32
		576	send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
		577	#else
247	write (sigpipe [1], &gotsig, 1);	578	write (sigpipe [1], &signum, 1);
		579	#endif
		580	errno = old_errno;
248	}	581	}
249	}	582	}
250		583
		584	void
		585	ev_feed_signal_event (EV_P_ int signum)
		586	{
		587	WL w;
		588
		589	#if EV_MULTIPLICITY
		590	assert (("feeding signal events is only supported in the default loop", loop == default_loop));
		591	#endif
		592
		593	--signum;
		594
		595	if (signum < 0 || signum >= signalmax)
		596	return;
		597
		598	signals [signum].gotsig = 0;
		599
		600	for (w = signals [signum].head; w; w = w->next)
		601	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
		602	}
		603
251	static void	604	static void
252	sigcb (struct ev_io *iow, int revents)	605	sigcb (EV_P_ struct ev_io *iow, int revents)
253	{	606	{
254	struct ev_signal *w;
255	int sig;	607	int signum;
256		608
		609	#ifdef WIN32
		610	recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
		611	#else
		612	read (sigpipe [0], &revents, 1);
		613	#endif
257	gotsig = 0;	614	gotsig = 0;
258	read (sigpipe [0], &revents, 1);
259		615
260	for (sig = signalmax; sig--; )	616	for (signum = signalmax; signum--; )
261	if (signals [sig].gotsig)	617	if (signals [signum].gotsig)
262	{	618	ev_feed_signal_event (EV_A_ signum + 1);
263	signals [sig].gotsig = 0;
264
265	for (w = signals [sig].head; w; w = w->next)
266	event ((W)w, EV_SIGNAL);
267	}
268	}	619	}
269		620
270	static void	621	static void
271	siginit (void)	622	siginit (EV_P)
272	{	623	{
		624	#ifndef WIN32
273	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	625	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
274	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	626	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
275		627
276	/* rather than sort out wether we really need nb, set it */	628	/* rather than sort out wether we really need nb, set it */
277	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	629	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
278	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	630	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		631	#endif
279		632
280	evio_set (&sigev, sigpipe [0], EV_READ);	633	ev_io_set (&sigev, sigpipe [0], EV_READ);
281	evio_start (&sigev);	634	ev_io_start (EV_A_ &sigev);
		635	ev_unref (EV_A); /* child watcher should not keep loop alive */
282	}	636	}
283		637
284	/*****************************************************************************/	638	/*****************************************************************************/
285		639
286	static struct ev_idle **idles;	640	static struct ev_child *childs [PID_HASHSIZE];
287	static int idlemax, idlecnt;
288		641
289	static struct ev_check **checks;	642	#ifndef WIN32
290	static int checkmax, checkcnt;	643
		644	static struct ev_signal childev;
		645
		646	#ifndef WCONTINUED
		647	# define WCONTINUED 0
		648	#endif
		649
		650	static void
		651	child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
		652	{
		653	struct ev_child *w;
		654
		655	for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
		656	if (w->pid == pid || !w->pid)
		657	{
		658	ev_priority (w) = ev_priority (sw); /* need to do it *now* */
		659	w->rpid = pid;
		660	w->rstatus = status;
		661	ev_feed_event (EV_A_ (W)w, EV_CHILD);
		662	}
		663	}
		664
		665	static void
		666	childcb (EV_P_ struct ev_signal *sw, int revents)
		667	{
		668	int pid, status;
		669
		670	if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
		671	{
		672	/* make sure we are called again until all childs have been reaped */
		673	ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
		674
		675	child_reap (EV_A_ sw, pid, pid, status);
		676	child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
		677	}
		678	}
		679
		680	#endif
291		681
292	/*****************************************************************************/	682	/*****************************************************************************/
293		683
		684	#if EV_USE_KQUEUE
		685	# include "ev_kqueue.c"
		686	#endif
294	#if HAVE_EPOLL	687	#if EV_USE_EPOLL
295	# include "ev_epoll.c"	688	# include "ev_epoll.c"
296	#endif	689	#endif
		690	#if EV_USE_POLL
		691	# include "ev_poll.c"
		692	#endif
297	#if HAVE_SELECT	693	#if EV_USE_SELECT
298	# include "ev_select.c"	694	# include "ev_select.c"
299	#endif	695	#endif
300		696
301	int ev_init (int flags)	697	int
		698	ev_version_major (void)
302	{	699	{
		700	return EV_VERSION_MAJOR;
		701	}
		702
		703	int
		704	ev_version_minor (void)
		705	{
		706	return EV_VERSION_MINOR;
		707	}
		708
		709	/* return true if we are running with elevated privileges and should ignore env variables */
		710	static int
		711	enable_secure (void)
		712	{
		713	#ifdef WIN32
		714	return 0;
		715	#else
		716	return getuid () != geteuid ()
		717	|| getgid () != getegid ();
		718	#endif
		719	}
		720
		721	int
		722	ev_method (EV_P)
		723	{
		724	return method;
		725	}
		726
		727	static void
		728	loop_init (EV_P_ int methods)
		729	{
		730	if (!method)
		731	{
303	#if HAVE_MONOTONIC	732	#if EV_USE_MONOTONIC
304	{	733	{
305	struct timespec ts;	734	struct timespec ts;
306	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	735	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
307	have_monotonic = 1;	736	have_monotonic = 1;
308	}	737	}
309	#endif	738	#endif
310		739
311	ev_now = ev_time ();	740	rt_now = ev_time ();
312	now = get_clock ();	741	mn_now = get_clock ();
313	diff = ev_now - now;	742	now_floor = mn_now;
		743	rtmn_diff = rt_now - mn_now;
314		744
315	if (pipe (sigpipe))	745	if (methods == EVMETHOD_AUTO)
316	return 0;	746	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		747	methods = atoi (getenv ("LIBEV_METHODS"));
		748	else
		749	methods = EVMETHOD_ANY;
317		750
318	ev_method = EVMETHOD_NONE;	751	method = 0;
		752	#if EV_USE_WIN32
		753	if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
		754	#endif
		755	#if EV_USE_KQUEUE
		756	if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
		757	#endif
319	#if HAVE_EPOLL	758	#if EV_USE_EPOLL
320	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	759	if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
321	#endif	760	#endif
		761	#if EV_USE_POLL
		762	if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
		763	#endif
322	#if HAVE_SELECT	764	#if EV_USE_SELECT
323	if (ev_method == EVMETHOD_NONE) select_init (flags);	765	if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
324	#endif	766	#endif
325		767
326	if (ev_method)
327	{
328	evw_init (&sigev, sigcb);	768	ev_init (&sigev, sigcb);
		769	ev_set_priority (&sigev, EV_MAXPRI);
		770	}
		771	}
		772
		773	void
		774	loop_destroy (EV_P)
		775	{
		776	int i;
		777
		778	#if EV_USE_WIN32
		779	if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
		780	#endif
		781	#if EV_USE_KQUEUE
		782	if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
		783	#endif
		784	#if EV_USE_EPOLL
		785	if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
		786	#endif
		787	#if EV_USE_POLL
		788	if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
		789	#endif
		790	#if EV_USE_SELECT
		791	if (method == EVMETHOD_SELECT) select_destroy (EV_A);
		792	#endif
		793
		794	for (i = NUMPRI; i--; )
		795	array_free (pending, [i]);
		796
		797	/* have to use the microsoft-never-gets-it-right macro */
		798	array_free_microshit (fdchange);
		799	array_free_microshit (timer);
		800	array_free_microshit (periodic);
		801	array_free_microshit (idle);
		802	array_free_microshit (prepare);
		803	array_free_microshit (check);
		804
		805	method = 0;
		806	}
		807
		808	static void
		809	loop_fork (EV_P)
		810	{
		811	#if EV_USE_EPOLL
		812	if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
		813	#endif
		814	#if EV_USE_KQUEUE
		815	if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
		816	#endif
		817
		818	if (ev_is_active (&sigev))
		819	{
		820	/* default loop */
		821
		822	ev_ref (EV_A);
		823	ev_io_stop (EV_A_ &sigev);
		824	close (sigpipe [0]);
		825	close (sigpipe [1]);
		826
		827	while (pipe (sigpipe))
		828	syserr ("(libev) error creating pipe");
		829
329	siginit ();	830	siginit (EV_A);
		831	}
		832
		833	postfork = 0;
		834	}
		835
		836	#if EV_MULTIPLICITY
		837	struct ev_loop *
		838	ev_loop_new (int methods)
		839	{
		840	struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
		841
		842	memset (loop, 0, sizeof (struct ev_loop));
		843
		844	loop_init (EV_A_ methods);
		845
		846	if (ev_method (EV_A))
		847	return loop;
		848
		849	return 0;
		850	}
		851
		852	void
		853	ev_loop_destroy (EV_P)
		854	{
		855	loop_destroy (EV_A);
		856	ev_free (loop);
		857	}
		858
		859	void
		860	ev_loop_fork (EV_P)
		861	{
		862	postfork = 1;
		863	}
		864
		865	#endif
		866
		867	#if EV_MULTIPLICITY
		868	struct ev_loop *
		869	#else
		870	int
		871	#endif
		872	ev_default_loop (int methods)
		873	{
		874	if (sigpipe [0] == sigpipe [1])
		875	if (pipe (sigpipe))
		876	return 0;
		877
		878	if (!default_loop)
330	}	879	{
		880	#if EV_MULTIPLICITY
		881	struct ev_loop *loop = default_loop = &default_loop_struct;
		882	#else
		883	default_loop = 1;
		884	#endif
331		885
332	return ev_method;	886	loop_init (EV_A_ methods);
		887
		888	if (ev_method (EV_A))
		889	{
		890	siginit (EV_A);
		891
		892	#ifndef WIN32
		893	ev_signal_init (&childev, childcb, SIGCHLD);
		894	ev_set_priority (&childev, EV_MAXPRI);
		895	ev_signal_start (EV_A_ &childev);
		896	ev_unref (EV_A); /* child watcher should not keep loop alive */
		897	#endif
		898	}
		899	else
		900	default_loop = 0;
		901	}
		902
		903	return default_loop;
		904	}
		905
		906	void
		907	ev_default_destroy (void)
		908	{
		909	#if EV_MULTIPLICITY
		910	struct ev_loop *loop = default_loop;
		911	#endif
		912
		913	#ifndef WIN32
		914	ev_ref (EV_A); /* child watcher */
		915	ev_signal_stop (EV_A_ &childev);
		916	#endif
		917
		918	ev_ref (EV_A); /* signal watcher */
		919	ev_io_stop (EV_A_ &sigev);
		920
		921	close (sigpipe [0]); sigpipe [0] = 0;
		922	close (sigpipe [1]); sigpipe [1] = 0;
		923
		924	loop_destroy (EV_A);
		925	}
		926
		927	void
		928	ev_default_fork (void)
		929	{
		930	#if EV_MULTIPLICITY
		931	struct ev_loop *loop = default_loop;
		932	#endif
		933
		934	if (method)
		935	postfork = 1;
333	}	936	}
334		937
335	/*****************************************************************************/	938	/*****************************************************************************/
336		939
337	void ev_prefork (void)
338	{
339	/* nop */
340	}
341
342	void ev_postfork_parent (void)
343	{
344	/* nop */
345	}
346
347	void ev_postfork_child (void)
348	{
349	#if HAVE_EPOLL
350	if (ev_method == EVMETHOD_EPOLL)
351	epoll_postfork_child ();
352	#endif
353
354	evio_stop (&sigev);
355	close (sigpipe [0]);
356	close (sigpipe [1]);
357	pipe (sigpipe);
358	siginit ();
359	}
360
361	/*****************************************************************************/
362
363	static void	940	static int
364	fd_reify (void)	941	any_pending (EV_P)
365	{	942	{
366	int i;	943	int pri;
367		944
368	for (i = 0; i < fdchangecnt; ++i)	945	for (pri = NUMPRI; pri--; )
369	{	946	if (pendingcnt [pri])
370	int fd = fdchanges [i];	947	return 1;
371	ANFD *anfd = anfds + fd;
372	struct ev_io *w;
373		948
374	int wev = 0;	949	return 0;
375
376	for (w = anfd->head; w; w = w->next)
377	wev |= w->events;
378
379	if (anfd->wev != wev)
380	{
381	method_modify (fd, anfd->wev, wev);
382	anfd->wev = wev;
383	}
384	}
385
386	fdchangecnt = 0;
387	}	950	}
388		951
389	static void	952	static void
390	call_pending ()	953	call_pending (EV_P)
391	{	954	{
392	int i;	955	int pri;
393		956
394	for (i = 0; i < pendingcnt; ++i)	957	for (pri = NUMPRI; pri--; )
		958	while (pendingcnt [pri])
395	{	959	{
396	ANPENDING *p = pendings + i;	960	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
397		961
398	if (p->w)	962	if (p->w)
399	{	963	{
400	p->w->pending = 0;	964	p->w->pending = 0;
401	p->w->cb (p->w, p->events);	965	EV_CB_INVOKE (p->w, p->events);
402	}	966	}
403	}	967	}
404
405	pendingcnt = 0;
406	}	968	}
407		969
408	static void	970	static void
409	timers_reify ()	971	timers_reify (EV_P)
410	{	972	{
411	while (timercnt && timers [0]->at <= now)	973	while (timercnt && ((WT)timers [0])->at <= mn_now)
412	{	974	{
413	struct ev_timer *w = timers [0];	975	struct ev_timer *w = timers [0];
414		976
415	event ((W)w, EV_TIMEOUT);	977	assert (("inactive timer on timer heap detected", ev_is_active (w)));
416		978
417	/* first reschedule or stop timer */	979	/* first reschedule or stop timer */
418	if (w->repeat)	980	if (w->repeat)
419	{	981	{
		982	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
420	w->at = now + w->repeat;	983	((WT)w)->at = mn_now + w->repeat;
421	assert (("timer timeout in the past, negative repeat?", w->at > now));
422	downheap ((WT *)timers, timercnt, 0);	984	downheap ((WT *)timers, timercnt, 0);
423	}	985	}
424	else	986	else
425	evtimer_stop (w); /* nonrepeating: stop timer */	987	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
426	}
427	}
428		988
		989	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
		990	}
		991	}
		992
429	static void	993	static void
430	periodics_reify ()	994	periodics_reify (EV_P)
431	{	995	{
432	while (periodiccnt && periodics [0]->at <= ev_now)	996	while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
433	{	997	{
434	struct ev_periodic *w = periodics [0];	998	struct ev_periodic *w = periodics [0];
435		999
		1000	assert (("inactive timer on periodic heap detected", ev_is_active (w)));
		1001
436	/* first reschedule or stop timer */	1002	/* first reschedule or stop timer */
437	if (w->interval)	1003	if (w->reschedule_cb)
438	{	1004	{
		1005	ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
		1006
		1007	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
		1008	downheap ((WT *)periodics, periodiccnt, 0);
		1009	}
		1010	else if (w->interval)
		1011	{
439	w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;	1012	((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
440	assert (("periodic timeout in the past, negative interval?", w->at > ev_now));	1013	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
441	downheap ((WT *)periodics, periodiccnt, 0);	1014	downheap ((WT *)periodics, periodiccnt, 0);
442	}	1015	}
443	else	1016	else
444	evperiodic_stop (w); /* nonrepeating: stop timer */	1017	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
445		1018
446	event ((W)w, EV_TIMEOUT);	1019	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
447	}	1020	}
448	}	1021	}
449		1022
450	static void	1023	static void
451	periodics_reschedule (ev_tstamp diff)	1024	periodics_reschedule (EV_P)
452	{	1025	{
453	int i;	1026	int i;
454		1027
455	/* adjust periodics after time jump */	1028	/* adjust periodics after time jump */
456	for (i = 0; i < periodiccnt; ++i)	1029	for (i = 0; i < periodiccnt; ++i)
457	{	1030	{
458	struct ev_periodic *w = periodics [i];	1031	struct ev_periodic *w = periodics [i];
459		1032
		1033	if (w->reschedule_cb)
		1034	((WT)w)->at = w->reschedule_cb (w, rt_now);
460	if (w->interval)	1035	else if (w->interval)
		1036	((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
		1037	}
		1038
		1039	/* now rebuild the heap */
		1040	for (i = periodiccnt >> 1; i--; )
		1041	downheap ((WT *)periodics, periodiccnt, i);
		1042	}
		1043
		1044	inline int
		1045	time_update_monotonic (EV_P)
		1046	{
		1047	mn_now = get_clock ();
		1048
		1049	if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
		1050	{
		1051	rt_now = rtmn_diff + mn_now;
		1052	return 0;
		1053	}
		1054	else
		1055	{
		1056	now_floor = mn_now;
		1057	rt_now = ev_time ();
		1058	return 1;
		1059	}
		1060	}
		1061
		1062	static void
		1063	time_update (EV_P)
		1064	{
		1065	int i;
		1066
		1067	#if EV_USE_MONOTONIC
		1068	if (expect_true (have_monotonic))
		1069	{
		1070	if (time_update_monotonic (EV_A))
461	{	1071	{
462	ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;	1072	ev_tstamp odiff = rtmn_diff;
463		1073
464	if (fabs (diff) >= 1e-4)	1074	for (i = 4; --i; ) /* loop a few times, before making important decisions */
465	{	1075	{
466	evperiodic_stop (w);	1076	rtmn_diff = rt_now - mn_now;
467	evperiodic_start (w);
468		1077
469	i = 0; /* restart loop, inefficient, but time jumps should be rare */	1078	if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
		1079	return; /* all is well */
		1080
		1081	rt_now = ev_time ();
		1082	mn_now = get_clock ();
		1083	now_floor = mn_now;
470	}	1084	}
		1085
		1086	periodics_reschedule (EV_A);
		1087	/* no timer adjustment, as the monotonic clock doesn't jump */
		1088	/* timers_reschedule (EV_A_ rtmn_diff - odiff) */
471	}	1089	}
472	}	1090	}
473	}	1091	else
474		1092	#endif
475	static void	1093	{
476	time_update ()
477	{
478	int i;
479
480	ev_now = ev_time ();	1094	rt_now = ev_time ();
481		1095
482	if (have_monotonic)	1096	if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
483	{
484	ev_tstamp odiff = diff;
485
486	for (i = 4; --i; ) /* loop a few times, before making important decisions */
487	{	1097	{
488	now = get_clock ();
489	diff = ev_now - now;
490
491	if (fabs (odiff - diff) < MIN_TIMEJUMP)
492	return; /* all is well */
493
494	ev_now = ev_time ();
495	}
496
497	periodics_reschedule (diff - odiff);
498	/* no timer adjustment, as the monotonic clock doesn't jump */
499	}
500	else
501	{
502	if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
503	{
504	periodics_reschedule (ev_now - now);	1098	periodics_reschedule (EV_A);
505		1099
506	/* adjust timers. this is easy, as the offset is the same for all */	1100	/* adjust timers. this is easy, as the offset is the same for all */
507	for (i = 0; i < timercnt; ++i)	1101	for (i = 0; i < timercnt; ++i)
508	timers [i]->at += diff;	1102	((WT)timers [i])->at += rt_now - mn_now;
509	}	1103	}
510		1104
511	now = ev_now;	1105	mn_now = rt_now;
512	}	1106	}
513	}	1107	}
514		1108
515	int ev_loop_done;	1109	void
		1110	ev_ref (EV_P)
		1111	{
		1112	++activecnt;
		1113	}
516		1114
		1115	void
		1116	ev_unref (EV_P)
		1117	{
		1118	--activecnt;
		1119	}
		1120
		1121	static int loop_done;
		1122
		1123	void
517	void ev_loop (int flags)	1124	ev_loop (EV_P_ int flags)
518	{	1125	{
519	double block;	1126	double block;
520	ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;	1127	loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
521
522	if (checkcnt)
523	{
524	queue_events ((W *)checks, checkcnt, EV_CHECK);
525	call_pending ();
526	}
527		1128
528	do	1129	do
529	{	1130	{
		1131	/* queue check watchers (and execute them) */
		1132	if (expect_false (preparecnt))
		1133	{
		1134	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
		1135	call_pending (EV_A);
		1136	}
		1137
		1138	/* we might have forked, so reify kernel state if necessary */
		1139	if (expect_false (postfork))
		1140	loop_fork (EV_A);
		1141
530	/* update fd-related kernel structures */	1142	/* update fd-related kernel structures */
531	fd_reify ();	1143	fd_reify (EV_A);
532		1144
533	/* calculate blocking time */	1145	/* calculate blocking time */
534		1146
535	/* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */	1147	/* we only need this for !monotonic clock or timers, but as we basically
		1148	always have timers, we just calculate it always */
		1149	#if EV_USE_MONOTONIC
		1150	if (expect_true (have_monotonic))
		1151	time_update_monotonic (EV_A);
		1152	else
		1153	#endif
		1154	{
536	ev_now = ev_time ();	1155	rt_now = ev_time ();
		1156	mn_now = rt_now;
		1157	}
537		1158
538	if (flags & EVLOOP_NONBLOCK || idlecnt)	1159	if (flags & EVLOOP_NONBLOCK || idlecnt)
539	block = 0.;	1160	block = 0.;
540	else	1161	else
541	{	1162	{
542	block = MAX_BLOCKTIME;	1163	block = MAX_BLOCKTIME;
543		1164
544	if (timercnt)	1165	if (timercnt)
545	{	1166	{
546	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	1167	ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
547	if (block > to) block = to;	1168	if (block > to) block = to;
548	}	1169	}
549		1170
550	if (periodiccnt)	1171	if (periodiccnt)
551	{	1172	{
552	ev_tstamp to = periodics [0]->at - ev_now + method_fudge;	1173	ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
553	if (block > to) block = to;	1174	if (block > to) block = to;
554	}	1175	}
555		1176
556	if (block < 0.) block = 0.;	1177	if (block < 0.) block = 0.;
557	}	1178	}
558		1179
559	method_poll (block);	1180	method_poll (EV_A_ block);
560		1181
561	/* update ev_now, do magic */	1182	/* update rt_now, do magic */
562	time_update ();	1183	time_update (EV_A);
563		1184
564	/* queue pending timers and reschedule them */	1185	/* queue pending timers and reschedule them */
		1186	timers_reify (EV_A); /* relative timers called last */
565	periodics_reify (); /* absolute timers first */	1187	periodics_reify (EV_A); /* absolute timers called first */
566	timers_reify (); /* relative timers second */
567		1188
568	/* queue idle watchers unless io or timers are pending */	1189	/* queue idle watchers unless io or timers are pending */
569	if (!pendingcnt)	1190	if (idlecnt && !any_pending (EV_A))
570	queue_events ((W *)idles, idlecnt, EV_IDLE);	1191	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
571		1192
572	/* queue check and possibly idle watchers */	1193	/* queue check watchers, to be executed first */
		1194	if (checkcnt)
573	queue_events ((W *)checks, checkcnt, EV_CHECK);	1195	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
574		1196
575	call_pending ();	1197	call_pending (EV_A);
576	}	1198	}
577	while (!ev_loop_done);	1199	while (activecnt && !loop_done);
578		1200
579	if (ev_loop_done != 2)	1201	if (loop_done != 2)
580	ev_loop_done = 0;	1202	loop_done = 0;
		1203	}
		1204
		1205	void
		1206	ev_unloop (EV_P_ int how)
		1207	{
		1208	loop_done = how;
581	}	1209	}
582		1210
583	/*****************************************************************************/	1211	/*****************************************************************************/
584		1212
585	static void	1213	inline void
586	wlist_add (WL *head, WL elem)	1214	wlist_add (WL *head, WL elem)
587	{	1215	{
588	elem->next = *head;	1216	elem->next = *head;
589	*head = elem;	1217	*head = elem;
590	}	1218	}
591		1219
592	static void	1220	inline void
593	wlist_del (WL *head, WL elem)	1221	wlist_del (WL *head, WL elem)
594	{	1222	{
595	while (*head)	1223	while (*head)
596	{	1224	{
597	if (*head == elem)	1225	if (*head == elem)
…		…
602		1230
603	head = &(*head)->next;	1231	head = &(*head)->next;
604	}	1232	}
605	}	1233	}
606		1234
607	static void	1235	inline void
608	ev_clear (W w)	1236	ev_clear_pending (EV_P_ W w)
609	{	1237	{
610	if (w->pending)	1238	if (w->pending)
611	{	1239	{
612	pendings [w->pending - 1].w = 0;	1240	pendings [ABSPRI (w)][w->pending - 1].w = 0;
613	w->pending = 0;	1241	w->pending = 0;
614	}	1242	}
615	}	1243	}
616		1244
617	static void	1245	inline void
618	ev_start (W w, int active)	1246	ev_start (EV_P_ W w, int active)
619	{	1247	{
		1248	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		1249	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		1250
620	w->active = active;	1251	w->active = active;
		1252	ev_ref (EV_A);
621	}	1253	}
622		1254
623	static void	1255	inline void
624	ev_stop (W w)	1256	ev_stop (EV_P_ W w)
625	{	1257	{
		1258	ev_unref (EV_A);
626	w->active = 0;	1259	w->active = 0;
627	}	1260	}
628		1261
629	/*****************************************************************************/	1262	/*****************************************************************************/
630		1263
631	void	1264	void
632	evio_start (struct ev_io *w)	1265	ev_io_start (EV_P_ struct ev_io *w)
633	{	1266	{
		1267	int fd = w->fd;
		1268
634	if (ev_is_active (w))	1269	if (ev_is_active (w))
635	return;	1270	return;
636		1271
637	int fd = w->fd;	1272	assert (("ev_io_start called with negative fd", fd >= 0));
638		1273
639	ev_start ((W)w, 1);	1274	ev_start (EV_A_ (W)w, 1);
640	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	1275	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
641	wlist_add ((WL *)&anfds[fd].head, (WL)w);	1276	wlist_add ((WL *)&anfds[fd].head, (WL)w);
642		1277
643	++fdchangecnt;	1278	fd_change (EV_A_ fd);
644	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
645	fdchanges [fdchangecnt - 1] = fd;
646	}	1279	}
647		1280
648	void	1281	void
649	evio_stop (struct ev_io *w)	1282	ev_io_stop (EV_P_ struct ev_io *w)
650	{	1283	{
651	ev_clear ((W)w);	1284	ev_clear_pending (EV_A_ (W)w);
652	if (!ev_is_active (w))	1285	if (!ev_is_active (w))
653	return;	1286	return;
654		1287
655	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);	1288	wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
656	ev_stop ((W)w);	1289	ev_stop (EV_A_ (W)w);
657		1290
658	++fdchangecnt;	1291	fd_change (EV_A_ w->fd);
659	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
660	fdchanges [fdchangecnt - 1] = w->fd;
661	}	1292	}
662		1293
663	void	1294	void
664	evtimer_start (struct ev_timer *w)	1295	ev_timer_start (EV_P_ struct ev_timer *w)
665	{	1296	{
666	if (ev_is_active (w))	1297	if (ev_is_active (w))
667	return;	1298	return;
668		1299
669	w->at += now;	1300	((WT)w)->at += mn_now;
670		1301
671	assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));	1302	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
672		1303
673	ev_start ((W)w, ++timercnt);	1304	ev_start (EV_A_ (W)w, ++timercnt);
674	array_needsize (timers, timermax, timercnt, );	1305	array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
675	timers [timercnt - 1] = w;	1306	timers [timercnt - 1] = w;
676	upheap ((WT *)timers, timercnt - 1);	1307	upheap ((WT *)timers, timercnt - 1);
677	}
678		1308
		1309	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
		1310	}
		1311
679	void	1312	void
680	evtimer_stop (struct ev_timer *w)	1313	ev_timer_stop (EV_P_ struct ev_timer *w)
681	{	1314	{
682	ev_clear ((W)w);	1315	ev_clear_pending (EV_A_ (W)w);
683	if (!ev_is_active (w))	1316	if (!ev_is_active (w))
684	return;	1317	return;
685		1318
		1319	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
		1320
686	if (w->active < timercnt--)	1321	if (((W)w)->active < timercnt--)
687	{	1322	{
688	timers [w->active - 1] = timers [timercnt];	1323	timers [((W)w)->active - 1] = timers [timercnt];
689	downheap ((WT *)timers, timercnt, w->active - 1);	1324	downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
690	}	1325	}
691		1326
692	w->at = w->repeat;	1327	((WT)w)->at = w->repeat;
693		1328
694	ev_stop ((W)w);	1329	ev_stop (EV_A_ (W)w);
695	}	1330	}
696		1331
697	void	1332	void
698	evtimer_again (struct ev_timer *w)	1333	ev_timer_again (EV_P_ struct ev_timer *w)
699	{	1334	{
700	if (ev_is_active (w))	1335	if (ev_is_active (w))
701	{	1336	{
702	if (w->repeat)	1337	if (w->repeat)
703	{
704	w->at = now + w->repeat;
705	downheap ((WT *)timers, timercnt, w->active - 1);	1338	adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
706	}
707	else	1339	else
708	evtimer_stop (w);	1340	ev_timer_stop (EV_A_ w);
709	}	1341	}
710	else if (w->repeat)	1342	else if (w->repeat)
711	evtimer_start (w);	1343	ev_timer_start (EV_A_ w);
712	}	1344	}
713		1345
714	void	1346	void
715	evperiodic_start (struct ev_periodic *w)	1347	ev_periodic_start (EV_P_ struct ev_periodic *w)
716	{	1348	{
717	if (ev_is_active (w))	1349	if (ev_is_active (w))
718	return;	1350	return;
719		1351
720	assert (("periodic interval value less than zero not allowed", w->interval >= 0.));	1352	if (w->reschedule_cb)
721		1353	((WT)w)->at = w->reschedule_cb (w, rt_now);
		1354	else if (w->interval)
		1355	{
		1356	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
722	/* this formula differs from the one in periodic_reify because we do not always round up */	1357	/* this formula differs from the one in periodic_reify because we do not always round up */
723	if (w->interval)
724	w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;	1358	((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
		1359	}
725		1360
726	ev_start ((W)w, ++periodiccnt);	1361	ev_start (EV_A_ (W)w, ++periodiccnt);
727	array_needsize (periodics, periodicmax, periodiccnt, );	1362	array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
728	periodics [periodiccnt - 1] = w;	1363	periodics [periodiccnt - 1] = w;
729	upheap ((WT *)periodics, periodiccnt - 1);	1364	upheap ((WT *)periodics, periodiccnt - 1);
730	}
731		1365
		1366	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
		1367	}
		1368
732	void	1369	void
733	evperiodic_stop (struct ev_periodic *w)	1370	ev_periodic_stop (EV_P_ struct ev_periodic *w)
734	{	1371	{
735	ev_clear ((W)w);	1372	ev_clear_pending (EV_A_ (W)w);
736	if (!ev_is_active (w))	1373	if (!ev_is_active (w))
737	return;	1374	return;
738		1375
		1376	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
		1377
739	if (w->active < periodiccnt--)	1378	if (((W)w)->active < periodiccnt--)
740	{	1379	{
741	periodics [w->active - 1] = periodics [periodiccnt];	1380	periodics [((W)w)->active - 1] = periodics [periodiccnt];
742	downheap ((WT *)periodics, periodiccnt, w->active - 1);	1381	downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
743	}	1382	}
744		1383
745	ev_stop ((W)w);	1384	ev_stop (EV_A_ (W)w);
746	}	1385	}
747		1386
748	void	1387	void
749	evsignal_start (struct ev_signal *w)	1388	ev_periodic_again (EV_P_ struct ev_periodic *w)
		1389	{
		1390	/* TODO: use adjustheap and recalculation */
		1391	ev_periodic_stop (EV_A_ w);
		1392	ev_periodic_start (EV_A_ w);
		1393	}
		1394
		1395	void
		1396	ev_idle_start (EV_P_ struct ev_idle *w)
750	{	1397	{
751	if (ev_is_active (w))	1398	if (ev_is_active (w))
752	return;	1399	return;
753		1400
		1401	ev_start (EV_A_ (W)w, ++idlecnt);
		1402	array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
		1403	idles [idlecnt - 1] = w;
		1404	}
		1405
		1406	void
		1407	ev_idle_stop (EV_P_ struct ev_idle *w)
		1408	{
		1409	ev_clear_pending (EV_A_ (W)w);
		1410	if (ev_is_active (w))
		1411	return;
		1412
		1413	idles [((W)w)->active - 1] = idles [--idlecnt];
		1414	ev_stop (EV_A_ (W)w);
		1415	}
		1416
		1417	void
		1418	ev_prepare_start (EV_P_ struct ev_prepare *w)
		1419	{
		1420	if (ev_is_active (w))
		1421	return;
		1422
		1423	ev_start (EV_A_ (W)w, ++preparecnt);
		1424	array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
		1425	prepares [preparecnt - 1] = w;
		1426	}
		1427
		1428	void
		1429	ev_prepare_stop (EV_P_ struct ev_prepare *w)
		1430	{
		1431	ev_clear_pending (EV_A_ (W)w);
		1432	if (ev_is_active (w))
		1433	return;
		1434
		1435	prepares [((W)w)->active - 1] = prepares [--preparecnt];
		1436	ev_stop (EV_A_ (W)w);
		1437	}
		1438
		1439	void
		1440	ev_check_start (EV_P_ struct ev_check *w)
		1441	{
		1442	if (ev_is_active (w))
		1443	return;
		1444
		1445	ev_start (EV_A_ (W)w, ++checkcnt);
		1446	array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
		1447	checks [checkcnt - 1] = w;
		1448	}
		1449
		1450	void
		1451	ev_check_stop (EV_P_ struct ev_check *w)
		1452	{
		1453	ev_clear_pending (EV_A_ (W)w);
		1454	if (ev_is_active (w))
		1455	return;
		1456
		1457	checks [((W)w)->active - 1] = checks [--checkcnt];
		1458	ev_stop (EV_A_ (W)w);
		1459	}
		1460
		1461	#ifndef SA_RESTART
		1462	# define SA_RESTART 0
		1463	#endif
		1464
		1465	void
		1466	ev_signal_start (EV_P_ struct ev_signal *w)
		1467	{
		1468	#if EV_MULTIPLICITY
		1469	assert (("signal watchers are only supported in the default loop", loop == default_loop));
		1470	#endif
		1471	if (ev_is_active (w))
		1472	return;
		1473
		1474	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
		1475
754	ev_start ((W)w, 1);	1476	ev_start (EV_A_ (W)w, 1);
755	array_needsize (signals, signalmax, w->signum, signals_init);	1477	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
756	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);	1478	wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
757		1479
758	if (!w->next)	1480	if (!((WL)w)->next)
759	{	1481	{
		1482	#if WIN32
		1483	signal (w->signum, sighandler);
		1484	#else
760	struct sigaction sa;	1485	struct sigaction sa;
761	sa.sa_handler = sighandler;	1486	sa.sa_handler = sighandler;
762	sigfillset (&sa.sa_mask);	1487	sigfillset (&sa.sa_mask);
763	sa.sa_flags = 0;	1488	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
764	sigaction (w->signum, &sa, 0);	1489	sigaction (w->signum, &sa, 0);
		1490	#endif
765	}	1491	}
766	}	1492	}
767		1493
768	void	1494	void
769	evsignal_stop (struct ev_signal *w)	1495	ev_signal_stop (EV_P_ struct ev_signal *w)
770	{	1496	{
771	ev_clear ((W)w);	1497	ev_clear_pending (EV_A_ (W)w);
772	if (!ev_is_active (w))	1498	if (!ev_is_active (w))
773	return;	1499	return;
774		1500
775	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1501	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
776	ev_stop ((W)w);	1502	ev_stop (EV_A_ (W)w);
777		1503
778	if (!signals [w->signum - 1].head)	1504	if (!signals [w->signum - 1].head)
779	signal (w->signum, SIG_DFL);	1505	signal (w->signum, SIG_DFL);
780	}	1506	}
781		1507
782	void evidle_start (struct ev_idle *w)	1508	void
		1509	ev_child_start (EV_P_ struct ev_child *w)
783	{	1510	{
		1511	#if EV_MULTIPLICITY
		1512	assert (("child watchers are only supported in the default loop", loop == default_loop));
		1513	#endif
784	if (ev_is_active (w))	1514	if (ev_is_active (w))
785	return;	1515	return;
786		1516
787	ev_start ((W)w, ++idlecnt);	1517	ev_start (EV_A_ (W)w, 1);
788	array_needsize (idles, idlemax, idlecnt, );	1518	wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
789	idles [idlecnt - 1] = w;
790	}	1519	}
791		1520
792	void evidle_stop (struct ev_idle *w)	1521	void
		1522	ev_child_stop (EV_P_ struct ev_child *w)
793	{	1523	{
794	ev_clear ((W)w);	1524	ev_clear_pending (EV_A_ (W)w);
795	if (ev_is_active (w))	1525	if (ev_is_active (w))
796	return;	1526	return;
797		1527
798	idles [w->active - 1] = idles [--idlecnt];	1528	wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
799	ev_stop ((W)w);	1529	ev_stop (EV_A_ (W)w);
800	}
801
802	void evcheck_start (struct ev_check *w)
803	{
804	if (ev_is_active (w))
805	return;
806
807	ev_start ((W)w, ++checkcnt);
808	array_needsize (checks, checkmax, checkcnt, );
809	checks [checkcnt - 1] = w;
810	}
811
812	void evcheck_stop (struct ev_check *w)
813	{
814	ev_clear ((W)w);
815	if (ev_is_active (w))
816	return;
817
818	checks [w->active - 1] = checks [--checkcnt];
819	ev_stop ((W)w);
820	}	1530	}
821		1531
822	/*****************************************************************************/	1532	/*****************************************************************************/
823		1533
824	struct ev_once	1534	struct ev_once
…		…
828	void (*cb)(int revents, void *arg);	1538	void (*cb)(int revents, void *arg);
829	void *arg;	1539	void *arg;
830	};	1540	};
831		1541
832	static void	1542	static void
833	once_cb (struct ev_once *once, int revents)	1543	once_cb (EV_P_ struct ev_once *once, int revents)
834	{	1544	{
835	void (*cb)(int revents, void *arg) = once->cb;	1545	void (*cb)(int revents, void *arg) = once->cb;
836	void *arg = once->arg;	1546	void *arg = once->arg;
837		1547
838	evio_stop (&once->io);	1548	ev_io_stop (EV_A_ &once->io);
839	evtimer_stop (&once->to);	1549	ev_timer_stop (EV_A_ &once->to);
840	free (once);	1550	ev_free (once);
841		1551
842	cb (revents, arg);	1552	cb (revents, arg);
843	}	1553	}
844		1554
845	static void	1555	static void
846	once_cb_io (struct ev_io *w, int revents)	1556	once_cb_io (EV_P_ struct ev_io *w, int revents)
847	{	1557	{
848	once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);	1558	once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
849	}	1559	}
850		1560
851	static void	1561	static void
852	once_cb_to (struct ev_timer *w, int revents)	1562	once_cb_to (EV_P_ struct ev_timer *w, int revents)
853	{	1563	{
854	once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);	1564	once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
855	}	1565	}
856		1566
857	void	1567	void
858	ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)	1568	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
859	{	1569	{
860	struct ev_once *once = malloc (sizeof (struct ev_once));	1570	struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
861		1571
862	if (!once)	1572	if (!once)
863	cb (EV_ERROR, arg);	1573	cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
864	else	1574	else
865	{	1575	{
866	once->cb = cb;	1576	once->cb = cb;
867	once->arg = arg;	1577	once->arg = arg;
868		1578
869	evw_init (&once->io, once_cb_io);	1579	ev_init (&once->io, once_cb_io);
870
871	if (fd >= 0)	1580	if (fd >= 0)
872	{	1581	{
873	evio_set (&once->io, fd, events);	1582	ev_io_set (&once->io, fd, events);
874	evio_start (&once->io);	1583	ev_io_start (EV_A_ &once->io);
875	}	1584	}
876		1585
877	evw_init (&once->to, once_cb_to);	1586	ev_init (&once->to, once_cb_to);
878
879	if (timeout >= 0.)	1587	if (timeout >= 0.)
880	{	1588	{
881	evtimer_set (&once->to, timeout, 0.);	1589	ev_timer_set (&once->to, timeout, 0.);
882	evtimer_start (&once->to);	1590	ev_timer_start (EV_A_ &once->to);
883	}	1591	}
884	}	1592	}
885	}	1593	}
886		1594
887	/*****************************************************************************/
888
889	#if 0
890
891	struct ev_io wio;
892
893	static void
894	sin_cb (struct ev_io *w, int revents)
895	{
896	fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
897	}
898
899	static void
900	ocb (struct ev_timer *w, int revents)
901	{
902	//fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
903	evtimer_stop (w);
904	evtimer_start (w);
905	}
906
907	static void
908	scb (struct ev_signal *w, int revents)
909	{
910	fprintf (stderr, "signal %x,%d\n", revents, w->signum);
911	evio_stop (&wio);
912	evio_start (&wio);
913	}
914
915	static void
916	gcb (struct ev_signal *w, int revents)
917	{
918	fprintf (stderr, "generic %x\n", revents);
919
920	}
921
922	int main (void)
923	{
924	ev_init (0);
925
926	evio_init (&wio, sin_cb, 0, EV_READ);
927	evio_start (&wio);
928
929	struct ev_timer t[10000];
930
931	#if 0
932	int i;
933	for (i = 0; i < 10000; ++i)
934	{
935	struct ev_timer *w = t + i;
936	evw_init (w, ocb, i);
937	evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
938	evtimer_start (w);
939	if (drand48 () < 0.5)
940	evtimer_stop (w);
941	}
942	#endif
943
944	struct ev_timer t1;
945	evtimer_init (&t1, ocb, 5, 10);
946	evtimer_start (&t1);
947
948	struct ev_signal sig;
949	evsignal_init (&sig, scb, SIGQUIT);
950	evsignal_start (&sig);
951
952	struct ev_check cw;
953	evcheck_init (&cw, gcb);
954	evcheck_start (&cw);
955
956	struct ev_idle iw;
957	evidle_init (&iw, gcb);
958	evidle_start (&iw);
959
960	ev_loop (0);
961
962	return 0;
963	}
964
965	#endif
966
967
968
969

Diff Legend

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