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

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

Diff Legend

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