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

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

Diff Legend

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