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

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs.
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC

…		…
126	# define EV_USE_EVENTFD 1	126	# define EV_USE_EVENTFD 1
127	# else	127	# else
128	# define EV_USE_EVENTFD 0	128	# define EV_USE_EVENTFD 0
129	# endif	129	# endif
130	# endif	130	# endif
131		131
132	#endif	132	#endif
133		133
134	#include <math.h>	134	#include <math.h>
135	#include <stdlib.h>	135	#include <stdlib.h>
136	#include <fcntl.h>	136	#include <fcntl.h>
…		…
154	#ifndef _WIN32	154	#ifndef _WIN32
155	# include <sys/time.h>	155	# include <sys/time.h>
156	# include <sys/wait.h>	156	# include <sys/wait.h>
157	# include <unistd.h>	157	# include <unistd.h>
158	#else	158	#else
		159	# include <io.h>
159	# define WIN32_LEAN_AND_MEAN	160	# define WIN32_LEAN_AND_MEAN
160	# include <windows.h>	161	# include <windows.h>
161	# ifndef EV_SELECT_IS_WINSOCKET	162	# ifndef EV_SELECT_IS_WINSOCKET
162	# define EV_SELECT_IS_WINSOCKET 1	163	# define EV_SELECT_IS_WINSOCKET 1
163	# endif	164	# endif
164	#endif	165	#endif
165		166
166	/* this block tries to deduce configuration from header-defined symbols and defaults */	167	/* this block tries to deduce configuration from header-defined symbols and defaults */
167		168
168	#ifndef EV_USE_MONOTONIC	169	#ifndef EV_USE_MONOTONIC
		170	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
		171	# define EV_USE_MONOTONIC 1
		172	# else
169	# define EV_USE_MONOTONIC 0	173	# define EV_USE_MONOTONIC 0
		174	# endif
170	#endif	175	#endif
171		176
172	#ifndef EV_USE_REALTIME	177	#ifndef EV_USE_REALTIME
173	# define EV_USE_REALTIME 0	178	# define EV_USE_REALTIME 0
174	#endif	179	#endif
175		180
176	#ifndef EV_USE_NANOSLEEP	181	#ifndef EV_USE_NANOSLEEP
		182	# if _POSIX_C_SOURCE >= 199309L
		183	# define EV_USE_NANOSLEEP 1
		184	# else
177	# define EV_USE_NANOSLEEP 0	185	# define EV_USE_NANOSLEEP 0
		186	# endif
178	#endif	187	#endif
179		188
180	#ifndef EV_USE_SELECT	189	#ifndef EV_USE_SELECT
181	# define EV_USE_SELECT 1	190	# define EV_USE_SELECT 1
182	#endif	191	#endif
…		…
235	# else	244	# else
236	# define EV_USE_EVENTFD 0	245	# define EV_USE_EVENTFD 0
237	# endif	246	# endif
238	#endif	247	#endif
239		248
		249	#if 0 /* debugging */
		250	# define EV_VERIFY 3
		251	# define EV_USE_4HEAP 1
		252	# define EV_HEAP_CACHE_AT 1
		253	#endif
		254
		255	#ifndef EV_VERIFY
		256	# define EV_VERIFY !EV_MINIMAL
		257	#endif
		258
240	#ifndef EV_USE_4HEAP	259	#ifndef EV_USE_4HEAP
241	# define EV_USE_4HEAP !EV_MINIMAL	260	# define EV_USE_4HEAP !EV_MINIMAL
242	#endif	261	#endif
243		262
244	#ifndef EV_HEAP_CACHE_AT	263	#ifndef EV_HEAP_CACHE_AT
…		…
267	# include <sys/select.h>	286	# include <sys/select.h>
268	# endif	287	# endif
269	#endif	288	#endif
270		289
271	#if EV_USE_INOTIFY	290	#if EV_USE_INOTIFY
		291	# include <sys/utsname.h>
272	# include <sys/inotify.h>	292	# include <sys/inotify.h>
		293	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
		294	# ifndef IN_DONT_FOLLOW
		295	# undef EV_USE_INOTIFY
		296	# define EV_USE_INOTIFY 0
		297	# endif
273	#endif	298	#endif
274		299
275	#if EV_SELECT_IS_WINSOCKET	300	#if EV_SELECT_IS_WINSOCKET
276	# include <winsock.h>	301	# include <winsock.h>
277	#endif	302	#endif
…		…
287	}	312	}
288	# endif	313	# endif
289	#endif	314	#endif
290		315
291	/**/	316	/**/
		317
		318	#if EV_VERIFY >= 3
		319	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
		320	#else
		321	# define EV_FREQUENT_CHECK do { } while (0)
		322	#endif
292		323
293	/*	324	/*
294	* This is used to avoid floating point rounding problems.	325	* This is used to avoid floating point rounding problems.
295	* It is added to ev_rt_now when scheduling periodics	326	* It is added to ev_rt_now when scheduling periodics
296	* to ensure progress, time-wise, even when rounding	327	* to ensure progress, time-wise, even when rounding
…		…
444	typedef struct {	475	typedef struct {
445	ev_tstamp at;	476	ev_tstamp at;
446	WT w;	477	WT w;
447	} ANHE;	478	} ANHE;
448		479
449	#define ANHE_w(he) (he).w /* access watcher, read-write */	480	#define ANHE_w(he) (he).w /* access watcher, read-write */
450	#define ANHE_at(he) (he).at /* access cached at, read-only */	481	#define ANHE_at(he) (he).at /* access cached at, read-only */
451	#define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */	482	#define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452	#else	483	#else
453	typedef WT ANHE;	484	typedef WT ANHE;
454		485
455	#define ANHE_w(he) (he)	486	#define ANHE_w(he) (he)
456	#define ANHE_at(he) (he)->at	487	#define ANHE_at(he) (he)->at
457	#define ANHE_at_set(he)	488	#define ANHE_at_cache(he)
458	#endif	489	#endif
459		490
460	#if EV_MULTIPLICITY	491	#if EV_MULTIPLICITY
461		492
462	struct ev_loop	493	struct ev_loop
…		…
540	struct timeval tv;	571	struct timeval tv;
541		572
542	tv.tv_sec = (time_t)delay;	573	tv.tv_sec = (time_t)delay;
543	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	574	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544		575
		576	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		577	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		578	/* by older ones */
545	select (0, 0, 0, 0, &tv);	579	select (0, 0, 0, 0, &tv);
546	#endif	580	#endif
547	}	581	}
548	}	582	}
549		583
…		…
683	events \|= (unsigned char)w->events;	717	events \|= (unsigned char)w->events;
684		718
685	#if EV_SELECT_IS_WINSOCKET	719	#if EV_SELECT_IS_WINSOCKET
686	if (events)	720	if (events)
687	{	721	{
688	unsigned long argp;	722	unsigned long arg;
689	#ifdef EV_FD_TO_WIN32_HANDLE	723	#ifdef EV_FD_TO_WIN32_HANDLE
690	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	724	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691	#else	725	#else
692	anfd->handle = _get_osfhandle (fd);	726	anfd->handle = _get_osfhandle (fd);
693	#endif	727	#endif
694	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));	728	assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
695	}	729	}
696	#endif	730	#endif
697		731
698	{	732	{
699	unsigned char o_events = anfd->events;	733	unsigned char o_events = anfd->events;
…		…
752	{	786	{
753	int fd;	787	int fd;
754		788
755	for (fd = 0; fd < anfdmax; ++fd)	789	for (fd = 0; fd < anfdmax; ++fd)
756	if (anfds [fd].events)	790	if (anfds [fd].events)
757	if (!fd_valid (fd) == -1 && errno == EBADF)	791	if (!fd_valid (fd) && errno == EBADF)
758	fd_kill (EV_A_ fd);	792	fd_kill (EV_A_ fd);
759	}	793	}
760		794
761	/* called on ENOMEM in select/poll to kill some fds and retry */	795	/* called on ENOMEM in select/poll to kill some fds and retry */
762	static void noinline	796	static void noinline
…		…
803	#if EV_USE_4HEAP	837	#if EV_USE_4HEAP
804		838
805	#define DHEAP 4	839	#define DHEAP 4
806	#define HEAP0 (DHEAP - 1) /* index of first element in heap */	840	#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807	#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)	841	#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808		842	#define UPHEAP_DONE(p,k) ((p) == (k))
809	/* towards the root */
810	void inline_speed
811	upheap (ANHE *heap, int k)
812	{
813	ANHE he = heap [k];
814
815	for (;;)
816	{
817	int p = HPARENT (k);
818
819	if (p == k \|\| ANHE_at (heap [p]) <= ANHE_at (he))
820	break;
821
822	heap [k] = heap [p];
823	ev_active (ANHE_w (heap [k])) = k;
824	k = p;
825	}
826
827	heap [k] = he;
828	ev_active (ANHE_w (he)) = k;
829	}
830		843
831	/* away from the root */	844	/* away from the root */
832	void inline_speed	845	void inline_speed
833	downheap (ANHE *heap, int N, int k)	846	downheap (ANHE *heap, int N, int k)
834	{	847	{
…		…
837		850
838	for (;;)	851	for (;;)
839	{	852	{
840	ev_tstamp minat;	853	ev_tstamp minat;
841	ANHE *minpos;	854	ANHE *minpos;
842	ANHE pos = heap + DHEAP (k - HEAP0) + HEAP0;	855	ANHE pos = heap + DHEAP (k - HEAP0) + HEAP0 + 1;
843		856
844	// find minimum child	857	/* find minimum child */
845	if (expect_true (pos + DHEAP - 1 < E))	858	if (expect_true (pos + DHEAP - 1 < E))
846	{	859	{
847	/* fast path / (minpos = pos + 0), (minat = ANHE_at (minpos));	860	/* fast path / (minpos = pos + 0), (minat = ANHE_at (minpos));
848	if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));	861	if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849	if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));	862	if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
…		…
870		883
871	heap [k] = he;	884	heap [k] = he;
872	ev_active (ANHE_w (he)) = k;	885	ev_active (ANHE_w (he)) = k;
873	}	886	}
874		887
875	#else // 4HEAP	888	#else /* 4HEAP */
876		889
877	#define HEAP0 1	890	#define HEAP0 1
878	#define HPARENT(k) ((k) >> 1)	891	#define HPARENT(k) ((k) >> 1)
879		892	#define UPHEAP_DONE(p,k) (!(p))
880	/* towards the root */
881	void inline_speed
882	upheap (ANHE *heap, int k)
883	{
884	ANHE he = heap [k];
885
886	for (;;)
887	{
888	int p = HPARENT (k);
889
890	/* maybe we could use a dummy element at heap [0]? */
891	if (!p \|\| ANHE_at (heap [p]) <= ANHE_at (he))
892	break;
893
894	heap [k] = heap [p];
895	ev_active (ANHE_w (heap [k])) = k;
896	k = p;
897	}
898
899	heap [k] = he;
900	ev_active (ANHE_w (heap [k])) = k;
901	}
902		893
903	/* away from the root */	894	/* away from the root */
904	void inline_speed	895	void inline_speed
905	downheap (ANHE *heap, int N, int k)	896	downheap (ANHE *heap, int N, int k)
906	{	897	{
…		…
908		899
909	for (;;)	900	for (;;)
910	{	901	{
911	int c = k << 1;	902	int c = k << 1;
912		903
913	if (c > N)	904	if (c > N + HEAP0 - 1)
914	break;	905	break;
915		906
916	c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])	907	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917	? 1 : 0;	908	? 1 : 0;
918		909
919	if (ANHE_at (he) <= ANHE_at (heap [c]))	910	if (ANHE_at (he) <= ANHE_at (heap [c]))
920	break;	911	break;
921		912
…		…
928	heap [k] = he;	919	heap [k] = he;
929	ev_active (ANHE_w (he)) = k;	920	ev_active (ANHE_w (he)) = k;
930	}	921	}
931	#endif	922	#endif
932		923
		924	/* towards the root */
		925	void inline_speed
		926	upheap (ANHE *heap, int k)
		927	{
		928	ANHE he = heap [k];
		929
		930	for (;;)
		931	{
		932	int p = HPARENT (k);
		933
		934	if (UPHEAP_DONE (p, k) \|\| ANHE_at (heap [p]) <= ANHE_at (he))
		935	break;
		936
		937	heap [k] = heap [p];
		938	ev_active (ANHE_w (heap [k])) = k;
		939	k = p;
		940	}
		941
		942	heap [k] = he;
		943	ev_active (ANHE_w (he)) = k;
		944	}
		945
933	void inline_size	946	void inline_size
934	adjustheap (ANHE *heap, int N, int k)	947	adjustheap (ANHE *heap, int N, int k)
935	{	948	{
936	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))	949	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937	upheap (heap, k);	950	upheap (heap, k);
938	else	951	else
939	downheap (heap, N, k);	952	downheap (heap, N, k);
940	}	953	}
941		954
		955	/* rebuild the heap: this function is used only once and executed rarely */
		956	void inline_size
		957	reheap (ANHE *heap, int N)
		958	{
		959	int i;
		960
		961	/* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
		962	/* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
		963	for (i = 0; i < N; ++i)
		964	upheap (heap, i + HEAP0);
		965	}
		966
942	/*****************************************************************************/	967	/*****************************************************************************/
943		968
944	typedef struct	969	typedef struct
945	{	970	{
946	WL head;	971	WL head;
…		…
968		993
969	void inline_speed	994	void inline_speed
970	fd_intern (int fd)	995	fd_intern (int fd)
971	{	996	{
972	#ifdef _WIN32	997	#ifdef _WIN32
973	int arg = 1;	998	unsigned long arg = 1;
974	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	999	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
975	#else	1000	#else
976	fcntl (fd, F_SETFD, FD_CLOEXEC);	1001	fcntl (fd, F_SETFD, FD_CLOEXEC);
977	fcntl (fd, F_SETFL, O_NONBLOCK);	1002	fcntl (fd, F_SETFL, O_NONBLOCK);
978	#endif	1003	#endif
…		…
1462		1487
1463	postfork = 0;	1488	postfork = 0;
1464	}	1489	}
1465		1490
1466	#if EV_MULTIPLICITY	1491	#if EV_MULTIPLICITY
		1492
1467	struct ev_loop *	1493	struct ev_loop *
1468	ev_loop_new (unsigned int flags)	1494	ev_loop_new (unsigned int flags)
1469	{	1495	{
1470	struct ev_loop loop = (struct ev_loop )ev_malloc (sizeof (struct ev_loop));	1496	struct ev_loop loop = (struct ev_loop )ev_malloc (sizeof (struct ev_loop));
1471		1497
…		…
1489	void	1515	void
1490	ev_loop_fork (EV_P)	1516	ev_loop_fork (EV_P)
1491	{	1517	{
1492	postfork = 1; /* must be in line with ev_default_fork */	1518	postfork = 1; /* must be in line with ev_default_fork */
1493	}	1519	}
		1520
		1521	#if EV_VERIFY
		1522	static void noinline
		1523	verify_watcher (EV_P_ W w)
		1524	{
		1525	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
		1526
		1527	if (w->pending)
		1528	assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
		1529	}
		1530
		1531	static void noinline
		1532	verify_heap (EV_P_ ANHE *heap, int N)
		1533	{
		1534	int i;
		1535
		1536	for (i = HEAP0; i < N + HEAP0; ++i)
		1537	{
		1538	assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
		1539	assert (("heap condition violated", i == HEAP0 \|\| ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
		1540	assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
		1541
		1542	verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
		1543	}
		1544	}
		1545
		1546	static void noinline
		1547	array_verify (EV_P_ W *ws, int cnt)
		1548	{
		1549	while (cnt--)
		1550	{
		1551	assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
		1552	verify_watcher (EV_A_ ws [cnt]);
		1553	}
		1554	}
		1555	#endif
		1556
		1557	void
		1558	ev_loop_verify (EV_P)
		1559	{
		1560	#if EV_VERIFY
		1561	int i;
		1562	WL w;
		1563
		1564	assert (activecnt >= -1);
		1565
		1566	assert (fdchangemax >= fdchangecnt);
		1567	for (i = 0; i < fdchangecnt; ++i)
		1568	assert (("negative fd in fdchanges", fdchanges [i] >= 0));
		1569
		1570	assert (anfdmax >= 0);
		1571	for (i = 0; i < anfdmax; ++i)
		1572	for (w = anfds [i].head; w; w = w->next)
		1573	{
		1574	verify_watcher (EV_A_ (W)w);
		1575	assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
		1576	assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
		1577	}
		1578
		1579	assert (timermax >= timercnt);
		1580	verify_heap (EV_A_ timers, timercnt);
		1581
		1582	#if EV_PERIODIC_ENABLE
		1583	assert (periodicmax >= periodiccnt);
		1584	verify_heap (EV_A_ periodics, periodiccnt);
		1585	#endif
		1586
		1587	for (i = NUMPRI; i--; )
		1588	{
		1589	assert (pendingmax [i] >= pendingcnt [i]);
		1590	#if EV_IDLE_ENABLE
		1591	assert (idleall >= 0);
		1592	assert (idlemax [i] >= idlecnt [i]);
		1593	array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
		1594	#endif
		1595	}
		1596
		1597	#if EV_FORK_ENABLE
		1598	assert (forkmax >= forkcnt);
		1599	array_verify (EV_A_ (W *)forks, forkcnt);
		1600	#endif
		1601
		1602	#if EV_ASYNC_ENABLE
		1603	assert (asyncmax >= asynccnt);
		1604	array_verify (EV_A_ (W *)asyncs, asynccnt);
		1605	#endif
		1606
		1607	assert (preparemax >= preparecnt);
		1608	array_verify (EV_A_ (W *)prepares, preparecnt);
		1609
		1610	assert (checkmax >= checkcnt);
		1611	array_verify (EV_A_ (W *)checks, checkcnt);
		1612
		1613	# if 0
		1614	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
		1615	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1494	#endif	1616	# endif
		1617	#endif
		1618	}
		1619
		1620	#endif /* multiplicity */
1495		1621
1496	#if EV_MULTIPLICITY	1622	#if EV_MULTIPLICITY
1497	struct ev_loop *	1623	struct ev_loop *
1498	ev_default_loop_init (unsigned int flags)	1624	ev_default_loop_init (unsigned int flags)
1499	#else	1625	#else
…		…
1575	{	1701	{
1576	/assert (("non-pending watcher on pending list", p->w->pending));/	1702	/assert (("non-pending watcher on pending list", p->w->pending));/
1577		1703
1578	p->w->pending = 0;	1704	p->w->pending = 0;
1579	EV_CB_INVOKE (p->w, p->events);	1705	EV_CB_INVOKE (p->w, p->events);
		1706	EV_FREQUENT_CHECK;
1580	}	1707	}
1581	}	1708	}
1582	}	1709	}
1583		1710
1584	#if EV_IDLE_ENABLE	1711	#if EV_IDLE_ENABLE
…		…
1605	#endif	1732	#endif
1606		1733
1607	void inline_size	1734	void inline_size
1608	timers_reify (EV_P)	1735	timers_reify (EV_P)
1609	{	1736	{
		1737	EV_FREQUENT_CHECK;
		1738
1610	while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)	1739	while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611	{	1740	{
1612	ev_timer w = (ev_timer )ANHE_w (timers [HEAP0]);	1741	ev_timer w = (ev_timer )ANHE_w (timers [HEAP0]);
1613		1742
1614	/assert (("inactive timer on timer heap detected", ev_is_active (w)));/	1743	/assert (("inactive timer on timer heap detected", ev_is_active (w)));/
…		…
1620	if (ev_at (w) < mn_now)	1749	if (ev_at (w) < mn_now)
1621	ev_at (w) = mn_now;	1750	ev_at (w) = mn_now;
1622		1751
1623	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));	1752	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624		1753
1625	ANHE_at_set (timers [HEAP0]);	1754	ANHE_at_cache (timers [HEAP0]);
1626	downheap (timers, timercnt, HEAP0);	1755	downheap (timers, timercnt, HEAP0);
1627	}	1756	}
1628	else	1757	else
1629	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */	1758	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630		1759
		1760	EV_FREQUENT_CHECK;
1631	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);	1761	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632	}	1762	}
1633	}	1763	}
1634		1764
1635	#if EV_PERIODIC_ENABLE	1765	#if EV_PERIODIC_ENABLE
1636	void inline_size	1766	void inline_size
1637	periodics_reify (EV_P)	1767	periodics_reify (EV_P)
1638	{	1768	{
		1769	EV_FREQUENT_CHECK;
		1770
1639	while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)	1771	while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640	{	1772	{
1641	ev_periodic w = (ev_periodic )ANHE_w (periodics [HEAP0]);	1773	ev_periodic w = (ev_periodic )ANHE_w (periodics [HEAP0]);
1642		1774
1643	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/	1775	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/
…		…
1647	{	1779	{
1648	ev_at (w) = w->reschedule_cb (w, ev_rt_now);	1780	ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649		1781
1650	assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));	1782	assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651		1783
1652	ANHE_at_set (periodics [HEAP0]);	1784	ANHE_at_cache (periodics [HEAP0]);
1653	downheap (periodics, periodiccnt, HEAP0);	1785	downheap (periodics, periodiccnt, HEAP0);
1654	}	1786	}
1655	else if (w->interval)	1787	else if (w->interval)
1656	{	1788	{
1657	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	1789	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
…		…
1666	/* has effectively asked to get triggered more often than possible */	1798	/* has effectively asked to get triggered more often than possible */
1667	if (ev_at (w) < ev_rt_now)	1799	if (ev_at (w) < ev_rt_now)
1668	ev_at (w) = ev_rt_now;	1800	ev_at (w) = ev_rt_now;
1669	}	1801	}
1670		1802
1671	ANHE_at_set (periodics [HEAP0]);	1803	ANHE_at_cache (periodics [HEAP0]);
1672	downheap (periodics, periodiccnt, HEAP0);	1804	downheap (periodics, periodiccnt, HEAP0);
1673	}	1805	}
1674	else	1806	else
1675	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1807	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676		1808
		1809	EV_FREQUENT_CHECK;
1677	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);	1810	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678	}	1811	}
1679	}	1812	}
1680		1813
1681	static void noinline	1814	static void noinline
…		…
1691	if (w->reschedule_cb)	1824	if (w->reschedule_cb)
1692	ev_at (w) = w->reschedule_cb (w, ev_rt_now);	1825	ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693	else if (w->interval)	1826	else if (w->interval)
1694	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	1827	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695		1828
1696	ANHE_at_set (periodics [i]);	1829	ANHE_at_cache (periodics [i]);
1697	}	1830	}
1698		1831
1699	/* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */	1832	reheap (periodics, periodiccnt);
1700	/* also, this is easy and corretc for both 2-heaps and 4-heaps */
1701	for (i = 0; i < periodiccnt; ++i)
1702	upheap (periodics, i + HEAP0);
1703	}	1833	}
1704	#endif	1834	#endif
1705		1835
1706	void inline_speed	1836	void inline_speed
1707	time_update (EV_P_ ev_tstamp max_block)	1837	time_update (EV_P_ ev_tstamp max_block)
…		…
1765	/* adjust timers. this is easy, as the offset is the same for all of them */	1895	/* adjust timers. this is easy, as the offset is the same for all of them */
1766	for (i = 0; i < timercnt; ++i)	1896	for (i = 0; i < timercnt; ++i)
1767	{	1897	{
1768	ANHE *he = timers + i + HEAP0;	1898	ANHE *he = timers + i + HEAP0;
1769	ANHE_w (*he)->at += ev_rt_now - mn_now;	1899	ANHE_w (*he)->at += ev_rt_now - mn_now;
1770	ANHE_at_set (*he);	1900	ANHE_at_cache (*he);
1771	}	1901	}
1772	}	1902	}
1773		1903
1774	mn_now = ev_rt_now;	1904	mn_now = ev_rt_now;
1775	}	1905	}
…		…
1785	ev_unref (EV_P)	1915	ev_unref (EV_P)
1786	{	1916	{
1787	--activecnt;	1917	--activecnt;
1788	}	1918	}
1789		1919
		1920	void
		1921	ev_now_update (EV_P)
		1922	{
		1923	time_update (EV_A_ 1e100);
		1924	}
		1925
1790	static int loop_done;	1926	static int loop_done;
1791		1927
1792	void	1928	void
1793	ev_loop (EV_P_ int flags)	1929	ev_loop (EV_P_ int flags)
1794	{	1930	{
…		…
1796		1932
1797	call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */	1933	call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1798		1934
1799	do	1935	do
1800	{	1936	{
		1937	#if EV_VERIFY >= 2
		1938	ev_loop_verify (EV_A);
		1939	#endif
		1940
1801	#ifndef _WIN32	1941	#ifndef _WIN32
1802	if (expect_false (curpid)) /* penalise the forking check even more */	1942	if (expect_false (curpid)) /* penalise the forking check even more */
1803	if (expect_false (getpid () != curpid))	1943	if (expect_false (getpid () != curpid))
1804	{	1944	{
1805	curpid = getpid ();	1945	curpid = getpid ();
…		…
2000	if (expect_false (ev_is_active (w)))	2140	if (expect_false (ev_is_active (w)))
2001	return;	2141	return;
2002		2142
2003	assert (("ev_io_start called with negative fd", fd >= 0));	2143	assert (("ev_io_start called with negative fd", fd >= 0));
2004		2144
		2145	EV_FREQUENT_CHECK;
		2146
2005	ev_start (EV_A_ (W)w, 1);	2147	ev_start (EV_A_ (W)w, 1);
2006	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2148	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
2007	wlist_add (&anfds[fd].head, (WL)w);	2149	wlist_add (&anfds[fd].head, (WL)w);
2008		2150
2009	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2151	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2010	w->events &= ~EV_IOFDSET;	2152	w->events &= ~EV_IOFDSET;
		2153
		2154	EV_FREQUENT_CHECK;
2011	}	2155	}
2012		2156
2013	void noinline	2157	void noinline
2014	ev_io_stop (EV_P_ ev_io *w)	2158	ev_io_stop (EV_P_ ev_io *w)
2015	{	2159	{
…		…
2017	if (expect_false (!ev_is_active (w)))	2161	if (expect_false (!ev_is_active (w)))
2018	return;	2162	return;
2019		2163
2020	assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));	2164	assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2021		2165
		2166	EV_FREQUENT_CHECK;
		2167
2022	wlist_del (&anfds[w->fd].head, (WL)w);	2168	wlist_del (&anfds[w->fd].head, (WL)w);
2023	ev_stop (EV_A_ (W)w);	2169	ev_stop (EV_A_ (W)w);
2024		2170
2025	fd_change (EV_A_ w->fd, 1);	2171	fd_change (EV_A_ w->fd, 1);
		2172
		2173	EV_FREQUENT_CHECK;
2026	}	2174	}
2027		2175
2028	void noinline	2176	void noinline
2029	ev_timer_start (EV_P_ ev_timer *w)	2177	ev_timer_start (EV_P_ ev_timer *w)
2030	{	2178	{
…		…
2033		2181
2034	ev_at (w) += mn_now;	2182	ev_at (w) += mn_now;
2035		2183
2036	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));	2184	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2037		2185
		2186	EV_FREQUENT_CHECK;
		2187
		2188	++timercnt;
2038	ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);	2189	ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039	array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);	2190	array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040	ANHE_w (timers [ev_active (w)]) = (WT)w;	2191	ANHE_w (timers [ev_active (w)]) = (WT)w;
2041	ANHE_at_set (timers [ev_active (w)]);	2192	ANHE_at_cache (timers [ev_active (w)]);
2042	upheap (timers, ev_active (w));	2193	upheap (timers, ev_active (w));
		2194
		2195	EV_FREQUENT_CHECK;
2043		2196
2044	/assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));/	2197	/assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));/
2045	}	2198	}
2046		2199
2047	void noinline	2200	void noinline
…		…
2049	{	2202	{
2050	clear_pending (EV_A_ (W)w);	2203	clear_pending (EV_A_ (W)w);
2051	if (expect_false (!ev_is_active (w)))	2204	if (expect_false (!ev_is_active (w)))
2052	return;	2205	return;
2053		2206
		2207	EV_FREQUENT_CHECK;
		2208
2054	{	2209	{
2055	int active = ev_active (w);	2210	int active = ev_active (w);
2056		2211
2057	assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));	2212	assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058		2213
		2214	--timercnt;
		2215
2059	if (expect_true (active < timercnt + HEAP0 - 1))	2216	if (expect_true (active < timercnt + HEAP0))
2060	{	2217	{
2061	timers [active] = timers [timercnt + HEAP0 - 1];	2218	timers [active] = timers [timercnt + HEAP0];
2062	adjustheap (timers, timercnt, active);	2219	adjustheap (timers, timercnt, active);
2063	}	2220	}
2064
2065	--timercnt;
2066	}	2221	}
		2222
		2223	EV_FREQUENT_CHECK;
2067		2224
2068	ev_at (w) -= mn_now;	2225	ev_at (w) -= mn_now;
2069		2226
2070	ev_stop (EV_A_ (W)w);	2227	ev_stop (EV_A_ (W)w);
2071	}	2228	}
2072		2229
2073	void noinline	2230	void noinline
2074	ev_timer_again (EV_P_ ev_timer *w)	2231	ev_timer_again (EV_P_ ev_timer *w)
2075	{	2232	{
		2233	EV_FREQUENT_CHECK;
		2234
2076	if (ev_is_active (w))	2235	if (ev_is_active (w))
2077	{	2236	{
2078	if (w->repeat)	2237	if (w->repeat)
2079	{	2238	{
2080	ev_at (w) = mn_now + w->repeat;	2239	ev_at (w) = mn_now + w->repeat;
2081	ANHE_at_set (timers [ev_active (w)]);	2240	ANHE_at_cache (timers [ev_active (w)]);
2082	adjustheap (timers, timercnt, ev_active (w));	2241	adjustheap (timers, timercnt, ev_active (w));
2083	}	2242	}
2084	else	2243	else
2085	ev_timer_stop (EV_A_ w);	2244	ev_timer_stop (EV_A_ w);
2086	}	2245	}
2087	else if (w->repeat)	2246	else if (w->repeat)
2088	{	2247	{
2089	ev_at (w) = w->repeat;	2248	ev_at (w) = w->repeat;
2090	ev_timer_start (EV_A_ w);	2249	ev_timer_start (EV_A_ w);
2091	}	2250	}
		2251
		2252	EV_FREQUENT_CHECK;
2092	}	2253	}
2093		2254
2094	#if EV_PERIODIC_ENABLE	2255	#if EV_PERIODIC_ENABLE
2095	void noinline	2256	void noinline
2096	ev_periodic_start (EV_P_ ev_periodic *w)	2257	ev_periodic_start (EV_P_ ev_periodic *w)
…		…
2107	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	2268	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108	}	2269	}
2109	else	2270	else
2110	ev_at (w) = w->offset;	2271	ev_at (w) = w->offset;
2111		2272
		2273	EV_FREQUENT_CHECK;
		2274
		2275	++periodiccnt;
2112	ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);	2276	ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113	array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);	2277	array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114	ANHE_w (periodics [ev_active (w)]) = (WT)w;	2278	ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115	ANHE_at_set (periodics [ev_active (w)]);	2279	ANHE_at_cache (periodics [ev_active (w)]);
2116	upheap (periodics, ev_active (w));	2280	upheap (periodics, ev_active (w));
		2281
		2282	EV_FREQUENT_CHECK;
2117		2283
2118	/assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));/	2284	/assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));/
2119	}	2285	}
2120		2286
2121	void noinline	2287	void noinline
…		…
2123	{	2289	{
2124	clear_pending (EV_A_ (W)w);	2290	clear_pending (EV_A_ (W)w);
2125	if (expect_false (!ev_is_active (w)))	2291	if (expect_false (!ev_is_active (w)))
2126	return;	2292	return;
2127		2293
		2294	EV_FREQUENT_CHECK;
		2295
2128	{	2296	{
2129	int active = ev_active (w);	2297	int active = ev_active (w);
2130		2298
2131	assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));	2299	assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132		2300
		2301	--periodiccnt;
		2302
2133	if (expect_true (active < periodiccnt + HEAP0 - 1))	2303	if (expect_true (active < periodiccnt + HEAP0))
2134	{	2304	{
2135	periodics [active] = periodics [periodiccnt + HEAP0 - 1];	2305	periodics [active] = periodics [periodiccnt + HEAP0];
2136	adjustheap (periodics, periodiccnt, active);	2306	adjustheap (periodics, periodiccnt, active);
2137	}	2307	}
2138
2139	--periodiccnt;
2140	}	2308	}
		2309
		2310	EV_FREQUENT_CHECK;
2141		2311
2142	ev_stop (EV_A_ (W)w);	2312	ev_stop (EV_A_ (W)w);
2143	}	2313	}
2144		2314
2145	void noinline	2315	void noinline
…		…
2165	return;	2335	return;
2166		2336
2167	assert (("ev_signal_start called with illegal signal number", w->signum > 0));	2337	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168		2338
2169	evpipe_init (EV_A);	2339	evpipe_init (EV_A);
		2340
		2341	EV_FREQUENT_CHECK;
2170		2342
2171	{	2343	{
2172	#ifndef _WIN32	2344	#ifndef _WIN32
2173	sigset_t full, prev;	2345	sigset_t full, prev;
2174	sigfillset (&full);	2346	sigfillset (&full);
…		…
2195	sigfillset (&sa.sa_mask);	2367	sigfillset (&sa.sa_mask);
2196	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */	2368	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2197	sigaction (w->signum, &sa, 0);	2369	sigaction (w->signum, &sa, 0);
2198	#endif	2370	#endif
2199	}	2371	}
		2372
		2373	EV_FREQUENT_CHECK;
2200	}	2374	}
2201		2375
2202	void noinline	2376	void noinline
2203	ev_signal_stop (EV_P_ ev_signal *w)	2377	ev_signal_stop (EV_P_ ev_signal *w)
2204	{	2378	{
2205	clear_pending (EV_A_ (W)w);	2379	clear_pending (EV_A_ (W)w);
2206	if (expect_false (!ev_is_active (w)))	2380	if (expect_false (!ev_is_active (w)))
2207	return;	2381	return;
2208		2382
		2383	EV_FREQUENT_CHECK;
		2384
2209	wlist_del (&signals [w->signum - 1].head, (WL)w);	2385	wlist_del (&signals [w->signum - 1].head, (WL)w);
2210	ev_stop (EV_A_ (W)w);	2386	ev_stop (EV_A_ (W)w);
2211		2387
2212	if (!signals [w->signum - 1].head)	2388	if (!signals [w->signum - 1].head)
2213	signal (w->signum, SIG_DFL);	2389	signal (w->signum, SIG_DFL);
		2390
		2391	EV_FREQUENT_CHECK;
2214	}	2392	}
2215		2393
2216	void	2394	void
2217	ev_child_start (EV_P_ ev_child *w)	2395	ev_child_start (EV_P_ ev_child *w)
2218	{	2396	{
…		…
2220	assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));	2398	assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2221	#endif	2399	#endif
2222	if (expect_false (ev_is_active (w)))	2400	if (expect_false (ev_is_active (w)))
2223	return;	2401	return;
2224		2402
		2403	EV_FREQUENT_CHECK;
		2404
2225	ev_start (EV_A_ (W)w, 1);	2405	ev_start (EV_A_ (W)w, 1);
2226	wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	2406	wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
		2407
		2408	EV_FREQUENT_CHECK;
2227	}	2409	}
2228		2410
2229	void	2411	void
2230	ev_child_stop (EV_P_ ev_child *w)	2412	ev_child_stop (EV_P_ ev_child *w)
2231	{	2413	{
2232	clear_pending (EV_A_ (W)w);	2414	clear_pending (EV_A_ (W)w);
2233	if (expect_false (!ev_is_active (w)))	2415	if (expect_false (!ev_is_active (w)))
2234	return;	2416	return;
2235		2417
		2418	EV_FREQUENT_CHECK;
		2419
2236	wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	2420	wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237	ev_stop (EV_A_ (W)w);	2421	ev_stop (EV_A_ (W)w);
		2422
		2423	EV_FREQUENT_CHECK;
2238	}	2424	}
2239		2425
2240	#if EV_STAT_ENABLE	2426	#if EV_STAT_ENABLE
2241		2427
2242	# ifdef _WIN32	2428	# ifdef _WIN32
…		…
2311		2497
2312	static void noinline	2498	static void noinline
2313	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2499	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2314	{	2500	{
2315	if (slot < 0)	2501	if (slot < 0)
2316	/* overflow, need to check for all hahs slots */	2502	/* overflow, need to check for all hash slots */
2317	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2503	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2318	infy_wd (EV_A_ slot, wd, ev);	2504	infy_wd (EV_A_ slot, wd, ev);
2319	else	2505	else
2320	{	2506	{
2321	WL w_;	2507	WL w_;
…		…
2355	infy_init (EV_P)	2541	infy_init (EV_P)
2356	{	2542	{
2357	if (fs_fd != -2)	2543	if (fs_fd != -2)
2358	return;	2544	return;
2359		2545
		2546	/* kernels < 2.6.25 are borked
		2547	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2548	*/
		2549	{
		2550	struct utsname buf;
		2551	int major, minor, micro;
		2552
		2553	fs_fd = -1;
		2554
		2555	if (uname (&buf))
		2556	return;
		2557
		2558	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2559	return;
		2560
		2561	if (major < 2
		2562	\|\| (major == 2 && minor < 6)
		2563	\|\| (major == 2 && minor == 6 && micro < 25))
		2564	return;
		2565	}
		2566
2360	fs_fd = inotify_init ();	2567	fs_fd = inotify_init ();
2361		2568
2362	if (fs_fd >= 0)	2569	if (fs_fd >= 0)
2363	{	2570	{
2364	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	2571	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
…		…
2393	if (fs_fd >= 0)	2600	if (fs_fd >= 0)
2394	infy_add (EV_A_ w); /* re-add, no matter what */	2601	infy_add (EV_A_ w); /* re-add, no matter what */
2395	else	2602	else
2396	ev_timer_start (EV_A_ &w->timer);	2603	ev_timer_start (EV_A_ &w->timer);
2397	}	2604	}
2398
2399	}	2605	}
2400	}	2606	}
2401		2607
		2608	#endif
		2609
		2610	#ifdef _WIN32
		2611	# define EV_LSTAT(p,b) _stati64 (p, b)
		2612	#else
		2613	# define EV_LSTAT(p,b) lstat (p, b)
2402	#endif	2614	#endif
2403		2615
2404	void	2616	void
2405	ev_stat_stat (EV_P_ ev_stat *w)	2617	ev_stat_stat (EV_P_ ev_stat *w)
2406	{	2618	{
…		…
2433	\|\| w->prev.st_atime != w->attr.st_atime	2645	\|\| w->prev.st_atime != w->attr.st_atime
2434	\|\| w->prev.st_mtime != w->attr.st_mtime	2646	\|\| w->prev.st_mtime != w->attr.st_mtime
2435	\|\| w->prev.st_ctime != w->attr.st_ctime	2647	\|\| w->prev.st_ctime != w->attr.st_ctime
2436	) {	2648	) {
2437	#if EV_USE_INOTIFY	2649	#if EV_USE_INOTIFY
		2650	if (fs_fd >= 0)
		2651	{
2438	infy_del (EV_A_ w);	2652	infy_del (EV_A_ w);
2439	infy_add (EV_A_ w);	2653	infy_add (EV_A_ w);
2440	ev_stat_stat (EV_A_ w); /* avoid race... */	2654	ev_stat_stat (EV_A_ w); /* avoid race... */
		2655	}
2441	#endif	2656	#endif
2442		2657
2443	ev_feed_event (EV_A_ w, EV_STAT);	2658	ev_feed_event (EV_A_ w, EV_STAT);
2444	}	2659	}
2445	}	2660	}
…		…
2470	else	2685	else
2471	#endif	2686	#endif
2472	ev_timer_start (EV_A_ &w->timer);	2687	ev_timer_start (EV_A_ &w->timer);
2473		2688
2474	ev_start (EV_A_ (W)w, 1);	2689	ev_start (EV_A_ (W)w, 1);
		2690
		2691	EV_FREQUENT_CHECK;
2475	}	2692	}
2476		2693
2477	void	2694	void
2478	ev_stat_stop (EV_P_ ev_stat *w)	2695	ev_stat_stop (EV_P_ ev_stat *w)
2479	{	2696	{
2480	clear_pending (EV_A_ (W)w);	2697	clear_pending (EV_A_ (W)w);
2481	if (expect_false (!ev_is_active (w)))	2698	if (expect_false (!ev_is_active (w)))
2482	return;	2699	return;
2483		2700
		2701	EV_FREQUENT_CHECK;
		2702
2484	#if EV_USE_INOTIFY	2703	#if EV_USE_INOTIFY
2485	infy_del (EV_A_ w);	2704	infy_del (EV_A_ w);
2486	#endif	2705	#endif
2487	ev_timer_stop (EV_A_ &w->timer);	2706	ev_timer_stop (EV_A_ &w->timer);
2488		2707
2489	ev_stop (EV_A_ (W)w);	2708	ev_stop (EV_A_ (W)w);
		2709
		2710	EV_FREQUENT_CHECK;
2490	}	2711	}
2491	#endif	2712	#endif
2492		2713
2493	#if EV_IDLE_ENABLE	2714	#if EV_IDLE_ENABLE
2494	void	2715	void
…		…
2496	{	2717	{
2497	if (expect_false (ev_is_active (w)))	2718	if (expect_false (ev_is_active (w)))
2498	return;	2719	return;
2499		2720
2500	pri_adjust (EV_A_ (W)w);	2721	pri_adjust (EV_A_ (W)w);
		2722
		2723	EV_FREQUENT_CHECK;
2501		2724
2502	{	2725	{
2503	int active = ++idlecnt [ABSPRI (w)];	2726	int active = ++idlecnt [ABSPRI (w)];
2504		2727
2505	++idleall;	2728	++idleall;
2506	ev_start (EV_A_ (W)w, active);	2729	ev_start (EV_A_ (W)w, active);
2507		2730
2508	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);	2731	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2509	idles [ABSPRI (w)][active - 1] = w;	2732	idles [ABSPRI (w)][active - 1] = w;
2510	}	2733	}
		2734
		2735	EV_FREQUENT_CHECK;
2511	}	2736	}
2512		2737
2513	void	2738	void
2514	ev_idle_stop (EV_P_ ev_idle *w)	2739	ev_idle_stop (EV_P_ ev_idle *w)
2515	{	2740	{
2516	clear_pending (EV_A_ (W)w);	2741	clear_pending (EV_A_ (W)w);
2517	if (expect_false (!ev_is_active (w)))	2742	if (expect_false (!ev_is_active (w)))
2518	return;	2743	return;
2519		2744
		2745	EV_FREQUENT_CHECK;
		2746
2520	{	2747	{
2521	int active = ev_active (w);	2748	int active = ev_active (w);
2522		2749
2523	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];	2750	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524	ev_active (idles [ABSPRI (w)][active - 1]) = active;	2751	ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525		2752
2526	ev_stop (EV_A_ (W)w);	2753	ev_stop (EV_A_ (W)w);
2527	--idleall;	2754	--idleall;
2528	}	2755	}
		2756
		2757	EV_FREQUENT_CHECK;
2529	}	2758	}
2530	#endif	2759	#endif
2531		2760
2532	void	2761	void
2533	ev_prepare_start (EV_P_ ev_prepare *w)	2762	ev_prepare_start (EV_P_ ev_prepare *w)
2534	{	2763	{
2535	if (expect_false (ev_is_active (w)))	2764	if (expect_false (ev_is_active (w)))
2536	return;	2765	return;
		2766
		2767	EV_FREQUENT_CHECK;
2537		2768
2538	ev_start (EV_A_ (W)w, ++preparecnt);	2769	ev_start (EV_A_ (W)w, ++preparecnt);
2539	array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);	2770	array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540	prepares [preparecnt - 1] = w;	2771	prepares [preparecnt - 1] = w;
		2772
		2773	EV_FREQUENT_CHECK;
2541	}	2774	}
2542		2775
2543	void	2776	void
2544	ev_prepare_stop (EV_P_ ev_prepare *w)	2777	ev_prepare_stop (EV_P_ ev_prepare *w)
2545	{	2778	{
2546	clear_pending (EV_A_ (W)w);	2779	clear_pending (EV_A_ (W)w);
2547	if (expect_false (!ev_is_active (w)))	2780	if (expect_false (!ev_is_active (w)))
2548	return;	2781	return;
2549		2782
		2783	EV_FREQUENT_CHECK;
		2784
2550	{	2785	{
2551	int active = ev_active (w);	2786	int active = ev_active (w);
2552		2787
2553	prepares [active - 1] = prepares [--preparecnt];	2788	prepares [active - 1] = prepares [--preparecnt];
2554	ev_active (prepares [active - 1]) = active;	2789	ev_active (prepares [active - 1]) = active;
2555	}	2790	}
2556		2791
2557	ev_stop (EV_A_ (W)w);	2792	ev_stop (EV_A_ (W)w);
		2793
		2794	EV_FREQUENT_CHECK;
2558	}	2795	}
2559		2796
2560	void	2797	void
2561	ev_check_start (EV_P_ ev_check *w)	2798	ev_check_start (EV_P_ ev_check *w)
2562	{	2799	{
2563	if (expect_false (ev_is_active (w)))	2800	if (expect_false (ev_is_active (w)))
2564	return;	2801	return;
		2802
		2803	EV_FREQUENT_CHECK;
2565		2804
2566	ev_start (EV_A_ (W)w, ++checkcnt);	2805	ev_start (EV_A_ (W)w, ++checkcnt);
2567	array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);	2806	array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568	checks [checkcnt - 1] = w;	2807	checks [checkcnt - 1] = w;
		2808
		2809	EV_FREQUENT_CHECK;
2569	}	2810	}
2570		2811
2571	void	2812	void
2572	ev_check_stop (EV_P_ ev_check *w)	2813	ev_check_stop (EV_P_ ev_check *w)
2573	{	2814	{
2574	clear_pending (EV_A_ (W)w);	2815	clear_pending (EV_A_ (W)w);
2575	if (expect_false (!ev_is_active (w)))	2816	if (expect_false (!ev_is_active (w)))
2576	return;	2817	return;
2577		2818
		2819	EV_FREQUENT_CHECK;
		2820
2578	{	2821	{
2579	int active = ev_active (w);	2822	int active = ev_active (w);
2580		2823
2581	checks [active - 1] = checks [--checkcnt];	2824	checks [active - 1] = checks [--checkcnt];
2582	ev_active (checks [active - 1]) = active;	2825	ev_active (checks [active - 1]) = active;
2583	}	2826	}
2584		2827
2585	ev_stop (EV_A_ (W)w);	2828	ev_stop (EV_A_ (W)w);
		2829
		2830	EV_FREQUENT_CHECK;
2586	}	2831	}
2587		2832
2588	#if EV_EMBED_ENABLE	2833	#if EV_EMBED_ENABLE
2589	void noinline	2834	void noinline
2590	ev_embed_sweep (EV_P_ ev_embed *w)	2835	ev_embed_sweep (EV_P_ ev_embed *w)
…		…
2617	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2862	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2618	}	2863	}
2619	}	2864	}
2620	}	2865	}
2621		2866
		2867	static void
		2868	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2869	{
		2870	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2871
		2872	{
		2873	struct ev_loop *loop = w->other;
		2874
		2875	ev_loop_fork (EV_A);
		2876	}
		2877	}
		2878
2622	#if 0	2879	#if 0
2623	static void	2880	static void
2624	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2881	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2625	{	2882	{
2626	ev_idle_stop (EV_A_ idle);	2883	ev_idle_stop (EV_A_ idle);
…		…
2637	struct ev_loop *loop = w->other;	2894	struct ev_loop *loop = w->other;
2638	assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));	2895	assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2639	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);	2896	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2640	}	2897	}
2641		2898
		2899	EV_FREQUENT_CHECK;
		2900
2642	ev_set_priority (&w->io, ev_priority (w));	2901	ev_set_priority (&w->io, ev_priority (w));
2643	ev_io_start (EV_A_ &w->io);	2902	ev_io_start (EV_A_ &w->io);
2644		2903
2645	ev_prepare_init (&w->prepare, embed_prepare_cb);	2904	ev_prepare_init (&w->prepare, embed_prepare_cb);
2646	ev_set_priority (&w->prepare, EV_MINPRI);	2905	ev_set_priority (&w->prepare, EV_MINPRI);
2647	ev_prepare_start (EV_A_ &w->prepare);	2906	ev_prepare_start (EV_A_ &w->prepare);
2648		2907
		2908	ev_fork_init (&w->fork, embed_fork_cb);
		2909	ev_fork_start (EV_A_ &w->fork);
		2910
2649	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2911	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2650		2912
2651	ev_start (EV_A_ (W)w, 1);	2913	ev_start (EV_A_ (W)w, 1);
		2914
		2915	EV_FREQUENT_CHECK;
2652	}	2916	}
2653		2917
2654	void	2918	void
2655	ev_embed_stop (EV_P_ ev_embed *w)	2919	ev_embed_stop (EV_P_ ev_embed *w)
2656	{	2920	{
2657	clear_pending (EV_A_ (W)w);	2921	clear_pending (EV_A_ (W)w);
2658	if (expect_false (!ev_is_active (w)))	2922	if (expect_false (!ev_is_active (w)))
2659	return;	2923	return;
2660		2924
		2925	EV_FREQUENT_CHECK;
		2926
2661	ev_io_stop (EV_A_ &w->io);	2927	ev_io_stop (EV_A_ &w->io);
2662	ev_prepare_stop (EV_A_ &w->prepare);	2928	ev_prepare_stop (EV_A_ &w->prepare);
		2929	ev_fork_stop (EV_A_ &w->fork);
2663		2930
2664	ev_stop (EV_A_ (W)w);	2931	EV_FREQUENT_CHECK;
2665	}	2932	}
2666	#endif	2933	#endif
2667		2934
2668	#if EV_FORK_ENABLE	2935	#if EV_FORK_ENABLE
2669	void	2936	void
2670	ev_fork_start (EV_P_ ev_fork *w)	2937	ev_fork_start (EV_P_ ev_fork *w)
2671	{	2938	{
2672	if (expect_false (ev_is_active (w)))	2939	if (expect_false (ev_is_active (w)))
2673	return;	2940	return;
		2941
		2942	EV_FREQUENT_CHECK;
2674		2943
2675	ev_start (EV_A_ (W)w, ++forkcnt);	2944	ev_start (EV_A_ (W)w, ++forkcnt);
2676	array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);	2945	array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677	forks [forkcnt - 1] = w;	2946	forks [forkcnt - 1] = w;
		2947
		2948	EV_FREQUENT_CHECK;
2678	}	2949	}
2679		2950
2680	void	2951	void
2681	ev_fork_stop (EV_P_ ev_fork *w)	2952	ev_fork_stop (EV_P_ ev_fork *w)
2682	{	2953	{
2683	clear_pending (EV_A_ (W)w);	2954	clear_pending (EV_A_ (W)w);
2684	if (expect_false (!ev_is_active (w)))	2955	if (expect_false (!ev_is_active (w)))
2685	return;	2956	return;
2686		2957
		2958	EV_FREQUENT_CHECK;
		2959
2687	{	2960	{
2688	int active = ev_active (w);	2961	int active = ev_active (w);
2689		2962
2690	forks [active - 1] = forks [--forkcnt];	2963	forks [active - 1] = forks [--forkcnt];
2691	ev_active (forks [active - 1]) = active;	2964	ev_active (forks [active - 1]) = active;
2692	}	2965	}
2693		2966
2694	ev_stop (EV_A_ (W)w);	2967	ev_stop (EV_A_ (W)w);
		2968
		2969	EV_FREQUENT_CHECK;
2695	}	2970	}
2696	#endif	2971	#endif
2697		2972
2698	#if EV_ASYNC_ENABLE	2973	#if EV_ASYNC_ENABLE
2699	void	2974	void
…		…
2701	{	2976	{
2702	if (expect_false (ev_is_active (w)))	2977	if (expect_false (ev_is_active (w)))
2703	return;	2978	return;
2704		2979
2705	evpipe_init (EV_A);	2980	evpipe_init (EV_A);
		2981
		2982	EV_FREQUENT_CHECK;
2706		2983
2707	ev_start (EV_A_ (W)w, ++asynccnt);	2984	ev_start (EV_A_ (W)w, ++asynccnt);
2708	array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);	2985	array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709	asyncs [asynccnt - 1] = w;	2986	asyncs [asynccnt - 1] = w;
		2987
		2988	EV_FREQUENT_CHECK;
2710	}	2989	}
2711		2990
2712	void	2991	void
2713	ev_async_stop (EV_P_ ev_async *w)	2992	ev_async_stop (EV_P_ ev_async *w)
2714	{	2993	{
2715	clear_pending (EV_A_ (W)w);	2994	clear_pending (EV_A_ (W)w);
2716	if (expect_false (!ev_is_active (w)))	2995	if (expect_false (!ev_is_active (w)))
2717	return;	2996	return;
2718		2997
		2998	EV_FREQUENT_CHECK;
		2999
2719	{	3000	{
2720	int active = ev_active (w);	3001	int active = ev_active (w);
2721		3002
2722	asyncs [active - 1] = asyncs [--asynccnt];	3003	asyncs [active - 1] = asyncs [--asynccnt];
2723	ev_active (asyncs [active - 1]) = active;	3004	ev_active (asyncs [active - 1]) = active;
2724	}	3005	}
2725		3006
2726	ev_stop (EV_A_ (W)w);	3007	ev_stop (EV_A_ (W)w);
		3008
		3009	EV_FREQUENT_CHECK;
2727	}	3010	}
2728		3011
2729	void	3012	void
2730	ev_async_send (EV_P_ ev_async *w)	3013	ev_async_send (EV_P_ ev_async *w)
2731	{	3014	{
…		…
2748	once_cb (EV_P_ struct ev_once *once, int revents)	3031	once_cb (EV_P_ struct ev_once *once, int revents)
2749	{	3032	{
2750	void (cb)(int revents, void arg) = once->cb;	3033	void (cb)(int revents, void arg) = once->cb;
2751	void *arg = once->arg;	3034	void *arg = once->arg;
2752		3035
2753	ev_io_stop (EV_A_ &once->io);	3036	ev_io_stop (EV_A_ &once->io);
2754	ev_timer_stop (EV_A_ &once->to);	3037	ev_timer_stop (EV_A_ &once->to);
2755	ev_free (once);	3038	ev_free (once);
2756		3039
2757	cb (revents, arg);	3040	cb (revents, arg);
2758	}	3041	}
2759		3042
2760	static void	3043	static void
2761	once_cb_io (EV_P_ ev_io *w, int revents)	3044	once_cb_io (EV_P_ ev_io *w, int revents)
2762	{	3045	{
2763	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3046	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3047
		3048	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2764	}	3049	}
2765		3050
2766	static void	3051	static void
2767	once_cb_to (EV_P_ ev_timer *w, int revents)	3052	once_cb_to (EV_P_ ev_timer *w, int revents)
2768	{	3053	{
2769	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3054	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3055
		3056	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
2770	}	3057	}
2771		3058
2772	void	3059	void
2773	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3060	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
2774	{	3061	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs. Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs.
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC