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

Comparing libev/ev.c (file contents):
Revision 1.244 by root, Tue May 20 23:49:41 2008 UTC vs.
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC

288# endif 288# endif
289#endif 289#endif
290 290
291/**/ 291/**/
292 292
293/* undefined or zero: no verification done or available */
294/* 1 or higher: ev_loop_verify function available */
295/* 2 or higher: ev_loop_verify is called frequently */
296#define EV_VERIFY 1
297
298#if EV_VERIFY > 1
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else
301# define EV_FREQUENT_CHECK do { } while (0)
302#endif
303
293/* 304/*
294 * This is used to avoid floating point rounding problems. 305 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 306 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 307 * to ensure progress, time-wise, even when rounding
297 * errors are against us. 308 * errors are against us.
444 typedef struct { 455 typedef struct {
445 ev_tstamp at; 456 ev_tstamp at;
446 WT w; 457 WT w;
447 } ANHE; 458 } ANHE;
448 459
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 460 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 461 #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 */ 462 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 463#else
453 typedef WT ANHE; 464 typedef WT ANHE;
454 465
455 #define ANHE_w(he) (he) 466 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 467 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 468 #define ANHE_at_cache(he)
458#endif 469#endif
459 470
460#if EV_MULTIPLICITY 471#if EV_MULTIPLICITY
461 472
462 struct ev_loop 473 struct ev_loop
802 */ 813 */
803#if EV_USE_4HEAP 814#if EV_USE_4HEAP
804 815
805#define DHEAP 4 816#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 817#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807 818#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 819#define UPHEAP_DONE(p,k) ((p) == (k))
809void inline_speed
810upheap (ANHE *heap, int k)
811{
812 ANHE he = heap [k];
813
814 for (;;)
815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
821 heap [k] = heap [p];
822 ev_active (ANHE_w (heap [k])) = k;
823 k = p;
824 }
825
826 ev_active (ANHE_w (he)) = k;
827 heap [k] = he;
828}
829 820
830/* away from the root */ 821/* away from the root */
831void inline_speed 822void inline_speed
832downheap (ANHE *heap, int N, int k) 823downheap (ANHE *heap, int N, int k)
833{ 824{
836 827
837 for (;;) 828 for (;;)
838 { 829 {
839 ev_tstamp minat; 830 ev_tstamp minat;
840 ANHE *minpos; 831 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 832 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 833
843 // find minimum child 834 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 835 if (expect_true (pos + DHEAP - 1 < E))
845 { 836 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 837 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 838 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)); 839 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)); 840 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 } 841 }
851 else if (pos < E) 842 else if (pos < E)
852 { 843 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 844 /* 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)); 845 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
859 break; 850 break;
860 851
861 if (ANHE_at (he) <= minat) 852 if (ANHE_at (he) <= minat)
862 break; 853 break;
863 854
855 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 856 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 857
867 k = minpos - heap; 858 k = minpos - heap;
868 } 859 }
869 860
861 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 862 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 863}
873 864
874#else // 4HEAP 865#else /* 4HEAP */
875 866
876#define HEAP0 1 867#define HEAP0 1
877 868#define HPARENT(k) ((k) >> 1)
878/* towards the root */ 869#define UPHEAP_DONE(p,k) (!(p))
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 870
901/* away from the root */ 871/* away from the root */
902void inline_speed 872void inline_speed
903downheap (ANHE *heap, int N, int k) 873downheap (ANHE *heap, int N, int k)
904{ 874{
906 876
907 for (;;) 877 for (;;)
908 { 878 {
909 int c = k << 1; 879 int c = k << 1;
910 880
911 if (c > N) 881 if (c > N + HEAP0 - 1)
912 break; 882 break;
913 883
914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 884 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
915 ? 1 : 0; 885 ? 1 : 0;
916 886
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 887 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 888 break;
919 889
926 heap [k] = he; 896 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 897 ev_active (ANHE_w (he)) = k;
928} 898}
929#endif 899#endif
930 900
901/* towards the root */
902void inline_speed
903upheap (ANHE *heap, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int p = HPARENT (k);
910
911 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
912 break;
913
914 heap [k] = heap [p];
915 ev_active (ANHE_w (heap [k])) = k;
916 k = p;
917 }
918
919 heap [k] = he;
920 ev_active (ANHE_w (he)) = k;
921}
922
931void inline_size 923void inline_size
932adjustheap (ANHE *heap, int N, int k) 924adjustheap (ANHE *heap, int N, int k)
933{ 925{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
934 upheap (heap, k); 927 upheap (heap, k);
928 else
935 downheap (heap, N, k); 929 downheap (heap, N, k);
936} 930}
931
932/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size
934reheap (ANHE *heap, int N)
935{
936 int i;
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
938 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0);
941}
942
943#if EV_VERIFY
944static void
945checkheap (ANHE *heap, int N)
946{
947 int i;
948
949 for (i = HEAP0; i < N + HEAP0; ++i)
950 {
951 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
952 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
953 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
954 }
955}
956#endif
937 957
938/*****************************************************************************/ 958/*****************************************************************************/
939 959
940typedef struct 960typedef struct
941{ 961{
1485void 1505void
1486ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1487{ 1507{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1489} 1509}
1510
1511#if EV_VERIFY
1512static void
1513array_check (W **ws, int cnt)
1514{
1515 while (cnt--)
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1517}
1518
1519static void
1520ev_loop_verify (EV_P)
1521{
1522 int i;
1523
1524 checkheap (timers, timercnt);
1525#if EV_PERIODIC_ENABLE
1526 checkheap (periodics, periodiccnt);
1527#endif
1528
1529#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; )
1531 array_check ((W **)idles [i], idlecnt [i]);
1532#endif
1533#if EV_FORK_ENABLE
1534 array_check ((W **)forks, forkcnt);
1535#endif
1536 array_check ((W **)prepares, preparecnt);
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE
1539 array_check ((W **)asyncs, asynccnt);
1540#endif
1541}
1542#endif
1543
1490#endif 1544#endif
1491 1545
1492#if EV_MULTIPLICITY 1546#if EV_MULTIPLICITY
1493struct ev_loop * 1547struct ev_loop *
1494ev_default_loop_init (unsigned int flags) 1548ev_default_loop_init (unsigned int flags)
1560void inline_speed 1614void inline_speed
1561call_pending (EV_P) 1615call_pending (EV_P)
1562{ 1616{
1563 int pri; 1617 int pri;
1564 1618
1619 EV_FREQUENT_CHECK;
1620
1565 for (pri = NUMPRI; pri--; ) 1621 for (pri = NUMPRI; pri--; )
1566 while (pendingcnt [pri]) 1622 while (pendingcnt [pri])
1567 { 1623 {
1568 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1569 1625
1573 1629
1574 p->w->pending = 0; 1630 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 1631 EV_CB_INVOKE (p->w, p->events);
1576 } 1632 }
1577 } 1633 }
1634
1635 EV_FREQUENT_CHECK;
1578} 1636}
1579 1637
1580#if EV_IDLE_ENABLE 1638#if EV_IDLE_ENABLE
1581void inline_size 1639void inline_size
1582idle_reify (EV_P) 1640idle_reify (EV_P)
1601#endif 1659#endif
1602 1660
1603void inline_size 1661void inline_size
1604timers_reify (EV_P) 1662timers_reify (EV_P)
1605{ 1663{
1664 EV_FREQUENT_CHECK;
1665
1606 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1666 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 1667 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1668 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609 1669
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1670 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1616 if (ev_at (w) < mn_now) 1676 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 1677 ev_at (w) = mn_now;
1618 1678
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1679 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620 1680
1621 ANHE_at_set (timers [HEAP0]); 1681 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0); 1682 downheap (timers, timercnt, HEAP0);
1623 } 1683 }
1624 else 1684 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1685 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 1686
1687 EV_FREQUENT_CHECK;
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1688 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 } 1689 }
1629} 1690}
1630 1691
1631#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1632void inline_size 1693void inline_size
1633periodics_reify (EV_P) 1694periodics_reify (EV_P)
1634{ 1695{
1696 EV_FREQUENT_CHECK;
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 1698 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638 1700
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1643 { 1705 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1706 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 1707
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647 1709
1648 ANHE_at_set (periodics [HEAP0]); 1710 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1711 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1650 } 1713 }
1651 else if (w->interval) 1714 else if (w->interval)
1652 { 1715 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1717 /* if next trigger time is not sufficiently in the future, put it there */
1718 /* this might happen because of floating point inexactness */
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1719 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1720 {
1721 ev_at (w) += w->interval;
1655 1722
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) >= ev_rt_now)); 1723 /* if interval is unreasonably low we might still have a time in the past */
1724 /* so correct this. this will make the periodic very inexact, but the user */
1725 /* has effectively asked to get triggered more often than possible */
1726 if (ev_at (w) < ev_rt_now)
1727 ev_at (w) = ev_rt_now;
1728 }
1657 1729
1658 ANHE_at_set (periodics [HEAP0]); 1730 ANHE_at_cache (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0); 1731 downheap (periodics, periodiccnt, HEAP0);
1660 } 1732 }
1661 else 1733 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1734 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663 1735
1736 EV_FREQUENT_CHECK;
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1737 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 } 1738 }
1666} 1739}
1667 1740
1668static void noinline 1741static void noinline
1678 if (w->reschedule_cb) 1751 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1752 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 1753 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1754 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682 1755
1683 ANHE_at_set (periodics [i]); 1756 ANHE_at_cache (periodics [i]);
1684 } 1757 }
1685 1758
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1759 reheap (periodics, periodiccnt);
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);
1690} 1760}
1691#endif 1761#endif
1692 1762
1693void inline_speed 1763void inline_speed
1694time_update (EV_P_ ev_tstamp max_block) 1764time_update (EV_P_ ev_tstamp max_block)
1752 /* adjust timers. this is easy, as the offset is the same for all of them */ 1822 /* adjust timers. this is easy, as the offset is the same for all of them */
1753 for (i = 0; i < timercnt; ++i) 1823 for (i = 0; i < timercnt; ++i)
1754 { 1824 {
1755 ANHE *he = timers + i + HEAP0; 1825 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now; 1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he); 1827 ANHE_at_cache (*he);
1758 } 1828 }
1759 } 1829 }
1760 1830
1761 mn_now = ev_rt_now; 1831 mn_now = ev_rt_now;
1762 } 1832 }
1987 if (expect_false (ev_is_active (w))) 2057 if (expect_false (ev_is_active (w)))
1988 return; 2058 return;
1989 2059
1990 assert (("ev_io_start called with negative fd", fd >= 0)); 2060 assert (("ev_io_start called with negative fd", fd >= 0));
1991 2061
2062 EV_FREQUENT_CHECK;
2063
1992 ev_start (EV_A_ (W)w, 1); 2064 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1994 wlist_add (&anfds[fd].head, (WL)w); 2066 wlist_add (&anfds[fd].head, (WL)w);
1995 2067
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1997 w->events &= ~EV_IOFDSET; 2069 w->events &= ~EV_IOFDSET;
2070
2071 EV_FREQUENT_CHECK;
1998} 2072}
1999 2073
2000void noinline 2074void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2075ev_io_stop (EV_P_ ev_io *w)
2002{ 2076{
2004 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
2005 return; 2079 return;
2006 2080
2007 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2081 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2008 2082
2083 EV_FREQUENT_CHECK;
2084
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2085 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
2011 2087
2012 fd_change (EV_A_ w->fd, 1); 2088 fd_change (EV_A_ w->fd, 1);
2089
2090 EV_FREQUENT_CHECK;
2013} 2091}
2014 2092
2015void noinline 2093void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2094ev_timer_start (EV_P_ ev_timer *w)
2017{ 2095{
2020 2098
2021 ev_at (w) += mn_now; 2099 ev_at (w) += mn_now;
2022 2100
2023 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2101 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2024 2102
2103 EV_FREQUENT_CHECK;
2104
2105 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2107 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2108 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2109 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2110 upheap (timers, ev_active (w));
2111
2112 EV_FREQUENT_CHECK;
2030 2113
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2115}
2033 2116
2034void noinline 2117void noinline
2036{ 2119{
2037 clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
2039 return; 2122 return;
2040 2123
2124 EV_FREQUENT_CHECK;
2125
2041 { 2126 {
2042 int active = ev_active (w); 2127 int active = ev_active (w);
2043 2128
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2130
2131 --timercnt;
2132
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2133 if (expect_true (active < timercnt + HEAP0))
2047 { 2134 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2135 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2136 adjustheap (timers, timercnt, active);
2050 } 2137 }
2051
2052 --timercnt;
2053 } 2138 }
2139
2140 EV_FREQUENT_CHECK;
2054 2141
2055 ev_at (w) -= mn_now; 2142 ev_at (w) -= mn_now;
2056 2143
2057 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
2058} 2145}
2059 2146
2060void noinline 2147void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2148ev_timer_again (EV_P_ ev_timer *w)
2062{ 2149{
2150 EV_FREQUENT_CHECK;
2151
2063 if (ev_is_active (w)) 2152 if (ev_is_active (w))
2064 { 2153 {
2065 if (w->repeat) 2154 if (w->repeat)
2066 { 2155 {
2067 ev_at (w) = mn_now + w->repeat; 2156 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2157 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2158 adjustheap (timers, timercnt, ev_active (w));
2070 } 2159 }
2071 else 2160 else
2072 ev_timer_stop (EV_A_ w); 2161 ev_timer_stop (EV_A_ w);
2073 } 2162 }
2074 else if (w->repeat) 2163 else if (w->repeat)
2075 { 2164 {
2076 ev_at (w) = w->repeat; 2165 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2166 ev_timer_start (EV_A_ w);
2078 } 2167 }
2168
2169 EV_FREQUENT_CHECK;
2079} 2170}
2080 2171
2081#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2082void noinline 2173void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2174ev_periodic_start (EV_P_ ev_periodic *w)
2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2185 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2095 } 2186 }
2096 else 2187 else
2097 ev_at (w) = w->offset; 2188 ev_at (w) = w->offset;
2098 2189
2190 EV_FREQUENT_CHECK;
2191
2192 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2193 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2194 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2195 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2196 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2197 upheap (periodics, ev_active (w));
2198
2199 EV_FREQUENT_CHECK;
2104 2200
2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2201 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2106} 2202}
2107 2203
2108void noinline 2204void noinline
2110{ 2206{
2111 clear_pending (EV_A_ (W)w); 2207 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2208 if (expect_false (!ev_is_active (w)))
2113 return; 2209 return;
2114 2210
2211 EV_FREQUENT_CHECK;
2212
2115 { 2213 {
2116 int active = ev_active (w); 2214 int active = ev_active (w);
2117 2215
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2217
2218 --periodiccnt;
2219
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2220 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2221 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2222 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2223 adjustheap (periodics, periodiccnt, active);
2124 } 2224 }
2125
2126 --periodiccnt;
2127 } 2225 }
2226
2227 EV_FREQUENT_CHECK;
2128 2228
2129 ev_stop (EV_A_ (W)w); 2229 ev_stop (EV_A_ (W)w);
2130} 2230}
2131 2231
2132void noinline 2232void noinline
2152 return; 2252 return;
2153 2253
2154 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2254 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2155 2255
2156 evpipe_init (EV_A); 2256 evpipe_init (EV_A);
2257
2258 EV_FREQUENT_CHECK;
2157 2259
2158 { 2260 {
2159#ifndef _WIN32 2261#ifndef _WIN32
2160 sigset_t full, prev; 2262 sigset_t full, prev;
2161 sigfillset (&full); 2263 sigfillset (&full);
2182 sigfillset (&sa.sa_mask); 2284 sigfillset (&sa.sa_mask);
2183 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2285 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2184 sigaction (w->signum, &sa, 0); 2286 sigaction (w->signum, &sa, 0);
2185#endif 2287#endif
2186 } 2288 }
2289
2290 EV_FREQUENT_CHECK;
2187} 2291}
2188 2292
2189void noinline 2293void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2294ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2295{
2192 clear_pending (EV_A_ (W)w); 2296 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2297 if (expect_false (!ev_is_active (w)))
2194 return; 2298 return;
2195 2299
2300 EV_FREQUENT_CHECK;
2301
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2302 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2303 ev_stop (EV_A_ (W)w);
2198 2304
2199 if (!signals [w->signum - 1].head) 2305 if (!signals [w->signum - 1].head)
2200 signal (w->signum, SIG_DFL); 2306 signal (w->signum, SIG_DFL);
2307
2308 EV_FREQUENT_CHECK;
2201} 2309}
2202 2310
2203void 2311void
2204ev_child_start (EV_P_ ev_child *w) 2312ev_child_start (EV_P_ ev_child *w)
2205{ 2313{
2207 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2315 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2208#endif 2316#endif
2209 if (expect_false (ev_is_active (w))) 2317 if (expect_false (ev_is_active (w)))
2210 return; 2318 return;
2211 2319
2320 EV_FREQUENT_CHECK;
2321
2212 ev_start (EV_A_ (W)w, 1); 2322 ev_start (EV_A_ (W)w, 1);
2213 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2323 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2324
2325 EV_FREQUENT_CHECK;
2214} 2326}
2215 2327
2216void 2328void
2217ev_child_stop (EV_P_ ev_child *w) 2329ev_child_stop (EV_P_ ev_child *w)
2218{ 2330{
2219 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2221 return; 2333 return;
2222 2334
2335 EV_FREQUENT_CHECK;
2336
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2337 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2339
2340 EV_FREQUENT_CHECK;
2225} 2341}
2226 2342
2227#if EV_STAT_ENABLE 2343#if EV_STAT_ENABLE
2228 2344
2229# ifdef _WIN32 2345# ifdef _WIN32
2457 else 2573 else
2458#endif 2574#endif
2459 ev_timer_start (EV_A_ &w->timer); 2575 ev_timer_start (EV_A_ &w->timer);
2460 2576
2461 ev_start (EV_A_ (W)w, 1); 2577 ev_start (EV_A_ (W)w, 1);
2578
2579 EV_FREQUENT_CHECK;
2462} 2580}
2463 2581
2464void 2582void
2465ev_stat_stop (EV_P_ ev_stat *w) 2583ev_stat_stop (EV_P_ ev_stat *w)
2466{ 2584{
2467 clear_pending (EV_A_ (W)w); 2585 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 2586 if (expect_false (!ev_is_active (w)))
2469 return; 2587 return;
2470 2588
2589 EV_FREQUENT_CHECK;
2590
2471#if EV_USE_INOTIFY 2591#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 2592 infy_del (EV_A_ w);
2473#endif 2593#endif
2474 ev_timer_stop (EV_A_ &w->timer); 2594 ev_timer_stop (EV_A_ &w->timer);
2475 2595
2476 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2597
2598 EV_FREQUENT_CHECK;
2477} 2599}
2478#endif 2600#endif
2479 2601
2480#if EV_IDLE_ENABLE 2602#if EV_IDLE_ENABLE
2481void 2603void
2483{ 2605{
2484 if (expect_false (ev_is_active (w))) 2606 if (expect_false (ev_is_active (w)))
2485 return; 2607 return;
2486 2608
2487 pri_adjust (EV_A_ (W)w); 2609 pri_adjust (EV_A_ (W)w);
2610
2611 EV_FREQUENT_CHECK;
2488 2612
2489 { 2613 {
2490 int active = ++idlecnt [ABSPRI (w)]; 2614 int active = ++idlecnt [ABSPRI (w)];
2491 2615
2492 ++idleall; 2616 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 2617 ev_start (EV_A_ (W)w, active);
2494 2618
2495 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2619 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2496 idles [ABSPRI (w)][active - 1] = w; 2620 idles [ABSPRI (w)][active - 1] = w;
2497 } 2621 }
2622
2623 EV_FREQUENT_CHECK;
2498} 2624}
2499 2625
2500void 2626void
2501ev_idle_stop (EV_P_ ev_idle *w) 2627ev_idle_stop (EV_P_ ev_idle *w)
2502{ 2628{
2503 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
2505 return; 2631 return;
2506 2632
2633 EV_FREQUENT_CHECK;
2634
2507 { 2635 {
2508 int active = ev_active (w); 2636 int active = ev_active (w);
2509 2637
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2638 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2639 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 2640
2513 ev_stop (EV_A_ (W)w); 2641 ev_stop (EV_A_ (W)w);
2514 --idleall; 2642 --idleall;
2515 } 2643 }
2644
2645 EV_FREQUENT_CHECK;
2516} 2646}
2517#endif 2647#endif
2518 2648
2519void 2649void
2520ev_prepare_start (EV_P_ ev_prepare *w) 2650ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 2651{
2522 if (expect_false (ev_is_active (w))) 2652 if (expect_false (ev_is_active (w)))
2523 return; 2653 return;
2654
2655 EV_FREQUENT_CHECK;
2524 2656
2525 ev_start (EV_A_ (W)w, ++preparecnt); 2657 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2658 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 2659 prepares [preparecnt - 1] = w;
2660
2661 EV_FREQUENT_CHECK;
2528} 2662}
2529 2663
2530void 2664void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 2665ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 2666{
2533 clear_pending (EV_A_ (W)w); 2667 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2668 if (expect_false (!ev_is_active (w)))
2535 return; 2669 return;
2536 2670
2671 EV_FREQUENT_CHECK;
2672
2537 { 2673 {
2538 int active = ev_active (w); 2674 int active = ev_active (w);
2539 2675
2540 prepares [active - 1] = prepares [--preparecnt]; 2676 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 2677 ev_active (prepares [active - 1]) = active;
2542 } 2678 }
2543 2679
2544 ev_stop (EV_A_ (W)w); 2680 ev_stop (EV_A_ (W)w);
2681
2682 EV_FREQUENT_CHECK;
2545} 2683}
2546 2684
2547void 2685void
2548ev_check_start (EV_P_ ev_check *w) 2686ev_check_start (EV_P_ ev_check *w)
2549{ 2687{
2550 if (expect_false (ev_is_active (w))) 2688 if (expect_false (ev_is_active (w)))
2551 return; 2689 return;
2690
2691 EV_FREQUENT_CHECK;
2552 2692
2553 ev_start (EV_A_ (W)w, ++checkcnt); 2693 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2694 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 2695 checks [checkcnt - 1] = w;
2696
2697 EV_FREQUENT_CHECK;
2556} 2698}
2557 2699
2558void 2700void
2559ev_check_stop (EV_P_ ev_check *w) 2701ev_check_stop (EV_P_ ev_check *w)
2560{ 2702{
2561 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2563 return; 2705 return;
2564 2706
2707 EV_FREQUENT_CHECK;
2708
2565 { 2709 {
2566 int active = ev_active (w); 2710 int active = ev_active (w);
2567 2711
2568 checks [active - 1] = checks [--checkcnt]; 2712 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 2713 ev_active (checks [active - 1]) = active;
2570 } 2714 }
2571 2715
2572 ev_stop (EV_A_ (W)w); 2716 ev_stop (EV_A_ (W)w);
2717
2718 EV_FREQUENT_CHECK;
2573} 2719}
2574 2720
2575#if EV_EMBED_ENABLE 2721#if EV_EMBED_ENABLE
2576void noinline 2722void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 2723ev_embed_sweep (EV_P_ ev_embed *w)
2624 struct ev_loop *loop = w->other; 2770 struct ev_loop *loop = w->other;
2625 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2771 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2626 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2772 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2627 } 2773 }
2628 2774
2775 EV_FREQUENT_CHECK;
2776
2629 ev_set_priority (&w->io, ev_priority (w)); 2777 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 2778 ev_io_start (EV_A_ &w->io);
2631 2779
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 2780 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 2781 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 2782 ev_prepare_start (EV_A_ &w->prepare);
2635 2783
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 2785
2638 ev_start (EV_A_ (W)w, 1); 2786 ev_start (EV_A_ (W)w, 1);
2787
2788 EV_FREQUENT_CHECK;
2639} 2789}
2640 2790
2641void 2791void
2642ev_embed_stop (EV_P_ ev_embed *w) 2792ev_embed_stop (EV_P_ ev_embed *w)
2643{ 2793{
2644 clear_pending (EV_A_ (W)w); 2794 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 2795 if (expect_false (!ev_is_active (w)))
2646 return; 2796 return;
2647 2797
2798 EV_FREQUENT_CHECK;
2799
2648 ev_io_stop (EV_A_ &w->io); 2800 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 2801 ev_prepare_stop (EV_A_ &w->prepare);
2650 2802
2651 ev_stop (EV_A_ (W)w); 2803 ev_stop (EV_A_ (W)w);
2804
2805 EV_FREQUENT_CHECK;
2652} 2806}
2653#endif 2807#endif
2654 2808
2655#if EV_FORK_ENABLE 2809#if EV_FORK_ENABLE
2656void 2810void
2657ev_fork_start (EV_P_ ev_fork *w) 2811ev_fork_start (EV_P_ ev_fork *w)
2658{ 2812{
2659 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2660 return; 2814 return;
2815
2816 EV_FREQUENT_CHECK;
2661 2817
2662 ev_start (EV_A_ (W)w, ++forkcnt); 2818 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2819 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 2820 forks [forkcnt - 1] = w;
2821
2822 EV_FREQUENT_CHECK;
2665} 2823}
2666 2824
2667void 2825void
2668ev_fork_stop (EV_P_ ev_fork *w) 2826ev_fork_stop (EV_P_ ev_fork *w)
2669{ 2827{
2670 clear_pending (EV_A_ (W)w); 2828 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 2829 if (expect_false (!ev_is_active (w)))
2672 return; 2830 return;
2673 2831
2832 EV_FREQUENT_CHECK;
2833
2674 { 2834 {
2675 int active = ev_active (w); 2835 int active = ev_active (w);
2676 2836
2677 forks [active - 1] = forks [--forkcnt]; 2837 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 2838 ev_active (forks [active - 1]) = active;
2679 } 2839 }
2680 2840
2681 ev_stop (EV_A_ (W)w); 2841 ev_stop (EV_A_ (W)w);
2842
2843 EV_FREQUENT_CHECK;
2682} 2844}
2683#endif 2845#endif
2684 2846
2685#if EV_ASYNC_ENABLE 2847#if EV_ASYNC_ENABLE
2686void 2848void
2688{ 2850{
2689 if (expect_false (ev_is_active (w))) 2851 if (expect_false (ev_is_active (w)))
2690 return; 2852 return;
2691 2853
2692 evpipe_init (EV_A); 2854 evpipe_init (EV_A);
2855
2856 EV_FREQUENT_CHECK;
2693 2857
2694 ev_start (EV_A_ (W)w, ++asynccnt); 2858 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2859 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 2860 asyncs [asynccnt - 1] = w;
2861
2862 EV_FREQUENT_CHECK;
2697} 2863}
2698 2864
2699void 2865void
2700ev_async_stop (EV_P_ ev_async *w) 2866ev_async_stop (EV_P_ ev_async *w)
2701{ 2867{
2702 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2704 return; 2870 return;
2705 2871
2872 EV_FREQUENT_CHECK;
2873
2706 { 2874 {
2707 int active = ev_active (w); 2875 int active = ev_active (w);
2708 2876
2709 asyncs [active - 1] = asyncs [--asynccnt]; 2877 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 2878 ev_active (asyncs [active - 1]) = active;
2711 } 2879 }
2712 2880
2713 ev_stop (EV_A_ (W)w); 2881 ev_stop (EV_A_ (W)w);
2882
2883 EV_FREQUENT_CHECK;
2714} 2884}
2715 2885
2716void 2886void
2717ev_async_send (EV_P_ ev_async *w) 2887ev_async_send (EV_P_ ev_async *w)
2718{ 2888{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines