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

Comparing libev/ev.c (file contents):
Revision 1.243 by root, Fri May 9 15:52:13 2008 UTC vs.
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC

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

Diff Legend

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