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.242 by root, Fri May 9 14:07:19 2008 UTC

… …
422 W w; 422 W w;
423 int events; 423 int events;
424} ANPENDING; 424} ANPENDING;
425 425
426#if EV_USE_INOTIFY 426#if EV_USE_INOTIFY
427/* hash table entry per inotify-id */
427typedef struct 428typedef struct
428{ 429{
429 WL head; 430 WL head;
430} ANFS; 431} ANFS;
432#endif
433
434/* Heap Entry */
435#define EV_HEAP_CACHE_AT 0
436#if EV_HEAP_CACHE_AT
437 typedef struct {
438 WT w;
439 ev_tstamp at;
440 } ANHE;
441
442 #define ANHE_w(he) (he).w /* access watcher, read-write */
443 #define ANHE_at(he) (he).at /* access cached at, read-only */
444 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
445#else
446 typedef WT ANHE;
447
448 #define ANHE_w(he) (he)
449 #define ANHE_at(he) (he)->at
450 #define ANHE_at_set(he)
431#endif 451#endif
432 452
433#if EV_MULTIPLICITY 453#if EV_MULTIPLICITY
434 454
435 struct ev_loop 455 struct ev_loop
… …
760} 780}
761 781
762/*****************************************************************************/ 782/*****************************************************************************/
763 783
764/* 784/*
785 * the heap functions want a real array index. array index 0 uis guaranteed to not
786 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
787 * the branching factor of the d-tree.
788 */
789
790/*
765 * at the moment we allow libev the luxury of two heaps, 791 * 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 792 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient. 793 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 794 * the difference is about 5% with 50000+ watchers.
769 */ 795 */
770#define USE_4HEAP !EV_MINIMAL 796#define EV_USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP 797#if EV_USE_4HEAP
772 798
799#define DHEAP 4
773#define HEAP0 3 /* index of first element in heap */ 800#define HEAP0 (DHEAP - 1) /* index of first element in heap */
774 801
775/* towards the root */ 802/* towards the root */
776void inline_speed 803void inline_speed
777upheap (WT *heap, int k) 804upheap (ANHE *heap, int k)
778{ 805{
779 WT w = heap [k]; 806 ANHE he = heap [k];
780 807
781 for (;;) 808 for (;;)
782 { 809 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0; 810 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
784 811
785 if (p >= HEAP0 || heap [p]->at <= w->at) 812 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
786 break; 813 break;
787 814
788 heap [k] = heap [p]; 815 heap [k] = heap [p];
789 ev_active (heap [k]) = k; 816 ev_active (ANHE_w (heap [k])) = k;
790 k = p; 817 k = p;
791 } 818 }
792 819
820 ev_active (ANHE_w (he)) = k;
793 heap [k] = w; 821 heap [k] = he;
794 ev_active (heap [k]) = k;
795} 822}
796 823
797/* away from the root */ 824/* away from the root */
798void inline_speed 825void inline_speed
799downheap (WT *heap, int N, int k) 826downheap (ANHE *heap, int N, int k)
800{ 827{
801 WT w = heap [k]; 828 ANHE he = heap [k];
802 WT *E = heap + N + HEAP0; 829 ANHE *E = heap + N + HEAP0;
803 830
804 for (;;) 831 for (;;)
805 { 832 {
806 ev_tstamp minat; 833 ev_tstamp minat;
807 WT *minpos; 834 ANHE *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0; 835 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
809 836
810 // find minimum child 837 // find minimum child
811 if (expect_true (pos +3 < E)) 838 if (expect_true (pos + DHEAP - 1 < E))
812 { 839 {
813 (minpos = pos + 0), (minat = (*minpos)->at); 840 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 841 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); 842 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); 843 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
844 }
845 else if (pos < E)
846 {
847 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
850 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
817 } 851 }
818 else 852 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; 853 break;
831 854
855 if (ANHE_at (he) <= minat)
856 break;
857
832 ev_active (*minpos) = k; 858 ev_active (ANHE_w (*minpos)) = k;
833 heap [k] = *minpos; 859 heap [k] = *minpos;
834 860
835 k = minpos - heap; 861 k = minpos - heap;
836 } 862 }
837 863
864 ev_active (ANHE_w (he)) = k;
838 heap [k] = w; 865 heap [k] = he;
839 ev_active (heap [k]) = k;
840} 866}
841 867
842#else // 4HEAP 868#else // 4HEAP
843 869
844#define HEAP0 1 870#define HEAP0 1
845 871
846/* towards the root */ 872/* towards the root */
847void inline_speed 873void inline_speed
848upheap (WT *heap, int k) 874upheap (ANHE *heap, int k)
849{ 875{
850 WT w = heap [k]; 876 ANHE he = heap [k];
851 877
852 for (;;) 878 for (;;)
853 { 879 {
854 int p = k >> 1; 880 int p = k >> 1;
855 881
856 /* maybe we could use a dummy element at heap [0]? */ 882 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at) 883 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
858 break; 884 break;
859 885
860 heap [k] = heap [p]; 886 heap [k] = heap [p];
861 ev_active (heap [k]) = k; 887 ev_active (ANHE_w (heap [k])) = k;
862 k = p; 888 k = p;
863 } 889 }
864 890
865 heap [k] = w; 891 heap [k] = w;
866 ev_active (heap [k]) = k; 892 ev_active (ANHE_w (heap [k])) = k;
867} 893}
868 894
869/* away from the root */ 895/* away from the root */
870void inline_speed 896void inline_speed
871downheap (WT *heap, int N, int k) 897downheap (ANHE *heap, int N, int k)
872{ 898{
873 WT w = heap [k]; 899 ANHE he = heap [k];
874 900
875 for (;;) 901 for (;;)
876 { 902 {
877 int c = k << 1; 903 int c = k << 1;
878 904
879 if (c > N) 905 if (c > N)
880 break; 906 break;
881 907
882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 908 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
883 ? 1 : 0; 909 ? 1 : 0;
884 910
885 if (w->at <= heap [c]->at) 911 if (w->at <= ANHE_at (heap [c]))
886 break; 912 break;
887 913
888 heap [k] = heap [c]; 914 heap [k] = heap [c];
889 ((W)heap [k])->active = k; 915 ev_active (ANHE_w (heap [k])) = k;
890 916
891 k = c; 917 k = c;
892 } 918 }
893 919
894 heap [k] = w; 920 heap [k] = he;
895 ev_active (heap [k]) = k; 921 ev_active (ANHE_w (he)) = k;
896} 922}
897#endif 923#endif
898 924
899void inline_size 925void inline_size
900adjustheap (WT *heap, int N, int k) 926adjustheap (ANHE *heap, int N, int k)
901{ 927{
902 upheap (heap, k); 928 upheap (heap, k);
903 downheap (heap, N, k); 929 downheap (heap, N, k);
904} 930}
905 931
… …
1569#endif 1595#endif
1570 1596
1571void inline_size 1597void inline_size
1572timers_reify (EV_P) 1598timers_reify (EV_P)
1573{ 1599{
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1600 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now)
1575 { 1601 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0]; 1602 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1577 1603
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1604 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579 1605
1580 /* first reschedule or stop timer */ 1606 /* first reschedule or stop timer */
1581 if (w->repeat) 1607 if (w->repeat)
… …
1584 1610
1585 ev_at (w) += w->repeat; 1611 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now) 1612 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now; 1613 ev_at (w) = mn_now;
1588 1614
1615 ANHE_at_set (timers [HEAP0]);
1589 downheap (timers, timercnt, HEAP0); 1616 downheap (timers, timercnt, HEAP0);
1590 } 1617 }
1591 else 1618 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1619 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593 1620
… …
1597 1624
1598#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1599void inline_size 1626void inline_size
1600periodics_reify (EV_P) 1627periodics_reify (EV_P)
1601{ 1628{
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1629 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now)
1603 { 1630 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1631 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1605 1632
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1633 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607 1634
1608 /* first reschedule or stop timer */ 1635 /* first reschedule or stop timer */
1609 if (w->reschedule_cb) 1636 if (w->reschedule_cb)
1610 { 1637 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1638 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1639 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1640 ANHE_at_set (periodics [HEAP0]);
1613 downheap (periodics, periodiccnt, 1); 1641 downheap (periodics, periodiccnt, HEAP0);
1614 } 1642 }
1615 else if (w->interval) 1643 else if (w->interval)
1616 { 1644 {
1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1646 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1647 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1648 ANHE_at_set (periodics [HEAP0]);
1620 downheap (periodics, periodiccnt, HEAP0); 1649 downheap (periodics, periodiccnt, HEAP0);
1621 } 1650 }
1622 else 1651 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1652 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624 1653
… …
1630periodics_reschedule (EV_P) 1659periodics_reschedule (EV_P)
1631{ 1660{
1632 int i; 1661 int i;
1633 1662
1634 /* adjust periodics after time jump */ 1663 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i) 1664 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1636 { 1665 {
1637 ev_periodic *w = (ev_periodic *)periodics [i]; 1666 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1638 1667
1639 if (w->reschedule_cb) 1668 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1669 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval) 1670 else if (w->interval)
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1671 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 }
1644 1672
1645 /* now rebuild the heap */ 1673 ANHE_at_set (periodics [i]);
1674 }
1675
1676 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1646 for (i = periodiccnt >> 1; --i; ) 1677 for (i = periodiccnt >> 1; --i; )
1647 downheap (periodics, periodiccnt, i + HEAP0); 1678 downheap (periodics, periodiccnt, i + HEAP0);
1648} 1679}
1649#endif 1680#endif
1650 1681
… …
1706 { 1737 {
1707#if EV_PERIODIC_ENABLE 1738#if EV_PERIODIC_ENABLE
1708 periodics_reschedule (EV_A); 1739 periodics_reschedule (EV_A);
1709#endif 1740#endif
1710 /* adjust timers. this is easy, as the offset is the same for all of them */ 1741 /* adjust timers. this is easy, as the offset is the same for all of them */
1711 for (i = 1; i <= timercnt; ++i) 1742 for (i = 0; i < timercnt; ++i)
1712 ev_at (timers [i]) += ev_rt_now - mn_now; 1743 {
1744 ANHE *he = timers + i + HEAP0;
1745 ANHE_w (*he)->at += ev_rt_now - mn_now;
1746 ANHE_at_set (*he);
1747 }
1713 } 1748 }
1714 1749
1715 mn_now = ev_rt_now; 1750 mn_now = ev_rt_now;
1716 } 1751 }
1717} 1752}
… …
1787 1822
1788 waittime = MAX_BLOCKTIME; 1823 waittime = MAX_BLOCKTIME;
1789 1824
1790 if (timercnt) 1825 if (timercnt)
1791 { 1826 {
1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1827 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1793 if (waittime > to) waittime = to; 1828 if (waittime > to) waittime = to;
1794 } 1829 }
1795 1830
1796#if EV_PERIODIC_ENABLE 1831#if EV_PERIODIC_ENABLE
1797 if (periodiccnt) 1832 if (periodiccnt)
1798 { 1833 {
1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1834 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1800 if (waittime > to) waittime = to; 1835 if (waittime > to) waittime = to;
1801 } 1836 }
1802#endif 1837#endif
1803 1838
1804 if (expect_false (waittime < timeout_blocktime)) 1839 if (expect_false (waittime < timeout_blocktime))
… …
1956{ 1991{
1957 clear_pending (EV_A_ (W)w); 1992 clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w))) 1993 if (expect_false (!ev_is_active (w)))
1959 return; 1994 return;
1960 1995
1961 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1996 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1962 1997
1963 wlist_del (&anfds[w->fd].head, (WL)w); 1998 wlist_del (&anfds[w->fd].head, (WL)w);
1964 ev_stop (EV_A_ (W)w); 1999 ev_stop (EV_A_ (W)w);
1965 2000
1966 fd_change (EV_A_ w->fd, 1); 2001 fd_change (EV_A_ w->fd, 1);
… …
1975 ev_at (w) += mn_now; 2010 ev_at (w) += mn_now;
1976 2011
1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2012 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1978 2013
1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2014 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2015 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1981 timers [ev_active (w)] = (WT)w; 2016 ANHE_w (timers [ev_active (w)]) = (WT)w;
2017 ANHE_at_set (timers [ev_active (w)]);
1982 upheap (timers, ev_active (w)); 2018 upheap (timers, ev_active (w));
1983 2019
1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2020 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1985} 2021}
1986 2022
1987void noinline 2023void noinline
1988ev_timer_stop (EV_P_ ev_timer *w) 2024ev_timer_stop (EV_P_ ev_timer *w)
1989{ 2025{
… …
1992 return; 2028 return;
1993 2029
1994 { 2030 {
1995 int active = ev_active (w); 2031 int active = ev_active (w);
1996 2032
1997 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2033 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1998 2034
1999 if (expect_true (active < timercnt + HEAP0 - 1)) 2035 if (expect_true (active < timercnt + HEAP0 - 1))
2000 { 2036 {
2001 timers [active] = timers [timercnt + HEAP0 - 1]; 2037 timers [active] = timers [timercnt + HEAP0 - 1];
2002 adjustheap (timers, timercnt, active); 2038 adjustheap (timers, timercnt, active);
… …
2016 if (ev_is_active (w)) 2052 if (ev_is_active (w))
2017 { 2053 {
2018 if (w->repeat) 2054 if (w->repeat)
2019 { 2055 {
2020 ev_at (w) = mn_now + w->repeat; 2056 ev_at (w) = mn_now + w->repeat;
2057 ANHE_at_set (timers [ev_active (w)]);
2021 adjustheap (timers, timercnt, ev_active (w)); 2058 adjustheap (timers, timercnt, ev_active (w));
2022 } 2059 }
2023 else 2060 else
2024 ev_timer_stop (EV_A_ w); 2061 ev_timer_stop (EV_A_ w);
2025 } 2062 }
… …
2047 } 2084 }
2048 else 2085 else
2049 ev_at (w) = w->offset; 2086 ev_at (w) = w->offset;
2050 2087
2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2088 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2089 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2053 periodics [ev_active (w)] = (WT)w; 2090 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2054 upheap (periodics, ev_active (w)); 2091 upheap (periodics, ev_active (w));
2055 2092
2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2093 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2057} 2094}
2058 2095
2059void noinline 2096void noinline
2060ev_periodic_stop (EV_P_ ev_periodic *w) 2097ev_periodic_stop (EV_P_ ev_periodic *w)
2061{ 2098{
… …
2064 return; 2101 return;
2065 2102
2066 { 2103 {
2067 int active = ev_active (w); 2104 int active = ev_active (w);
2068 2105
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2106 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2070 2107
2071 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2108 if (expect_true (active < periodiccnt + HEAP0 - 1))
2072 { 2109 {
2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2110 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
2074 adjustheap (periodics, periodiccnt, active); 2111 adjustheap (periodics, periodiccnt, active);

Diff Legend

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