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

Comparing libev/ev.c (file contents):
Revision 1.166 by root, Sat Dec 8 03:53:36 2007 UTC vs.
Revision 1.175 by root, Tue Dec 11 04:08:54 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)w)->priority - EV_MINPRI)	247	#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247		248
248	#define EMPTY /* required for microsofts broken pseudo-c compiler */	249	#define EMPTY /* required for microsofts broken pseudo-c compiler */
…		…
417	}	418	}
418		419
419	return ncur;	420	return ncur;
420	}	421	}
421		422
422	inline_speed void *	423	static noinline void *
423	array_realloc (int elem, void base, int cur, int cnt)	424	array_realloc (int elem, void base, int cur, int cnt)
424	{	425	{
425	cur = array_nextsize (elem, cur, cnt);	426	cur = array_nextsize (elem, cur, cnt);
426	return ev_realloc (base, elem * *cur);	427	return ev_realloc (base, elem * *cur);
427	}	428	}
…		…
452		453
453	void noinline	454	void noinline
454	ev_feed_event (EV_P_ void *w, int revents)	455	ev_feed_event (EV_P_ void *w, int revents)
455	{	456	{
456	W w_ = (W)w;	457	W w_ = (W)w;
		458	int pri = ABSPRI (w_);
457		459
458	if (expect_false (w_->pending))	460	if (expect_false (w_->pending))
		461	pendings [pri][w_->pending - 1].events \|= revents;
		462	else
459	{	463	{
		464	w_->pending = ++pendingcnt [pri];
		465	array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
		466	pendings [pri][w_->pending - 1].w = w_;
460	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;	467	pendings [pri][w_->pending - 1].events = revents;
461	return;
462	}	468	}
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	}	469	}
469		470
470	void inline_size	471	void inline_size
471	queue_events (EV_P_ W *events, int eventcnt, int type)	472	queue_events (EV_P_ W *events, int eventcnt, int type)
472	{	473	{
…		…
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	{
…		…
747	for (signum = signalmax; signum--; )	749	for (signum = signalmax; signum--; )
748	if (signals [signum].gotsig)	750	if (signals [signum].gotsig)
749	ev_feed_signal_event (EV_A_ signum + 1);	751	ev_feed_signal_event (EV_A_ signum + 1);
750	}	752	}
751		753
752	void inline_size	754	void inline_speed
753	fd_intern (int fd)	755	fd_intern (int fd)
754	{	756	{
755	#ifdef _WIN32	757	#ifdef _WIN32
756	int arg = 1;	758	int arg = 1;
757	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	759	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
…		…
1163	postfork = 1;	1165	postfork = 1;
1164	}	1166	}
1165		1167
1166	/*****************************************************************************/	1168	/*****************************************************************************/
1167		1169
		1170	void
		1171	ev_invoke (EV_P_ void *w, int revents)
		1172	{
		1173	EV_CB_INVOKE ((W)w, revents);
		1174	}
		1175
1168	void inline_speed	1176	void inline_speed
1169	call_pending (EV_P)	1177	call_pending (EV_P)
1170	{	1178	{
1171	int pri;	1179	int pri;
1172		1180
…		…
1223	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/	1231	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/
1224		1232
1225	/* first reschedule or stop timer */	1233	/* first reschedule or stop timer */
1226	if (w->reschedule_cb)	1234	if (w->reschedule_cb)
1227	{	1235	{
1228	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);	1236	((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001220703125 /* 1/8192 */);
1229	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));	1237	assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230	downheap ((WT *)periodics, periodiccnt, 0);	1238	downheap ((WT *)periodics, periodiccnt, 0);
1231	}	1239	}
1232	else if (w->interval)	1240	else if (w->interval)
1233	{	1241	{
1234	((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;	1242	((WT)w)->at = w->offset + (floor ((ev_rt_now - w->offset) / w->interval) + 1.) * w->interval;
1235	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));	1243	assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1236	downheap ((WT *)periodics, periodiccnt, 0);	1244	downheap ((WT *)periodics, periodiccnt, 0);
1237	}	1245	}
1238	else	1246	else
1239	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1247	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
…		…
1253	ev_periodic *w = periodics [i];	1261	ev_periodic *w = periodics [i];
1254		1262
1255	if (w->reschedule_cb)	1263	if (w->reschedule_cb)
1256	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1264	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257	else if (w->interval)	1265	else if (w->interval)
1258	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;	1266	((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259	}	1267	}
1260		1268
1261	/* now rebuild the heap */	1269	/* now rebuild the heap */
1262	for (i = periodiccnt >> 1; i--; )	1270	for (i = periodiccnt >> 1; i--; )
1263	downheap ((WT *)periodics, periodiccnt, i);	1271	downheap ((WT *)periodics, periodiccnt, i);
…		…
1406	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);	1414	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407	call_pending (EV_A);	1415	call_pending (EV_A);
1408	}	1416	}
1409	#endif	1417	#endif
1410		1418
1411	/* queue check watchers (and execute them) */	1419	/* queue prepare watchers (and execute them) */
1412	if (expect_false (preparecnt))	1420	if (expect_false (preparecnt))
1413	{	1421	{
1414	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	1422	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415	call_pending (EV_A);	1423	call_pending (EV_A);
1416	}	1424	}
…		…
1532	pendings [ABSPRI (w)][w->pending - 1].w = 0;	1540	pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533	w->pending = 0;	1541	w->pending = 0;
1534	}	1542	}
1535	}	1543	}
1536		1544
1537	void	1545	int
1538	ev_clear_pending (EV_P_ void *w, int invoke)	1546	ev_clear_pending (EV_P_ void *w)
1539	{	1547	{
1540	W w_ = (W)w;	1548	W w_ = (W)w;
1541	int pending = w_->pending;	1549	int pending = w_->pending;
1542		1550
1543	if (pending)	1551	if (expect_true (pending))
1544	{	1552	{
1545	ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;	1553	ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1546
1547	w_->pending = 0;	1554	w_->pending = 0;
1548	p->w = 0;	1555	p->w = 0;
1549		1556	return p->events;
1550	if (invoke)
1551	EV_CB_INVOKE (w_, p->events);
1552	}	1557	}
		1558	else
		1559	return 0;
1553	}	1560	}
1554		1561
1555	void inline_size	1562	void inline_size
1556	pri_adjust (EV_P_ W w)	1563	pri_adjust (EV_P_ W w)
1557	{	1564	{
…		…
1576	w->active = 0;	1583	w->active = 0;
1577	}	1584	}
1578		1585
1579	/*****************************************************************************/	1586	/*****************************************************************************/
1580		1587
1581	void	1588	void noinline
1582	ev_io_start (EV_P_ ev_io *w)	1589	ev_io_start (EV_P_ ev_io *w)
1583	{	1590	{
1584	int fd = w->fd;	1591	int fd = w->fd;
1585		1592
1586	if (expect_false (ev_is_active (w)))	1593	if (expect_false (ev_is_active (w)))
…		…
1593	wlist_add ((WL *)&anfds[fd].head, (WL)w);	1600	wlist_add ((WL *)&anfds[fd].head, (WL)w);
1594		1601
1595	fd_change (EV_A_ fd);	1602	fd_change (EV_A_ fd);
1596	}	1603	}
1597		1604
1598	void	1605	void noinline
1599	ev_io_stop (EV_P_ ev_io *w)	1606	ev_io_stop (EV_P_ ev_io *w)
1600	{	1607	{
1601	clear_pending (EV_A_ (W)w);	1608	clear_pending (EV_A_ (W)w);
1602	if (expect_false (!ev_is_active (w)))	1609	if (expect_false (!ev_is_active (w)))
1603	return;	1610	return;
…		…
1608	ev_stop (EV_A_ (W)w);	1615	ev_stop (EV_A_ (W)w);
1609		1616
1610	fd_change (EV_A_ w->fd);	1617	fd_change (EV_A_ w->fd);
1611	}	1618	}
1612		1619
1613	void	1620	void noinline
1614	ev_timer_start (EV_P_ ev_timer *w)	1621	ev_timer_start (EV_P_ ev_timer *w)
1615	{	1622	{
1616	if (expect_false (ev_is_active (w)))	1623	if (expect_false (ev_is_active (w)))
1617	return;	1624	return;
1618		1625
…		…
1626	upheap ((WT *)timers, timercnt - 1);	1633	upheap ((WT *)timers, timercnt - 1);
1627		1634
1628	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/	1635	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/
1629	}	1636	}
1630		1637
1631	void	1638	void noinline
1632	ev_timer_stop (EV_P_ ev_timer *w)	1639	ev_timer_stop (EV_P_ ev_timer *w)
1633	{	1640	{
1634	clear_pending (EV_A_ (W)w);	1641	clear_pending (EV_A_ (W)w);
1635	if (expect_false (!ev_is_active (w)))	1642	if (expect_false (!ev_is_active (w)))
1636	return;	1643	return;
…		…
1650	((WT)w)->at -= mn_now;	1657	((WT)w)->at -= mn_now;
1651		1658
1652	ev_stop (EV_A_ (W)w);	1659	ev_stop (EV_A_ (W)w);
1653	}	1660	}
1654		1661
1655	void	1662	void noinline
1656	ev_timer_again (EV_P_ ev_timer *w)	1663	ev_timer_again (EV_P_ ev_timer *w)
1657	{	1664	{
1658	if (ev_is_active (w))	1665	if (ev_is_active (w))
1659	{	1666	{
1660	if (w->repeat)	1667	if (w->repeat)
…		…
1671	ev_timer_start (EV_A_ w);	1678	ev_timer_start (EV_A_ w);
1672	}	1679	}
1673	}	1680	}
1674		1681
1675	#if EV_PERIODIC_ENABLE	1682	#if EV_PERIODIC_ENABLE
1676	void	1683	void noinline
1677	ev_periodic_start (EV_P_ ev_periodic *w)	1684	ev_periodic_start (EV_P_ ev_periodic *w)
1678	{	1685	{
1679	if (expect_false (ev_is_active (w)))	1686	if (expect_false (ev_is_active (w)))
1680	return;	1687	return;
1681		1688
…		…
1683	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1690	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1684	else if (w->interval)	1691	else if (w->interval)
1685	{	1692	{
1686	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));	1693	assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1687	/* this formula differs from the one in periodic_reify because we do not always round up */	1694	/* this formula differs from the one in periodic_reify because we do not always round up */
1688	((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;	1695	((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1689	}	1696	}
		1697	else
		1698	((WT)w)->at = w->offset;
1690		1699
1691	ev_start (EV_A_ (W)w, ++periodiccnt);	1700	ev_start (EV_A_ (W)w, ++periodiccnt);
1692	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);	1701	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1693	periodics [periodiccnt - 1] = w;	1702	periodics [periodiccnt - 1] = w;
1694	upheap ((WT *)periodics, periodiccnt - 1);	1703	upheap ((WT *)periodics, periodiccnt - 1);
1695		1704
1696	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/	1705	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/
1697	}	1706	}
1698		1707
1699	void	1708	void noinline
1700	ev_periodic_stop (EV_P_ ev_periodic *w)	1709	ev_periodic_stop (EV_P_ ev_periodic *w)
1701	{	1710	{
1702	clear_pending (EV_A_ (W)w);	1711	clear_pending (EV_A_ (W)w);
1703	if (expect_false (!ev_is_active (w)))	1712	if (expect_false (!ev_is_active (w)))
1704	return;	1713	return;
…		…
1716	}	1725	}
1717		1726
1718	ev_stop (EV_A_ (W)w);	1727	ev_stop (EV_A_ (W)w);
1719	}	1728	}
1720		1729
1721	void	1730	void noinline
1722	ev_periodic_again (EV_P_ ev_periodic *w)	1731	ev_periodic_again (EV_P_ ev_periodic *w)
1723	{	1732	{
1724	/* TODO: use adjustheap and recalculation */	1733	/* TODO: use adjustheap and recalculation */
1725	ev_periodic_stop (EV_A_ w);	1734	ev_periodic_stop (EV_A_ w);
1726	ev_periodic_start (EV_A_ w);	1735	ev_periodic_start (EV_A_ w);
…		…
1729		1738
1730	#ifndef SA_RESTART	1739	#ifndef SA_RESTART
1731	# define SA_RESTART 0	1740	# define SA_RESTART 0
1732	#endif	1741	#endif
1733		1742
1734	void	1743	void noinline
1735	ev_signal_start (EV_P_ ev_signal *w)	1744	ev_signal_start (EV_P_ ev_signal *w)
1736	{	1745	{
1737	#if EV_MULTIPLICITY	1746	#if EV_MULTIPLICITY
1738	assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));	1747	assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1739	#endif	1748	#endif
…		…
1758	sigaction (w->signum, &sa, 0);	1767	sigaction (w->signum, &sa, 0);
1759	#endif	1768	#endif
1760	}	1769	}
1761	}	1770	}
1762		1771
1763	void	1772	void noinline
1764	ev_signal_stop (EV_P_ ev_signal *w)	1773	ev_signal_stop (EV_P_ ev_signal *w)
1765	{	1774	{
1766	clear_pending (EV_A_ (W)w);	1775	clear_pending (EV_A_ (W)w);
1767	if (expect_false (!ev_is_active (w)))	1776	if (expect_false (!ev_is_active (w)))
1768	return;	1777	return;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.166 by root, Sat Dec 8 03:53:36 2007 UTC vs. Revision 1.175 by root, Tue Dec 11 04:08:54 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.166 by root, Sat Dec 8 03:53:36 2007 UTC vs.
Revision 1.175 by root, Tue Dec 11 04:08:54 2007 UTC