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

Comparing libev/ev.c (file contents):
Revision 1.233 by root, Tue May 6 23:34:16 2008 UTC vs.
Revision 1.235 by root, Wed May 7 14:45:17 2008 UTC

… …
759 } 759 }
760} 760}
761 761
762/*****************************************************************************/ 762/*****************************************************************************/
763 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
764/* towards the root */ 775/* towards the root */
765void inline_speed 776void inline_speed
766upheap (WT *heap, int k) 777upheap (WT *heap, int k)
767{ 778{
768 WT w = heap [k]; 779 WT w = heap [k];
769 780
770 for (;;) 781 for (;;)
771 { 782 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
784
785 if (p >= HEAP0 || heap [p]->at <= w->at)
786 break;
787
788 heap [k] = heap [p];
789 ev_active (heap [k]) = k;
790 k = p;
791 }
792
793 heap [k] = w;
794 ev_active (heap [k]) = k;
795}
796
797/* away from the root */
798void inline_speed
799downheap (WT *heap, int N, int k)
800{
801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
803
804 for (;;)
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 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 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;
831
832 ev_active (*minpos) = k;
833 heap [k] = *minpos;
834
835 k = minpos - heap;
836 }
837
838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
772 int p = k >> 1; 854 int p = k >> 1;
773 855
774 /* maybe we could use a dummy element at heap [0]? */ 856 /* maybe we could use a dummy element at heap [0]? */
775 if (!p || heap [p]->at <= w->at) 857 if (!p || heap [p]->at <= w->at)
776 break; 858 break;
… …
795 int c = k << 1; 877 int c = k << 1;
796 878
797 if (c > N) 879 if (c > N)
798 break; 880 break;
799 881
800 c += c < N && heap [c]->at > heap [c + 1]->at 882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
801 ? 1 : 0; 883 ? 1 : 0;
802 884
803 if (w->at <= heap [c]->at) 885 if (w->at <= heap [c]->at)
804 break; 886 break;
805 887
806 heap [k] = heap [c]; 888 heap [k] = heap [c];
807 ev_active (heap [k]) = k; 889 ((W)heap [k])->active = k;
808 890
809 k = c; 891 k = c;
810 } 892 }
811 893
812 heap [k] = w; 894 heap [k] = w;
813 ev_active (heap [k]) = k; 895 ev_active (heap [k]) = k;
814} 896}
897#endif
815 898
816void inline_size 899void inline_size
817adjustheap (WT *heap, int N, int k) 900adjustheap (WT *heap, int N, int k)
818{ 901{
819 upheap (heap, k); 902 upheap (heap, k);
… …
1370void 1453void
1371ev_loop_fork (EV_P) 1454ev_loop_fork (EV_P)
1372{ 1455{
1373 postfork = 1; /* must be in line with ev_default_fork */ 1456 postfork = 1; /* must be in line with ev_default_fork */
1374} 1457}
1375
1376#endif 1458#endif
1377 1459
1378#if EV_MULTIPLICITY 1460#if EV_MULTIPLICITY
1379struct ev_loop * 1461struct ev_loop *
1380ev_default_loop_init (unsigned int flags) 1462ev_default_loop_init (unsigned int flags)
… …
1461 EV_CB_INVOKE (p->w, p->events); 1543 EV_CB_INVOKE (p->w, p->events);
1462 } 1544 }
1463 } 1545 }
1464} 1546}
1465 1547
1548#if EV_IDLE_ENABLE
1549void inline_size
1550idle_reify (EV_P)
1551{
1552 if (expect_false (idleall))
1553 {
1554 int pri;
1555
1556 for (pri = NUMPRI; pri--; )
1557 {
1558 if (pendingcnt [pri])
1559 break;
1560
1561 if (idlecnt [pri])
1562 {
1563 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1564 break;
1565 }
1566 }
1567 }
1568}
1569#endif
1570
1466void inline_size 1571void inline_size
1467timers_reify (EV_P) 1572timers_reify (EV_P)
1468{ 1573{
1469 while (timercnt && ev_at (timers [1]) <= mn_now) 1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1470 { 1575 {
1471 ev_timer *w = (ev_timer *)timers [1]; 1576 ev_timer *w = (ev_timer *)timers [HEAP0];
1472 1577
1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1474 1579
1475 /* first reschedule or stop timer */ 1580 /* first reschedule or stop timer */
1476 if (w->repeat) 1581 if (w->repeat)
… …
1479 1584
1480 ev_at (w) += w->repeat; 1585 ev_at (w) += w->repeat;
1481 if (ev_at (w) < mn_now) 1586 if (ev_at (w) < mn_now)
1482 ev_at (w) = mn_now; 1587 ev_at (w) = mn_now;
1483 1588
1484 downheap (timers, timercnt, 1); 1589 downheap (timers, timercnt, HEAP0);
1485 } 1590 }
1486 else 1591 else
1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1488 1593
1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1492 1597
1493#if EV_PERIODIC_ENABLE 1598#if EV_PERIODIC_ENABLE
1494void inline_size 1599void inline_size
1495periodics_reify (EV_P) 1600periodics_reify (EV_P)
1496{ 1601{
1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now) 1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1498 { 1603 {
1499 ev_periodic *w = (ev_periodic *)periodics [1]; 1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1500 1605
1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1502 1607
1503 /* first reschedule or stop timer */ 1608 /* first reschedule or stop timer */
1504 if (w->reschedule_cb) 1609 if (w->reschedule_cb)
… …
1510 else if (w->interval) 1615 else if (w->interval)
1511 { 1616 {
1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1515 downheap (periodics, periodiccnt, 1); 1620 downheap (periodics, periodiccnt, HEAP0);
1516 } 1621 }
1517 else 1622 else
1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1519 1624
1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1536 else if (w->interval) 1641 else if (w->interval)
1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1538 } 1643 }
1539 1644
1540 /* now rebuild the heap */ 1645 /* now rebuild the heap */
1541 for (i = periodiccnt >> 1; i--; ) 1646 for (i = periodiccnt >> 1; --i; )
1542 downheap (periodics, periodiccnt, i); 1647 downheap (periodics, periodiccnt, i + HEAP0);
1543}
1544#endif
1545
1546#if EV_IDLE_ENABLE
1547void inline_size
1548idle_reify (EV_P)
1549{
1550 if (expect_false (idleall))
1551 {
1552 int pri;
1553
1554 for (pri = NUMPRI; pri--; )
1555 {
1556 if (pendingcnt [pri])
1557 break;
1558
1559 if (idlecnt [pri])
1560 {
1561 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1562 break;
1563 }
1564 }
1565 }
1566} 1648}
1567#endif 1649#endif
1568 1650
1569void inline_speed 1651void inline_speed
1570time_update (EV_P_ ev_tstamp max_block) 1652time_update (EV_P_ ev_tstamp max_block)
… …
1599 */ 1681 */
1600 for (i = 4; --i; ) 1682 for (i = 4; --i; )
1601 { 1683 {
1602 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1603 1685
1604 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1686 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1605 return; /* all is well */ 1687 return; /* all is well */
1606 1688
1607 ev_rt_now = ev_time (); 1689 ev_rt_now = ev_time ();
1608 mn_now = get_clock (); 1690 mn_now = get_clock ();
1609 now_floor = mn_now; 1691 now_floor = mn_now;
… …
1705 1787
1706 waittime = MAX_BLOCKTIME; 1788 waittime = MAX_BLOCKTIME;
1707 1789
1708 if (timercnt) 1790 if (timercnt)
1709 { 1791 {
1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1711 if (waittime > to) waittime = to; 1793 if (waittime > to) waittime = to;
1712 } 1794 }
1713 1795
1714#if EV_PERIODIC_ENABLE 1796#if EV_PERIODIC_ENABLE
1715 if (periodiccnt) 1797 if (periodiccnt)
1716 { 1798 {
1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1718 if (waittime > to) waittime = to; 1800 if (waittime > to) waittime = to;
1719 } 1801 }
1720#endif 1802#endif
1721 1803
1722 if (expect_false (waittime < timeout_blocktime)) 1804 if (expect_false (waittime < timeout_blocktime))
… …
1892 1974
1893 ev_at (w) += mn_now; 1975 ev_at (w) += mn_now;
1894 1976
1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1896 1978
1897 ev_start (EV_A_ (W)w, ++timercnt); 1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1899 timers [timercnt] = (WT)w; 1981 timers [ev_active (w)] = (WT)w;
1900 upheap (timers, timercnt); 1982 upheap (timers, ev_active (w));
1901 1983
1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1903} 1985}
1904 1986
1905void noinline 1987void noinline
… …
1912 { 1994 {
1913 int active = ev_active (w); 1995 int active = ev_active (w);
1914 1996
1915 assert (("internal timer heap corruption", timers [active] == (WT)w)); 1997 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916 1998
1917 if (expect_true (active < timercnt)) 1999 if (expect_true (active < timercnt + HEAP0 - 1))
1918 { 2000 {
1919 timers [active] = timers [timercnt]; 2001 timers [active] = timers [timercnt + HEAP0 - 1];
1920 adjustheap (timers, timercnt, active); 2002 adjustheap (timers, timercnt, active);
1921 } 2003 }
1922 2004
1923 --timercnt; 2005 --timercnt;
1924 } 2006 }
… …
1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2046 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1965 } 2047 }
1966 else 2048 else
1967 ev_at (w) = w->offset; 2049 ev_at (w) = w->offset;
1968 2050
1969 ev_start (EV_A_ (W)w, ++periodiccnt); 2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1971 periodics [periodiccnt] = (WT)w; 2053 periodics [ev_active (w)] = (WT)w;
1972 upheap (periodics, periodiccnt); 2054 upheap (periodics, ev_active (w));
1973 2055
1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1975} 2057}
1976 2058
1977void noinline 2059void noinline
… …
1984 { 2066 {
1985 int active = ev_active (w); 2067 int active = ev_active (w);
1986 2068
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988 2070
1989 if (expect_true (active < periodiccnt)) 2071 if (expect_true (active < periodiccnt + HEAP0 - 1))
1990 { 2072 {
1991 periodics [active] = periodics [periodiccnt]; 2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1992 adjustheap (periodics, periodiccnt, active); 2074 adjustheap (periodics, periodiccnt, active);
1993 } 2075 }
1994 2076
1995 --periodiccnt; 2077 --periodiccnt;
1996 } 2078 }

Diff Legend

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