[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.248 by root, Wed May 21 23:25:21 2008 UTC

…		…
288	# endif	288	# endif
289	#endif	289	#endif
290		290
291	/**/	291	/**/
292		292
		293	/* undefined or zero: no verification done or available */
		294	/* 1 or higher: ev_loop_verify function available */
		295	/* 2 or higher: ev_loop_verify is called frequently */
		296	#define EV_VERIFY 1
		297
		298	#if EV_VERIFY > 1
		299	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
		300	#else
		301	# define EV_FREQUENT_CHECK do { } while (0)
		302	#endif
		303
293	/*	304	/*
294	* This is used to avoid floating point rounding problems.	305	* This is used to avoid floating point rounding problems.
295	* It is added to ev_rt_now when scheduling periodics	306	* It is added to ev_rt_now when scheduling periodics
296	* to ensure progress, time-wise, even when rounding	307	* to ensure progress, time-wise, even when rounding
297	* errors are against us.	308	* errors are against us.
…		…
444	typedef struct {	455	typedef struct {
445	ev_tstamp at;	456	ev_tstamp at;
446	WT w;	457	WT w;
447	} ANHE;	458	} ANHE;
448		459
449	#define ANHE_w(he) (he).w /* access watcher, read-write */	460	#define ANHE_w(he) (he).w /* access watcher, read-write */
450	#define ANHE_at(he) (he).at /* access cached at, read-only */	461	#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 */	462	#define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452	#else	463	#else
453	typedef WT ANHE;	464	typedef WT ANHE;
454		465
455	#define ANHE_w(he) (he)	466	#define ANHE_w(he) (he)
456	#define ANHE_at(he) (he)->at	467	#define ANHE_at(he) (he)->at
457	#define ANHE_at_set(he)	468	#define ANHE_at_cache(he)
458	#endif	469	#endif
459		470
460	#if EV_MULTIPLICITY	471	#if EV_MULTIPLICITY
461		472
462	struct ev_loop	473	struct ev_loop
…		…
803	#if EV_USE_4HEAP	814	#if EV_USE_4HEAP
804		815
805	#define DHEAP 4	816	#define DHEAP 4
806	#define HEAP0 (DHEAP - 1) /* index of first element in heap */	817	#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807	#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)	818	#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808		819	#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		820
831	/* away from the root */	821	/* away from the root */
832	void inline_speed	822	void inline_speed
833	downheap (ANHE *heap, int N, int k)	823	downheap (ANHE *heap, int N, int k)
834	{	824	{
…		…
837		827
838	for (;;)	828	for (;;)
839	{	829	{
840	ev_tstamp minat;	830	ev_tstamp minat;
841	ANHE *minpos;	831	ANHE *minpos;
842	ANHE pos = heap + DHEAP (k - HEAP0) + HEAP0;	832	ANHE pos = heap + DHEAP (k - HEAP0) + HEAP0 + 1;
843		833
844	// find minimum child	834	/* find minimum child */
845	if (expect_true (pos + DHEAP - 1 < E))	835	if (expect_true (pos + DHEAP - 1 < E))
846	{	836	{
847	/* fast path / (minpos = pos + 0), (minat = ANHE_at (minpos));	837	/* fast path / (minpos = pos + 0), (minat = ANHE_at (minpos));
848	if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));	838	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));	839	if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
…		…
870		860
871	heap [k] = he;	861	heap [k] = he;
872	ev_active (ANHE_w (he)) = k;	862	ev_active (ANHE_w (he)) = k;
873	}	863	}
874		864
875	#else // 4HEAP	865	#else /* 4HEAP */
876		866
877	#define HEAP0 1	867	#define HEAP0 1
878	#define HPARENT(k) ((k) >> 1)	868	#define HPARENT(k) ((k) >> 1)
879		869	#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		870
903	/* away from the root */	871	/* away from the root */
904	void inline_speed	872	void inline_speed
905	downheap (ANHE *heap, int N, int k)	873	downheap (ANHE *heap, int N, int k)
906	{	874	{
…		…
908		876
909	for (;;)	877	for (;;)
910	{	878	{
911	int c = k << 1;	879	int c = k << 1;
912		880
913	if (c > N)	881	if (c > N + HEAP0 - 1)
914	break;	882	break;
915		883
916	c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])	884	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917	? 1 : 0;	885	? 1 : 0;
918		886
919	if (ANHE_at (he) <= ANHE_at (heap [c]))	887	if (ANHE_at (he) <= ANHE_at (heap [c]))
920	break;	888	break;
921		889
…		…
928	heap [k] = he;	896	heap [k] = he;
929	ev_active (ANHE_w (he)) = k;	897	ev_active (ANHE_w (he)) = k;
930	}	898	}
931	#endif	899	#endif
932		900
		901	/* towards the root */
		902	void inline_speed
		903	upheap (ANHE *heap, int k)
		904	{
		905	ANHE he = heap [k];
		906
		907	for (;;)
		908	{
		909	int p = HPARENT (k);
		910
		911	if (UPHEAP_DONE (p, k) \|\| ANHE_at (heap [p]) <= ANHE_at (he))
		912	break;
		913
		914	heap [k] = heap [p];
		915	ev_active (ANHE_w (heap [k])) = k;
		916	k = p;
		917	}
		918
		919	heap [k] = he;
		920	ev_active (ANHE_w (he)) = k;
		921	}
		922
933	void inline_size	923	void inline_size
934	adjustheap (ANHE *heap, int N, int k)	924	adjustheap (ANHE *heap, int N, int k)
935	{	925	{
936	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))	926	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937	upheap (heap, k);	927	upheap (heap, k);
938	else	928	else
939	downheap (heap, N, k);	929	downheap (heap, N, k);
940	}	930	}
		931
		932	/* rebuild the heap: this function is used only once and executed rarely */
		933	void inline_size
		934	reheap (ANHE *heap, int N)
		935	{
		936	int i;
		937	/* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
		938	/* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
		939	for (i = 0; i < N; ++i)
		940	upheap (heap, i + HEAP0);
		941	}
		942
		943	#if EV_VERIFY
		944	static void
		945	checkheap (ANHE *heap, int N)
		946	{
		947	int i;
		948
		949	for (i = HEAP0; i < N + HEAP0; ++i)
		950	{
		951	assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
		952	assert (("heap condition violated", i == HEAP0 \|\| ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
		953	assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
		954	}
		955	}
		956	#endif
941		957
942	/*****************************************************************************/	958	/*****************************************************************************/
943		959
944	typedef struct	960	typedef struct
945	{	961	{
…		…
1489	void	1505	void
1490	ev_loop_fork (EV_P)	1506	ev_loop_fork (EV_P)
1491	{	1507	{
1492	postfork = 1; /* must be in line with ev_default_fork */	1508	postfork = 1; /* must be in line with ev_default_fork */
1493	}	1509	}
		1510
		1511	#if EV_VERIFY
		1512	static void
		1513	array_check (W **ws, int cnt)
		1514	{
		1515	while (cnt--)
		1516	assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
		1517	}
		1518
		1519	static void
		1520	ev_loop_verify (EV_P)
		1521	{
		1522	int i;
		1523
		1524	checkheap (timers, timercnt);
		1525	#if EV_PERIODIC_ENABLE
		1526	checkheap (periodics, periodiccnt);
		1527	#endif
		1528
		1529	#if EV_IDLE_ENABLE
		1530	for (i = NUMPRI; i--; )
		1531	array_check ((W **)idles [i], idlecnt [i]);
		1532	#endif
		1533	#if EV_FORK_ENABLE
		1534	array_check ((W **)forks, forkcnt);
		1535	#endif
		1536	array_check ((W **)prepares, preparecnt);
		1537	array_check ((W **)checks, checkcnt);
		1538	#if EV_ASYNC_ENABLE
		1539	array_check ((W **)asyncs, asynccnt);
		1540	#endif
		1541	}
		1542	#endif
		1543
1494	#endif	1544	#endif
1495		1545
1496	#if EV_MULTIPLICITY	1546	#if EV_MULTIPLICITY
1497	struct ev_loop *	1547	struct ev_loop *
1498	ev_default_loop_init (unsigned int flags)	1548	ev_default_loop_init (unsigned int flags)
…		…
1564	void inline_speed	1614	void inline_speed
1565	call_pending (EV_P)	1615	call_pending (EV_P)
1566	{	1616	{
1567	int pri;	1617	int pri;
1568		1618
		1619	EV_FREQUENT_CHECK;
		1620
1569	for (pri = NUMPRI; pri--; )	1621	for (pri = NUMPRI; pri--; )
1570	while (pendingcnt [pri])	1622	while (pendingcnt [pri])
1571	{	1623	{
1572	ANPENDING *p = pendings [pri] + --pendingcnt [pri];	1624	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1573		1625
…		…
1577		1629
1578	p->w->pending = 0;	1630	p->w->pending = 0;
1579	EV_CB_INVOKE (p->w, p->events);	1631	EV_CB_INVOKE (p->w, p->events);
1580	}	1632	}
1581	}	1633	}
		1634
		1635	EV_FREQUENT_CHECK;
1582	}	1636	}
1583		1637
1584	#if EV_IDLE_ENABLE	1638	#if EV_IDLE_ENABLE
1585	void inline_size	1639	void inline_size
1586	idle_reify (EV_P)	1640	idle_reify (EV_P)
…		…
1605	#endif	1659	#endif
1606		1660
1607	void inline_size	1661	void inline_size
1608	timers_reify (EV_P)	1662	timers_reify (EV_P)
1609	{	1663	{
		1664	EV_FREQUENT_CHECK;
		1665
1610	while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)	1666	while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611	{	1667	{
1612	ev_timer w = (ev_timer )ANHE_w (timers [HEAP0]);	1668	ev_timer w = (ev_timer )ANHE_w (timers [HEAP0]);
1613		1669
1614	/assert (("inactive timer on timer heap detected", ev_is_active (w)));/	1670	/assert (("inactive timer on timer heap detected", ev_is_active (w)));/
…		…
1620	if (ev_at (w) < mn_now)	1676	if (ev_at (w) < mn_now)
1621	ev_at (w) = mn_now;	1677	ev_at (w) = mn_now;
1622		1678
1623	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));	1679	assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624		1680
1625	ANHE_at_set (timers [HEAP0]);	1681	ANHE_at_cache (timers [HEAP0]);
1626	downheap (timers, timercnt, HEAP0);	1682	downheap (timers, timercnt, HEAP0);
1627	}	1683	}
1628	else	1684	else
1629	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */	1685	ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630		1686
		1687	EV_FREQUENT_CHECK;
1631	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);	1688	ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632	}	1689	}
1633	}	1690	}
1634		1691
1635	#if EV_PERIODIC_ENABLE	1692	#if EV_PERIODIC_ENABLE
1636	void inline_size	1693	void inline_size
1637	periodics_reify (EV_P)	1694	periodics_reify (EV_P)
1638	{	1695	{
		1696	EV_FREQUENT_CHECK;
1639	while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)	1697	while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640	{	1698	{
1641	ev_periodic w = (ev_periodic )ANHE_w (periodics [HEAP0]);	1699	ev_periodic w = (ev_periodic )ANHE_w (periodics [HEAP0]);
1642		1700
1643	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/	1701	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/
…		…
1647	{	1705	{
1648	ev_at (w) = w->reschedule_cb (w, ev_rt_now);	1706	ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649		1707
1650	assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));	1708	assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651		1709
1652	ANHE_at_set (periodics [HEAP0]);	1710	ANHE_at_cache (periodics [HEAP0]);
1653	downheap (periodics, periodiccnt, HEAP0);	1711	downheap (periodics, periodiccnt, HEAP0);
		1712	EV_FREQUENT_CHECK;
1654	}	1713	}
1655	else if (w->interval)	1714	else if (w->interval)
1656	{	1715	{
1657	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	1716	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1658	/* if next trigger time is not sufficiently in the future, put it there */	1717	/* if next trigger time is not sufficiently in the future, put it there */
…		…
1666	/* has effectively asked to get triggered more often than possible */	1725	/* has effectively asked to get triggered more often than possible */
1667	if (ev_at (w) < ev_rt_now)	1726	if (ev_at (w) < ev_rt_now)
1668	ev_at (w) = ev_rt_now;	1727	ev_at (w) = ev_rt_now;
1669	}	1728	}
1670		1729
1671	ANHE_at_set (periodics [HEAP0]);	1730	ANHE_at_cache (periodics [HEAP0]);
1672	downheap (periodics, periodiccnt, HEAP0);	1731	downheap (periodics, periodiccnt, HEAP0);
1673	}	1732	}
1674	else	1733	else
1675	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1734	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676		1735
		1736	EV_FREQUENT_CHECK;
1677	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);	1737	ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678	}	1738	}
1679	}	1739	}
1680		1740
1681	static void noinline	1741	static void noinline
…		…
1691	if (w->reschedule_cb)	1751	if (w->reschedule_cb)
1692	ev_at (w) = w->reschedule_cb (w, ev_rt_now);	1752	ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693	else if (w->interval)	1753	else if (w->interval)
1694	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	1754	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695		1755
1696	ANHE_at_set (periodics [i]);	1756	ANHE_at_cache (periodics [i]);
1697	}	1757	}
1698		1758
1699	/* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */	1759	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	}	1760	}
1704	#endif	1761	#endif
1705		1762
1706	void inline_speed	1763	void inline_speed
1707	time_update (EV_P_ ev_tstamp max_block)	1764	time_update (EV_P_ ev_tstamp max_block)
…		…
1765	/* adjust timers. this is easy, as the offset is the same for all of them */	1822	/* adjust timers. this is easy, as the offset is the same for all of them */
1766	for (i = 0; i < timercnt; ++i)	1823	for (i = 0; i < timercnt; ++i)
1767	{	1824	{
1768	ANHE *he = timers + i + HEAP0;	1825	ANHE *he = timers + i + HEAP0;
1769	ANHE_w (*he)->at += ev_rt_now - mn_now;	1826	ANHE_w (*he)->at += ev_rt_now - mn_now;
1770	ANHE_at_set (*he);	1827	ANHE_at_cache (*he);
1771	}	1828	}
1772	}	1829	}
1773		1830
1774	mn_now = ev_rt_now;	1831	mn_now = ev_rt_now;
1775	}	1832	}
…		…
2000	if (expect_false (ev_is_active (w)))	2057	if (expect_false (ev_is_active (w)))
2001	return;	2058	return;
2002		2059
2003	assert (("ev_io_start called with negative fd", fd >= 0));	2060	assert (("ev_io_start called with negative fd", fd >= 0));
2004		2061
		2062	EV_FREQUENT_CHECK;
		2063
2005	ev_start (EV_A_ (W)w, 1);	2064	ev_start (EV_A_ (W)w, 1);
2006	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2065	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
2007	wlist_add (&anfds[fd].head, (WL)w);	2066	wlist_add (&anfds[fd].head, (WL)w);
2008		2067
2009	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2068	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2010	w->events &= ~EV_IOFDSET;	2069	w->events &= ~EV_IOFDSET;
		2070
		2071	EV_FREQUENT_CHECK;
2011	}	2072	}
2012		2073
2013	void noinline	2074	void noinline
2014	ev_io_stop (EV_P_ ev_io *w)	2075	ev_io_stop (EV_P_ ev_io *w)
2015	{	2076	{
…		…
2017	if (expect_false (!ev_is_active (w)))	2078	if (expect_false (!ev_is_active (w)))
2018	return;	2079	return;
2019		2080
2020	assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));	2081	assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2021		2082
		2083	EV_FREQUENT_CHECK;
		2084
2022	wlist_del (&anfds[w->fd].head, (WL)w);	2085	wlist_del (&anfds[w->fd].head, (WL)w);
2023	ev_stop (EV_A_ (W)w);	2086	ev_stop (EV_A_ (W)w);
2024		2087
2025	fd_change (EV_A_ w->fd, 1);	2088	fd_change (EV_A_ w->fd, 1);
		2089
		2090	EV_FREQUENT_CHECK;
2026	}	2091	}
2027		2092
2028	void noinline	2093	void noinline
2029	ev_timer_start (EV_P_ ev_timer *w)	2094	ev_timer_start (EV_P_ ev_timer *w)
2030	{	2095	{
…		…
2033		2098
2034	ev_at (w) += mn_now;	2099	ev_at (w) += mn_now;
2035		2100
2036	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));	2101	assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2037		2102
		2103	EV_FREQUENT_CHECK;
		2104
		2105	++timercnt;
2038	ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);	2106	ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039	array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);	2107	array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040	ANHE_w (timers [ev_active (w)]) = (WT)w;	2108	ANHE_w (timers [ev_active (w)]) = (WT)w;
2041	ANHE_at_set (timers [ev_active (w)]);	2109	ANHE_at_cache (timers [ev_active (w)]);
2042	upheap (timers, ev_active (w));	2110	upheap (timers, ev_active (w));
		2111
		2112	EV_FREQUENT_CHECK;
2043		2113
2044	/assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));/	2114	/assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));/
2045	}	2115	}
2046		2116
2047	void noinline	2117	void noinline
…		…
2049	{	2119	{
2050	clear_pending (EV_A_ (W)w);	2120	clear_pending (EV_A_ (W)w);
2051	if (expect_false (!ev_is_active (w)))	2121	if (expect_false (!ev_is_active (w)))
2052	return;	2122	return;
2053		2123
		2124	EV_FREQUENT_CHECK;
		2125
2054	{	2126	{
2055	int active = ev_active (w);	2127	int active = ev_active (w);
2056		2128
2057	assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));	2129	assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058		2130
		2131	--timercnt;
		2132
2059	if (expect_true (active < timercnt + HEAP0 - 1))	2133	if (expect_true (active < timercnt + HEAP0))
2060	{	2134	{
2061	timers [active] = timers [timercnt + HEAP0 - 1];	2135	timers [active] = timers [timercnt + HEAP0];
2062	adjustheap (timers, timercnt, active);	2136	adjustheap (timers, timercnt, active);
2063	}	2137	}
2064
2065	--timercnt;
2066	}	2138	}
		2139
		2140	EV_FREQUENT_CHECK;
2067		2141
2068	ev_at (w) -= mn_now;	2142	ev_at (w) -= mn_now;
2069		2143
2070	ev_stop (EV_A_ (W)w);	2144	ev_stop (EV_A_ (W)w);
2071	}	2145	}
2072		2146
2073	void noinline	2147	void noinline
2074	ev_timer_again (EV_P_ ev_timer *w)	2148	ev_timer_again (EV_P_ ev_timer *w)
2075	{	2149	{
		2150	EV_FREQUENT_CHECK;
		2151
2076	if (ev_is_active (w))	2152	if (ev_is_active (w))
2077	{	2153	{
2078	if (w->repeat)	2154	if (w->repeat)
2079	{	2155	{
2080	ev_at (w) = mn_now + w->repeat;	2156	ev_at (w) = mn_now + w->repeat;
2081	ANHE_at_set (timers [ev_active (w)]);	2157	ANHE_at_cache (timers [ev_active (w)]);
2082	adjustheap (timers, timercnt, ev_active (w));	2158	adjustheap (timers, timercnt, ev_active (w));
2083	}	2159	}
2084	else	2160	else
2085	ev_timer_stop (EV_A_ w);	2161	ev_timer_stop (EV_A_ w);
2086	}	2162	}
2087	else if (w->repeat)	2163	else if (w->repeat)
2088	{	2164	{
2089	ev_at (w) = w->repeat;	2165	ev_at (w) = w->repeat;
2090	ev_timer_start (EV_A_ w);	2166	ev_timer_start (EV_A_ w);
2091	}	2167	}
		2168
		2169	EV_FREQUENT_CHECK;
2092	}	2170	}
2093		2171
2094	#if EV_PERIODIC_ENABLE	2172	#if EV_PERIODIC_ENABLE
2095	void noinline	2173	void noinline
2096	ev_periodic_start (EV_P_ ev_periodic *w)	2174	ev_periodic_start (EV_P_ ev_periodic *w)
…		…
2107	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;	2185	ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108	}	2186	}
2109	else	2187	else
2110	ev_at (w) = w->offset;	2188	ev_at (w) = w->offset;
2111		2189
		2190	EV_FREQUENT_CHECK;
		2191
		2192	++periodiccnt;
2112	ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);	2193	ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113	array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);	2194	array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114	ANHE_w (periodics [ev_active (w)]) = (WT)w;	2195	ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115	ANHE_at_set (periodics [ev_active (w)]);	2196	ANHE_at_cache (periodics [ev_active (w)]);
2116	upheap (periodics, ev_active (w));	2197	upheap (periodics, ev_active (w));
		2198
		2199	EV_FREQUENT_CHECK;
2117		2200
2118	/assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));/	2201	/assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));/
2119	}	2202	}
2120		2203
2121	void noinline	2204	void noinline
…		…
2123	{	2206	{
2124	clear_pending (EV_A_ (W)w);	2207	clear_pending (EV_A_ (W)w);
2125	if (expect_false (!ev_is_active (w)))	2208	if (expect_false (!ev_is_active (w)))
2126	return;	2209	return;
2127		2210
		2211	EV_FREQUENT_CHECK;
		2212
2128	{	2213	{
2129	int active = ev_active (w);	2214	int active = ev_active (w);
2130		2215
2131	assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));	2216	assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132		2217
		2218	--periodiccnt;
		2219
2133	if (expect_true (active < periodiccnt + HEAP0 - 1))	2220	if (expect_true (active < periodiccnt + HEAP0))
2134	{	2221	{
2135	periodics [active] = periodics [periodiccnt + HEAP0 - 1];	2222	periodics [active] = periodics [periodiccnt + HEAP0];
2136	adjustheap (periodics, periodiccnt, active);	2223	adjustheap (periodics, periodiccnt, active);
2137	}	2224	}
2138
2139	--periodiccnt;
2140	}	2225	}
		2226
		2227	EV_FREQUENT_CHECK;
2141		2228
2142	ev_stop (EV_A_ (W)w);	2229	ev_stop (EV_A_ (W)w);
2143	}	2230	}
2144		2231
2145	void noinline	2232	void noinline
…		…
2165	return;	2252	return;
2166		2253
2167	assert (("ev_signal_start called with illegal signal number", w->signum > 0));	2254	assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168		2255
2169	evpipe_init (EV_A);	2256	evpipe_init (EV_A);
		2257
		2258	EV_FREQUENT_CHECK;
2170		2259
2171	{	2260	{
2172	#ifndef _WIN32	2261	#ifndef _WIN32
2173	sigset_t full, prev;	2262	sigset_t full, prev;
2174	sigfillset (&full);	2263	sigfillset (&full);
…		…
2195	sigfillset (&sa.sa_mask);	2284	sigfillset (&sa.sa_mask);
2196	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */	2285	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2197	sigaction (w->signum, &sa, 0);	2286	sigaction (w->signum, &sa, 0);
2198	#endif	2287	#endif
2199	}	2288	}
		2289
		2290	EV_FREQUENT_CHECK;
2200	}	2291	}
2201		2292
2202	void noinline	2293	void noinline
2203	ev_signal_stop (EV_P_ ev_signal *w)	2294	ev_signal_stop (EV_P_ ev_signal *w)
2204	{	2295	{
2205	clear_pending (EV_A_ (W)w);	2296	clear_pending (EV_A_ (W)w);
2206	if (expect_false (!ev_is_active (w)))	2297	if (expect_false (!ev_is_active (w)))
2207	return;	2298	return;
2208		2299
		2300	EV_FREQUENT_CHECK;
		2301
2209	wlist_del (&signals [w->signum - 1].head, (WL)w);	2302	wlist_del (&signals [w->signum - 1].head, (WL)w);
2210	ev_stop (EV_A_ (W)w);	2303	ev_stop (EV_A_ (W)w);
2211		2304
2212	if (!signals [w->signum - 1].head)	2305	if (!signals [w->signum - 1].head)
2213	signal (w->signum, SIG_DFL);	2306	signal (w->signum, SIG_DFL);
		2307
		2308	EV_FREQUENT_CHECK;
2214	}	2309	}
2215		2310
2216	void	2311	void
2217	ev_child_start (EV_P_ ev_child *w)	2312	ev_child_start (EV_P_ ev_child *w)
2218	{	2313	{
…		…
2220	assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));	2315	assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2221	#endif	2316	#endif
2222	if (expect_false (ev_is_active (w)))	2317	if (expect_false (ev_is_active (w)))
2223	return;	2318	return;
2224		2319
		2320	EV_FREQUENT_CHECK;
		2321
2225	ev_start (EV_A_ (W)w, 1);	2322	ev_start (EV_A_ (W)w, 1);
2226	wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	2323	wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
		2324
		2325	EV_FREQUENT_CHECK;
2227	}	2326	}
2228		2327
2229	void	2328	void
2230	ev_child_stop (EV_P_ ev_child *w)	2329	ev_child_stop (EV_P_ ev_child *w)
2231	{	2330	{
2232	clear_pending (EV_A_ (W)w);	2331	clear_pending (EV_A_ (W)w);
2233	if (expect_false (!ev_is_active (w)))	2332	if (expect_false (!ev_is_active (w)))
2234	return;	2333	return;
2235		2334
		2335	EV_FREQUENT_CHECK;
		2336
2236	wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	2337	wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237	ev_stop (EV_A_ (W)w);	2338	ev_stop (EV_A_ (W)w);
		2339
		2340	EV_FREQUENT_CHECK;
2238	}	2341	}
2239		2342
2240	#if EV_STAT_ENABLE	2343	#if EV_STAT_ENABLE
2241		2344
2242	# ifdef _WIN32	2345	# ifdef _WIN32
…		…
2470	else	2573	else
2471	#endif	2574	#endif
2472	ev_timer_start (EV_A_ &w->timer);	2575	ev_timer_start (EV_A_ &w->timer);
2473		2576
2474	ev_start (EV_A_ (W)w, 1);	2577	ev_start (EV_A_ (W)w, 1);
		2578
		2579	EV_FREQUENT_CHECK;
2475	}	2580	}
2476		2581
2477	void	2582	void
2478	ev_stat_stop (EV_P_ ev_stat *w)	2583	ev_stat_stop (EV_P_ ev_stat *w)
2479	{	2584	{
2480	clear_pending (EV_A_ (W)w);	2585	clear_pending (EV_A_ (W)w);
2481	if (expect_false (!ev_is_active (w)))	2586	if (expect_false (!ev_is_active (w)))
2482	return;	2587	return;
2483		2588
		2589	EV_FREQUENT_CHECK;
		2590
2484	#if EV_USE_INOTIFY	2591	#if EV_USE_INOTIFY
2485	infy_del (EV_A_ w);	2592	infy_del (EV_A_ w);
2486	#endif	2593	#endif
2487	ev_timer_stop (EV_A_ &w->timer);	2594	ev_timer_stop (EV_A_ &w->timer);
2488		2595
2489	ev_stop (EV_A_ (W)w);	2596	ev_stop (EV_A_ (W)w);
		2597
		2598	EV_FREQUENT_CHECK;
2490	}	2599	}
2491	#endif	2600	#endif
2492		2601
2493	#if EV_IDLE_ENABLE	2602	#if EV_IDLE_ENABLE
2494	void	2603	void
…		…
2496	{	2605	{
2497	if (expect_false (ev_is_active (w)))	2606	if (expect_false (ev_is_active (w)))
2498	return;	2607	return;
2499		2608
2500	pri_adjust (EV_A_ (W)w);	2609	pri_adjust (EV_A_ (W)w);
		2610
		2611	EV_FREQUENT_CHECK;
2501		2612
2502	{	2613	{
2503	int active = ++idlecnt [ABSPRI (w)];	2614	int active = ++idlecnt [ABSPRI (w)];
2504		2615
2505	++idleall;	2616	++idleall;
2506	ev_start (EV_A_ (W)w, active);	2617	ev_start (EV_A_ (W)w, active);
2507		2618
2508	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);	2619	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2509	idles [ABSPRI (w)][active - 1] = w;	2620	idles [ABSPRI (w)][active - 1] = w;
2510	}	2621	}
		2622
		2623	EV_FREQUENT_CHECK;
2511	}	2624	}
2512		2625
2513	void	2626	void
2514	ev_idle_stop (EV_P_ ev_idle *w)	2627	ev_idle_stop (EV_P_ ev_idle *w)
2515	{	2628	{
2516	clear_pending (EV_A_ (W)w);	2629	clear_pending (EV_A_ (W)w);
2517	if (expect_false (!ev_is_active (w)))	2630	if (expect_false (!ev_is_active (w)))
2518	return;	2631	return;
2519		2632
		2633	EV_FREQUENT_CHECK;
		2634
2520	{	2635	{
2521	int active = ev_active (w);	2636	int active = ev_active (w);
2522		2637
2523	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];	2638	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524	ev_active (idles [ABSPRI (w)][active - 1]) = active;	2639	ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525		2640
2526	ev_stop (EV_A_ (W)w);	2641	ev_stop (EV_A_ (W)w);
2527	--idleall;	2642	--idleall;
2528	}	2643	}
		2644
		2645	EV_FREQUENT_CHECK;
2529	}	2646	}
2530	#endif	2647	#endif
2531		2648
2532	void	2649	void
2533	ev_prepare_start (EV_P_ ev_prepare *w)	2650	ev_prepare_start (EV_P_ ev_prepare *w)
2534	{	2651	{
2535	if (expect_false (ev_is_active (w)))	2652	if (expect_false (ev_is_active (w)))
2536	return;	2653	return;
		2654
		2655	EV_FREQUENT_CHECK;
2537		2656
2538	ev_start (EV_A_ (W)w, ++preparecnt);	2657	ev_start (EV_A_ (W)w, ++preparecnt);
2539	array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);	2658	array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540	prepares [preparecnt - 1] = w;	2659	prepares [preparecnt - 1] = w;
		2660
		2661	EV_FREQUENT_CHECK;
2541	}	2662	}
2542		2663
2543	void	2664	void
2544	ev_prepare_stop (EV_P_ ev_prepare *w)	2665	ev_prepare_stop (EV_P_ ev_prepare *w)
2545	{	2666	{
2546	clear_pending (EV_A_ (W)w);	2667	clear_pending (EV_A_ (W)w);
2547	if (expect_false (!ev_is_active (w)))	2668	if (expect_false (!ev_is_active (w)))
2548	return;	2669	return;
2549		2670
		2671	EV_FREQUENT_CHECK;
		2672
2550	{	2673	{
2551	int active = ev_active (w);	2674	int active = ev_active (w);
2552		2675
2553	prepares [active - 1] = prepares [--preparecnt];	2676	prepares [active - 1] = prepares [--preparecnt];
2554	ev_active (prepares [active - 1]) = active;	2677	ev_active (prepares [active - 1]) = active;
2555	}	2678	}
2556		2679
2557	ev_stop (EV_A_ (W)w);	2680	ev_stop (EV_A_ (W)w);
		2681
		2682	EV_FREQUENT_CHECK;
2558	}	2683	}
2559		2684
2560	void	2685	void
2561	ev_check_start (EV_P_ ev_check *w)	2686	ev_check_start (EV_P_ ev_check *w)
2562	{	2687	{
2563	if (expect_false (ev_is_active (w)))	2688	if (expect_false (ev_is_active (w)))
2564	return;	2689	return;
		2690
		2691	EV_FREQUENT_CHECK;
2565		2692
2566	ev_start (EV_A_ (W)w, ++checkcnt);	2693	ev_start (EV_A_ (W)w, ++checkcnt);
2567	array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);	2694	array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568	checks [checkcnt - 1] = w;	2695	checks [checkcnt - 1] = w;
		2696
		2697	EV_FREQUENT_CHECK;
2569	}	2698	}
2570		2699
2571	void	2700	void
2572	ev_check_stop (EV_P_ ev_check *w)	2701	ev_check_stop (EV_P_ ev_check *w)
2573	{	2702	{
2574	clear_pending (EV_A_ (W)w);	2703	clear_pending (EV_A_ (W)w);
2575	if (expect_false (!ev_is_active (w)))	2704	if (expect_false (!ev_is_active (w)))
2576	return;	2705	return;
2577		2706
		2707	EV_FREQUENT_CHECK;
		2708
2578	{	2709	{
2579	int active = ev_active (w);	2710	int active = ev_active (w);
2580		2711
2581	checks [active - 1] = checks [--checkcnt];	2712	checks [active - 1] = checks [--checkcnt];
2582	ev_active (checks [active - 1]) = active;	2713	ev_active (checks [active - 1]) = active;
2583	}	2714	}
2584		2715
2585	ev_stop (EV_A_ (W)w);	2716	ev_stop (EV_A_ (W)w);
		2717
		2718	EV_FREQUENT_CHECK;
2586	}	2719	}
2587		2720
2588	#if EV_EMBED_ENABLE	2721	#if EV_EMBED_ENABLE
2589	void noinline	2722	void noinline
2590	ev_embed_sweep (EV_P_ ev_embed *w)	2723	ev_embed_sweep (EV_P_ ev_embed *w)
…		…
2637	struct ev_loop *loop = w->other;	2770	struct ev_loop *loop = w->other;
2638	assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));	2771	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);	2772	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2640	}	2773	}
2641		2774
		2775	EV_FREQUENT_CHECK;
		2776
2642	ev_set_priority (&w->io, ev_priority (w));	2777	ev_set_priority (&w->io, ev_priority (w));
2643	ev_io_start (EV_A_ &w->io);	2778	ev_io_start (EV_A_ &w->io);
2644		2779
2645	ev_prepare_init (&w->prepare, embed_prepare_cb);	2780	ev_prepare_init (&w->prepare, embed_prepare_cb);
2646	ev_set_priority (&w->prepare, EV_MINPRI);	2781	ev_set_priority (&w->prepare, EV_MINPRI);
2647	ev_prepare_start (EV_A_ &w->prepare);	2782	ev_prepare_start (EV_A_ &w->prepare);
2648		2783
2649	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2784	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2650		2785
2651	ev_start (EV_A_ (W)w, 1);	2786	ev_start (EV_A_ (W)w, 1);
		2787
		2788	EV_FREQUENT_CHECK;
2652	}	2789	}
2653		2790
2654	void	2791	void
2655	ev_embed_stop (EV_P_ ev_embed *w)	2792	ev_embed_stop (EV_P_ ev_embed *w)
2656	{	2793	{
2657	clear_pending (EV_A_ (W)w);	2794	clear_pending (EV_A_ (W)w);
2658	if (expect_false (!ev_is_active (w)))	2795	if (expect_false (!ev_is_active (w)))
2659	return;	2796	return;
2660		2797
		2798	EV_FREQUENT_CHECK;
		2799
2661	ev_io_stop (EV_A_ &w->io);	2800	ev_io_stop (EV_A_ &w->io);
2662	ev_prepare_stop (EV_A_ &w->prepare);	2801	ev_prepare_stop (EV_A_ &w->prepare);
2663		2802
2664	ev_stop (EV_A_ (W)w);	2803	ev_stop (EV_A_ (W)w);
		2804
		2805	EV_FREQUENT_CHECK;
2665	}	2806	}
2666	#endif	2807	#endif
2667		2808
2668	#if EV_FORK_ENABLE	2809	#if EV_FORK_ENABLE
2669	void	2810	void
2670	ev_fork_start (EV_P_ ev_fork *w)	2811	ev_fork_start (EV_P_ ev_fork *w)
2671	{	2812	{
2672	if (expect_false (ev_is_active (w)))	2813	if (expect_false (ev_is_active (w)))
2673	return;	2814	return;
		2815
		2816	EV_FREQUENT_CHECK;
2674		2817
2675	ev_start (EV_A_ (W)w, ++forkcnt);	2818	ev_start (EV_A_ (W)w, ++forkcnt);
2676	array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);	2819	array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677	forks [forkcnt - 1] = w;	2820	forks [forkcnt - 1] = w;
		2821
		2822	EV_FREQUENT_CHECK;
2678	}	2823	}
2679		2824
2680	void	2825	void
2681	ev_fork_stop (EV_P_ ev_fork *w)	2826	ev_fork_stop (EV_P_ ev_fork *w)
2682	{	2827	{
2683	clear_pending (EV_A_ (W)w);	2828	clear_pending (EV_A_ (W)w);
2684	if (expect_false (!ev_is_active (w)))	2829	if (expect_false (!ev_is_active (w)))
2685	return;	2830	return;
2686		2831
		2832	EV_FREQUENT_CHECK;
		2833
2687	{	2834	{
2688	int active = ev_active (w);	2835	int active = ev_active (w);
2689		2836
2690	forks [active - 1] = forks [--forkcnt];	2837	forks [active - 1] = forks [--forkcnt];
2691	ev_active (forks [active - 1]) = active;	2838	ev_active (forks [active - 1]) = active;
2692	}	2839	}
2693		2840
2694	ev_stop (EV_A_ (W)w);	2841	ev_stop (EV_A_ (W)w);
		2842
		2843	EV_FREQUENT_CHECK;
2695	}	2844	}
2696	#endif	2845	#endif
2697		2846
2698	#if EV_ASYNC_ENABLE	2847	#if EV_ASYNC_ENABLE
2699	void	2848	void
…		…
2701	{	2850	{
2702	if (expect_false (ev_is_active (w)))	2851	if (expect_false (ev_is_active (w)))
2703	return;	2852	return;
2704		2853
2705	evpipe_init (EV_A);	2854	evpipe_init (EV_A);
		2855
		2856	EV_FREQUENT_CHECK;
2706		2857
2707	ev_start (EV_A_ (W)w, ++asynccnt);	2858	ev_start (EV_A_ (W)w, ++asynccnt);
2708	array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);	2859	array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709	asyncs [asynccnt - 1] = w;	2860	asyncs [asynccnt - 1] = w;
		2861
		2862	EV_FREQUENT_CHECK;
2710	}	2863	}
2711		2864
2712	void	2865	void
2713	ev_async_stop (EV_P_ ev_async *w)	2866	ev_async_stop (EV_P_ ev_async *w)
2714	{	2867	{
2715	clear_pending (EV_A_ (W)w);	2868	clear_pending (EV_A_ (W)w);
2716	if (expect_false (!ev_is_active (w)))	2869	if (expect_false (!ev_is_active (w)))
2717	return;	2870	return;
2718		2871
		2872	EV_FREQUENT_CHECK;
		2873
2719	{	2874	{
2720	int active = ev_active (w);	2875	int active = ev_active (w);
2721		2876
2722	asyncs [active - 1] = asyncs [--asynccnt];	2877	asyncs [active - 1] = asyncs [--asynccnt];
2723	ev_active (asyncs [active - 1]) = active;	2878	ev_active (asyncs [active - 1]) = active;
2724	}	2879	}
2725		2880
2726	ev_stop (EV_A_ (W)w);	2881	ev_stop (EV_A_ (W)w);
		2882
		2883	EV_FREQUENT_CHECK;
2727	}	2884	}
2728		2885
2729	void	2886	void
2730	ev_async_send (EV_P_ ev_async *w)	2887	ev_async_send (EV_P_ ev_async *w)
2731	{	2888	{

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.248 by root, Wed May 21 23:25:21 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.248 by root, Wed May 21 23:25:21 2008 UTC