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

Comparing libev/ev.c (file contents):
Revision 1.224 by root, Wed Apr 9 22:07:50 2008 UTC vs.
Revision 1.236 by root, Wed May 7 14:46:22 2008 UTC

… …
325 325
326typedef ev_watcher *W; 326typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
329 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
330#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 337#endif
… …
517 } 520 }
518} 521}
519 522
520/*****************************************************************************/ 523/*****************************************************************************/
521 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
522int inline_size 527int inline_size
523array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
524{ 529{
525 int ncur = cur + 1; 530 int ncur = cur + 1;
526 531
527 do 532 do
528 ncur <<= 1; 533 ncur <<= 1;
529 while (cnt > ncur); 534 while (cnt > ncur);
530 535
531 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
532 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
533 { 538 {
534 ncur *= elem; 539 ncur *= elem;
535 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
536 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
537 ncur /= elem; 542 ncur /= elem;
538 } 543 }
539 544
540 return ncur; 545 return ncur;
… …
754 } 759 }
755} 760}
756 761
757/*****************************************************************************/ 762/*****************************************************************************/
758 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
759void inline_speed 776void inline_speed
760upheap (WT *heap, int k) 777upheap (WT *heap, int k)
761{ 778{
762 WT w = heap [k]; 779 WT w = heap [k];
763 780
764 while (k) 781 for (;;)
765 { 782 {
766 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
767 784
768 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
769 break; 786 break;
770 787
771 heap [k] = heap [p]; 788 heap [k] = heap [p];
772 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
773 k = p; 790 k = p;
774 } 791 }
775 792
776 heap [k] = w; 793 heap [k] = w;
777 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
778} 795}
779 796
797/* away from the root */
780void inline_speed 798void inline_speed
781downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
782{ 800{
783 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
784 803
785 for (;;) 804 for (;;)
786 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 /* fast path */
814 (minpos = pos + 0), (minat = (*minpos)->at);
815 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
816 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
817 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
818 }
819 else
820 {
821 /* slow path */
822 if (pos >= E)
823 break;
824 (minpos = pos + 0), (minat = (*minpos)->at);
825 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
826 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
827 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
828 }
829
830 if (w->at <= minat)
831 break;
832
833 ev_active (*minpos) = k;
834 heap [k] = *minpos;
835
836 k = minpos - heap;
837 }
838
839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
787 int c = (k << 1) + 1; 878 int c = k << 1;
788 879
789 if (c >= N) 880 if (c > N)
790 break; 881 break;
791 882
792 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
793 ? 1 : 0; 884 ? 1 : 0;
794 885
795 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
796 break; 887 break;
797 888
798 heap [k] = heap [c]; 889 heap [k] = heap [c];
799 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
800 891
801 k = c; 892 k = c;
802 } 893 }
803 894
804 heap [k] = w; 895 heap [k] = w;
805 ((W)heap [k])->active = k + 1; 896 ev_active (heap [k]) = k;
806} 897}
898#endif
807 899
808void inline_size 900void inline_size
809adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
810{ 902{
811 upheap (heap, k); 903 upheap (heap, k);
… …
906pipecb (EV_P_ ev_io *iow, int revents) 998pipecb (EV_P_ ev_io *iow, int revents)
907{ 999{
908#if EV_USE_EVENTFD 1000#if EV_USE_EVENTFD
909 if (evfd >= 0) 1001 if (evfd >= 0)
910 { 1002 {
911 uint64_t counter = 1; 1003 uint64_t counter;
912 read (evfd, &counter, sizeof (uint64_t)); 1004 read (evfd, &counter, sizeof (uint64_t));
913 } 1005 }
914 else 1006 else
915#endif 1007#endif
916 { 1008 {
… …
1185 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
1186 && !enable_secure () 1278 && !enable_secure ()
1187 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
1188 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
1189 1281
1190 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
1191 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
1192 1284
1193#if EV_USE_PORT 1285#if EV_USE_PORT
1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1195#endif 1287#endif
… …
1283#endif 1375#endif
1284 1376
1285 backend = 0; 1377 backend = 0;
1286} 1378}
1287 1379
1380#if EV_USE_INOTIFY
1288void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1289 1383
1290void inline_size 1384void inline_size
1291loop_fork (EV_P) 1385loop_fork (EV_P)
1292{ 1386{
1293#if EV_USE_PORT 1387#if EV_USE_PORT
… …
1360void 1454void
1361ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1362{ 1456{
1363 postfork = 1; /* must be in line with ev_default_fork */ 1457 postfork = 1; /* must be in line with ev_default_fork */
1364} 1458}
1365
1366#endif 1459#endif
1367 1460
1368#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1369struct ev_loop * 1462struct ev_loop *
1370ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
… …
1451 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1452 } 1545 }
1453 } 1546 }
1454} 1547}
1455 1548
1456void inline_size
1457timers_reify (EV_P)
1458{
1459 while (timercnt && ((WT)timers [0])->at <= mn_now)
1460 {
1461 ev_timer *w = (ev_timer *)timers [0];
1462
1463 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1464
1465 /* first reschedule or stop timer */
1466 if (w->repeat)
1467 {
1468 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1469
1470 ((WT)w)->at += w->repeat;
1471 if (((WT)w)->at < mn_now)
1472 ((WT)w)->at = mn_now;
1473
1474 downheap (timers, timercnt, 0);
1475 }
1476 else
1477 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1478
1479 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1480 }
1481}
1482
1483#if EV_PERIODIC_ENABLE
1484void inline_size
1485periodics_reify (EV_P)
1486{
1487 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1488 {
1489 ev_periodic *w = (ev_periodic *)periodics [0];
1490
1491 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1492
1493 /* first reschedule or stop timer */
1494 if (w->reschedule_cb)
1495 {
1496 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1497 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1498 downheap (periodics, periodiccnt, 0);
1499 }
1500 else if (w->interval)
1501 {
1502 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1503 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1504 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1505 downheap (periodics, periodiccnt, 0);
1506 }
1507 else
1508 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1509
1510 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1511 }
1512}
1513
1514static void noinline
1515periodics_reschedule (EV_P)
1516{
1517 int i;
1518
1519 /* adjust periodics after time jump */
1520 for (i = 0; i < periodiccnt; ++i)
1521 {
1522 ev_periodic *w = (ev_periodic *)periodics [i];
1523
1524 if (w->reschedule_cb)
1525 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1526 else if (w->interval)
1527 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1528 }
1529
1530 /* now rebuild the heap */
1531 for (i = periodiccnt >> 1; i--; )
1532 downheap (periodics, periodiccnt, i);
1533}
1534#endif
1535
1536#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1537void inline_size 1550void inline_size
1538idle_reify (EV_P) 1551idle_reify (EV_P)
1539{ 1552{
1540 if (expect_false (idleall)) 1553 if (expect_false (idleall))
… …
1551 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1552 break; 1565 break;
1553 } 1566 }
1554 } 1567 }
1555 } 1568 }
1569}
1570#endif
1571
1572void inline_size
1573timers_reify (EV_P)
1574{
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1576 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1578
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580
1581 /* first reschedule or stop timer */
1582 if (w->repeat)
1583 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now;
1589
1590 downheap (timers, timercnt, HEAP0);
1591 }
1592 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 }
1597}
1598
1599#if EV_PERIODIC_ENABLE
1600void inline_size
1601periodics_reify (EV_P)
1602{
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1604 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1606
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608
1609 /* first reschedule or stop timer */
1610 if (w->reschedule_cb)
1611 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1614 downheap (periodics, periodiccnt, 1);
1615 }
1616 else if (w->interval)
1617 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1621 downheap (periodics, periodiccnt, HEAP0);
1622 }
1623 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 }
1628}
1629
1630static void noinline
1631periodics_reschedule (EV_P)
1632{
1633 int i;
1634
1635 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i)
1637 {
1638 ev_periodic *w = (ev_periodic *)periodics [i];
1639
1640 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645
1646 /* now rebuild the heap */
1647 for (i = periodiccnt >> 1; --i; )
1648 downheap (periodics, periodiccnt, i + HEAP0);
1556} 1649}
1557#endif 1650#endif
1558 1651
1559void inline_speed 1652void inline_speed
1560time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
… …
1589 */ 1682 */
1590 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1591 { 1684 {
1592 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1593 1686
1594 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1595 return; /* all is well */ 1688 return; /* all is well */
1596 1689
1597 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1598 mn_now = get_clock (); 1691 mn_now = get_clock ();
1599 now_floor = mn_now; 1692 now_floor = mn_now;
… …
1614 { 1707 {
1615#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1616 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1617#endif 1710#endif
1618 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1619 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1620 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1621 } 1714 }
1622 1715
1623 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1624 } 1717 }
1625} 1718}
… …
1695 1788
1696 waittime = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1697 1790
1698 if (timercnt) 1791 if (timercnt)
1699 { 1792 {
1700 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1701 if (waittime > to) waittime = to; 1794 if (waittime > to) waittime = to;
1702 } 1795 }
1703 1796
1704#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1705 if (periodiccnt) 1798 if (periodiccnt)
1706 { 1799 {
1707 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1708 if (waittime > to) waittime = to; 1801 if (waittime > to) waittime = to;
1709 } 1802 }
1710#endif 1803#endif
1711 1804
1712 if (expect_false (waittime < timeout_blocktime)) 1805 if (expect_false (waittime < timeout_blocktime))
… …
1878ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1879{ 1972{
1880 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1881 return; 1974 return;
1882 1975
1883 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1884 1977
1885 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1886 1979
1887 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1888 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1889 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1890 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1891 1984
1892 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1893} 1986}
1894 1987
1895void noinline 1988void noinline
1896ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1897{ 1990{
1898 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1899 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1900 return; 1993 return;
1901 1994
1902 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1903
1904 { 1995 {
1905 int active = ((W)w)->active; 1996 int active = ev_active (w);
1906 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1907 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1908 { 2001 {
1909 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1910 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1911 } 2004 }
2005
2006 --timercnt;
1912 } 2007 }
1913 2008
1914 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1915 2010
1916 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1917} 2012}
1918 2013
1919void noinline 2014void noinline
… …
1921{ 2016{
1922 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1923 { 2018 {
1924 if (w->repeat) 2019 if (w->repeat)
1925 { 2020 {
1926 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1927 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1928 } 2023 }
1929 else 2024 else
1930 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1931 } 2026 }
1932 else if (w->repeat) 2027 else if (w->repeat)
1933 { 2028 {
1934 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1935 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1936 } 2031 }
1937} 2032}
1938 2033
1939#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
… …
1942{ 2037{
1943 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1944 return; 2039 return;
1945 2040
1946 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1947 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1948 else if (w->interval) 2043 else if (w->interval)
1949 { 2044 {
1950 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1951 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1952 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1953 } 2048 }
1954 else 2049 else
1955 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1956 2051
1957 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1958 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1959 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1960 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1961 2056
1962 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1963} 2058}
1964 2059
1965void noinline 2060void noinline
1966ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1967{ 2062{
1968 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1969 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1970 return; 2065 return;
1971 2066
1972 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1973
1974 { 2067 {
1975 int active = ((W)w)->active; 2068 int active = ev_active (w);
1976 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1977 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1978 { 2073 {
1979 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1980 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1981 } 2076 }
2077
2078 --periodiccnt;
1982 } 2079 }
1983 2080
1984 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1985} 2082}
1986 2083
… …
2102 if (w->wd < 0) 2199 if (w->wd < 0)
2103 { 2200 {
2104 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2105 2202
2106 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
2107 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2108 { 2207 {
2109 char path [4096]; 2208 char path [4096];
2110 strcpy (path, w->path); 2209 strcpy (path, w->path);
2111 2210
… …
2356 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2357 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2358 return; 2457 return;
2359 2458
2360 { 2459 {
2361 int active = ((W)w)->active; 2460 int active = ev_active (w);
2362 2461
2363 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2364 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2365 2464
2366 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2367 --idleall; 2466 --idleall;
2368 } 2467 }
2369} 2468}
… …
2386 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2387 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2388 return; 2487 return;
2389 2488
2390 { 2489 {
2391 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2392 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2393 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2394 } 2494 }
2395 2495
2396 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2397} 2497}
2398 2498
… …
2413 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2414 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2415 return; 2515 return;
2416 2516
2417 { 2517 {
2418 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2419 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2420 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2421 } 2522 }
2422 2523
2423 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2424} 2525}
2425 2526
… …
2521 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2523 return; 2624 return;
2524 2625
2525 { 2626 {
2526 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2527 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2528 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2529 } 2631 }
2530 2632
2531 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2532} 2634}
2533#endif 2635#endif
… …
2552 clear_pending (EV_A_ (W)w); 2654 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w))) 2655 if (expect_false (!ev_is_active (w)))
2554 return; 2656 return;
2555 2657
2556 { 2658 {
2557 int active = ((W)w)->active; 2659 int active = ev_active (w);
2660
2558 asyncs [active - 1] = asyncs [--asynccnt]; 2661 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active; 2662 ev_active (asyncs [active - 1]) = active;
2560 } 2663 }
2561 2664
2562 ev_stop (EV_A_ (W)w); 2665 ev_stop (EV_A_ (W)w);
2563} 2666}
2564 2667

Diff Legend

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