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

Comparing libev/ev.c (file contents):
Revision 1.231 by root, Mon May 5 20:47:33 2008 UTC vs.
Revision 1.244 by root, Tue May 20 23:49:41 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
… …
520 } 547 }
521} 548}
522 549
523/*****************************************************************************/ 550/*****************************************************************************/
524 551
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553
525int inline_size 554int inline_size
526array_nextsize (int elem, int cur, int cnt) 555array_nextsize (int elem, int cur, int cnt)
527{ 556{
528 int ncur = cur + 1; 557 int ncur = cur + 1;
529 558
530 do 559 do
531 ncur <<= 1; 560 ncur <<= 1;
532 while (cnt > ncur); 561 while (cnt > ncur);
533 562
534 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 563 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
535 if (elem * ncur > 4096) 564 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
536 { 565 {
537 ncur *= elem; 566 ncur *= elem;
538 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 567 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
539 ncur = ncur - sizeof (void *) * 4; 568 ncur = ncur - sizeof (void *) * 4;
540 ncur /= elem; 569 ncur /= elem;
541 } 570 }
542 571
543 return ncur; 572 return ncur;
… …
757 } 786 }
758} 787}
759 788
760/*****************************************************************************/ 789/*****************************************************************************/
761 790
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/*
798 * at the moment we allow libev the luxury of two heaps,
799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
800 * which is more cache-efficient.
801 * the difference is about 5% with 50000+ watchers.
802 */
803#if EV_USE_4HEAP
804
805#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807
762/* towards the root */ 808/* towards the root */
763void inline_speed 809void inline_speed
764upheap (WT *heap, int k) 810upheap (ANHE *heap, int k)
765{ 811{
766 WT w = heap [k]; 812 ANHE he = heap [k];
767 813
768 for (;;) 814 for (;;)
769 { 815 {
770 int p = k >> 1; 816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
771 817
772 /* maybe we could use a dummy element at heap [0]? */ 818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
773 if (!p || heap [p]->at <= w->at)
774 break; 819 break;
775 820
776 heap [k] = heap [p]; 821 heap [k] = heap [p];
777 ev_active (heap [k]) = k; 822 ev_active (ANHE_w (heap [k])) = k;
778 k = p; 823 k = p;
779 } 824 }
780 825
826 ev_active (ANHE_w (he)) = k;
781 heap [k] = w; 827 heap [k] = he;
782 ev_active (heap [k]) = k;
783} 828}
784 829
785/* away from the root */ 830/* away from the root */
786void inline_speed 831void inline_speed
787downheap (WT *heap, int N, int k) 832downheap (ANHE *heap, int N, int k)
788{ 833{
789 WT w = heap [k]; 834 ANHE he = heap [k];
835 ANHE *E = heap + N + HEAP0;
836
837 for (;;)
838 {
839 ev_tstamp minat;
840 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
842
843 // find minimum child
844 if (expect_true (pos + DHEAP - 1 < E))
845 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 }
851 else if (pos < E)
852 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
855 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
856 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
857 }
858 else
859 break;
860
861 if (ANHE_at (he) <= minat)
862 break;
863
864 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866
867 k = minpos - heap;
868 }
869
870 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872}
873
874#else // 4HEAP
875
876#define HEAP0 1
877
878/* towards the root */
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900
901/* away from the root */
902void inline_speed
903downheap (ANHE *heap, int N, int k)
904{
905 ANHE he = heap [k];
790 906
791 for (;;) 907 for (;;)
792 { 908 {
793 int c = k << 1; 909 int c = k << 1;
794 910
795 if (c > N) 911 if (c > N)
796 break; 912 break;
797 913
798 c += c < N && heap [c]->at > heap [c + 1]->at 914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
799 ? 1 : 0; 915 ? 1 : 0;
800 916
801 if (w->at <= heap [c]->at) 917 if (ANHE_at (he) <= ANHE_at (heap [c]))
802 break; 918 break;
803 919
804 heap [k] = heap [c]; 920 heap [k] = heap [c];
805 ev_active (heap [k]) = k; 921 ev_active (ANHE_w (heap [k])) = k;
806 922
807 k = c; 923 k = c;
808 } 924 }
809 925
810 heap [k] = w; 926 heap [k] = he;
811 ev_active (heap [k]) = k; 927 ev_active (ANHE_w (he)) = k;
812} 928}
929#endif
813 930
814void inline_size 931void inline_size
815adjustheap (WT *heap, int N, int k) 932adjustheap (ANHE *heap, int N, int k)
816{ 933{
817 upheap (heap, k); 934 upheap (heap, k);
818 downheap (heap, N, k); 935 downheap (heap, N, k);
819} 936}
820 937
… …
912pipecb (EV_P_ ev_io *iow, int revents) 1029pipecb (EV_P_ ev_io *iow, int revents)
913{ 1030{
914#if EV_USE_EVENTFD 1031#if EV_USE_EVENTFD
915 if (evfd >= 0) 1032 if (evfd >= 0)
916 { 1033 {
917 uint64_t counter = 1; 1034 uint64_t counter;
918 read (evfd, &counter, sizeof (uint64_t)); 1035 read (evfd, &counter, sizeof (uint64_t));
919 } 1036 }
920 else 1037 else
921#endif 1038#endif
922 { 1039 {
… …
1368void 1485void
1369ev_loop_fork (EV_P) 1486ev_loop_fork (EV_P)
1370{ 1487{
1371 postfork = 1; /* must be in line with ev_default_fork */ 1488 postfork = 1; /* must be in line with ev_default_fork */
1372} 1489}
1373
1374#endif 1490#endif
1375 1491
1376#if EV_MULTIPLICITY 1492#if EV_MULTIPLICITY
1377struct ev_loop * 1493struct ev_loop *
1378ev_default_loop_init (unsigned int flags) 1494ev_default_loop_init (unsigned int flags)
… …
1459 EV_CB_INVOKE (p->w, p->events); 1575 EV_CB_INVOKE (p->w, p->events);
1460 } 1576 }
1461 } 1577 }
1462} 1578}
1463 1579
1464void inline_size
1465timers_reify (EV_P)
1466{
1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1468 {
1469 ev_timer *w = (ev_timer *)timers [1];
1470
1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1472
1473 /* first reschedule or stop timer */
1474 if (w->repeat)
1475 {
1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1477
1478 ev_at (w) += w->repeat;
1479 if (ev_at (w) < mn_now)
1480 ev_at (w) = mn_now;
1481
1482 downheap (timers, timercnt, 1);
1483 }
1484 else
1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1486
1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1488 }
1489}
1490
1491#if EV_PERIODIC_ENABLE
1492void inline_size
1493periodics_reify (EV_P)
1494{
1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1496 {
1497 ev_periodic *w = (ev_periodic *)periodics [1];
1498
1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1500
1501 /* first reschedule or stop timer */
1502 if (w->reschedule_cb)
1503 {
1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1506 downheap (periodics, periodiccnt, 1);
1507 }
1508 else if (w->interval)
1509 {
1510 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;
1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1513 downheap (periodics, periodiccnt, 1);
1514 }
1515 else
1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1517
1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1519 }
1520}
1521
1522static void noinline
1523periodics_reschedule (EV_P)
1524{
1525 int i;
1526
1527 /* adjust periodics after time jump */
1528 for (i = 1; i <= periodiccnt; ++i)
1529 {
1530 ev_periodic *w = (ev_periodic *)periodics [i];
1531
1532 if (w->reschedule_cb)
1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1534 else if (w->interval)
1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1536 }
1537
1538 /* now rebuild the heap */
1539 for (i = periodiccnt >> 1; i--; )
1540 downheap (periodics, periodiccnt, i);
1541}
1542#endif
1543
1544#if EV_IDLE_ENABLE 1580#if EV_IDLE_ENABLE
1545void inline_size 1581void inline_size
1546idle_reify (EV_P) 1582idle_reify (EV_P)
1547{ 1583{
1548 if (expect_false (idleall)) 1584 if (expect_false (idleall))
… …
1559 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1595 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1560 break; 1596 break;
1561 } 1597 }
1562 } 1598 }
1563 } 1599 }
1600}
1601#endif
1602
1603void inline_size
1604timers_reify (EV_P)
1605{
1606 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611
1612 /* first reschedule or stop timer */
1613 if (w->repeat)
1614 {
1615 ev_at (w) += w->repeat;
1616 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now;
1618
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620
1621 ANHE_at_set (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0);
1623 }
1624 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 }
1629}
1630
1631#if EV_PERIODIC_ENABLE
1632void inline_size
1633periodics_reify (EV_P)
1634{
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1640
1641 /* first reschedule or stop timer */
1642 if (w->reschedule_cb)
1643 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647
1648 ANHE_at_set (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0);
1650 }
1651 else if (w->interval)
1652 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1655
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) >= ev_rt_now));
1657
1658 ANHE_at_set (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0);
1660 }
1661 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 }
1666}
1667
1668static void noinline
1669periodics_reschedule (EV_P)
1670{
1671 int i;
1672
1673 /* adjust periodics after time jump */
1674 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1675 {
1676 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1677
1678 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682
1683 ANHE_at_set (periodics [i]);
1684 }
1685
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1688 for (i = 0; i < periodiccnt; ++i)
1689 upheap (periodics, i + HEAP0);
1564} 1690}
1565#endif 1691#endif
1566 1692
1567void inline_speed 1693void inline_speed
1568time_update (EV_P_ ev_tstamp max_block) 1694time_update (EV_P_ ev_tstamp max_block)
… …
1597 */ 1723 */
1598 for (i = 4; --i; ) 1724 for (i = 4; --i; )
1599 { 1725 {
1600 rtmn_diff = ev_rt_now - mn_now; 1726 rtmn_diff = ev_rt_now - mn_now;
1601 1727
1602 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1728 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1603 return; /* all is well */ 1729 return; /* all is well */
1604 1730
1605 ev_rt_now = ev_time (); 1731 ev_rt_now = ev_time ();
1606 mn_now = get_clock (); 1732 mn_now = get_clock ();
1607 now_floor = mn_now; 1733 now_floor = mn_now;
… …
1622 { 1748 {
1623#if EV_PERIODIC_ENABLE 1749#if EV_PERIODIC_ENABLE
1624 periodics_reschedule (EV_A); 1750 periodics_reschedule (EV_A);
1625#endif 1751#endif
1626 /* adjust timers. this is easy, as the offset is the same for all of them */ 1752 /* adjust timers. this is easy, as the offset is the same for all of them */
1627 for (i = 1; i <= timercnt; ++i) 1753 for (i = 0; i < timercnt; ++i)
1628 ev_at (timers [i]) += ev_rt_now - mn_now; 1754 {
1755 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he);
1758 }
1629 } 1759 }
1630 1760
1631 mn_now = ev_rt_now; 1761 mn_now = ev_rt_now;
1632 } 1762 }
1633} 1763}
… …
1703 1833
1704 waittime = MAX_BLOCKTIME; 1834 waittime = MAX_BLOCKTIME;
1705 1835
1706 if (timercnt) 1836 if (timercnt)
1707 { 1837 {
1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1838 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1709 if (waittime > to) waittime = to; 1839 if (waittime > to) waittime = to;
1710 } 1840 }
1711 1841
1712#if EV_PERIODIC_ENABLE 1842#if EV_PERIODIC_ENABLE
1713 if (periodiccnt) 1843 if (periodiccnt)
1714 { 1844 {
1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1845 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1716 if (waittime > to) waittime = to; 1846 if (waittime > to) waittime = to;
1717 } 1847 }
1718#endif 1848#endif
1719 1849
1720 if (expect_false (waittime < timeout_blocktime)) 1850 if (expect_false (waittime < timeout_blocktime))
… …
1872{ 2002{
1873 clear_pending (EV_A_ (W)w); 2003 clear_pending (EV_A_ (W)w);
1874 if (expect_false (!ev_is_active (w))) 2004 if (expect_false (!ev_is_active (w)))
1875 return; 2005 return;
1876 2006
1877 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2007 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1878 2008
1879 wlist_del (&anfds[w->fd].head, (WL)w); 2009 wlist_del (&anfds[w->fd].head, (WL)w);
1880 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1881 2011
1882 fd_change (EV_A_ w->fd, 1); 2012 fd_change (EV_A_ w->fd, 1);
… …
1890 2020
1891 ev_at (w) += mn_now; 2021 ev_at (w) += mn_now;
1892 2022
1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2023 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1894 2024
1895 ev_start (EV_A_ (W)w, ++timercnt); 2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1897 timers [timercnt] = (WT)w; 2027 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]);
1898 upheap (timers, timercnt); 2029 upheap (timers, ev_active (w));
1899 2030
1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1901} 2032}
1902 2033
1903void noinline 2034void noinline
1904ev_timer_stop (EV_P_ ev_timer *w) 2035ev_timer_stop (EV_P_ ev_timer *w)
1905{ 2036{
… …
1908 return; 2039 return;
1909 2040
1910 { 2041 {
1911 int active = ev_active (w); 2042 int active = ev_active (w);
1912 2043
1913 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1914 2045
1915 if (expect_true (active < timercnt)) 2046 if (expect_true (active < timercnt + HEAP0 - 1))
1916 { 2047 {
1917 timers [active] = timers [timercnt]; 2048 timers [active] = timers [timercnt + HEAP0 - 1];
1918 adjustheap (timers, timercnt, active); 2049 adjustheap (timers, timercnt, active);
1919 } 2050 }
1920 2051
1921 --timercnt; 2052 --timercnt;
1922 } 2053 }
… …
1932 if (ev_is_active (w)) 2063 if (ev_is_active (w))
1933 { 2064 {
1934 if (w->repeat) 2065 if (w->repeat)
1935 { 2066 {
1936 ev_at (w) = mn_now + w->repeat; 2067 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]);
1937 adjustheap (timers, timercnt, ev_active (w)); 2069 adjustheap (timers, timercnt, ev_active (w));
1938 } 2070 }
1939 else 2071 else
1940 ev_timer_stop (EV_A_ w); 2072 ev_timer_stop (EV_A_ w);
1941 } 2073 }
… …
1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1963 } 2095 }
1964 else 2096 else
1965 ev_at (w) = w->offset; 2097 ev_at (w) = w->offset;
1966 2098
1967 ev_start (EV_A_ (W)w, ++periodiccnt); 2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1969 periodics [periodiccnt] = (WT)w; 2101 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1970 upheap (periodics, periodiccnt); 2102 ANHE_at_set (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w));
1971 2104
1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1973} 2106}
1974 2107
1975void noinline 2108void noinline
1976ev_periodic_stop (EV_P_ ev_periodic *w) 2109ev_periodic_stop (EV_P_ ev_periodic *w)
1977{ 2110{
… …
1980 return; 2113 return;
1981 2114
1982 { 2115 {
1983 int active = ev_active (w); 2116 int active = ev_active (w);
1984 2117
1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
1986 2119
1987 if (expect_true (active < periodiccnt)) 2120 if (expect_true (active < periodiccnt + HEAP0 - 1))
1988 { 2121 {
1989 periodics [active] = periodics [periodiccnt]; 2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1990 adjustheap (periodics, periodiccnt, active); 2123 adjustheap (periodics, periodiccnt, active);
1991 } 2124 }
1992 2125
1993 --periodiccnt; 2126 --periodiccnt;
1994 } 2127 }
… …
2114 if (w->wd < 0) 2247 if (w->wd < 0)
2115 { 2248 {
2116 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2249 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2117 2250
2118 /* monitor some parent directory for speedup hints */ 2251 /* monitor some parent directory for speedup hints */
2252 /* note that exceeding the hardcoded limit is not a correctness issue, */
2253 /* but an efficiency issue only */
2119 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2254 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2120 { 2255 {
2121 char path [4096]; 2256 char path [4096];
2122 strcpy (path, w->path); 2257 strcpy (path, w->path);
2123 2258

Diff Legend

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