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

Comparing libev/ev.c (file contents):
Revision 1.186 by root, Sat Dec 15 23:14:38 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC

…		…
51	# ifndef EV_USE_MONOTONIC	51	# ifndef EV_USE_MONOTONIC
52	# define EV_USE_MONOTONIC 0	52	# define EV_USE_MONOTONIC 0
53	# endif	53	# endif
54	# ifndef EV_USE_REALTIME	54	# ifndef EV_USE_REALTIME
55	# define EV_USE_REALTIME 0	55	# define EV_USE_REALTIME 0
		56	# endif
		57	# endif
		58
		59	# ifndef EV_USE_NANOSLEEP
		60	# if HAVE_NANOSLEEP
		61	# define EV_USE_NANOSLEEP 1
		62	# else
		63	# define EV_USE_NANOSLEEP 0
56	# endif	64	# endif
57	# endif	65	# endif
58		66
59	# ifndef EV_USE_SELECT	67	# ifndef EV_USE_SELECT
60	# if HAVE_SELECT && HAVE_SYS_SELECT_H	68	# if HAVE_SELECT && HAVE_SYS_SELECT_H
…		…
146		154
147	#ifndef EV_USE_REALTIME	155	#ifndef EV_USE_REALTIME
148	# define EV_USE_REALTIME 0	156	# define EV_USE_REALTIME 0
149	#endif	157	#endif
150		158
		159	#ifndef EV_USE_NANOSLEEP
		160	# define EV_USE_NANOSLEEP 0
		161	#endif
		162
151	#ifndef EV_USE_SELECT	163	#ifndef EV_USE_SELECT
152	# define EV_USE_SELECT 1	164	# define EV_USE_SELECT 1
153	#endif	165	#endif
154		166
155	#ifndef EV_USE_POLL	167	#ifndef EV_USE_POLL
…		…
205	#endif	217	#endif
206		218
207	#if !EV_STAT_ENABLE	219	#if !EV_STAT_ENABLE
208	# undef EV_USE_INOTIFY	220	# undef EV_USE_INOTIFY
209	# define EV_USE_INOTIFY 0	221	# define EV_USE_INOTIFY 0
		222	#endif
		223
		224	#if !EV_USE_NANOSLEEP
		225	# ifndef _WIN32
		226	# include <sys/select.h>
		227	# endif
210	#endif	228	#endif
211		229
212	#if EV_USE_INOTIFY	230	#if EV_USE_INOTIFY
213	# include <sys/inotify.h>	231	# include <sys/inotify.h>
214	#endif	232	#endif
…		…
262		280
263	typedef ev_watcher *W;	281	typedef ev_watcher *W;
264	typedef ev_watcher_list *WL;	282	typedef ev_watcher_list *WL;
265	typedef ev_watcher_time *WT;	283	typedef ev_watcher_time *WT;
266		284
		285	/* sig_atomic_t is used to avoid per-thread variables or locking but still */
		286	/* giving it a reasonably high chance of working on typical architetcures */
267	static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	287	static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
268		288
269	#ifdef _WIN32	289	#ifdef _WIN32
270	# include "ev_win32.c"	290	# include "ev_win32.c"
271	#endif	291	#endif
272		292
…		…
408	{	428	{
409	return ev_rt_now;	429	return ev_rt_now;
410	}	430	}
411	#endif	431	#endif
412		432
		433	void
		434	ev_sleep (ev_tstamp delay)
		435	{
		436	if (delay > 0.)
		437	{
		438	#if EV_USE_NANOSLEEP
		439	struct timespec ts;
		440
		441	ts.tv_sec = (time_t)delay;
		442	ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
		443
		444	nanosleep (&ts, 0);
		445	#elif defined(_WIN32)
		446	Sleep (delay * 1e3);
		447	#else
		448	struct timeval tv;
		449
		450	tv.tv_sec = (time_t)delay;
		451	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
		452
		453	select (0, 0, 0, 0, &tv);
		454	#endif
		455	}
		456	}
		457
		458	/*****************************************************************************/
		459
413	int inline_size	460	int inline_size
414	array_nextsize (int elem, int cur, int cnt)	461	array_nextsize (int elem, int cur, int cnt)
415	{	462	{
416	int ncur = cur + 1;	463	int ncur = cur + 1;
417		464
…		…
925	}	972	}
926		973
927	unsigned int	974	unsigned int
928	ev_embeddable_backends (void)	975	ev_embeddable_backends (void)
929	{	976	{
930	return EVBACKEND_EPOLL	977	int flags = EVBACKEND_EPOLL \| EVBACKEND_KQUEUE \| EVBACKEND_PORT;
931	\| EVBACKEND_KQUEUE	978
932	\| EVBACKEND_PORT;	979	/* epoll embeddability broken on all linux versions up to at least 2.6.23 */
		980	/* please fix it and tell me how to detect the fix */
		981	flags &= ~EVBACKEND_EPOLL;
		982
		983	return flags;
933	}	984	}
934		985
935	unsigned int	986	unsigned int
936	ev_backend (EV_P)	987	ev_backend (EV_P)
937	{	988	{
…		…
940		991
941	unsigned int	992	unsigned int
942	ev_loop_count (EV_P)	993	ev_loop_count (EV_P)
943	{	994	{
944	return loop_count;	995	return loop_count;
		996	}
		997
		998	void
		999	ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
		1000	{
		1001	io_blocktime = interval;
		1002	}
		1003
		1004	void
		1005	ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
		1006	{
		1007	timeout_blocktime = interval;
945	}	1008	}
946		1009
947	static void noinline	1010	static void noinline
948	loop_init (EV_P_ unsigned int flags)	1011	loop_init (EV_P_ unsigned int flags)
949	{	1012	{
…		…
960	ev_rt_now = ev_time ();	1023	ev_rt_now = ev_time ();
961	mn_now = get_clock ();	1024	mn_now = get_clock ();
962	now_floor = mn_now;	1025	now_floor = mn_now;
963	rtmn_diff = ev_rt_now - mn_now;	1026	rtmn_diff = ev_rt_now - mn_now;
964		1027
		1028	io_blocktime = 0.;
		1029	timeout_blocktime = 0.;
		1030
965	/* pid check not overridable via env */	1031	/* pid check not overridable via env */
966	#ifndef _WIN32	1032	#ifndef _WIN32
967	if (flags & EVFLAG_FORKCHECK)	1033	if (flags & EVFLAG_FORKCHECK)
968	curpid = getpid ();	1034	curpid = getpid ();
969	#endif	1035	#endif
…		…
1046	array_free (fdchange, EMPTY);	1112	array_free (fdchange, EMPTY);
1047	array_free (timer, EMPTY);	1113	array_free (timer, EMPTY);
1048	#if EV_PERIODIC_ENABLE	1114	#if EV_PERIODIC_ENABLE
1049	array_free (periodic, EMPTY);	1115	array_free (periodic, EMPTY);
1050	#endif	1116	#endif
		1117	#if EV_FORK_ENABLE
		1118	array_free (fork, EMPTY);
		1119	#endif
1051	array_free (prepare, EMPTY);	1120	array_free (prepare, EMPTY);
1052	array_free (check, EMPTY);	1121	array_free (check, EMPTY);
1053	array_free (fork, EMPTY);
1054		1122
1055	backend = 0;	1123	backend = 0;
1056	}	1124	}
1057		1125
1058	void inline_size infy_fork (EV_P);	1126	void inline_size infy_fork (EV_P);
…		…
1454	/* update fd-related kernel structures */	1522	/* update fd-related kernel structures */
1455	fd_reify (EV_A);	1523	fd_reify (EV_A);
1456		1524
1457	/* calculate blocking time */	1525	/* calculate blocking time */
1458	{	1526	{
1459	ev_tstamp block;	1527	ev_tstamp waittime = 0.;
		1528	ev_tstamp sleeptime = 0.;
1460		1529
1461	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt))	1530	if (expect_true (!(flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt)))
1462	block = 0.; /* do not block at all */
1463	else
1464	{	1531	{
1465	/* update time to cancel out callback processing overhead */	1532	/* update time to cancel out callback processing overhead */
1466	time_update (EV_A_ 1e100);	1533	time_update (EV_A_ 1e100);
1467		1534
1468	block = MAX_BLOCKTIME;	1535	waittime = MAX_BLOCKTIME;
1469		1536
1470	if (timercnt)	1537	if (timercnt)
1471	{	1538	{
1472	ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;	1539	ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1473	if (block > to) block = to;	1540	if (waittime > to) waittime = to;
1474	}	1541	}
1475		1542
1476	#if EV_PERIODIC_ENABLE	1543	#if EV_PERIODIC_ENABLE
1477	if (periodiccnt)	1544	if (periodiccnt)
1478	{	1545	{
1479	ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;	1546	ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1480	if (block > to) block = to;	1547	if (waittime > to) waittime = to;
1481	}	1548	}
1482	#endif	1549	#endif
1483		1550
1484	if (expect_false (block < 0.)) block = 0.;	1551	if (expect_false (waittime < timeout_blocktime))
		1552	waittime = timeout_blocktime;
		1553
		1554	sleeptime = waittime - backend_fudge;
		1555
		1556	if (expect_true (sleeptime > io_blocktime))
		1557	sleeptime = io_blocktime;
		1558
		1559	if (sleeptime)
		1560	{
		1561	ev_sleep (sleeptime);
		1562	waittime -= sleeptime;
		1563	}
1485	}	1564	}
1486		1565
1487	++loop_count;	1566	++loop_count;
1488	backend_poll (EV_A_ block);	1567	backend_poll (EV_A_ waittime);
1489		1568
1490	/* update ev_rt_now, do magic */	1569	/* update ev_rt_now, do magic */
1491	time_update (EV_A_ block);	1570	time_update (EV_A_ waittime + sleeptime);
1492	}	1571	}
1493		1572
1494	/* queue pending timers and reschedule them */	1573	/* queue pending timers and reschedule them */
1495	timers_reify (EV_A); /* relative timers called last */	1574	timers_reify (EV_A); /* relative timers called last */
1496	#if EV_PERIODIC_ENABLE	1575	#if EV_PERIODIC_ENABLE
…		…
2180		2259
2181	#if EV_EMBED_ENABLE	2260	#if EV_EMBED_ENABLE
2182	void noinline	2261	void noinline
2183	ev_embed_sweep (EV_P_ ev_embed *w)	2262	ev_embed_sweep (EV_P_ ev_embed *w)
2184	{	2263	{
2185	ev_loop (w->loop, EVLOOP_NONBLOCK);	2264	ev_loop (w->other, EVLOOP_NONBLOCK);
2186	}	2265	}
2187		2266
2188	static void	2267	static void
2189	embed_cb (EV_P_ ev_io *io, int revents)	2268	embed_io_cb (EV_P_ ev_io *io, int revents)
2190	{	2269	{
2191	ev_embed w = (ev_embed )(((char *)io) - offsetof (ev_embed, io));	2270	ev_embed w = (ev_embed )(((char *)io) - offsetof (ev_embed, io));
2192		2271
2193	if (ev_cb (w))	2272	if (ev_cb (w))
2194	ev_feed_event (EV_A_ (W)w, EV_EMBED);	2273	ev_feed_event (EV_A_ (W)w, EV_EMBED);
2195	else	2274	else
2196	ev_embed_sweep (loop, w);	2275	ev_loop (w->other, EVLOOP_NONBLOCK);
2197	}	2276	}
		2277
		2278	static void
		2279	embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
		2280	{
		2281	ev_embed w = (ev_embed )(((char *)prepare) - offsetof (ev_embed, prepare));
		2282
		2283	{
		2284	struct ev_loop *loop = w->other;
		2285
		2286	while (fdchangecnt)
		2287	{
		2288	fd_reify (EV_A);
		2289	ev_loop (EV_A_ EVLOOP_NONBLOCK);
		2290	}
		2291	}
		2292	}
		2293
		2294	#if 0
		2295	static void
		2296	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
		2297	{
		2298	ev_idle_stop (EV_A_ idle);
		2299	}
		2300	#endif
2198		2301
2199	void	2302	void
2200	ev_embed_start (EV_P_ ev_embed *w)	2303	ev_embed_start (EV_P_ ev_embed *w)
2201	{	2304	{
2202	if (expect_false (ev_is_active (w)))	2305	if (expect_false (ev_is_active (w)))
2203	return;	2306	return;
2204		2307
2205	{	2308	{
2206	struct ev_loop *loop = w->loop;	2309	struct ev_loop *loop = w->other;
2207	assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));	2310	assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2208	ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);	2311	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2209	}	2312	}
2210		2313
2211	ev_set_priority (&w->io, ev_priority (w));	2314	ev_set_priority (&w->io, ev_priority (w));
2212	ev_io_start (EV_A_ &w->io);	2315	ev_io_start (EV_A_ &w->io);
2213		2316
		2317	ev_prepare_init (&w->prepare, embed_prepare_cb);
		2318	ev_set_priority (&w->prepare, EV_MINPRI);
		2319	ev_prepare_start (EV_A_ &w->prepare);
		2320
		2321	/ev_idle_init (&w->idle, e,bed_idle_cb);/
		2322
2214	ev_start (EV_A_ (W)w, 1);	2323	ev_start (EV_A_ (W)w, 1);
2215	}	2324	}
2216		2325
2217	void	2326	void
2218	ev_embed_stop (EV_P_ ev_embed *w)	2327	ev_embed_stop (EV_P_ ev_embed *w)
…		…
2220	clear_pending (EV_A_ (W)w);	2329	clear_pending (EV_A_ (W)w);
2221	if (expect_false (!ev_is_active (w)))	2330	if (expect_false (!ev_is_active (w)))
2222	return;	2331	return;
2223		2332
2224	ev_io_stop (EV_A_ &w->io);	2333	ev_io_stop (EV_A_ &w->io);
		2334	ev_prepare_stop (EV_A_ &w->prepare);
2225		2335
2226	ev_stop (EV_A_ (W)w);	2336	ev_stop (EV_A_ (W)w);
2227	}	2337	}
2228	#endif	2338	#endif
2229		2339
…		…
2318	ev_timer_set (&once->to, timeout, 0.);	2428	ev_timer_set (&once->to, timeout, 0.);
2319	ev_timer_start (EV_A_ &once->to);	2429	ev_timer_start (EV_A_ &once->to);
2320	}	2430	}
2321	}	2431	}
2322		2432
		2433	#if EV_MULTIPLICITY
		2434	#include "ev_wrap.h"
		2435	#endif
		2436
2323	#ifdef __cplusplus	2437	#ifdef __cplusplus
2324	}	2438	}
2325	#endif	2439	#endif
2326		2440

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.186 by root, Sat Dec 15 23:14:38 2007 UTC vs. Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.186 by root, Sat Dec 15 23:14:38 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC