[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.177 by root, Tue Dec 11 15:06:50 2007 UTC

…		…
216	# include <sys/inotify.h>	216	# include <sys/inotify.h>
217	#endif	217	#endif
218		218
219	/**/	219	/**/
220		220
		221	/*
		222	* This is used to avoid floating point rounding problems.
		223	* It is added to ev_rt_now when scheduling periodics
		224	* to ensure progress, time-wise, even when rounding
		225	* errors are against us.
		226	* This value is good at least till the year 4000.
		227	* Better solutions welcome.
		228	*/
		229	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
		230
221	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	231	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222	#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */	232	#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 */	233	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds, TODO */
224		234
225	#if __GNUC__ >= 3	235	#if __GNUC__ >= 3
226	# define expect(expr,value) __builtin_expect ((expr),(value))	236	# 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))	237	# 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	238	#else
236	# define expect(expr,value) (expr)	239	# define expect(expr,value) (expr)
237	# define inline_speed static
238	# define inline_size static
239	# define noinline	240	# define noinline
		241	# if __STDC_VERSION__ < 199901L
		242	# define inline
		243	# endif
240	#endif	244	#endif
241		245
242	#define expect_false(expr) expect ((expr) != 0, 0)	246	#define expect_false(expr) expect ((expr) != 0, 0)
243	#define expect_true(expr) expect ((expr) != 0, 1)	247	#define expect_true(expr) expect ((expr) != 0, 1)
		248	#define inline_size static inline
		249
		250	#if EV_MINIMAL
		251	# define inline_speed static noinline
		252	#else
		253	# define inline_speed static inline
		254	#endif
244		255
245	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)	256	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246	#define ABSPRI(w) ((w)->priority - EV_MINPRI)	257	#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247		258
248	#define EMPTY0 /* required for microsofts broken pseudo-c compiler */	259	#define EMPTY /* required for microsofts broken pseudo-c compiler */
249	#define EMPTY2(a,b) /* used to suppress some warnings */	260	#define EMPTY2(a,b) /* used to suppress some warnings */
250		261
251	typedef ev_watcher *W;	262	typedef ev_watcher *W;
252	typedef ev_watcher_list *WL;	263	typedef ev_watcher_list *WL;
253	typedef ev_watcher_time *WT;	264	typedef ev_watcher_time *WT;
…		…
417	}	428	}
418		429
419	return ncur;	430	return ncur;
420	}	431	}
421		432
422	inline_speed void *	433	static noinline void *
423	array_realloc (int elem, void base, int cur, int cnt)	434	array_realloc (int elem, void base, int cur, int cnt)
424	{	435	{
425	cur = array_nextsize (elem, cur, cnt);	436	cur = array_nextsize (elem, cur, cnt);
426	return ev_realloc (base, elem * *cur);	437	return ev_realloc (base, elem * *cur);
427	}	438	}
…		…
452		463
453	void noinline	464	void noinline
454	ev_feed_event (EV_P_ void *w, int revents)	465	ev_feed_event (EV_P_ void *w, int revents)
455	{	466	{
456	W w_ = (W)w;	467	W w_ = (W)w;
		468	int pri = ABSPRI (w_);
457		469
458	if (expect_false (w_->pending))	470	if (expect_false (w_->pending))
		471	pendings [pri][w_->pending - 1].events \|= revents;
		472	else
459	{	473	{
		474	w_->pending = ++pendingcnt [pri];
		475	array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
		476	pendings [pri][w_->pending - 1].w = w_;
460	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;	477	pendings [pri][w_->pending - 1].events = revents;
461	return;
462	}	478	}
463
464	w_->pending = ++pendingcnt [ABSPRI (w_)];
465	array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468	}	479	}
469		480
470	void inline_size	481	void inline_size
471	queue_events (EV_P_ W *events, int eventcnt, int type)	482	queue_events (EV_P_ W *events, int eventcnt, int type)
472	{	483	{
…		…
507	}	518	}
508		519
509	void	520	void
510	ev_feed_fd_event (EV_P_ int fd, int revents)	521	ev_feed_fd_event (EV_P_ int fd, int revents)
511	{	522	{
		523	if (fd >= 0 && fd < anfdmax)
512	fd_event (EV_A_ fd, revents);	524	fd_event (EV_A_ fd, revents);
513	}	525	}
514		526
515	void inline_size	527	void inline_size
516	fd_reify (EV_P)	528	fd_reify (EV_P)
517	{	529	{
…		…
747	for (signum = signalmax; signum--; )	759	for (signum = signalmax; signum--; )
748	if (signals [signum].gotsig)	760	if (signals [signum].gotsig)
749	ev_feed_signal_event (EV_A_ signum + 1);	761	ev_feed_signal_event (EV_A_ signum + 1);
750	}	762	}
751		763
752	void inline_size	764	void inline_speed
753	fd_intern (int fd)	765	fd_intern (int fd)
754	{	766	{
755	#ifdef _WIN32	767	#ifdef _WIN32
756	int arg = 1;	768	int arg = 1;
757	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	769	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
…		…
786	ev_child *w;	798	ev_child *w;
787		799
788	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)	800	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
789	if (w->pid == pid \|\| !w->pid)	801	if (w->pid == pid \|\| !w->pid)
790	{	802	{
791	ev_priority (w) = ev_priority (sw); /* need to do it now */	803	ev_set_priority (w, ev_priority (sw)); /* need to do it now */
792	w->rpid = pid;	804	w->rpid = pid;
793	w->rstatus = status;	805	w->rstatus = status;
794	ev_feed_event (EV_A_ (W)w, EV_CHILD);	806	ev_feed_event (EV_A_ (W)w, EV_CHILD);
795	}	807	}
796	}	808	}
797		809
798	#ifndef WCONTINUED	810	#ifndef WCONTINUED
…		…
1003	#if EV_USE_SELECT	1015	#if EV_USE_SELECT
1004	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);	1016	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005	#endif	1017	#endif
1006		1018
1007	for (i = NUMPRI; i--; )	1019	for (i = NUMPRI; i--; )
		1020	{
1008	array_free (pending, [i]);	1021	array_free (pending, [i]);
		1022	#if EV_IDLE_ENABLE
		1023	array_free (idle, [i]);
		1024	#endif
		1025	}
1009		1026
1010	/* have to use the microsoft-never-gets-it-right macro */	1027	/* have to use the microsoft-never-gets-it-right macro */
1011	array_free (fdchange, EMPTY0);	1028	array_free (fdchange, EMPTY);
1012	array_free (timer, EMPTY0);	1029	array_free (timer, EMPTY);
1013	#if EV_PERIODIC_ENABLE	1030	#if EV_PERIODIC_ENABLE
1014	array_free (periodic, EMPTY0);	1031	array_free (periodic, EMPTY);
1015	#endif	1032	#endif
1016	array_free (idle, EMPTY0);
1017	array_free (prepare, EMPTY0);	1033	array_free (prepare, EMPTY);
1018	array_free (check, EMPTY0);	1034	array_free (check, EMPTY);
1019		1035
1020	backend = 0;	1036	backend = 0;
1021	}	1037	}
1022		1038
1023	void inline_size infy_fork (EV_P);	1039	void inline_size infy_fork (EV_P);
…		…
1159	postfork = 1;	1175	postfork = 1;
1160	}	1176	}
1161		1177
1162	/*****************************************************************************/	1178	/*****************************************************************************/
1163		1179
1164	int inline_size	1180	void
1165	any_pending (EV_P)	1181	ev_invoke (EV_P_ void *w, int revents)
1166	{	1182	{
1167	int pri;	1183	EV_CB_INVOKE ((W)w, revents);
1168
1169	for (pri = NUMPRI; pri--; )
1170	if (pendingcnt [pri])
1171	return 1;
1172
1173	return 0;
1174	}	1184	}
1175		1185
1176	void inline_speed	1186	void inline_speed
1177	call_pending (EV_P)	1187	call_pending (EV_P)
1178	{	1188	{
…		…
1231	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/	1241	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/
1232		1242
1233	/* first reschedule or stop timer */	1243	/* first reschedule or stop timer */
1234	if (w->reschedule_cb)	1244	if (w->reschedule_cb)
1235	{	1245	{
1236	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);	1246	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));	1247	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238	downheap ((WT *)periodics, periodiccnt, 0);	1248	downheap ((WT *)periodics, periodiccnt, 0);
1239	}	1249	}
1240	else if (w->interval)	1250	else if (w->interval)
1241	{	1251	{
1242	((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;	1252	((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
		1253	if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));	1254	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244	downheap ((WT *)periodics, periodiccnt, 0);	1255	downheap ((WT *)periodics, periodiccnt, 0);
1245	}	1256	}
1246	else	1257	else
1247	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1258	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
…		…
1261	ev_periodic *w = periodics [i];	1272	ev_periodic *w = periodics [i];
1262		1273
1263	if (w->reschedule_cb)	1274	if (w->reschedule_cb)
1264	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1275	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265	else if (w->interval)	1276	else if (w->interval)
1266	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;	1277	((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267	}	1278	}
1268		1279
1269	/* now rebuild the heap */	1280	/* now rebuild the heap */
1270	for (i = periodiccnt >> 1; i--; )	1281	for (i = periodiccnt >> 1; i--; )
1271	downheap ((WT *)periodics, periodiccnt, i);	1282	downheap ((WT *)periodics, periodiccnt, i);
		1283	}
		1284	#endif
		1285
		1286	#if EV_IDLE_ENABLE
		1287	void inline_size
		1288	idle_reify (EV_P)
		1289	{
		1290	if (expect_false (idleall))
		1291	{
		1292	int pri;
		1293
		1294	for (pri = NUMPRI; pri--; )
		1295	{
		1296	if (pendingcnt [pri])
		1297	break;
		1298
		1299	if (idlecnt [pri])
		1300	{
		1301	queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
		1302	break;
		1303	}
		1304	}
		1305	}
1272	}	1306	}
1273	#endif	1307	#endif
1274		1308
1275	int inline_size	1309	int inline_size
1276	time_update_monotonic (EV_P)	1310	time_update_monotonic (EV_P)
…		…
1337	if (expect_false (mn_now > ev_rt_now \|\| mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))	1371	if (expect_false (mn_now > ev_rt_now \|\| mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1338	{	1372	{
1339	#if EV_PERIODIC_ENABLE	1373	#if EV_PERIODIC_ENABLE
1340	periodics_reschedule (EV_A);	1374	periodics_reschedule (EV_A);
1341	#endif	1375	#endif
1342
1343	/* adjust timers. this is easy, as the offset is the same for all of them */	1376	/* adjust timers. this is easy, as the offset is the same for all of them */
1344	for (i = 0; i < timercnt; ++i)	1377	for (i = 0; i < timercnt; ++i)
1345	((WT)timers [i])->at += ev_rt_now - mn_now;	1378	((WT)timers [i])->at += ev_rt_now - mn_now;
1346	}	1379	}
1347		1380
…		…
1391	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);	1424	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392	call_pending (EV_A);	1425	call_pending (EV_A);
1393	}	1426	}
1394	#endif	1427	#endif
1395		1428
1396	/* queue check watchers (and execute them) */	1429	/* queue prepare watchers (and execute them) */
1397	if (expect_false (preparecnt))	1430	if (expect_false (preparecnt))
1398	{	1431	{
1399	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	1432	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400	call_pending (EV_A);	1433	call_pending (EV_A);
1401	}	1434	}
…		…
1412		1445
1413	/* calculate blocking time */	1446	/* calculate blocking time */
1414	{	1447	{
1415	ev_tstamp block;	1448	ev_tstamp block;
1416		1449
1417	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idlecnt \|\| !activecnt))	1450	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt))
1418	block = 0.; /* do not block at all */	1451	block = 0.; /* do not block at all */
1419	else	1452	else
1420	{	1453	{
1421	/* update time to cancel out callback processing overhead */	1454	/* update time to cancel out callback processing overhead */
1422	#if EV_USE_MONOTONIC	1455	#if EV_USE_MONOTONIC
…		…
1459	timers_reify (EV_A); /* relative timers called last */	1492	timers_reify (EV_A); /* relative timers called last */
1460	#if EV_PERIODIC_ENABLE	1493	#if EV_PERIODIC_ENABLE
1461	periodics_reify (EV_A); /* absolute timers called first */	1494	periodics_reify (EV_A); /* absolute timers called first */
1462	#endif	1495	#endif
1463		1496
		1497	#if EV_IDLE_ENABLE
1464	/* queue idle watchers unless other events are pending */	1498	/* queue idle watchers unless other events are pending */
1465	if (idlecnt && !any_pending (EV_A))	1499	idle_reify (EV_A);
1466	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);	1500	#endif
1467		1501
1468	/* queue check watchers, to be executed first */	1502	/* queue check watchers, to be executed first */
1469	if (expect_false (checkcnt))	1503	if (expect_false (checkcnt))
1470	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);	1504	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471		1505
…		…
1507	head = &(*head)->next;	1541	head = &(*head)->next;
1508	}	1542	}
1509	}	1543	}
1510		1544
1511	void inline_speed	1545	void inline_speed
1512	ev_clear_pending (EV_P_ W w)	1546	clear_pending (EV_P_ W w)
1513	{	1547	{
1514	if (w->pending)	1548	if (w->pending)
1515	{	1549	{
1516	pendings [ABSPRI (w)][w->pending - 1].w = 0;	1550	pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517	w->pending = 0;	1551	w->pending = 0;
1518	}	1552	}
1519	}	1553	}
1520		1554
		1555	int
		1556	ev_clear_pending (EV_P_ void *w)
		1557	{
		1558	W w_ = (W)w;
		1559	int pending = w_->pending;
		1560
		1561	if (expect_true (pending))
		1562	{
		1563	ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
		1564	w_->pending = 0;
		1565	p->w = 0;
		1566	return p->events;
		1567	}
		1568	else
		1569	return 0;
		1570	}
		1571
		1572	void inline_size
		1573	pri_adjust (EV_P_ W w)
		1574	{
		1575	int pri = w->priority;
		1576	pri = pri < EV_MINPRI ? EV_MINPRI : pri;
		1577	pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
		1578	w->priority = pri;
		1579	}
		1580
1521	void inline_speed	1581	void inline_speed
1522	ev_start (EV_P_ W w, int active)	1582	ev_start (EV_P_ W w, int active)
1523	{	1583	{
1524	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;	1584	pri_adjust (EV_A_ w);
1525	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527	w->active = active;	1585	w->active = active;
1528	ev_ref (EV_A);	1586	ev_ref (EV_A);
1529	}	1587	}
1530		1588
1531	void inline_size	1589	void inline_size
…		…
1535	w->active = 0;	1593	w->active = 0;
1536	}	1594	}
1537		1595
1538	/*****************************************************************************/	1596	/*****************************************************************************/
1539		1597
1540	void	1598	void noinline
1541	ev_io_start (EV_P_ ev_io *w)	1599	ev_io_start (EV_P_ ev_io *w)
1542	{	1600	{
1543	int fd = w->fd;	1601	int fd = w->fd;
1544		1602
1545	if (expect_false (ev_is_active (w)))	1603	if (expect_false (ev_is_active (w)))
…		…
1552	wlist_add ((WL *)&anfds[fd].head, (WL)w);	1610	wlist_add ((WL *)&anfds[fd].head, (WL)w);
1553		1611
1554	fd_change (EV_A_ fd);	1612	fd_change (EV_A_ fd);
1555	}	1613	}
1556		1614
1557	void	1615	void noinline
1558	ev_io_stop (EV_P_ ev_io *w)	1616	ev_io_stop (EV_P_ ev_io *w)
1559	{	1617	{
1560	ev_clear_pending (EV_A_ (W)w);	1618	clear_pending (EV_A_ (W)w);
1561	if (expect_false (!ev_is_active (w)))	1619	if (expect_false (!ev_is_active (w)))
1562	return;	1620	return;
1563		1621
1564	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));	1622	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565		1623
…		…
1567	ev_stop (EV_A_ (W)w);	1625	ev_stop (EV_A_ (W)w);
1568		1626
1569	fd_change (EV_A_ w->fd);	1627	fd_change (EV_A_ w->fd);
1570	}	1628	}
1571		1629
1572	void	1630	void noinline
1573	ev_timer_start (EV_P_ ev_timer *w)	1631	ev_timer_start (EV_P_ ev_timer *w)
1574	{	1632	{
1575	if (expect_false (ev_is_active (w)))	1633	if (expect_false (ev_is_active (w)))
1576	return;	1634	return;
1577		1635
…		…
1585	upheap ((WT *)timers, timercnt - 1);	1643	upheap ((WT *)timers, timercnt - 1);
1586		1644
1587	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/	1645	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/
1588	}	1646	}
1589		1647
1590	void	1648	void noinline
1591	ev_timer_stop (EV_P_ ev_timer *w)	1649	ev_timer_stop (EV_P_ ev_timer *w)
1592	{	1650	{
1593	ev_clear_pending (EV_A_ (W)w);	1651	clear_pending (EV_A_ (W)w);
1594	if (expect_false (!ev_is_active (w)))	1652	if (expect_false (!ev_is_active (w)))
1595	return;	1653	return;
1596		1654
1597	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1655	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1598		1656
…		…
1609	((WT)w)->at -= mn_now;	1667	((WT)w)->at -= mn_now;
1610		1668
1611	ev_stop (EV_A_ (W)w);	1669	ev_stop (EV_A_ (W)w);
1612	}	1670	}
1613		1671
1614	void	1672	void noinline
1615	ev_timer_again (EV_P_ ev_timer *w)	1673	ev_timer_again (EV_P_ ev_timer *w)
1616	{	1674	{
1617	if (ev_is_active (w))	1675	if (ev_is_active (w))
1618	{	1676	{
1619	if (w->repeat)	1677	if (w->repeat)
…		…
1630	ev_timer_start (EV_A_ w);	1688	ev_timer_start (EV_A_ w);
1631	}	1689	}
1632	}	1690	}
1633		1691
1634	#if EV_PERIODIC_ENABLE	1692	#if EV_PERIODIC_ENABLE
1635	void	1693	void noinline
1636	ev_periodic_start (EV_P_ ev_periodic *w)	1694	ev_periodic_start (EV_P_ ev_periodic *w)
1637	{	1695	{
1638	if (expect_false (ev_is_active (w)))	1696	if (expect_false (ev_is_active (w)))
1639	return;	1697	return;
1640		1698
…		…
1642	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1700	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1643	else if (w->interval)	1701	else if (w->interval)
1644	{	1702	{
1645	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));	1703	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1646	/* this formula differs from the one in periodic_reify because we do not always round up */	1704	/* this formula differs from the one in periodic_reify because we do not always round up */
1647	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;	1705	((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648	}	1706	}
		1707	else
		1708	((WT)w)->at = w->offset;
1649		1709
1650	ev_start (EV_A_ (W)w, ++periodiccnt);	1710	ev_start (EV_A_ (W)w, ++periodiccnt);
1651	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);	1711	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1652	periodics [periodiccnt - 1] = w;	1712	periodics [periodiccnt - 1] = w;
1653	upheap ((WT *)periodics, periodiccnt - 1);	1713	upheap ((WT *)periodics, periodiccnt - 1);
1654		1714
1655	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/	1715	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/
1656	}	1716	}
1657		1717
1658	void	1718	void noinline
1659	ev_periodic_stop (EV_P_ ev_periodic *w)	1719	ev_periodic_stop (EV_P_ ev_periodic *w)
1660	{	1720	{
1661	ev_clear_pending (EV_A_ (W)w);	1721	clear_pending (EV_A_ (W)w);
1662	if (expect_false (!ev_is_active (w)))	1722	if (expect_false (!ev_is_active (w)))
1663	return;	1723	return;
1664		1724
1665	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1725	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1666		1726
…		…
1675	}	1735	}
1676		1736
1677	ev_stop (EV_A_ (W)w);	1737	ev_stop (EV_A_ (W)w);
1678	}	1738	}
1679		1739
1680	void	1740	void noinline
1681	ev_periodic_again (EV_P_ ev_periodic *w)	1741	ev_periodic_again (EV_P_ ev_periodic *w)
1682	{	1742	{
1683	/* TODO: use adjustheap and recalculation */	1743	/* TODO: use adjustheap and recalculation */
1684	ev_periodic_stop (EV_A_ w);	1744	ev_periodic_stop (EV_A_ w);
1685	ev_periodic_start (EV_A_ w);	1745	ev_periodic_start (EV_A_ w);
…		…
1688		1748
1689	#ifndef SA_RESTART	1749	#ifndef SA_RESTART
1690	# define SA_RESTART 0	1750	# define SA_RESTART 0
1691	#endif	1751	#endif
1692		1752
1693	void	1753	void noinline
1694	ev_signal_start (EV_P_ ev_signal *w)	1754	ev_signal_start (EV_P_ ev_signal *w)
1695	{	1755	{
1696	#if EV_MULTIPLICITY	1756	#if EV_MULTIPLICITY
1697	assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));	1757	assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698	#endif	1758	#endif
…		…
1717	sigaction (w->signum, &sa, 0);	1777	sigaction (w->signum, &sa, 0);
1718	#endif	1778	#endif
1719	}	1779	}
1720	}	1780	}
1721		1781
1722	void	1782	void noinline
1723	ev_signal_stop (EV_P_ ev_signal *w)	1783	ev_signal_stop (EV_P_ ev_signal *w)
1724	{	1784	{
1725	ev_clear_pending (EV_A_ (W)w);	1785	clear_pending (EV_A_ (W)w);
1726	if (expect_false (!ev_is_active (w)))	1786	if (expect_false (!ev_is_active (w)))
1727	return;	1787	return;
1728		1788
1729	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1789	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1730	ev_stop (EV_A_ (W)w);	1790	ev_stop (EV_A_ (W)w);
…		…
1747	}	1807	}
1748		1808
1749	void	1809	void
1750	ev_child_stop (EV_P_ ev_child *w)	1810	ev_child_stop (EV_P_ ev_child *w)
1751	{	1811	{
1752	ev_clear_pending (EV_A_ (W)w);	1812	clear_pending (EV_A_ (W)w);
1753	if (expect_false (!ev_is_active (w)))	1813	if (expect_false (!ev_is_active (w)))
1754	return;	1814	return;
1755		1815
1756	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	1816	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757	ev_stop (EV_A_ (W)w);	1817	ev_stop (EV_A_ (W)w);
…		…
1993	}	2053	}
1994		2054
1995	void	2055	void
1996	ev_stat_stop (EV_P_ ev_stat *w)	2056	ev_stat_stop (EV_P_ ev_stat *w)
1997	{	2057	{
1998	ev_clear_pending (EV_A_ (W)w);	2058	clear_pending (EV_A_ (W)w);
1999	if (expect_false (!ev_is_active (w)))	2059	if (expect_false (!ev_is_active (w)))
2000	return;	2060	return;
2001		2061
2002	#if EV_USE_INOTIFY	2062	#if EV_USE_INOTIFY
2003	infy_del (EV_A_ w);	2063	infy_del (EV_A_ w);
…		…
2006		2066
2007	ev_stop (EV_A_ (W)w);	2067	ev_stop (EV_A_ (W)w);
2008	}	2068	}
2009	#endif	2069	#endif
2010		2070
		2071	#if EV_IDLE_ENABLE
2011	void	2072	void
2012	ev_idle_start (EV_P_ ev_idle *w)	2073	ev_idle_start (EV_P_ ev_idle *w)
2013	{	2074	{
2014	if (expect_false (ev_is_active (w)))	2075	if (expect_false (ev_is_active (w)))
2015	return;	2076	return;
2016		2077
		2078	pri_adjust (EV_A_ (W)w);
		2079
		2080	{
		2081	int active = ++idlecnt [ABSPRI (w)];
		2082
		2083	++idleall;
2017	ev_start (EV_A_ (W)w, ++idlecnt);	2084	ev_start (EV_A_ (W)w, active);
		2085
2018	array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);	2086	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019	idles [idlecnt - 1] = w;	2087	idles [ABSPRI (w)][active - 1] = w;
		2088	}
2020	}	2089	}
2021		2090
2022	void	2091	void
2023	ev_idle_stop (EV_P_ ev_idle *w)	2092	ev_idle_stop (EV_P_ ev_idle *w)
2024	{	2093	{
2025	ev_clear_pending (EV_A_ (W)w);	2094	clear_pending (EV_A_ (W)w);
2026	if (expect_false (!ev_is_active (w)))	2095	if (expect_false (!ev_is_active (w)))
2027	return;	2096	return;
2028		2097
2029	{	2098	{
2030	int active = ((W)w)->active;	2099	int active = ((W)w)->active;
2031	idles [active - 1] = idles [--idlecnt];	2100
		2101	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032	((W)idles [active - 1])->active = active;	2102	((W)idles [ABSPRI (w)][active - 1])->active = active;
		2103
		2104	ev_stop (EV_A_ (W)w);
		2105	--idleall;
2033	}	2106	}
2034
2035	ev_stop (EV_A_ (W)w);
2036	}	2107	}
		2108	#endif
2037		2109
2038	void	2110	void
2039	ev_prepare_start (EV_P_ ev_prepare *w)	2111	ev_prepare_start (EV_P_ ev_prepare *w)
2040	{	2112	{
2041	if (expect_false (ev_is_active (w)))	2113	if (expect_false (ev_is_active (w)))
…		…
2047	}	2119	}
2048		2120
2049	void	2121	void
2050	ev_prepare_stop (EV_P_ ev_prepare *w)	2122	ev_prepare_stop (EV_P_ ev_prepare *w)
2051	{	2123	{
2052	ev_clear_pending (EV_A_ (W)w);	2124	clear_pending (EV_A_ (W)w);
2053	if (expect_false (!ev_is_active (w)))	2125	if (expect_false (!ev_is_active (w)))
2054	return;	2126	return;
2055		2127
2056	{	2128	{
2057	int active = ((W)w)->active;	2129	int active = ((W)w)->active;
…		…
2074	}	2146	}
2075		2147
2076	void	2148	void
2077	ev_check_stop (EV_P_ ev_check *w)	2149	ev_check_stop (EV_P_ ev_check *w)
2078	{	2150	{
2079	ev_clear_pending (EV_A_ (W)w);	2151	clear_pending (EV_A_ (W)w);
2080	if (expect_false (!ev_is_active (w)))	2152	if (expect_false (!ev_is_active (w)))
2081	return;	2153	return;
2082		2154
2083	{	2155	{
2084	int active = ((W)w)->active;	2156	int active = ((W)w)->active;
…		…
2126	}	2198	}
2127		2199
2128	void	2200	void
2129	ev_embed_stop (EV_P_ ev_embed *w)	2201	ev_embed_stop (EV_P_ ev_embed *w)
2130	{	2202	{
2131	ev_clear_pending (EV_A_ (W)w);	2203	clear_pending (EV_A_ (W)w);
2132	if (expect_false (!ev_is_active (w)))	2204	if (expect_false (!ev_is_active (w)))
2133	return;	2205	return;
2134		2206
2135	ev_io_stop (EV_A_ &w->io);	2207	ev_io_stop (EV_A_ &w->io);
2136		2208
…		…
2151	}	2223	}
2152		2224
2153	void	2225	void
2154	ev_fork_stop (EV_P_ ev_fork *w)	2226	ev_fork_stop (EV_P_ ev_fork *w)
2155	{	2227	{
2156	ev_clear_pending (EV_A_ (W)w);	2228	clear_pending (EV_A_ (W)w);
2157	if (expect_false (!ev_is_active (w)))	2229	if (expect_false (!ev_is_active (w)))
2158	return;	2230	return;
2159		2231
2160	{	2232	{
2161	int active = ((W)w)->active;	2233	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.177 by root, Tue Dec 11 15:06:50 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.177 by root, Tue Dec 11 15:06:50 2007 UTC