ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC vs.
Revision 1.178 by root, Tue Dec 11 18:36:11 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 noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
228#else 238#else
… …
418 } 428 }
419 429
420 return ncur; 430 return ncur;
421} 431}
422 432
423inline_speed void * 433static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt) 434array_realloc (int elem, void *base, int *cur, int cnt)
425{ 435{
426 *cur = array_nextsize (elem, *cur, cnt); 436 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur); 437 return ev_realloc (base, elem * *cur);
428} 438}
… …
453 463
454void noinline 464void noinline
455ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
456{ 466{
457 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
458 469
459 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
460 { 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_;
461 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
462 return;
463 } 478 }
464
465 w_->pending = ++pendingcnt [ABSPRI (w_)];
466 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
467 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
468 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
469} 479}
470 480
471void inline_size 481void inline_size
472queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 483{
… …
749 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
752} 762}
753 763
754void inline_size 764void inline_speed
755fd_intern (int fd) 765fd_intern (int fd)
756{ 766{
757#ifdef _WIN32 767#ifdef _WIN32
758 int arg = 1; 768 int arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
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);
… …
1293 } 1304 }
1294 } 1305 }
1295} 1306}
1296#endif 1307#endif
1297 1308
1298int inline_size 1309void inline_speed
1299time_update_monotonic (EV_P) 1310time_update (EV_P_ ev_tstamp max_block)
1300{ 1311{
1312 int i;
1313
1314#if EV_USE_MONOTONIC
1315 if (expect_true (have_monotonic))
1316 {
1317 ev_tstamp odiff = rtmn_diff;
1318
1301 mn_now = get_clock (); 1319 mn_now = get_clock ();
1302 1320
1321 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1322 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1323 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1324 {
1305 ev_rt_now = rtmn_diff + mn_now; 1325 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1326 return;
1307 } 1327 }
1308 else 1328
1309 {
1310 now_floor = mn_now; 1329 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1330 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1331
1316void inline_size 1332 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1333 * on the choice of "4": one iteration isn't enough,
1318{ 1334 * in case we get preempted during the calls to
1319 int i; 1335 * ev_time and get_clock. a second call is almost guaranteed
1320 1336 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1337 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1338 * in the unlikely event of having been preempted here.
1323 { 1339 */
1324 if (time_update_monotonic (EV_A)) 1340 for (i = 4; --i; )
1325 { 1341 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1342 rtmn_diff = ev_rt_now - mn_now;
1339 1343
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1344 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1345 return; /* all is well */
1342 1346
1343 ev_rt_now = ev_time (); 1347 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1348 mn_now = get_clock ();
1345 now_floor = mn_now; 1349 now_floor = mn_now;
1346 } 1350 }
1347 1351
1348# if EV_PERIODIC_ENABLE 1352# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1353 periodics_reschedule (EV_A);
1350# endif 1354# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1355 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1356 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1357 }
1355 else 1358 else
1356#endif 1359#endif
1357 { 1360 {
1358 ev_rt_now = ev_time (); 1361 ev_rt_now = ev_time ();
1359 1362
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1363 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1364 {
1362#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1366 periodics_reschedule (EV_A);
1364#endif 1367#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1368 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1369 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1370 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1371 }
1370 1372
… …
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1416 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1417 call_pending (EV_A);
1416 } 1418 }
1417#endif 1419#endif
1418 1420
1419 /* queue check watchers (and execute them) */ 1421 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1422 if (expect_false (preparecnt))
1421 { 1423 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1424 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1425 call_pending (EV_A);
1424 } 1426 }
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1443 block = 0.; /* do not block at all */
1442 else 1444 else
1443 { 1445 {
1444 /* update time to cancel out callback processing overhead */ 1446 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1447 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1448
1455 block = MAX_BLOCKTIME; 1449 block = MAX_BLOCKTIME;
1456 1450
1457 if (timercnt) 1451 if (timercnt)
1458 { 1452 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1465 if (expect_false (block < 0.)) block = 0.;
1472 } 1466 }
1473 1467
1474 ++loop_count; 1468 ++loop_count;
1475 backend_poll (EV_A_ block); 1469 backend_poll (EV_A_ block);
1470
1471 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block);
1476 } 1473 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1474
1481 /* queue pending timers and reschedule them */ 1475 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1476 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1477#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1478 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1540ev_clear_pending (EV_P_ void *w)
1547{ 1541{
1548 W w_ = (W)w; 1542 W w_ = (W)w;
1549 int pending = w_->pending; 1543 int pending = w_->pending;
1550 1544
1551 if (!pending) 1545 if (expect_true (pending))
1546 {
1547 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1548 w_->pending = 0;
1549 p->w = 0;
1550 return p->events;
1551 }
1552 else
1552 return 0; 1553 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1554}
1560 1555
1561void inline_size 1556void inline_size
1562pri_adjust (EV_P_ W w) 1557pri_adjust (EV_P_ W w)
1563{ 1558{
… …
1582 w->active = 0; 1577 w->active = 0;
1583} 1578}
1584 1579
1585/*****************************************************************************/ 1580/*****************************************************************************/
1586 1581
1587void 1582void noinline
1588ev_io_start (EV_P_ ev_io *w) 1583ev_io_start (EV_P_ ev_io *w)
1589{ 1584{
1590 int fd = w->fd; 1585 int fd = w->fd;
1591 1586
1592 if (expect_false (ev_is_active (w))) 1587 if (expect_false (ev_is_active (w)))
… …
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1594 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1600 1595
1601 fd_change (EV_A_ fd); 1596 fd_change (EV_A_ fd);
1602} 1597}
1603 1598
1604void 1599void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1600ev_io_stop (EV_P_ ev_io *w)
1606{ 1601{
1607 clear_pending (EV_A_ (W)w); 1602 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1603 if (expect_false (!ev_is_active (w)))
1609 return; 1604 return;
… …
1614 ev_stop (EV_A_ (W)w); 1609 ev_stop (EV_A_ (W)w);
1615 1610
1616 fd_change (EV_A_ w->fd); 1611 fd_change (EV_A_ w->fd);
1617} 1612}
1618 1613
1619void 1614void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1615ev_timer_start (EV_P_ ev_timer *w)
1621{ 1616{
1622 if (expect_false (ev_is_active (w))) 1617 if (expect_false (ev_is_active (w)))
1623 return; 1618 return;
1624 1619
… …
1632 upheap ((WT *)timers, timercnt - 1); 1627 upheap ((WT *)timers, timercnt - 1);
1633 1628
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1630}
1636 1631
1637void 1632void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1633ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1634{
1640 clear_pending (EV_A_ (W)w); 1635 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1636 if (expect_false (!ev_is_active (w)))
1642 return; 1637 return;
… …
1656 ((WT)w)->at -= mn_now; 1651 ((WT)w)->at -= mn_now;
1657 1652
1658 ev_stop (EV_A_ (W)w); 1653 ev_stop (EV_A_ (W)w);
1659} 1654}
1660 1655
1661void 1656void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1657ev_timer_again (EV_P_ ev_timer *w)
1663{ 1658{
1664 if (ev_is_active (w)) 1659 if (ev_is_active (w))
1665 { 1660 {
1666 if (w->repeat) 1661 if (w->repeat)
… …
1677 ev_timer_start (EV_A_ w); 1672 ev_timer_start (EV_A_ w);
1678 } 1673 }
1679} 1674}
1680 1675
1681#if EV_PERIODIC_ENABLE 1676#if EV_PERIODIC_ENABLE
1682void 1677void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1678ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1679{
1685 if (expect_false (ev_is_active (w))) 1680 if (expect_false (ev_is_active (w)))
1686 return; 1681 return;
1687 1682
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1684 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1685 else if (w->interval)
1691 { 1686 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1687 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1693 /* this formula differs from the one in periodic_reify because we do not always round up */ 1688 /* this formula differs from the one in periodic_reify because we do not always round up */
1694 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1689 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1690 }
1691 else
1692 ((WT)w)->at = w->offset;
1696 1693
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1694 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1696 periodics [periodiccnt - 1] = w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1697 upheap ((WT *)periodics, periodiccnt - 1);
1701 1698
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1700}
1704 1701
1705void 1702void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1703ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1704{
1708 clear_pending (EV_A_ (W)w); 1705 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1706 if (expect_false (!ev_is_active (w)))
1710 return; 1707 return;
… …
1722 } 1719 }
1723 1720
1724 ev_stop (EV_A_ (W)w); 1721 ev_stop (EV_A_ (W)w);
1725} 1722}
1726 1723
1727void 1724void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1725ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1726{
1730 /* TODO: use adjustheap and recalculation */ 1727 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1728 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1729 ev_periodic_start (EV_A_ w);
… …
1735 1732
1736#ifndef SA_RESTART 1733#ifndef SA_RESTART
1737# define SA_RESTART 0 1734# define SA_RESTART 0
1738#endif 1735#endif
1739 1736
1740void 1737void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1738ev_signal_start (EV_P_ ev_signal *w)
1742{ 1739{
1743#if EV_MULTIPLICITY 1740#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1741 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1742#endif
… …
1764 sigaction (w->signum, &sa, 0); 1761 sigaction (w->signum, &sa, 0);
1765#endif 1762#endif
1766 } 1763 }
1767} 1764}
1768 1765
1769void 1766void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1767ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1768{
1772 clear_pending (EV_A_ (W)w); 1769 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1770 if (expect_false (!ev_is_active (w)))
1774 return; 1771 return;

Diff Legend

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