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

Comparing libev/ev.c (file contents):
Revision 1.230 by root, Fri May 2 08:13:16 2008 UTC vs.
Revision 1.240 by root, Thu May 8 21:21:41 2008 UTC

… …
520 } 520 }
521} 521}
522 522
523/*****************************************************************************/ 523/*****************************************************************************/
524 524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
525int inline_size 527int inline_size
526array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
527{ 529{
528 int ncur = cur + 1; 530 int ncur = cur + 1;
529 531
530 do 532 do
531 ncur <<= 1; 533 ncur <<= 1;
532 while (cnt > ncur); 534 while (cnt > ncur);
533 535
534 /* 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 */
535 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
536 { 538 {
537 ncur *= elem; 539 ncur *= elem;
538 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
539 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
540 ncur /= elem; 542 ncur /= elem;
541 } 543 }
542 544
543 return ncur; 545 return ncur;
… …
757 } 759 }
758} 760}
759 761
760/*****************************************************************************/ 762/*****************************************************************************/
761 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 DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
762/* towards the root */ 776/* towards the root */
763void inline_speed 777void inline_speed
764upheap (WT *heap, int k) 778upheap (WT *heap, int k)
765{ 779{
766 WT w = heap [k]; 780 WT w = heap [k];
781 ev_tstamp w_at = w->at;
782
783 for (;;)
784 {
785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
786
787 if (p == k || heap [p]->at <= w_at)
788 break;
789
790 heap [k] = heap [p];
791 ev_active (heap [k]) = k;
792 k = p;
793 }
794
795 heap [k] = w;
796 ev_active (heap [k]) = k;
797}
798
799/* away from the root */
800void inline_speed
801downheap (WT *heap, int N, int k)
802{
803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
805
806 for (;;)
807 {
808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
811
812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
814 {
815 /* fast path */ (minpos = pos + 0), (minat = (*minpos)->at);
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
819 }
820 else if (pos < E)
821 {
822 /* slow path */ (minpos = pos + 0), (minat = (*minpos)->at);
823 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
824 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
825 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
826 }
827 else
828 break;
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];
767 852
768 for (;;) 853 for (;;)
769 { 854 {
770 int p = k >> 1; 855 int p = k >> 1;
771 856
… …
793 int c = k << 1; 878 int c = k << 1;
794 879
795 if (c > N) 880 if (c > N)
796 break; 881 break;
797 882
798 c += c < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
799 ? 1 : 0; 884 ? 1 : 0;
800 885
801 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
802 break; 887 break;
803 888
804 heap [k] = heap [c]; 889 heap [k] = heap [c];
805 ev_active (heap [k]) = k; 890 ((W)heap [k])->active = k;
806 891
807 k = c; 892 k = c;
808 } 893 }
809 894
810 heap [k] = w; 895 heap [k] = w;
811 ev_active (heap [k]) = k; 896 ev_active (heap [k]) = k;
812} 897}
898#endif
813 899
814void inline_size 900void inline_size
815adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
816{ 902{
817 upheap (heap, k); 903 upheap (heap, k);
… …
912pipecb (EV_P_ ev_io *iow, int revents) 998pipecb (EV_P_ ev_io *iow, int revents)
913{ 999{
914#if EV_USE_EVENTFD 1000#if EV_USE_EVENTFD
915 if (evfd >= 0) 1001 if (evfd >= 0)
916 { 1002 {
917 uint64_t counter = 1; 1003 uint64_t counter;
918 read (evfd, &counter, sizeof (uint64_t)); 1004 read (evfd, &counter, sizeof (uint64_t));
919 } 1005 }
920 else 1006 else
921#endif 1007#endif
922 { 1008 {
… …
1368void 1454void
1369ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1370{ 1456{
1371 postfork = 1; /* must be in line with ev_default_fork */ 1457 postfork = 1; /* must be in line with ev_default_fork */
1372} 1458}
1373
1374#endif 1459#endif
1375 1460
1376#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1377struct ev_loop * 1462struct ev_loop *
1378ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
… …
1459 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1460 } 1545 }
1461 } 1546 }
1462} 1547}
1463 1548
1549#if EV_IDLE_ENABLE
1550void inline_size
1551idle_reify (EV_P)
1552{
1553 if (expect_false (idleall))
1554 {
1555 int pri;
1556
1557 for (pri = NUMPRI; pri--; )
1558 {
1559 if (pendingcnt [pri])
1560 break;
1561
1562 if (idlecnt [pri])
1563 {
1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1565 break;
1566 }
1567 }
1568 }
1569}
1570#endif
1571
1464void inline_size 1572void inline_size
1465timers_reify (EV_P) 1573timers_reify (EV_P)
1466{ 1574{
1467 while (timercnt && ev_at (timers [1]) <= mn_now) 1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1468 { 1576 {
1469 ev_timer *w = (ev_timer *)timers [1]; 1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1470 1578
1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1472 1580
1473 /* first reschedule or stop timer */ 1581 /* first reschedule or stop timer */
1474 if (w->repeat) 1582 if (w->repeat)
… …
1477 1585
1478 ev_at (w) += w->repeat; 1586 ev_at (w) += w->repeat;
1479 if (ev_at (w) < mn_now) 1587 if (ev_at (w) < mn_now)
1480 ev_at (w) = mn_now; 1588 ev_at (w) = mn_now;
1481 1589
1482 downheap (timers, timercnt, 1); 1590 downheap (timers, timercnt, HEAP0);
1483 } 1591 }
1484 else 1592 else
1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1486 1594
1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1490 1598
1491#if EV_PERIODIC_ENABLE 1599#if EV_PERIODIC_ENABLE
1492void inline_size 1600void inline_size
1493periodics_reify (EV_P) 1601periodics_reify (EV_P)
1494{ 1602{
1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now) 1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1496 { 1604 {
1497 ev_periodic *w = (ev_periodic *)periodics [1]; 1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1498 1606
1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1500 1608
1501 /* first reschedule or stop timer */ 1609 /* first reschedule or stop timer */
1502 if (w->reschedule_cb) 1610 if (w->reschedule_cb)
… …
1508 else if (w->interval) 1616 else if (w->interval)
1509 { 1617 {
1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1513 downheap (periodics, periodiccnt, 1); 1621 downheap (periodics, periodiccnt, HEAP0);
1514 } 1622 }
1515 else 1623 else
1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1517 1625
1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1523periodics_reschedule (EV_P) 1631periodics_reschedule (EV_P)
1524{ 1632{
1525 int i; 1633 int i;
1526 1634
1527 /* adjust periodics after time jump */ 1635 /* adjust periodics after time jump */
1528 for (i = 0; i < periodiccnt; ++i) 1636 for (i = 1; i <= periodiccnt; ++i)
1529 { 1637 {
1530 ev_periodic *w = (ev_periodic *)periodics [i]; 1638 ev_periodic *w = (ev_periodic *)periodics [i];
1531 1639
1532 if (w->reschedule_cb) 1640 if (w->reschedule_cb)
1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1534 else if (w->interval) 1642 else if (w->interval)
1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1536 } 1644 }
1537 1645
1538 /* now rebuild the heap */ 1646 /* now rebuild the heap */
1539 for (i = periodiccnt >> 1; i--; ) 1647 for (i = periodiccnt >> 1; --i; )
1540 downheap (periodics, periodiccnt, i); 1648 downheap (periodics, periodiccnt, i + HEAP0);
1541}
1542#endif
1543
1544#if EV_IDLE_ENABLE
1545void inline_size
1546idle_reify (EV_P)
1547{
1548 if (expect_false (idleall))
1549 {
1550 int pri;
1551
1552 for (pri = NUMPRI; pri--; )
1553 {
1554 if (pendingcnt [pri])
1555 break;
1556
1557 if (idlecnt [pri])
1558 {
1559 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1560 break;
1561 }
1562 }
1563 }
1564} 1649}
1565#endif 1650#endif
1566 1651
1567void inline_speed 1652void inline_speed
1568time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
… …
1597 */ 1682 */
1598 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1599 { 1684 {
1600 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1601 1686
1602 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1603 return; /* all is well */ 1688 return; /* all is well */
1604 1689
1605 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1606 mn_now = get_clock (); 1691 mn_now = get_clock ();
1607 now_floor = mn_now; 1692 now_floor = mn_now;
… …
1703 1788
1704 waittime = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1705 1790
1706 if (timercnt) 1791 if (timercnt)
1707 { 1792 {
1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1709 if (waittime > to) waittime = to; 1794 if (waittime > to) waittime = to;
1710 } 1795 }
1711 1796
1712#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1713 if (periodiccnt) 1798 if (periodiccnt)
1714 { 1799 {
1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1716 if (waittime > to) waittime = to; 1801 if (waittime > to) waittime = to;
1717 } 1802 }
1718#endif 1803#endif
1719 1804
1720 if (expect_false (waittime < timeout_blocktime)) 1805 if (expect_false (waittime < timeout_blocktime))
… …
1890 1975
1891 ev_at (w) += mn_now; 1976 ev_at (w) += mn_now;
1892 1977
1893 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.));
1894 1979
1895 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1897 timers [timercnt] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1898 upheap (timers, timercnt); 1983 upheap (timers, ev_active (w));
1899 1984
1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1901} 1986}
1902 1987
1903void noinline 1988void noinline
… …
1910 { 1995 {
1911 int active = ev_active (w); 1996 int active = ev_active (w);
1912 1997
1913 assert (("internal timer heap corruption", timers [active] == (WT)w)); 1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1914 1999
1915 if (expect_true (active < timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1916 { 2001 {
1917 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1918 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1919 } 2004 }
1920 2005
1921 --timercnt; 2006 --timercnt;
1922 } 2007 }
… …
1962 ev_at (w) = 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;
1963 } 2048 }
1964 else 2049 else
1965 ev_at (w) = w->offset; 2050 ev_at (w) = w->offset;
1966 2051
1967 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1969 periodics [periodiccnt] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1970 upheap (periodics, periodiccnt); 2055 upheap (periodics, ev_active (w));
1971 2056
1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1973} 2058}
1974 2059
1975void noinline 2060void noinline
… …
1982 { 2067 {
1983 int active = ev_active (w); 2068 int active = ev_active (w);
1984 2069
1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1986 2071
1987 if (expect_true (active < periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1988 { 2073 {
1989 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1990 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1991 } 2076 }
1992 2077
1993 --periodiccnt; 2078 --periodiccnt;
1994 } 2079 }
… …
2114 if (w->wd < 0) 2199 if (w->wd < 0)
2115 { 2200 {
2116 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 */
2117 2202
2118 /* 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 */
2119 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2120 { 2207 {
2121 char path [4096]; 2208 char path [4096];
2122 strcpy (path, w->path); 2209 strcpy (path, w->path);
2123 2210

Diff Legend

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