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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC

…		…
391	# define inline_speed static noinline	391	# define inline_speed static noinline
392	#else	392	#else
393	# define inline_speed static inline	393	# define inline_speed static inline
394	#endif	394	#endif
395		395
396	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)	396	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
		397
		398	#if EV_MINPRI == EV_MAXPRI
		399	# define ABSPRI(w) (((W)w), 0)
		400	#else
397	#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)	401	# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
		402	#endif
398		403
399	#define EMPTY /* required for microsofts broken pseudo-c compiler */	404	#define EMPTY /* required for microsofts broken pseudo-c compiler */
400	#define EMPTY2(a,b) /* used to suppress some warnings */	405	#define EMPTY2(a,b) /* used to suppress some warnings */
401		406
402	typedef ev_watcher *W;	407	typedef ev_watcher *W;
…		…
562		567
563	static int ev_default_loop_ptr;	568	static int ev_default_loop_ptr;
564		569
565	#endif	570	#endif
566		571
		572	#if EV_MINIMAL < 2
		573	# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
		574	# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A)
		575	# define EV_INVOKE_PENDING invoke_cb (EV_A)
		576	#else
		577	# define EV_SUSPEND_CB (void)0
		578	# define EV_RESUME_CB (void)0
		579	# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
		580	#endif
		581
567	/*****************************************************************************/	582	/*****************************************************************************/
568		583
569	#ifndef EV_HAVE_EV_TIME	584	#ifndef EV_HAVE_EV_TIME
570	ev_tstamp	585	ev_tstamp
571	ev_time (void)	586	ev_time (void)
…		…
627		642
628	tv.tv_sec = (time_t)delay;	643	tv.tv_sec = (time_t)delay;
629	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	644	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630		645
631	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */	646	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632	/* somehting nto guaranteed by newer posix versions, but guaranteed */	647	/* somehting not guaranteed by newer posix versions, but guaranteed */
633	/* by older ones */	648	/* by older ones */
634	select (0, 0, 0, 0, &tv);	649	select (0, 0, 0, 0, &tv);
635	#endif	650	#endif
636	}	651	}
637	}	652	}
…		…
1352	ev_backend (EV_P)	1367	ev_backend (EV_P)
1353	{	1368	{
1354	return backend;	1369	return backend;
1355	}	1370	}
1356		1371
		1372	#if EV_MINIMAL < 2
1357	unsigned int	1373	unsigned int
1358	ev_loop_count (EV_P)	1374	ev_loop_count (EV_P)
1359	{	1375	{
1360	return loop_count;	1376	return loop_count;
1361	}	1377	}
1362		1378
		1379	unsigned int
		1380	ev_loop_depth (EV_P)
		1381	{
		1382	return loop_depth;
		1383	}
		1384
1363	void	1385	void
1364	ev_set_io_collect_interval (EV_P_ ev_tstamp interval)	1386	ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365	{	1387	{
1366	io_blocktime = interval;	1388	io_blocktime = interval;
1367	}	1389	}
…		…
1369	void	1391	void
1370	ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)	1392	ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371	{	1393	{
1372	timeout_blocktime = interval;	1394	timeout_blocktime = interval;
1373	}	1395	}
		1396
		1397	void
		1398	ev_set_userdata (EV_P_ void *data)
		1399	{
		1400	userdata = data;
		1401	}
		1402
		1403	void *
		1404	ev_userdata (EV_P)
		1405	{
		1406	return userdata;
		1407	}
		1408
		1409	void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
		1410	{
		1411	invoke_cb = invoke_pending_cb;
		1412	}
		1413
		1414	void ev_set_blocking_cb (EV_P_ void (suspend_cb_)(EV_P), void (resume_cb_)(EV_P))
		1415	{
		1416	suspend_cb = suspend_cb_;
		1417	resume_cb = resume_cb_;
		1418	}
		1419	#endif
1374		1420
1375	/* initialise a loop structure, must be zero-initialised */	1421	/* initialise a loop structure, must be zero-initialised */
1376	static void noinline	1422	static void noinline
1377	loop_init (EV_P_ unsigned int flags)	1423	loop_init (EV_P_ unsigned int flags)
1378	{	1424	{
…		…
1400		1446
1401	ev_rt_now = ev_time ();	1447	ev_rt_now = ev_time ();
1402	mn_now = get_clock ();	1448	mn_now = get_clock ();
1403	now_floor = mn_now;	1449	now_floor = mn_now;
1404	rtmn_diff = ev_rt_now - mn_now;	1450	rtmn_diff = ev_rt_now - mn_now;
		1451	#if EV_MINIMAL < 2
		1452	invoke_cb = ev_invoke_pending;
		1453	#endif
1405		1454
1406	io_blocktime = 0.;	1455	io_blocktime = 0.;
1407	timeout_blocktime = 0.;	1456	timeout_blocktime = 0.;
1408	backend = 0;	1457	backend = 0;
1409	backend_fd = -1;	1458	backend_fd = -1;
…		…
1603	void	1652	void
1604	ev_loop_fork (EV_P)	1653	ev_loop_fork (EV_P)
1605	{	1654	{
1606	postfork = 1; /* must be in line with ev_default_fork */	1655	postfork = 1; /* must be in line with ev_default_fork */
1607	}	1656	}
		1657	#endif /* multiplicity */
1608		1658
1609	#if EV_VERIFY	1659	#if EV_VERIFY
1610	static void noinline	1660	static void noinline
1611	verify_watcher (EV_P_ W w)	1661	verify_watcher (EV_P_ W w)
1612	{	1662	{
…		…
1640	verify_watcher (EV_A_ ws [cnt]);	1690	verify_watcher (EV_A_ ws [cnt]);
1641	}	1691	}
1642	}	1692	}
1643	#endif	1693	#endif
1644		1694
		1695	#if EV_MINIMAL < 2
1645	void	1696	void
1646	ev_loop_verify (EV_P)	1697	ev_loop_verify (EV_P)
1647	{	1698	{
1648	#if EV_VERIFY	1699	#if EV_VERIFY
1649	int i;	1700	int i;
…		…
1702	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)	1753	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
1703	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)	1754	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1704	# endif	1755	# endif
1705	#endif	1756	#endif
1706	}	1757	}
1707		1758	#endif
1708	#endif /* multiplicity */
1709		1759
1710	#if EV_MULTIPLICITY	1760	#if EV_MULTIPLICITY
1711	struct ev_loop *	1761	struct ev_loop *
1712	ev_default_loop_init (unsigned int flags)	1762	ev_default_loop_init (unsigned int flags)
1713	#else	1763	#else
…		…
1774	ev_invoke (EV_P_ void *w, int revents)	1824	ev_invoke (EV_P_ void *w, int revents)
1775	{	1825	{
1776	EV_CB_INVOKE ((W)w, revents);	1826	EV_CB_INVOKE ((W)w, revents);
1777	}	1827	}
1778		1828
1779	inline_speed void	1829	void noinline
1780	call_pending (EV_P)	1830	ev_invoke_pending (EV_P)
1781	{	1831	{
1782	int pri;	1832	int pri;
1783		1833
1784	for (pri = NUMPRI; pri--; )	1834	for (pri = NUMPRI; pri--; )
1785	while (pendingcnt [pri])	1835	while (pendingcnt [pri])
…		…
2020		2070
2021	mn_now = ev_rt_now;	2071	mn_now = ev_rt_now;
2022	}	2072	}
2023	}	2073	}
2024		2074
2025	static int loop_done;
2026
2027	void	2075	void
2028	ev_loop (EV_P_ int flags)	2076	ev_loop (EV_P_ int flags)
2029	{	2077	{
		2078	#if EV_MINIMAL < 2
		2079	++loop_depth;
		2080	#endif
		2081
2030	loop_done = EVUNLOOP_CANCEL;	2082	loop_done = EVUNLOOP_CANCEL;
2031		2083
2032	call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */	2084	EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033		2085
2034	do	2086	do
2035	{	2087	{
2036	#if EV_VERIFY >= 2	2088	#if EV_VERIFY >= 2
2037	ev_loop_verify (EV_A);	2089	ev_loop_verify (EV_A);
…		…
2050	/* we might have forked, so queue fork handlers */	2102	/* we might have forked, so queue fork handlers */
2051	if (expect_false (postfork))	2103	if (expect_false (postfork))
2052	if (forkcnt)	2104	if (forkcnt)
2053	{	2105	{
2054	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);	2106	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055	call_pending (EV_A);	2107	EV_INVOKE_PENDING;
2056	}	2108	}
2057	#endif	2109	#endif
2058		2110
2059	/* queue prepare watchers (and execute them) */	2111	/* queue prepare watchers (and execute them) */
2060	if (expect_false (preparecnt))	2112	if (expect_false (preparecnt))
2061	{	2113	{
2062	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	2114	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063	call_pending (EV_A);	2115	EV_INVOKE_PENDING;
2064	}	2116	}
2065		2117
2066	/* we might have forked, so reify kernel state if necessary */	2118	/* we might have forked, so reify kernel state if necessary */
2067	if (expect_false (postfork))	2119	if (expect_false (postfork))
2068	loop_fork (EV_A);	2120	loop_fork (EV_A);
…		…
2075	ev_tstamp waittime = 0.;	2127	ev_tstamp waittime = 0.;
2076	ev_tstamp sleeptime = 0.;	2128	ev_tstamp sleeptime = 0.;
2077		2129
2078	if (expect_true (!(flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt)))	2130	if (expect_true (!(flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt)))
2079	{	2131	{
		2132	/* remember old timestamp for io_blocktime calculation */
		2133	ev_tstamp prev_mn_now = mn_now;
		2134
2080	/* update time to cancel out callback processing overhead */	2135	/* update time to cancel out callback processing overhead */
2081	time_update (EV_A_ 1e100);	2136	time_update (EV_A_ 1e100);
2082		2137
2083	waittime = MAX_BLOCKTIME;	2138	waittime = MAX_BLOCKTIME;
2084		2139
…		…
2094	ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;	2149	ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095	if (waittime > to) waittime = to;	2150	if (waittime > to) waittime = to;
2096	}	2151	}
2097	#endif	2152	#endif
2098		2153
		2154	/* don't let timeouts decrease the waittime below timeout_blocktime */
2099	if (expect_false (waittime < timeout_blocktime))	2155	if (expect_false (waittime < timeout_blocktime))
2100	waittime = timeout_blocktime;	2156	waittime = timeout_blocktime;
2101		2157
2102	sleeptime = waittime - backend_fudge;	2158	/* extra check because io_blocktime is commonly 0 */
2103
2104	if (expect_true (sleeptime > io_blocktime))	2159	if (expect_false (io_blocktime))
2105	sleeptime = io_blocktime;
2106
2107	if (sleeptime)
2108	{	2160	{
		2161	sleeptime = io_blocktime - (mn_now - prev_mn_now);
		2162
		2163	if (sleeptime > waittime - backend_fudge)
		2164	sleeptime = waittime - backend_fudge;
		2165
		2166	if (expect_true (sleeptime > 0.))
		2167	{
2109	ev_sleep (sleeptime);	2168	ev_sleep (sleeptime);
2110	waittime -= sleeptime;	2169	waittime -= sleeptime;
		2170	}
2111	}	2171	}
2112	}	2172	}
2113		2173
		2174	#if EV_MINIMAL < 2
2114	++loop_count;	2175	++loop_count;
		2176	#endif
2115	backend_poll (EV_A_ waittime);	2177	backend_poll (EV_A_ waittime);
2116		2178
2117	/* update ev_rt_now, do magic */	2179	/* update ev_rt_now, do magic */
2118	time_update (EV_A_ waittime + sleeptime);	2180	time_update (EV_A_ waittime + sleeptime);
2119	}	2181	}
…		…
2131		2193
2132	/* queue check watchers, to be executed first */	2194	/* queue check watchers, to be executed first */
2133	if (expect_false (checkcnt))	2195	if (expect_false (checkcnt))
2134	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);	2196	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2135		2197
2136	call_pending (EV_A);	2198	EV_INVOKE_PENDING;
2137	}	2199	}
2138	while (expect_true (	2200	while (expect_true (
2139	activecnt	2201	activecnt
2140	&& !loop_done	2202	&& !loop_done
2141	&& !(flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK))	2203	&& !(flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK))
2142	));	2204	));
2143		2205
2144	if (loop_done == EVUNLOOP_ONE)	2206	if (loop_done == EVUNLOOP_ONE)
2145	loop_done = EVUNLOOP_CANCEL;	2207	loop_done = EVUNLOOP_CANCEL;
		2208
		2209	#if EV_MINIMAL < 2
		2210	--loop_depth;
		2211	#endif
2146	}	2212	}
2147		2213
2148	void	2214	void
2149	ev_unloop (EV_P_ int how)	2215	ev_unloop (EV_P_ int how)
2150	{	2216	{
…		…
2242	}	2308	}
2243		2309
2244	inline_size void	2310	inline_size void
2245	pri_adjust (EV_P_ W w)	2311	pri_adjust (EV_P_ W w)
2246	{	2312	{
2247	int pri = w->priority;	2313	int pri = ev_priority (w);
2248	pri = pri < EV_MINPRI ? EV_MINPRI : pri;	2314	pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249	pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;	2315	pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250	w->priority = pri;	2316	ev_set_priority (w, pri);
2251	}	2317	}
2252		2318
2253	inline_speed void	2319	inline_speed void
2254	ev_start (EV_P_ W w, int active)	2320	ev_start (EV_P_ W w, int active)
2255	{	2321	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs. Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC