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

Comparing libev/ev.c (file contents):
Revision 1.225 by root, Wed Apr 16 01:37:14 2008 UTC vs.
Revision 1.239 by root, Thu May 8 20:52:13 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 DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775
776/* towards the root */
759void inline_speed 777void inline_speed
760upheap (WT *heap, int k) 778upheap (WT *heap, int k)
761{ 779{
762 WT w = heap [k]; 780 WT w = heap [k];
763 781
764 while (k) 782 for (;;)
765 { 783 {
766 int p = (k - 1) >> 1; 784 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
767 785
768 if (heap [p]->at <= w->at) 786 if (p == k || heap [p]->at <= w->at)
769 break; 787 break;
770 788
771 heap [k] = heap [p]; 789 heap [k] = heap [p];
772 ((W)heap [k])->active = k + 1; 790 ev_active (heap [k]) = k;
773 k = p; 791 k = p;
774 } 792 }
775 793
776 heap [k] = w; 794 heap [k] = w;
777 ((W)heap [k])->active = k + 1; 795 ev_active (heap [k]) = k;
778} 796}
779 797
798/* away from the root */
780void inline_speed 799void inline_speed
781downheap (WT *heap, int N, int k) 800downheap (WT *heap, int N, int k)
782{ 801{
783 WT w = heap [k]; 802 WT w = heap [k];
803 WT *E = heap + N + HEAP0;
784 804
785 for (;;) 805 for (;;)
786 { 806 {
807 ev_tstamp minat;
808 WT *minpos;
809 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
810
811 // find minimum child
812 if (expect_true (pos + DHEAP - 1 < E))
813 {
814 /* fast path */
815 (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
821 {
822 /* slow path */
823 if (pos >= E)
824 break;
825 (minpos = pos + 0), (minat = (*minpos)->at);
826 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
827 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
828 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
829 }
830
831 if (w->at <= minat)
832 break;
833
834 ev_active (*minpos) = k;
835 heap [k] = *minpos;
836
837 k = minpos - heap;
838 }
839
840 heap [k] = w;
841 ev_active (heap [k]) = k;
842}
843
844#else // 4HEAP
845
846#define HEAP0 1
847
848/* towards the root */
849void inline_speed
850upheap (WT *heap, int k)
851{
852 WT w = heap [k];
853
854 for (;;)
855 {
856 int p = k >> 1;
857
858 /* maybe we could use a dummy element at heap [0]? */
859 if (!p || heap [p]->at <= w->at)
860 break;
861
862 heap [k] = heap [p];
863 ev_active (heap [k]) = k;
864 k = p;
865 }
866
867 heap [k] = w;
868 ev_active (heap [k]) = k;
869}
870
871/* away from the root */
872void inline_speed
873downheap (WT *heap, int N, int k)
874{
875 WT w = heap [k];
876
877 for (;;)
878 {
787 int c = (k << 1) + 1; 879 int c = k << 1;
788 880
789 if (c >= N) 881 if (c > N)
790 break; 882 break;
791 883
792 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 884 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
793 ? 1 : 0; 885 ? 1 : 0;
794 886
795 if (w->at <= heap [c]->at) 887 if (w->at <= heap [c]->at)
796 break; 888 break;
797 889
798 heap [k] = heap [c]; 890 heap [k] = heap [c];
799 ((W)heap [k])->active = k + 1; 891 ((W)heap [k])->active = k;
800 892
801 k = c; 893 k = c;
802 } 894 }
803 895
804 heap [k] = w; 896 heap [k] = w;
805 ((W)heap [k])->active = k + 1; 897 ev_active (heap [k]) = k;
806} 898}
899#endif
807 900
808void inline_size 901void inline_size
809adjustheap (WT *heap, int N, int k) 902adjustheap (WT *heap, int N, int k)
810{ 903{
811 upheap (heap, k); 904 upheap (heap, k);
… …
906pipecb (EV_P_ ev_io *iow, int revents) 999pipecb (EV_P_ ev_io *iow, int revents)
907{ 1000{
908#if EV_USE_EVENTFD 1001#if EV_USE_EVENTFD
909 if (evfd >= 0) 1002 if (evfd >= 0)
910 { 1003 {
911 uint64_t counter = 1; 1004 uint64_t counter;
912 read (evfd, &counter, sizeof (uint64_t)); 1005 read (evfd, &counter, sizeof (uint64_t));
913 } 1006 }
914 else 1007 else
915#endif 1008#endif
916 { 1009 {
… …
1283#endif 1376#endif
1284 1377
1285 backend = 0; 1378 backend = 0;
1286} 1379}
1287 1380
1381#if EV_USE_INOTIFY
1288void inline_size infy_fork (EV_P); 1382void inline_size infy_fork (EV_P);
1383#endif
1289 1384
1290void inline_size 1385void inline_size
1291loop_fork (EV_P) 1386loop_fork (EV_P)
1292{ 1387{
1293#if EV_USE_PORT 1388#if EV_USE_PORT
… …
1360void 1455void
1361ev_loop_fork (EV_P) 1456ev_loop_fork (EV_P)
1362{ 1457{
1363 postfork = 1; /* must be in line with ev_default_fork */ 1458 postfork = 1; /* must be in line with ev_default_fork */
1364} 1459}
1365
1366#endif 1460#endif
1367 1461
1368#if EV_MULTIPLICITY 1462#if EV_MULTIPLICITY
1369struct ev_loop * 1463struct ev_loop *
1370ev_default_loop_init (unsigned int flags) 1464ev_default_loop_init (unsigned int flags)
… …
1451 EV_CB_INVOKE (p->w, p->events); 1545 EV_CB_INVOKE (p->w, p->events);
1452 } 1546 }
1453 } 1547 }
1454} 1548}
1455 1549
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 1550#if EV_IDLE_ENABLE
1537void inline_size 1551void inline_size
1538idle_reify (EV_P) 1552idle_reify (EV_P)
1539{ 1553{
1540 if (expect_false (idleall)) 1554 if (expect_false (idleall))
… …
1551 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1565 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1552 break; 1566 break;
1553 } 1567 }
1554 } 1568 }
1555 } 1569 }
1570}
1571#endif
1572
1573void inline_size
1574timers_reify (EV_P)
1575{
1576 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1577 {
1578 ev_timer *w = (ev_timer *)timers [HEAP0];
1579
1580 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1581
1582 /* first reschedule or stop timer */
1583 if (w->repeat)
1584 {
1585 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1586
1587 ev_at (w) += w->repeat;
1588 if (ev_at (w) < mn_now)
1589 ev_at (w) = mn_now;
1590
1591 downheap (timers, timercnt, HEAP0);
1592 }
1593 else
1594 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1595
1596 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1597 }
1598}
1599
1600#if EV_PERIODIC_ENABLE
1601void inline_size
1602periodics_reify (EV_P)
1603{
1604 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1605 {
1606 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1607
1608 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1609
1610 /* first reschedule or stop timer */
1611 if (w->reschedule_cb)
1612 {
1613 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1614 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1615 downheap (periodics, periodiccnt, 1);
1616 }
1617 else if (w->interval)
1618 {
1619 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1620 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1621 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1622 downheap (periodics, periodiccnt, HEAP0);
1623 }
1624 else
1625 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1626
1627 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1628 }
1629}
1630
1631static void noinline
1632periodics_reschedule (EV_P)
1633{
1634 int i;
1635
1636 /* adjust periodics after time jump */
1637 for (i = 1; i <= periodiccnt; ++i)
1638 {
1639 ev_periodic *w = (ev_periodic *)periodics [i];
1640
1641 if (w->reschedule_cb)
1642 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval)
1644 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1645 }
1646
1647 /* now rebuild the heap */
1648 for (i = periodiccnt >> 1; --i; )
1649 downheap (periodics, periodiccnt, i + HEAP0);
1556} 1650}
1557#endif 1651#endif
1558 1652
1559void inline_speed 1653void inline_speed
1560time_update (EV_P_ ev_tstamp max_block) 1654time_update (EV_P_ ev_tstamp max_block)
… …
1589 */ 1683 */
1590 for (i = 4; --i; ) 1684 for (i = 4; --i; )
1591 { 1685 {
1592 rtmn_diff = ev_rt_now - mn_now; 1686 rtmn_diff = ev_rt_now - mn_now;
1593 1687
1594 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1688 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1595 return; /* all is well */ 1689 return; /* all is well */
1596 1690
1597 ev_rt_now = ev_time (); 1691 ev_rt_now = ev_time ();
1598 mn_now = get_clock (); 1692 mn_now = get_clock ();
1599 now_floor = mn_now; 1693 now_floor = mn_now;
… …
1614 { 1708 {
1615#if EV_PERIODIC_ENABLE 1709#if EV_PERIODIC_ENABLE
1616 periodics_reschedule (EV_A); 1710 periodics_reschedule (EV_A);
1617#endif 1711#endif
1618 /* adjust timers. this is easy, as the offset is the same for all of them */ 1712 /* adjust timers. this is easy, as the offset is the same for all of them */
1619 for (i = 0; i < timercnt; ++i) 1713 for (i = 1; i <= timercnt; ++i)
1620 ((WT)timers [i])->at += ev_rt_now - mn_now; 1714 ev_at (timers [i]) += ev_rt_now - mn_now;
1621 } 1715 }
1622 1716
1623 mn_now = ev_rt_now; 1717 mn_now = ev_rt_now;
1624 } 1718 }
1625} 1719}
… …
1695 1789
1696 waittime = MAX_BLOCKTIME; 1790 waittime = MAX_BLOCKTIME;
1697 1791
1698 if (timercnt) 1792 if (timercnt)
1699 { 1793 {
1700 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1794 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1701 if (waittime > to) waittime = to; 1795 if (waittime > to) waittime = to;
1702 } 1796 }
1703 1797
1704#if EV_PERIODIC_ENABLE 1798#if EV_PERIODIC_ENABLE
1705 if (periodiccnt) 1799 if (periodiccnt)
1706 { 1800 {
1707 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1801 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1708 if (waittime > to) waittime = to; 1802 if (waittime > to) waittime = to;
1709 } 1803 }
1710#endif 1804#endif
1711 1805
1712 if (expect_false (waittime < timeout_blocktime)) 1806 if (expect_false (waittime < timeout_blocktime))
… …
1878ev_timer_start (EV_P_ ev_timer *w) 1972ev_timer_start (EV_P_ ev_timer *w)
1879{ 1973{
1880 if (expect_false (ev_is_active (w))) 1974 if (expect_false (ev_is_active (w)))
1881 return; 1975 return;
1882 1976
1883 ((WT)w)->at += mn_now; 1977 ev_at (w) += mn_now;
1884 1978
1885 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1979 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1886 1980
1887 ev_start (EV_A_ (W)w, ++timercnt); 1981 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1888 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1982 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1889 timers [timercnt - 1] = (WT)w; 1983 timers [ev_active (w)] = (WT)w;
1890 upheap (timers, timercnt - 1); 1984 upheap (timers, ev_active (w));
1891 1985
1892 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1986 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1893} 1987}
1894 1988
1895void noinline 1989void noinline
1896ev_timer_stop (EV_P_ ev_timer *w) 1990ev_timer_stop (EV_P_ ev_timer *w)
1897{ 1991{
1898 clear_pending (EV_A_ (W)w); 1992 clear_pending (EV_A_ (W)w);
1899 if (expect_false (!ev_is_active (w))) 1993 if (expect_false (!ev_is_active (w)))
1900 return; 1994 return;
1901 1995
1902 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1903
1904 { 1996 {
1905 int active = ((W)w)->active; 1997 int active = ev_active (w);
1906 1998
1999 assert (("internal timer heap corruption", timers [active] == (WT)w));
2000
1907 if (expect_true (--active < --timercnt)) 2001 if (expect_true (active < timercnt + HEAP0 - 1))
1908 { 2002 {
1909 timers [active] = timers [timercnt]; 2003 timers [active] = timers [timercnt + HEAP0 - 1];
1910 adjustheap (timers, timercnt, active); 2004 adjustheap (timers, timercnt, active);
1911 } 2005 }
2006
2007 --timercnt;
1912 } 2008 }
1913 2009
1914 ((WT)w)->at -= mn_now; 2010 ev_at (w) -= mn_now;
1915 2011
1916 ev_stop (EV_A_ (W)w); 2012 ev_stop (EV_A_ (W)w);
1917} 2013}
1918 2014
1919void noinline 2015void noinline
… …
1921{ 2017{
1922 if (ev_is_active (w)) 2018 if (ev_is_active (w))
1923 { 2019 {
1924 if (w->repeat) 2020 if (w->repeat)
1925 { 2021 {
1926 ((WT)w)->at = mn_now + w->repeat; 2022 ev_at (w) = mn_now + w->repeat;
1927 adjustheap (timers, timercnt, ((W)w)->active - 1); 2023 adjustheap (timers, timercnt, ev_active (w));
1928 } 2024 }
1929 else 2025 else
1930 ev_timer_stop (EV_A_ w); 2026 ev_timer_stop (EV_A_ w);
1931 } 2027 }
1932 else if (w->repeat) 2028 else if (w->repeat)
1933 { 2029 {
1934 w->at = w->repeat; 2030 ev_at (w) = w->repeat;
1935 ev_timer_start (EV_A_ w); 2031 ev_timer_start (EV_A_ w);
1936 } 2032 }
1937} 2033}
1938 2034
1939#if EV_PERIODIC_ENABLE 2035#if EV_PERIODIC_ENABLE
… …
1942{ 2038{
1943 if (expect_false (ev_is_active (w))) 2039 if (expect_false (ev_is_active (w)))
1944 return; 2040 return;
1945 2041
1946 if (w->reschedule_cb) 2042 if (w->reschedule_cb)
1947 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2043 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1948 else if (w->interval) 2044 else if (w->interval)
1949 { 2045 {
1950 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2046 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 */ 2047 /* 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; 2048 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1953 } 2049 }
1954 else 2050 else
1955 ((WT)w)->at = w->offset; 2051 ev_at (w) = w->offset;
1956 2052
1957 ev_start (EV_A_ (W)w, ++periodiccnt); 2053 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1958 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2054 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1959 periodics [periodiccnt - 1] = (WT)w; 2055 periodics [ev_active (w)] = (WT)w;
1960 upheap (periodics, periodiccnt - 1); 2056 upheap (periodics, ev_active (w));
1961 2057
1962 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2058 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1963} 2059}
1964 2060
1965void noinline 2061void noinline
1966ev_periodic_stop (EV_P_ ev_periodic *w) 2062ev_periodic_stop (EV_P_ ev_periodic *w)
1967{ 2063{
1968 clear_pending (EV_A_ (W)w); 2064 clear_pending (EV_A_ (W)w);
1969 if (expect_false (!ev_is_active (w))) 2065 if (expect_false (!ev_is_active (w)))
1970 return; 2066 return;
1971 2067
1972 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1973
1974 { 2068 {
1975 int active = ((W)w)->active; 2069 int active = ev_active (w);
1976 2070
2071 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2072
1977 if (expect_true (--active < --periodiccnt)) 2073 if (expect_true (active < periodiccnt + HEAP0 - 1))
1978 { 2074 {
1979 periodics [active] = periodics [periodiccnt]; 2075 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1980 adjustheap (periodics, periodiccnt, active); 2076 adjustheap (periodics, periodiccnt, active);
1981 } 2077 }
2078
2079 --periodiccnt;
1982 } 2080 }
1983 2081
1984 ev_stop (EV_A_ (W)w); 2082 ev_stop (EV_A_ (W)w);
1985} 2083}
1986 2084
… …
2102 if (w->wd < 0) 2200 if (w->wd < 0)
2103 { 2201 {
2104 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2202 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2105 2203
2106 /* monitor some parent directory for speedup hints */ 2204 /* monitor some parent directory for speedup hints */
2205 /* note that exceeding the hardcoded limit is not a correctness issue, */
2206 /* but an efficiency issue only */
2107 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2207 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2108 { 2208 {
2109 char path [4096]; 2209 char path [4096];
2110 strcpy (path, w->path); 2210 strcpy (path, w->path);
2111 2211
… …
2356 clear_pending (EV_A_ (W)w); 2456 clear_pending (EV_A_ (W)w);
2357 if (expect_false (!ev_is_active (w))) 2457 if (expect_false (!ev_is_active (w)))
2358 return; 2458 return;
2359 2459
2360 { 2460 {
2361 int active = ((W)w)->active; 2461 int active = ev_active (w);
2362 2462
2363 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2463 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2364 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2464 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2365 2465
2366 ev_stop (EV_A_ (W)w); 2466 ev_stop (EV_A_ (W)w);
2367 --idleall; 2467 --idleall;
2368 } 2468 }
2369} 2469}
… …
2386 clear_pending (EV_A_ (W)w); 2486 clear_pending (EV_A_ (W)w);
2387 if (expect_false (!ev_is_active (w))) 2487 if (expect_false (!ev_is_active (w)))
2388 return; 2488 return;
2389 2489
2390 { 2490 {
2391 int active = ((W)w)->active; 2491 int active = ev_active (w);
2492
2392 prepares [active - 1] = prepares [--preparecnt]; 2493 prepares [active - 1] = prepares [--preparecnt];
2393 ((W)prepares [active - 1])->active = active; 2494 ev_active (prepares [active - 1]) = active;
2394 } 2495 }
2395 2496
2396 ev_stop (EV_A_ (W)w); 2497 ev_stop (EV_A_ (W)w);
2397} 2498}
2398 2499
… …
2413 clear_pending (EV_A_ (W)w); 2514 clear_pending (EV_A_ (W)w);
2414 if (expect_false (!ev_is_active (w))) 2515 if (expect_false (!ev_is_active (w)))
2415 return; 2516 return;
2416 2517
2417 { 2518 {
2418 int active = ((W)w)->active; 2519 int active = ev_active (w);
2520
2419 checks [active - 1] = checks [--checkcnt]; 2521 checks [active - 1] = checks [--checkcnt];
2420 ((W)checks [active - 1])->active = active; 2522 ev_active (checks [active - 1]) = active;
2421 } 2523 }
2422 2524
2423 ev_stop (EV_A_ (W)w); 2525 ev_stop (EV_A_ (W)w);
2424} 2526}
2425 2527
… …
2521 clear_pending (EV_A_ (W)w); 2623 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2624 if (expect_false (!ev_is_active (w)))
2523 return; 2625 return;
2524 2626
2525 { 2627 {
2526 int active = ((W)w)->active; 2628 int active = ev_active (w);
2629
2527 forks [active - 1] = forks [--forkcnt]; 2630 forks [active - 1] = forks [--forkcnt];
2528 ((W)forks [active - 1])->active = active; 2631 ev_active (forks [active - 1]) = active;
2529 } 2632 }
2530 2633
2531 ev_stop (EV_A_ (W)w); 2634 ev_stop (EV_A_ (W)w);
2532} 2635}
2533#endif 2636#endif
… …
2552 clear_pending (EV_A_ (W)w); 2655 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w))) 2656 if (expect_false (!ev_is_active (w)))
2554 return; 2657 return;
2555 2658
2556 { 2659 {
2557 int active = ((W)w)->active; 2660 int active = ev_active (w);
2661
2558 asyncs [active - 1] = asyncs [--asynccnt]; 2662 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active; 2663 ev_active (asyncs [active - 1]) = active;
2560 } 2664 }
2561 2665
2562 ev_stop (EV_A_ (W)w); 2666 ev_stop (EV_A_ (W)w);
2563} 2667}
2564 2668

Diff Legend

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