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

Comparing libev/ev.c (file contents):
Revision 1.160 by root, Sat Dec 1 22:57:20 2007 UTC vs.
Revision 1.174 by root, Tue Dec 11 03:18:33 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;
…		…
396	{	397	{
397	return ev_rt_now;	398	return ev_rt_now;
398	}	399	}
399	#endif	400	#endif
400		401
401	#define array_roundsize(type,n) (((n) \| 4) & ~3)	402	int inline_size
		403	array_nextsize (int elem, int cur, int cnt)
		404	{
		405	int ncur = cur + 1;
		406
		407	do
		408	ncur <<= 1;
		409	while (cnt > ncur);
		410
		411	/* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
		412	if (elem * ncur > 4096)
		413	{
		414	ncur *= elem;
		415	ncur = (ncur + elem + 4095 + sizeof (void ) 4) & ~4095;
		416	ncur = ncur - sizeof (void ) 4;
		417	ncur /= elem;
		418	}
		419
		420	return ncur;
		421	}
		422
		423	static noinline void *
		424	array_realloc (int elem, void base, int cur, int cnt)
		425	{
		426	cur = array_nextsize (elem, cur, cnt);
		427	return ev_realloc (base, elem * *cur);
		428	}
402		429
403	#define array_needsize(type,base,cur,cnt,init) \	430	#define array_needsize(type,base,cur,cnt,init) \
404	if (expect_false ((cnt) > cur)) \	431	if (expect_false ((cnt) > (cur))) \
405	{ \	432	{ \
406	int newcnt = cur; \	433	int ocur_ = (cur); \
407	do \	434	(base) = (type *)array_realloc \
408	{ \	435	(sizeof (type), (base), &(cur), (cnt)); \
409	newcnt = array_roundsize (type, newcnt << 1); \	436	init ((base) + (ocur_), (cur) - ocur_); \
410	} \
411	while ((cnt) > newcnt); \
412	\
413	base = (type )ev_realloc (base, sizeof (type) (newcnt));\
414	init (base + cur, newcnt - cur); \
415	cur = newcnt; \
416	}	437	}
417		438
		439	#if 0
418	#define array_slim(type,stem) \	440	#define array_slim(type,stem) \
419	if (stem ## max < array_roundsize (stem ## cnt >> 2)) \	441	if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420	{ \	442	{ \
421	stem ## max = array_roundsize (stem ## cnt >> 1); \	443	stem ## max = array_roundsize (stem ## cnt >> 1); \
422	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\	444	base = (type )ev_realloc (base, sizeof (type) (stem ## max));\
423	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\	445	fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/D/\
424	}	446	}
		447	#endif
425		448
426	#define array_free(stem, idx) \	449	#define array_free(stem, idx) \
427	ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;	450	ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428		451
429	/*****************************************************************************/	452	/*****************************************************************************/
430		453
431	void noinline	454	void noinline
432	ev_feed_event (EV_P_ void *w, int revents)	455	ev_feed_event (EV_P_ void *w, int revents)
433	{	456	{
434	W w_ = (W)w;	457	W w_ = (W)w;
		458	int pri = ABSPRI (w_);
435		459
436	if (expect_false (w_->pending))	460	if (expect_false (w_->pending))
		461	pendings [pri][w_->pending - 1].events \|= revents;
		462	else
437	{	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_;
438	pendings [ABSPRI (w_)][w_->pending - 1].events \|= revents;	467	pendings [pri][w_->pending - 1].events = revents;
439	return;
440	}	468	}
441
442	w_->pending = ++pendingcnt [ABSPRI (w_)];
443	array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444	pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445	pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446	}	469	}
447		470
448	void inline_size	471	void inline_size
449	queue_events (EV_P_ W *events, int eventcnt, int type)	472	queue_events (EV_P_ W *events, int eventcnt, int type)
450	{	473	{
…		…
485	}	508	}
486		509
487	void	510	void
488	ev_feed_fd_event (EV_P_ int fd, int revents)	511	ev_feed_fd_event (EV_P_ int fd, int revents)
489	{	512	{
		513	if (fd >= 0 && fd < anfdmax)
490	fd_event (EV_A_ fd, revents);	514	fd_event (EV_A_ fd, revents);
491	}	515	}
492		516
493	void inline_size	517	void inline_size
494	fd_reify (EV_P)	518	fd_reify (EV_P)
495	{	519	{
…		…
725	for (signum = signalmax; signum--; )	749	for (signum = signalmax; signum--; )
726	if (signals [signum].gotsig)	750	if (signals [signum].gotsig)
727	ev_feed_signal_event (EV_A_ signum + 1);	751	ev_feed_signal_event (EV_A_ signum + 1);
728	}	752	}
729		753
730	void inline_size	754	void inline_speed
731	fd_intern (int fd)	755	fd_intern (int fd)
732	{	756	{
733	#ifdef _WIN32	757	#ifdef _WIN32
734	int arg = 1;	758	int arg = 1;
735	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	759	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
…		…
764	ev_child *w;	788	ev_child *w;
765		789
766	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)
767	if (w->pid == pid \|\| !w->pid)	791	if (w->pid == pid \|\| !w->pid)
768	{	792	{
769	ev_priority (w) = ev_priority (sw); /* need to do it now */	793	ev_set_priority (w, ev_priority (sw)); /* need to do it now */
770	w->rpid = pid;	794	w->rpid = pid;
771	w->rstatus = status;	795	w->rstatus = status;
772	ev_feed_event (EV_A_ (W)w, EV_CHILD);	796	ev_feed_event (EV_A_ (W)w, EV_CHILD);
773	}	797	}
774	}	798	}
775		799
776	#ifndef WCONTINUED	800	#ifndef WCONTINUED
…		…
886	ev_backend (EV_P)	910	ev_backend (EV_P)
887	{	911	{
888	return backend;	912	return backend;
889	}	913	}
890		914
		915	unsigned int
		916	ev_loop_count (EV_P)
		917	{
		918	return loop_count;
		919	}
		920
891	static void noinline	921	static void noinline
892	loop_init (EV_P_ unsigned int flags)	922	loop_init (EV_P_ unsigned int flags)
893	{	923	{
894	if (!backend)	924	if (!backend)
895	{	925	{
…		…
975	#if EV_USE_SELECT	1005	#if EV_USE_SELECT
976	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);	1006	if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977	#endif	1007	#endif
978		1008
979	for (i = NUMPRI; i--; )	1009	for (i = NUMPRI; i--; )
		1010	{
980	array_free (pending, [i]);	1011	array_free (pending, [i]);
		1012	#if EV_IDLE_ENABLE
		1013	array_free (idle, [i]);
		1014	#endif
		1015	}
981		1016
982	/* have to use the microsoft-never-gets-it-right macro */	1017	/* have to use the microsoft-never-gets-it-right macro */
983	array_free (fdchange, EMPTY0);	1018	array_free (fdchange, EMPTY);
984	array_free (timer, EMPTY0);	1019	array_free (timer, EMPTY);
985	#if EV_PERIODIC_ENABLE	1020	#if EV_PERIODIC_ENABLE
986	array_free (periodic, EMPTY0);	1021	array_free (periodic, EMPTY);
987	#endif	1022	#endif
988	array_free (idle, EMPTY0);
989	array_free (prepare, EMPTY0);	1023	array_free (prepare, EMPTY);
990	array_free (check, EMPTY0);	1024	array_free (check, EMPTY);
991		1025
992	backend = 0;	1026	backend = 0;
993	}	1027	}
994		1028
995	void inline_size infy_fork (EV_P);	1029	void inline_size infy_fork (EV_P);
…		…
1131	postfork = 1;	1165	postfork = 1;
1132	}	1166	}
1133		1167
1134	/*****************************************************************************/	1168	/*****************************************************************************/
1135		1169
1136	int inline_size	1170	void
1137	any_pending (EV_P)	1171	ev_invoke (EV_P_ void *w, int revents)
1138	{	1172	{
1139	int pri;	1173	EV_CB_INVOKE ((W)w, revents);
1140
1141	for (pri = NUMPRI; pri--; )
1142	if (pendingcnt [pri])
1143	return 1;
1144
1145	return 0;
1146	}	1174	}
1147		1175
1148	void inline_speed	1176	void inline_speed
1149	call_pending (EV_P)	1177	call_pending (EV_P)
1150	{	1178	{
…		…
1203	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/	1231	/assert (("inactive timer on periodic heap detected", ev_is_active (w)));/
1204		1232
1205	/* first reschedule or stop timer */	1233	/* first reschedule or stop timer */
1206	if (w->reschedule_cb)	1234	if (w->reschedule_cb)
1207	{	1235	{
1208	((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 */);
1209	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));
1210	downheap ((WT *)periodics, periodiccnt, 0);	1238	downheap ((WT *)periodics, periodiccnt, 0);
1211	}	1239	}
1212	else if (w->interval)	1240	else if (w->interval)
1213	{	1241	{
1214	((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;
1215	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));
1216	downheap ((WT *)periodics, periodiccnt, 0);	1244	downheap ((WT *)periodics, periodiccnt, 0);
1217	}	1245	}
1218	else	1246	else
1219	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */	1247	ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
…		…
1233	ev_periodic *w = periodics [i];	1261	ev_periodic *w = periodics [i];
1234		1262
1235	if (w->reschedule_cb)	1263	if (w->reschedule_cb)
1236	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1264	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237	else if (w->interval)	1265	else if (w->interval)
1238	((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;
1239	}	1267	}
1240		1268
1241	/* now rebuild the heap */	1269	/* now rebuild the heap */
1242	for (i = periodiccnt >> 1; i--; )	1270	for (i = periodiccnt >> 1; i--; )
1243	downheap ((WT *)periodics, periodiccnt, i);	1271	downheap ((WT *)periodics, periodiccnt, i);
		1272	}
		1273	#endif
		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	}
1244	}	1295	}
1245	#endif	1296	#endif
1246		1297
1247	int inline_size	1298	int inline_size
1248	time_update_monotonic (EV_P)	1299	time_update_monotonic (EV_P)
…		…
1342	? EVUNLOOP_ONE	1393	? EVUNLOOP_ONE
1343	: EVUNLOOP_CANCEL;	1394	: EVUNLOOP_CANCEL;
1344		1395
1345	call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */	1396	call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346		1397
1347	while (expect_false (!activecnt))	1398	do
1348	{	1399	{
1349	#ifndef _WIN32	1400	#ifndef _WIN32
1350	if (expect_false (curpid)) /* penalise the forking check even more */	1401	if (expect_false (curpid)) /* penalise the forking check even more */
1351	if (expect_false (getpid () != curpid))	1402	if (expect_false (getpid () != curpid))
1352	{	1403	{
…		…
1363	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);	1414	queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364	call_pending (EV_A);	1415	call_pending (EV_A);
1365	}	1416	}
1366	#endif	1417	#endif
1367		1418
1368	/* queue check watchers (and execute them) */	1419	/* queue prepare watchers (and execute them) */
1369	if (expect_false (preparecnt))	1420	if (expect_false (preparecnt))
1370	{	1421	{
1371	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	1422	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372	call_pending (EV_A);	1423	call_pending (EV_A);
1373	}	1424	}
…		…
1384		1435
1385	/* calculate blocking time */	1436	/* calculate blocking time */
1386	{	1437	{
1387	ev_tstamp block;	1438	ev_tstamp block;
1388		1439
1389	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idlecnt \|\| !activecnt))	1440	if (expect_false (flags & EVLOOP_NONBLOCK \|\| idleall \|\| !activecnt))
1390	block = 0.; /* do not block at all */	1441	block = 0.; /* do not block at all */
1391	else	1442	else
1392	{	1443	{
1393	/* update time to cancel out callback processing overhead */	1444	/* update time to cancel out callback processing overhead */
1394	#if EV_USE_MONOTONIC	1445	#if EV_USE_MONOTONIC
…		…
1418	#endif	1469	#endif
1419		1470
1420	if (expect_false (block < 0.)) block = 0.;	1471	if (expect_false (block < 0.)) block = 0.;
1421	}	1472	}
1422		1473
		1474	++loop_count;
1423	backend_poll (EV_A_ block);	1475	backend_poll (EV_A_ block);
1424	}	1476	}
1425		1477
1426	/* update ev_rt_now, do magic */	1478	/* update ev_rt_now, do magic */
1427	time_update (EV_A);	1479	time_update (EV_A);
…		…
1430	timers_reify (EV_A); /* relative timers called last */	1482	timers_reify (EV_A); /* relative timers called last */
1431	#if EV_PERIODIC_ENABLE	1483	#if EV_PERIODIC_ENABLE
1432	periodics_reify (EV_A); /* absolute timers called first */	1484	periodics_reify (EV_A); /* absolute timers called first */
1433	#endif	1485	#endif
1434		1486
		1487	#if EV_IDLE_ENABLE
1435	/* queue idle watchers unless other events are pending */	1488	/* queue idle watchers unless other events are pending */
1436	if (idlecnt && !any_pending (EV_A))	1489	idle_reify (EV_A);
1437	queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);	1490	#endif
1438		1491
1439	/* queue check watchers, to be executed first */	1492	/* queue check watchers, to be executed first */
1440	if (expect_false (checkcnt))	1493	if (expect_false (checkcnt))
1441	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);	1494	queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442		1495
1443	call_pending (EV_A);	1496	call_pending (EV_A);
1444		1497
1445	if (expect_false (loop_done))
1446	break;
1447	}	1498	}
		1499	while (expect_true (activecnt && !loop_done));
1448		1500
1449	if (loop_done == EVUNLOOP_ONE)	1501	if (loop_done == EVUNLOOP_ONE)
1450	loop_done = EVUNLOOP_CANCEL;	1502	loop_done = EVUNLOOP_CANCEL;
1451	}	1503	}
1452		1504
…		…
1479	head = &(*head)->next;	1531	head = &(*head)->next;
1480	}	1532	}
1481	}	1533	}
1482		1534
1483	void inline_speed	1535	void inline_speed
1484	ev_clear_pending (EV_P_ W w)	1536	clear_pending (EV_P_ W w)
1485	{	1537	{
1486	if (w->pending)	1538	if (w->pending)
1487	{	1539	{
1488	pendings [ABSPRI (w)][w->pending - 1].w = 0;	1540	pendings [ABSPRI (w)][w->pending - 1].w = 0;
1489	w->pending = 0;	1541	w->pending = 0;
1490	}	1542	}
1491	}	1543	}
1492		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 (expect_true (pending))
		1552	{
		1553	ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
		1554	w_->pending = 0;
		1555	p->w = 0;
		1556	return p->events;
		1557	}
		1558	else
		1559	return 0;
		1560	}
		1561
		1562	void inline_size
		1563	pri_adjust (EV_P_ W w)
		1564	{
		1565	int pri = w->priority;
		1566	pri = pri < EV_MINPRI ? EV_MINPRI : pri;
		1567	pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
		1568	w->priority = pri;
		1569	}
		1570
1493	void inline_speed	1571	void inline_speed
1494	ev_start (EV_P_ W w, int active)	1572	ev_start (EV_P_ W w, int active)
1495	{	1573	{
1496	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;	1574	pri_adjust (EV_A_ w);
1497	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1498
1499	w->active = active;	1575	w->active = active;
1500	ev_ref (EV_A);	1576	ev_ref (EV_A);
1501	}	1577	}
1502		1578
1503	void inline_size	1579	void inline_size
…		…
1507	w->active = 0;	1583	w->active = 0;
1508	}	1584	}
1509		1585
1510	/*****************************************************************************/	1586	/*****************************************************************************/
1511		1587
1512	void	1588	void noinline
1513	ev_io_start (EV_P_ ev_io *w)	1589	ev_io_start (EV_P_ ev_io *w)
1514	{	1590	{
1515	int fd = w->fd;	1591	int fd = w->fd;
1516		1592
1517	if (expect_false (ev_is_active (w)))	1593	if (expect_false (ev_is_active (w)))
…		…
1524	wlist_add ((WL *)&anfds[fd].head, (WL)w);	1600	wlist_add ((WL *)&anfds[fd].head, (WL)w);
1525		1601
1526	fd_change (EV_A_ fd);	1602	fd_change (EV_A_ fd);
1527	}	1603	}
1528		1604
1529	void	1605	void noinline
1530	ev_io_stop (EV_P_ ev_io *w)	1606	ev_io_stop (EV_P_ ev_io *w)
1531	{	1607	{
1532	ev_clear_pending (EV_A_ (W)w);	1608	clear_pending (EV_A_ (W)w);
1533	if (expect_false (!ev_is_active (w)))	1609	if (expect_false (!ev_is_active (w)))
1534	return;	1610	return;
1535		1611
1536	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));	1612	assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1537		1613
…		…
1539	ev_stop (EV_A_ (W)w);	1615	ev_stop (EV_A_ (W)w);
1540		1616
1541	fd_change (EV_A_ w->fd);	1617	fd_change (EV_A_ w->fd);
1542	}	1618	}
1543		1619
1544	void	1620	void noinline
1545	ev_timer_start (EV_P_ ev_timer *w)	1621	ev_timer_start (EV_P_ ev_timer *w)
1546	{	1622	{
1547	if (expect_false (ev_is_active (w)))	1623	if (expect_false (ev_is_active (w)))
1548	return;	1624	return;
1549		1625
…		…
1557	upheap ((WT *)timers, timercnt - 1);	1633	upheap ((WT *)timers, timercnt - 1);
1558		1634
1559	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/	1635	/assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));/
1560	}	1636	}
1561		1637
1562	void	1638	void noinline
1563	ev_timer_stop (EV_P_ ev_timer *w)	1639	ev_timer_stop (EV_P_ ev_timer *w)
1564	{	1640	{
1565	ev_clear_pending (EV_A_ (W)w);	1641	clear_pending (EV_A_ (W)w);
1566	if (expect_false (!ev_is_active (w)))	1642	if (expect_false (!ev_is_active (w)))
1567	return;	1643	return;
1568		1644
1569	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));	1645	assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1570		1646
…		…
1581	((WT)w)->at -= mn_now;	1657	((WT)w)->at -= mn_now;
1582		1658
1583	ev_stop (EV_A_ (W)w);	1659	ev_stop (EV_A_ (W)w);
1584	}	1660	}
1585		1661
1586	void	1662	void noinline
1587	ev_timer_again (EV_P_ ev_timer *w)	1663	ev_timer_again (EV_P_ ev_timer *w)
1588	{	1664	{
1589	if (ev_is_active (w))	1665	if (ev_is_active (w))
1590	{	1666	{
1591	if (w->repeat)	1667	if (w->repeat)
…		…
1602	ev_timer_start (EV_A_ w);	1678	ev_timer_start (EV_A_ w);
1603	}	1679	}
1604	}	1680	}
1605		1681
1606	#if EV_PERIODIC_ENABLE	1682	#if EV_PERIODIC_ENABLE
1607	void	1683	void noinline
1608	ev_periodic_start (EV_P_ ev_periodic *w)	1684	ev_periodic_start (EV_P_ ev_periodic *w)
1609	{	1685	{
1610	if (expect_false (ev_is_active (w)))	1686	if (expect_false (ev_is_active (w)))
1611	return;	1687	return;
1612		1688
…		…
1614	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);	1690	((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1615	else if (w->interval)	1691	else if (w->interval)
1616	{	1692	{
1617	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.));
1618	/* 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 */
1619	((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;
1620	}	1696	}
		1697	else
		1698	((WT)w)->at = w->offset;
1621		1699
1622	ev_start (EV_A_ (W)w, ++periodiccnt);	1700	ev_start (EV_A_ (W)w, ++periodiccnt);
1623	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);	1701	array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1624	periodics [periodiccnt - 1] = w;	1702	periodics [periodiccnt - 1] = w;
1625	upheap ((WT *)periodics, periodiccnt - 1);	1703	upheap ((WT *)periodics, periodiccnt - 1);
1626		1704
1627	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/	1705	/assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));/
1628	}	1706	}
1629		1707
1630	void	1708	void noinline
1631	ev_periodic_stop (EV_P_ ev_periodic *w)	1709	ev_periodic_stop (EV_P_ ev_periodic *w)
1632	{	1710	{
1633	ev_clear_pending (EV_A_ (W)w);	1711	clear_pending (EV_A_ (W)w);
1634	if (expect_false (!ev_is_active (w)))	1712	if (expect_false (!ev_is_active (w)))
1635	return;	1713	return;
1636		1714
1637	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));	1715	assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1638		1716
…		…
1647	}	1725	}
1648		1726
1649	ev_stop (EV_A_ (W)w);	1727	ev_stop (EV_A_ (W)w);
1650	}	1728	}
1651		1729
1652	void	1730	void noinline
1653	ev_periodic_again (EV_P_ ev_periodic *w)	1731	ev_periodic_again (EV_P_ ev_periodic *w)
1654	{	1732	{
1655	/* TODO: use adjustheap and recalculation */	1733	/* TODO: use adjustheap and recalculation */
1656	ev_periodic_stop (EV_A_ w);	1734	ev_periodic_stop (EV_A_ w);
1657	ev_periodic_start (EV_A_ w);	1735	ev_periodic_start (EV_A_ w);
…		…
1660		1738
1661	#ifndef SA_RESTART	1739	#ifndef SA_RESTART
1662	# define SA_RESTART 0	1740	# define SA_RESTART 0
1663	#endif	1741	#endif
1664		1742
1665	void	1743	void noinline
1666	ev_signal_start (EV_P_ ev_signal *w)	1744	ev_signal_start (EV_P_ ev_signal *w)
1667	{	1745	{
1668	#if EV_MULTIPLICITY	1746	#if EV_MULTIPLICITY
1669	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));
1670	#endif	1748	#endif
…		…
1689	sigaction (w->signum, &sa, 0);	1767	sigaction (w->signum, &sa, 0);
1690	#endif	1768	#endif
1691	}	1769	}
1692	}	1770	}
1693		1771
1694	void	1772	void noinline
1695	ev_signal_stop (EV_P_ ev_signal *w)	1773	ev_signal_stop (EV_P_ ev_signal *w)
1696	{	1774	{
1697	ev_clear_pending (EV_A_ (W)w);	1775	clear_pending (EV_A_ (W)w);
1698	if (expect_false (!ev_is_active (w)))	1776	if (expect_false (!ev_is_active (w)))
1699	return;	1777	return;
1700		1778
1701	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);	1779	wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1702	ev_stop (EV_A_ (W)w);	1780	ev_stop (EV_A_ (W)w);
…		…
1719	}	1797	}
1720		1798
1721	void	1799	void
1722	ev_child_stop (EV_P_ ev_child *w)	1800	ev_child_stop (EV_P_ ev_child *w)
1723	{	1801	{
1724	ev_clear_pending (EV_A_ (W)w);	1802	clear_pending (EV_A_ (W)w);
1725	if (expect_false (!ev_is_active (w)))	1803	if (expect_false (!ev_is_active (w)))
1726	return;	1804	return;
1727		1805
1728	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);	1806	wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1729	ev_stop (EV_A_ (W)w);	1807	ev_stop (EV_A_ (W)w);
…		…
1965	}	2043	}
1966		2044
1967	void	2045	void
1968	ev_stat_stop (EV_P_ ev_stat *w)	2046	ev_stat_stop (EV_P_ ev_stat *w)
1969	{	2047	{
1970	ev_clear_pending (EV_A_ (W)w);	2048	clear_pending (EV_A_ (W)w);
1971	if (expect_false (!ev_is_active (w)))	2049	if (expect_false (!ev_is_active (w)))
1972	return;	2050	return;
1973		2051
1974	#if EV_USE_INOTIFY	2052	#if EV_USE_INOTIFY
1975	infy_del (EV_A_ w);	2053	infy_del (EV_A_ w);
…		…
1978		2056
1979	ev_stop (EV_A_ (W)w);	2057	ev_stop (EV_A_ (W)w);
1980	}	2058	}
1981	#endif	2059	#endif
1982		2060
		2061	#if EV_IDLE_ENABLE
1983	void	2062	void
1984	ev_idle_start (EV_P_ ev_idle *w)	2063	ev_idle_start (EV_P_ ev_idle *w)
1985	{	2064	{
1986	if (expect_false (ev_is_active (w)))	2065	if (expect_false (ev_is_active (w)))
1987	return;	2066	return;
1988		2067
		2068	pri_adjust (EV_A_ (W)w);
		2069
		2070	{
		2071	int active = ++idlecnt [ABSPRI (w)];
		2072
		2073	++idleall;
1989	ev_start (EV_A_ (W)w, ++idlecnt);	2074	ev_start (EV_A_ (W)w, active);
		2075
1990	array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);	2076	array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1991	idles [idlecnt - 1] = w;	2077	idles [ABSPRI (w)][active - 1] = w;
		2078	}
1992	}	2079	}
1993		2080
1994	void	2081	void
1995	ev_idle_stop (EV_P_ ev_idle *w)	2082	ev_idle_stop (EV_P_ ev_idle *w)
1996	{	2083	{
1997	ev_clear_pending (EV_A_ (W)w);	2084	clear_pending (EV_A_ (W)w);
1998	if (expect_false (!ev_is_active (w)))	2085	if (expect_false (!ev_is_active (w)))
1999	return;	2086	return;
2000		2087
2001	{	2088	{
2002	int active = ((W)w)->active;	2089	int active = ((W)w)->active;
2003	idles [active - 1] = idles [--idlecnt];	2090
		2091	idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2004	((W)idles [active - 1])->active = active;	2092	((W)idles [ABSPRI (w)][active - 1])->active = active;
		2093
		2094	ev_stop (EV_A_ (W)w);
		2095	--idleall;
2005	}	2096	}
2006
2007	ev_stop (EV_A_ (W)w);
2008	}	2097	}
		2098	#endif
2009		2099
2010	void	2100	void
2011	ev_prepare_start (EV_P_ ev_prepare *w)	2101	ev_prepare_start (EV_P_ ev_prepare *w)
2012	{	2102	{
2013	if (expect_false (ev_is_active (w)))	2103	if (expect_false (ev_is_active (w)))
…		…
2019	}	2109	}
2020		2110
2021	void	2111	void
2022	ev_prepare_stop (EV_P_ ev_prepare *w)	2112	ev_prepare_stop (EV_P_ ev_prepare *w)
2023	{	2113	{
2024	ev_clear_pending (EV_A_ (W)w);	2114	clear_pending (EV_A_ (W)w);
2025	if (expect_false (!ev_is_active (w)))	2115	if (expect_false (!ev_is_active (w)))
2026	return;	2116	return;
2027		2117
2028	{	2118	{
2029	int active = ((W)w)->active;	2119	int active = ((W)w)->active;
…		…
2046	}	2136	}
2047		2137
2048	void	2138	void
2049	ev_check_stop (EV_P_ ev_check *w)	2139	ev_check_stop (EV_P_ ev_check *w)
2050	{	2140	{
2051	ev_clear_pending (EV_A_ (W)w);	2141	clear_pending (EV_A_ (W)w);
2052	if (expect_false (!ev_is_active (w)))	2142	if (expect_false (!ev_is_active (w)))
2053	return;	2143	return;
2054		2144
2055	{	2145	{
2056	int active = ((W)w)->active;	2146	int active = ((W)w)->active;
…		…
2098	}	2188	}
2099		2189
2100	void	2190	void
2101	ev_embed_stop (EV_P_ ev_embed *w)	2191	ev_embed_stop (EV_P_ ev_embed *w)
2102	{	2192	{
2103	ev_clear_pending (EV_A_ (W)w);	2193	clear_pending (EV_A_ (W)w);
2104	if (expect_false (!ev_is_active (w)))	2194	if (expect_false (!ev_is_active (w)))
2105	return;	2195	return;
2106		2196
2107	ev_io_stop (EV_A_ &w->io);	2197	ev_io_stop (EV_A_ &w->io);
2108		2198
…		…
2123	}	2213	}
2124		2214
2125	void	2215	void
2126	ev_fork_stop (EV_P_ ev_fork *w)	2216	ev_fork_stop (EV_P_ ev_fork *w)
2127	{	2217	{
2128	ev_clear_pending (EV_A_ (W)w);	2218	clear_pending (EV_A_ (W)w);
2129	if (expect_false (!ev_is_active (w)))	2219	if (expect_false (!ev_is_active (w)))
2130	return;	2220	return;
2131		2221
2132	{	2222	{
2133	int active = ((W)w)->active;	2223	int active = ((W)w)->active;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.160 by root, Sat Dec 1 22:57:20 2007 UTC vs. Revision 1.174 by root, Tue Dec 11 03:18:33 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.160 by root, Sat Dec 1 22:57:20 2007 UTC vs.
Revision 1.174 by root, Tue Dec 11 03:18:33 2007 UTC