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

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC

…		…
222	#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */	222	#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds */	223	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds */
224		224
225	#if __GNUC__ >= 3	225	#if __GNUC__ >= 3
226	# define expect(expr,value) __builtin_expect ((expr),(value))	226	# define expect(expr,value) __builtin_expect ((expr),(value))
227	# define inline_size static inline /* inline for codesize */
228	# if EV_MINIMAL
229	# define noinline __attribute__ ((noinline))	227	# define noinline __attribute__ ((noinline))
230	# define inline_speed static noinline
231	# else
232	# define noinline
233	# define inline_speed static inline
234	# endif
235	#else	228	#else
236	# define expect(expr,value) (expr)	229	# define expect(expr,value) (expr)
237	# define inline_speed static
238	# define inline_size static
239	# define noinline	230	# define noinline
		231	# if __STDC_VERSION__ < 199901L
		232	# define inline
		233	# endif
240	#endif	234	#endif
241		235
242	#define expect_false(expr) expect ((expr) != 0, 0)	236	#define expect_false(expr) expect ((expr) != 0, 0)
243	#define expect_true(expr) expect ((expr) != 0, 1)	237	#define expect_true(expr) expect ((expr) != 0, 1)
		238	#define inline_size static inline
		239
		240	#if EV_MINIMAL
		241	# define inline_speed static noinline
		242	#else
		243	# define inline_speed static inline
		244	#endif
244		245
245	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)	246	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246	#define ABSPRI(w) ((w)->priority - EV_MINPRI)	247	#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247		248
248	#define EMPTY0 /* required for microsofts broken pseudo-c compiler */	249	#define EMPTY /* required for microsofts broken pseudo-c compiler */
249	#define EMPTY2(a,b) /* used to suppress some warnings */	250	#define EMPTY2(a,b) /* used to suppress some warnings */
250		251
251	typedef ev_watcher *W;	252	typedef ev_watcher *W;
252	typedef ev_watcher_list *WL;	253	typedef ev_watcher_list *WL;
253	typedef ev_watcher_time *WT;	254	typedef ev_watcher_time *WT;
…		…
507	}	508	}
508		509
509	void	510	void
510	ev_feed_fd_event (EV_P_ int fd, int revents)	511	ev_feed_fd_event (EV_P_ int fd, int revents)
511	{	512	{
		513	if (fd >= 0 && fd < anfdmax)
512	fd_event (EV_A_ fd, revents);	514	fd_event (EV_A_ fd, revents);
513	}	515	}
514		516
515	void inline_size	517	void inline_size
516	fd_reify (EV_P)	518	fd_reify (EV_P)
517	{	519	{
…		…
786	ev_child *w;	788	ev_child *w;
787		789
788	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)	790	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
789	if (w->pid == pid \|\| !w->pid)	791	if (w->pid == pid \|\| !w->pid)
790	{	792	{
791	ev_priority (w) = ev_priority (sw); /* need to do it now */	793	ev_set_priority (w, ev_priority (sw)); /* need to do it now */
792	w->rpid = pid;	794	w->rpid = pid;
793	w->rstatus = status;	795	w->rstatus = status;
794	ev_feed_event (EV_A_ (W)w, EV_CHILD);	796	ev_feed_event (EV_A_ (W)w, EV_CHILD);
795	}	797	}
796	}	798	}
797		799
798	#ifndef WCONTINUED	800	#ifndef WCONTINUED
…		…
1003	#if EV_USE_SELECT	1005	#if EV_USE_SELECT
1004	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);	1006	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005	#endif	1007	#endif
1006		1008
1007	for (i = NUMPRI; i--; )	1009	for (i = NUMPRI; i--; )
		1010	{
1008	array_free (pending, [i]);	1011	array_free (pending, [i]);
		1012	#if EV_IDLE_ENABLE
		1013	array_free (idle, [i]);
		1014	#endif
		1015	}
1009		1016
1010	/* have to use the microsoft-never-gets-it-right macro */	1017	/* have to use the microsoft-never-gets-it-right macro */
1011	array_free (fdchange, EMPTY0);	1018	array_free (fdchange, EMPTY);
1012	array_free (timer, EMPTY0);	1019	array_free (timer, EMPTY);
1013	#if EV_PERIODIC_ENABLE	1020	#if EV_PERIODIC_ENABLE
1014	array_free (periodic, EMPTY0);	1021	array_free (periodic, EMPTY);
1015	#endif	1022	#endif
1016	array_free (idle, EMPTY0);
1017	array_free (prepare, EMPTY0);	1023	array_free (prepare, EMPTY);
1018	array_free (check, EMPTY0);	1024	array_free (check, EMPTY);
1019		1025
1020	backend = 0;	1026	backend = 0;
1021	}	1027	}
1022		1028
1023	void inline_size infy_fork (EV_P);	1029	void inline_size infy_fork (EV_P);
…		…
1159	postfork = 1;	1165	postfork = 1;
1160	}	1166	}
1161		1167
1162	/*****************************************************************************/	1168	/*****************************************************************************/
1163		1169
1164	int inline_size	1170	void
1165	any_pending (EV_P)	1171	ev_invoke (EV_P_ void *w, int revents)
1166	{	1172	{
1167	int pri;	1173	EV_CB_INVOKE ((W)w, revents);
1168
1169	for (pri = NUMPRI; pri--; )
1170	if (pendingcnt [pri])
1171	return 1;
1172
1173	return 0;
1174	}	1174	}
1175		1175
1176	void inline_speed	1176	void inline_speed
1177	call_pending (EV_P)	1177	call_pending (EV_P)
1178	{	1178	{
…		…
1270	for (i = periodiccnt >> 1; i--; )	1270	for (i = periodiccnt >> 1; i--; )
1271	downheap ((WT *)periodics, periodiccnt, i);	1271	downheap ((WT *)periodics, periodiccnt, i);
1272	}	1272	}
1273	#endif	1273	#endif
1274		1274
		1275	#if EV_IDLE_ENABLE
		1276	void inline_size
		1277	idle_reify (EV_P)
		1278	{
		1279	if (expect_false (idleall))
		1280	{
		1281	int pri;
		1282
		1283	for (pri = NUMPRI; pri--; )
		1284	{
		1285	if (pendingcnt [pri])
		1286	break;
		1287
		1288	if (idlecnt [pri])
		1289	{
		1290	queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
		1291	break;
		1292	}
		1293	}
		1294	}
		1295	}
		1296	#endif
		1297
1275	int inline_size	1298	int inline_size
1276	time_update_monotonic (EV_P)	1299	time_update_monotonic (EV_P)
1277	{	1300	{
1278	mn_now = get_clock ();	1301	mn_now = get_clock ();
1279		1302
…		…
1412		1435
1413	/* calculate blocking time */	1436	/* calculate blocking time */
1414	{	1437	{
1415	ev_tstamp block;	1438	ev_tstamp block;
1416		1439
1417	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idlecnt \|\| !activecnt))	1440	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt))
1418	block = 0.; /* do not block at all */	1441	block = 0.; /* do not block at all */
1419	else	1442	else
1420	{	1443	{
1421	/* update time to cancel out callback processing overhead */	1444	/* update time to cancel out callback processing overhead */
1422	#if EV_USE_MONOTONIC	1445	#if EV_USE_MONOTONIC
…		…
1459	timers_reify (EV_A); /* relative timers called last */	1482	timers_reify (EV_A); /* relative timers called last */
1460	#if EV_PERIODIC_ENABLE	1483	#if EV_PERIODIC_ENABLE
1461	periodics_reify (EV_A); /* absolute timers called first */	1484	periodics_reify (EV_A); /* absolute timers called first */
1462	#endif	1485	#endif
1463		1486
		1487	#if EV_IDLE_ENABLE
1464	/* queue idle watchers unless other events are pending */	1488	/* queue idle watchers unless other events are pending */
1465	if (idlecnt && !any_pending (EV_A))	1489	idle_reify (EV_A);
1466	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);	1490	#endif
1467		1491
1468	/* queue check watchers, to be executed first */	1492	/* queue check watchers, to be executed first */
1469	if (expect_false (checkcnt))	1493	if (expect_false (checkcnt))
1470	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);	1494	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471		1495
…		…
1507	head = &(*head)->next;	1531	head = &(*head)->next;
1508	}	1532	}
1509	}	1533	}
1510		1534
1511	void inline_speed	1535	void inline_speed
1512	ev_clear_pending (EV_P_ W w)	1536	clear_pending (EV_P_ W w)
1513	{	1537	{
1514	if (w->pending)	1538	if (w->pending)
1515	{	1539	{
1516	pendings [ABSPRI (w)][w->pending - 1].w = 0;	1540	pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517	w->pending = 0;	1541	w->pending = 0;
1518	}	1542	}
1519	}	1543	}
1520		1544
		1545	int
		1546	ev_clear_pending (EV_P_ void *w)
		1547	{
		1548	W w_ = (W)w;
		1549	int pending = w_->pending;
		1550
		1551	if (!pending)
		1552	return 0;
		1553
		1554	w_->pending = 0;
		1555	ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
		1556	p->w = 0;
		1557
		1558	return p->events;
		1559	}
		1560
		1561	void inline_size
		1562	pri_adjust (EV_P_ W w)
		1563	{
		1564	int pri = w->priority;
		1565	pri = pri < EV_MINPRI ? EV_MINPRI : pri;
		1566	pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
		1567	w->priority = pri;
		1568	}
		1569
1521	void inline_speed	1570	void inline_speed
1522	ev_start (EV_P_ W w, int active)	1571	ev_start (EV_P_ W w, int active)
1523	{	1572	{
1524	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;	1573	pri_adjust (EV_A_ w);
1525	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527	w->active = active;	1574	w->active = active;
1528	ev_ref (EV_A);	1575	ev_ref (EV_A);
1529	}	1576	}
1530		1577
1531	void inline_size	1578	void inline_size
…		…
1555	}	1602	}
1556		1603
1557	void	1604	void
1558	ev_io_stop (EV_P_ ev_io *w)	1605	ev_io_stop (EV_P_ ev_io *w)
1559	{	1606	{
1560	ev_clear_pending (EV_A_ (W)w);	1607	clear_pending (EV_A_ (W)w);
1561	if (expect_false (!ev_is_active (w)))	1608	if (expect_false (!ev_is_active (w)))
1562	return;	1609	return;
1563		1610
1564	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));	1611	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565		1612
…		…
1588	}	1635	}
1589		1636
1590	void	1637	void
1591	ev_timer_stop (EV_P_ ev_timer *w)	1638	ev_timer_stop (EV_P_ ev_timer *w)
1592	{	1639	{
1593	ev_clear_pending (EV_A_ (W)w);	1640	clear_pending (EV_A_ (W)w);
1594	if (expect_false (!ev_is_active (w)))	1641	if (expect_false (!ev_is_active (w)))
1595	return;	1642	return;
1596		1643
1597	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1644	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1598		1645
…		…
1656	}	1703	}
1657		1704
1658	void	1705	void
1659	ev_periodic_stop (EV_P_ ev_periodic *w)	1706	ev_periodic_stop (EV_P_ ev_periodic *w)
1660	{	1707	{
1661	ev_clear_pending (EV_A_ (W)w);	1708	clear_pending (EV_A_ (W)w);
1662	if (expect_false (!ev_is_active (w)))	1709	if (expect_false (!ev_is_active (w)))
1663	return;	1710	return;
1664		1711
1665	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1712	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1666		1713
…		…
1720	}	1767	}
1721		1768
1722	void	1769	void
1723	ev_signal_stop (EV_P_ ev_signal *w)	1770	ev_signal_stop (EV_P_ ev_signal *w)
1724	{	1771	{
1725	ev_clear_pending (EV_A_ (W)w);	1772	clear_pending (EV_A_ (W)w);
1726	if (expect_false (!ev_is_active (w)))	1773	if (expect_false (!ev_is_active (w)))
1727	return;	1774	return;
1728		1775
1729	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1776	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1730	ev_stop (EV_A_ (W)w);	1777	ev_stop (EV_A_ (W)w);
…		…
1747	}	1794	}
1748		1795
1749	void	1796	void
1750	ev_child_stop (EV_P_ ev_child *w)	1797	ev_child_stop (EV_P_ ev_child *w)
1751	{	1798	{
1752	ev_clear_pending (EV_A_ (W)w);	1799	clear_pending (EV_A_ (W)w);
1753	if (expect_false (!ev_is_active (w)))	1800	if (expect_false (!ev_is_active (w)))
1754	return;	1801	return;
1755		1802
1756	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	1803	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757	ev_stop (EV_A_ (W)w);	1804	ev_stop (EV_A_ (W)w);
…		…
1993	}	2040	}
1994		2041
1995	void	2042	void
1996	ev_stat_stop (EV_P_ ev_stat *w)	2043	ev_stat_stop (EV_P_ ev_stat *w)
1997	{	2044	{
1998	ev_clear_pending (EV_A_ (W)w);	2045	clear_pending (EV_A_ (W)w);
1999	if (expect_false (!ev_is_active (w)))	2046	if (expect_false (!ev_is_active (w)))
2000	return;	2047	return;
2001		2048
2002	#if EV_USE_INOTIFY	2049	#if EV_USE_INOTIFY
2003	infy_del (EV_A_ w);	2050	infy_del (EV_A_ w);
…		…
2006		2053
2007	ev_stop (EV_A_ (W)w);	2054	ev_stop (EV_A_ (W)w);
2008	}	2055	}
2009	#endif	2056	#endif
2010		2057
		2058	#if EV_IDLE_ENABLE
2011	void	2059	void
2012	ev_idle_start (EV_P_ ev_idle *w)	2060	ev_idle_start (EV_P_ ev_idle *w)
2013	{	2061	{
2014	if (expect_false (ev_is_active (w)))	2062	if (expect_false (ev_is_active (w)))
2015	return;	2063	return;
2016		2064
		2065	pri_adjust (EV_A_ (W)w);
		2066
		2067	{
		2068	int active = ++idlecnt [ABSPRI (w)];
		2069
		2070	++idleall;
2017	ev_start (EV_A_ (W)w, ++idlecnt);	2071	ev_start (EV_A_ (W)w, active);
		2072
2018	array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);	2073	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019	idles [idlecnt - 1] = w;	2074	idles [ABSPRI (w)][active - 1] = w;
		2075	}
2020	}	2076	}
2021		2077
2022	void	2078	void
2023	ev_idle_stop (EV_P_ ev_idle *w)	2079	ev_idle_stop (EV_P_ ev_idle *w)
2024	{	2080	{
2025	ev_clear_pending (EV_A_ (W)w);	2081	clear_pending (EV_A_ (W)w);
2026	if (expect_false (!ev_is_active (w)))	2082	if (expect_false (!ev_is_active (w)))
2027	return;	2083	return;
2028		2084
2029	{	2085	{
2030	int active = ((W)w)->active;	2086	int active = ((W)w)->active;
2031	idles [active - 1] = idles [--idlecnt];	2087
		2088	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032	((W)idles [active - 1])->active = active;	2089	((W)idles [ABSPRI (w)][active - 1])->active = active;
		2090
		2091	ev_stop (EV_A_ (W)w);
		2092	--idleall;
2033	}	2093	}
2034
2035	ev_stop (EV_A_ (W)w);
2036	}	2094	}
		2095	#endif
2037		2096
2038	void	2097	void
2039	ev_prepare_start (EV_P_ ev_prepare *w)	2098	ev_prepare_start (EV_P_ ev_prepare *w)
2040	{	2099	{
2041	if (expect_false (ev_is_active (w)))	2100	if (expect_false (ev_is_active (w)))
…		…
2047	}	2106	}
2048		2107
2049	void	2108	void
2050	ev_prepare_stop (EV_P_ ev_prepare *w)	2109	ev_prepare_stop (EV_P_ ev_prepare *w)
2051	{	2110	{
2052	ev_clear_pending (EV_A_ (W)w);	2111	clear_pending (EV_A_ (W)w);
2053	if (expect_false (!ev_is_active (w)))	2112	if (expect_false (!ev_is_active (w)))
2054	return;	2113	return;
2055		2114
2056	{	2115	{
2057	int active = ((W)w)->active;	2116	int active = ((W)w)->active;
…		…
2074	}	2133	}
2075		2134
2076	void	2135	void
2077	ev_check_stop (EV_P_ ev_check *w)	2136	ev_check_stop (EV_P_ ev_check *w)
2078	{	2137	{
2079	ev_clear_pending (EV_A_ (W)w);	2138	clear_pending (EV_A_ (W)w);
2080	if (expect_false (!ev_is_active (w)))	2139	if (expect_false (!ev_is_active (w)))
2081	return;	2140	return;
2082		2141
2083	{	2142	{
2084	int active = ((W)w)->active;	2143	int active = ((W)w)->active;
…		…
2126	}	2185	}
2127		2186
2128	void	2187	void
2129	ev_embed_stop (EV_P_ ev_embed *w)	2188	ev_embed_stop (EV_P_ ev_embed *w)
2130	{	2189	{
2131	ev_clear_pending (EV_A_ (W)w);	2190	clear_pending (EV_A_ (W)w);
2132	if (expect_false (!ev_is_active (w)))	2191	if (expect_false (!ev_is_active (w)))
2133	return;	2192	return;
2134		2193
2135	ev_io_stop (EV_A_ &w->io);	2194	ev_io_stop (EV_A_ &w->io);
2136		2195
…		…
2151	}	2210	}
2152		2211
2153	void	2212	void
2154	ev_fork_stop (EV_P_ ev_fork *w)	2213	ev_fork_stop (EV_P_ ev_fork *w)
2155	{	2214	{
2156	ev_clear_pending (EV_A_ (W)w);	2215	clear_pending (EV_A_ (W)w);
2157	if (expect_false (!ev_is_active (w)))	2216	if (expect_false (!ev_is_active (w)))
2158	return;	2217	return;
2159		2218
2160	{	2219	{
2161	int active = ((W)w)->active;	2220	int active = ((W)w)->active;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs. Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC