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

Comparing libev/ev.c (file contents):
Revision 1.235 by root, Wed May 7 14:45:17 2008 UTC vs.
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC

… …
235# else 235# else
236# define EV_USE_EVENTFD 0 236# define EV_USE_EVENTFD 0
237# endif 237# endif
238#endif 238#endif
239 239
240#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 249
242#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
… …
422 W w; 430 W w;
423 int events; 431 int events;
424} ANPENDING; 432} ANPENDING;
425 433
426#if EV_USE_INOTIFY 434#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */
427typedef struct 436typedef struct
428{ 437{
429 WL head; 438 WL head;
430} ANFS; 439} ANFS;
440#endif
441
442/* Heap Entry */
443#if EV_HEAP_CACHE_AT
444 typedef struct {
445 ev_tstamp at;
446 WT w;
447 } ANHE;
448
449 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
452#else
453 typedef WT ANHE;
454
455 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he)
431#endif 458#endif
432 459
433#if EV_MULTIPLICITY 460#if EV_MULTIPLICITY
434 461
435 struct ev_loop 462 struct ev_loop
… …
760} 787}
761 788
762/*****************************************************************************/ 789/*****************************************************************************/
763 790
764/* 791/*
792 * the heap functions want a real array index. array index 0 uis guaranteed to not
793 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
794 * the branching factor of the d-tree.
795 */
796
797/*
765 * at the moment we allow libev the luxury of two heaps, 798 * 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 799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient. 800 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 801 * the difference is about 5% with 50000+ watchers.
769 */ 802 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP 803#if EV_USE_4HEAP
772 804
805#define DHEAP 4
773#define HEAP0 3 /* index of first element in heap */ 806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
774 808
775/* towards the root */ 809/* towards the root */
776void inline_speed 810void inline_speed
777upheap (WT *heap, int k) 811upheap (ANHE *heap, int k)
778{ 812{
779 WT w = heap [k]; 813 ANHE he = heap [k];
780 814
781 for (;;) 815 for (;;)
782 { 816 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0; 817 int p = HPARENT (k);
784 818
785 if (p >= HEAP0 || heap [p]->at <= w->at) 819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
786 break; 820 break;
787 821
788 heap [k] = heap [p]; 822 heap [k] = heap [p];
789 ev_active (heap [k]) = k; 823 ev_active (ANHE_w (heap [k])) = k;
790 k = p; 824 k = p;
791 } 825 }
792 826
793 heap [k] = w; 827 heap [k] = he;
794 ev_active (heap [k]) = k; 828 ev_active (ANHE_w (he)) = k;
795} 829}
796 830
797/* away from the root */ 831/* away from the root */
798void inline_speed 832void inline_speed
799downheap (WT *heap, int N, int k) 833downheap (ANHE *heap, int N, int k)
800{ 834{
801 WT w = heap [k]; 835 ANHE he = heap [k];
802 WT *E = heap + N + HEAP0; 836 ANHE *E = heap + N + HEAP0;
803 837
804 for (;;) 838 for (;;)
805 { 839 {
806 ev_tstamp minat; 840 ev_tstamp minat;
807 WT *minpos; 841 ANHE *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0; 842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
809 843
810 // find minimum child 844 // find minimum child
811 if (expect_true (pos +3 < E)) 845 if (expect_true (pos + DHEAP - 1 < E))
812 { 846 {
813 (minpos = pos + 0), (minat = (*minpos)->at); 847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at); 849 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at); 850 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
851 }
852 else if (pos < E)
853 {
854 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
855 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
856 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
857 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
817 } 858 }
818 else 859 else
819 {
820 if (pos >= E)
821 break;
822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
829 if (w->at <= minat)
830 break; 860 break;
831 861
832 ev_active (*minpos) = k; 862 if (ANHE_at (he) <= minat)
863 break;
864
833 heap [k] = *minpos; 865 heap [k] = *minpos;
866 ev_active (ANHE_w (*minpos)) = k;
834 867
835 k = minpos - heap; 868 k = minpos - heap;
836 } 869 }
837 870
838 heap [k] = w; 871 heap [k] = he;
839 ev_active (heap [k]) = k; 872 ev_active (ANHE_w (he)) = k;
840} 873}
841 874
842#else // 4HEAP 875#else // 4HEAP
843 876
844#define HEAP0 1 877#define HEAP0 1
878#define HPARENT(k) ((k) >> 1)
845 879
846/* towards the root */ 880/* towards the root */
847void inline_speed 881void inline_speed
848upheap (WT *heap, int k) 882upheap (ANHE *heap, int k)
849{ 883{
850 WT w = heap [k]; 884 ANHE he = heap [k];
851 885
852 for (;;) 886 for (;;)
853 { 887 {
854 int p = k >> 1; 888 int p = HPARENT (k);
855 889
856 /* maybe we could use a dummy element at heap [0]? */ 890 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at) 891 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
858 break; 892 break;
859 893
860 heap [k] = heap [p]; 894 heap [k] = heap [p];
861 ev_active (heap [k]) = k; 895 ev_active (ANHE_w (heap [k])) = k;
862 k = p; 896 k = p;
863 } 897 }
864 898
865 heap [k] = w; 899 heap [k] = he;
866 ev_active (heap [k]) = k; 900 ev_active (ANHE_w (heap [k])) = k;
867} 901}
868 902
869/* away from the root */ 903/* away from the root */
870void inline_speed 904void inline_speed
871downheap (WT *heap, int N, int k) 905downheap (ANHE *heap, int N, int k)
872{ 906{
873 WT w = heap [k]; 907 ANHE he = heap [k];
874 908
875 for (;;) 909 for (;;)
876 { 910 {
877 int c = k << 1; 911 int c = k << 1;
878 912
879 if (c > N) 913 if (c > N)
880 break; 914 break;
881 915
882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
883 ? 1 : 0; 917 ? 1 : 0;
884 918
885 if (w->at <= heap [c]->at) 919 if (ANHE_at (he) <= ANHE_at (heap [c]))
886 break; 920 break;
887 921
888 heap [k] = heap [c]; 922 heap [k] = heap [c];
889 ((W)heap [k])->active = k; 923 ev_active (ANHE_w (heap [k])) = k;
890 924
891 k = c; 925 k = c;
892 } 926 }
893 927
894 heap [k] = w; 928 heap [k] = he;
895 ev_active (heap [k]) = k; 929 ev_active (ANHE_w (he)) = k;
896} 930}
897#endif 931#endif
898 932
899void inline_size 933void inline_size
900adjustheap (WT *heap, int N, int k) 934adjustheap (ANHE *heap, int N, int k)
901{ 935{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
902 upheap (heap, k); 937 upheap (heap, k);
938 else
903 downheap (heap, N, k); 939 downheap (heap, N, k);
904} 940}
905 941
906/*****************************************************************************/ 942/*****************************************************************************/
907 943
908typedef struct 944typedef struct
… …
1569#endif 1605#endif
1570 1606
1571void inline_size 1607void inline_size
1572timers_reify (EV_P) 1608timers_reify (EV_P)
1573{ 1609{
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1575 { 1611 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0]; 1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1577 1613
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579 1615
1580 /* first reschedule or stop timer */ 1616 /* first reschedule or stop timer */
1581 if (w->repeat) 1617 if (w->repeat)
1582 { 1618 {
1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1584
1585 ev_at (w) += w->repeat; 1619 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now) 1620 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now; 1621 ev_at (w) = mn_now;
1588 1622
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624
1625 ANHE_at_set (timers [HEAP0]);
1589 downheap (timers, timercnt, HEAP0); 1626 downheap (timers, timercnt, HEAP0);
1590 } 1627 }
1591 else 1628 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593 1630
… …
1597 1634
1598#if EV_PERIODIC_ENABLE 1635#if EV_PERIODIC_ENABLE
1599void inline_size 1636void inline_size
1600periodics_reify (EV_P) 1637periodics_reify (EV_P)
1601{ 1638{
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1603 { 1640 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1605 1642
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607 1644
1608 /* first reschedule or stop timer */ 1645 /* first reschedule or stop timer */
1609 if (w->reschedule_cb) 1646 if (w->reschedule_cb)
1610 { 1647 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649
1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651
1652 ANHE_at_set (periodics [HEAP0]);
1613 downheap (periodics, periodiccnt, 1); 1653 downheap (periodics, periodiccnt, HEAP0);
1614 } 1654 }
1615 else if (w->interval) 1655 else if (w->interval)
1616 { 1656 {
1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1658 /* if next trigger time is not sufficiently in the future, put it there */
1659 /* this might happen because of floating point inexactness */
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1660 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1661 {
1662 ev_at (w) += w->interval;
1663
1664 /* if interval is unreasonably low we might still have a time in the past */
1665 /* so correct this. this will make the periodic very inexact, but the user */
1666 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now;
1669 }
1670
1671 ANHE_at_set (periodics [HEAP0]);
1620 downheap (periodics, periodiccnt, HEAP0); 1672 downheap (periodics, periodiccnt, HEAP0);
1621 } 1673 }
1622 else 1674 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624 1676
… …
1630periodics_reschedule (EV_P) 1682periodics_reschedule (EV_P)
1631{ 1683{
1632 int i; 1684 int i;
1633 1685
1634 /* adjust periodics after time jump */ 1686 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i) 1687 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1636 { 1688 {
1637 ev_periodic *w = (ev_periodic *)periodics [i]; 1689 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1638 1690
1639 if (w->reschedule_cb) 1691 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval) 1693 else if (w->interval)
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 }
1644 1695
1645 /* now rebuild the heap */ 1696 ANHE_at_set (periodics [i]);
1646 for (i = periodiccnt >> 1; --i; ) 1697 }
1698
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1700 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1701 for (i = 0; i < periodiccnt; ++i)
1647 downheap (periodics, periodiccnt, i + HEAP0); 1702 upheap (periodics, i + HEAP0);
1648} 1703}
1649#endif 1704#endif
1650 1705
1651void inline_speed 1706void inline_speed
1652time_update (EV_P_ ev_tstamp max_block) 1707time_update (EV_P_ ev_tstamp max_block)
… …
1706 { 1761 {
1707#if EV_PERIODIC_ENABLE 1762#if EV_PERIODIC_ENABLE
1708 periodics_reschedule (EV_A); 1763 periodics_reschedule (EV_A);
1709#endif 1764#endif
1710 /* adjust timers. this is easy, as the offset is the same for all of them */ 1765 /* adjust timers. this is easy, as the offset is the same for all of them */
1711 for (i = 1; i <= timercnt; ++i) 1766 for (i = 0; i < timercnt; ++i)
1712 ev_at (timers [i]) += ev_rt_now - mn_now; 1767 {
1768 ANHE *he = timers + i + HEAP0;
1769 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he);
1771 }
1713 } 1772 }
1714 1773
1715 mn_now = ev_rt_now; 1774 mn_now = ev_rt_now;
1716 } 1775 }
1717} 1776}
… …
1787 1846
1788 waittime = MAX_BLOCKTIME; 1847 waittime = MAX_BLOCKTIME;
1789 1848
1790 if (timercnt) 1849 if (timercnt)
1791 { 1850 {
1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1851 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1793 if (waittime > to) waittime = to; 1852 if (waittime > to) waittime = to;
1794 } 1853 }
1795 1854
1796#if EV_PERIODIC_ENABLE 1855#if EV_PERIODIC_ENABLE
1797 if (periodiccnt) 1856 if (periodiccnt)
1798 { 1857 {
1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1858 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1800 if (waittime > to) waittime = to; 1859 if (waittime > to) waittime = to;
1801 } 1860 }
1802#endif 1861#endif
1803 1862
1804 if (expect_false (waittime < timeout_blocktime)) 1863 if (expect_false (waittime < timeout_blocktime))
… …
1956{ 2015{
1957 clear_pending (EV_A_ (W)w); 2016 clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w))) 2017 if (expect_false (!ev_is_active (w)))
1959 return; 2018 return;
1960 2019
1961 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1962 2021
1963 wlist_del (&anfds[w->fd].head, (WL)w); 2022 wlist_del (&anfds[w->fd].head, (WL)w);
1964 ev_stop (EV_A_ (W)w); 2023 ev_stop (EV_A_ (W)w);
1965 2024
1966 fd_change (EV_A_ w->fd, 1); 2025 fd_change (EV_A_ w->fd, 1);
… …
1975 ev_at (w) += mn_now; 2034 ev_at (w) += mn_now;
1976 2035
1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1978 2037
1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1981 timers [ev_active (w)] = (WT)w; 2040 ANHE_w (timers [ev_active (w)]) = (WT)w;
2041 ANHE_at_set (timers [ev_active (w)]);
1982 upheap (timers, ev_active (w)); 2042 upheap (timers, ev_active (w));
1983 2043
1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1985} 2045}
1986 2046
1987void noinline 2047void noinline
1988ev_timer_stop (EV_P_ ev_timer *w) 2048ev_timer_stop (EV_P_ ev_timer *w)
1989{ 2049{
… …
1992 return; 2052 return;
1993 2053
1994 { 2054 {
1995 int active = ev_active (w); 2055 int active = ev_active (w);
1996 2056
1997 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1998 2058
1999 if (expect_true (active < timercnt + HEAP0 - 1)) 2059 if (expect_true (active < timercnt + HEAP0 - 1))
2000 { 2060 {
2001 timers [active] = timers [timercnt + HEAP0 - 1]; 2061 timers [active] = timers [timercnt + HEAP0 - 1];
2002 adjustheap (timers, timercnt, active); 2062 adjustheap (timers, timercnt, active);
… …
2016 if (ev_is_active (w)) 2076 if (ev_is_active (w))
2017 { 2077 {
2018 if (w->repeat) 2078 if (w->repeat)
2019 { 2079 {
2020 ev_at (w) = mn_now + w->repeat; 2080 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]);
2021 adjustheap (timers, timercnt, ev_active (w)); 2082 adjustheap (timers, timercnt, ev_active (w));
2022 } 2083 }
2023 else 2084 else
2024 ev_timer_stop (EV_A_ w); 2085 ev_timer_stop (EV_A_ w);
2025 } 2086 }
… …
2047 } 2108 }
2048 else 2109 else
2049 ev_at (w) = w->offset; 2110 ev_at (w) = w->offset;
2050 2111
2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2053 periodics [ev_active (w)] = (WT)w; 2114 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115 ANHE_at_set (periodics [ev_active (w)]);
2054 upheap (periodics, ev_active (w)); 2116 upheap (periodics, ev_active (w));
2055 2117
2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2057} 2119}
2058 2120
2059void noinline 2121void noinline
2060ev_periodic_stop (EV_P_ ev_periodic *w) 2122ev_periodic_stop (EV_P_ ev_periodic *w)
2061{ 2123{
… …
2064 return; 2126 return;
2065 2127
2066 { 2128 {
2067 int active = ev_active (w); 2129 int active = ev_active (w);
2068 2130
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2070 2132
2071 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2133 if (expect_true (active < periodiccnt + HEAP0 - 1))
2072 { 2134 {
2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
2074 adjustheap (periodics, periodiccnt, active); 2136 adjustheap (periodics, periodiccnt, active);

Diff Legend

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