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

Comparing libev/ev.c (file contents):
Revision 1.242 by root, Fri May 9 14:07:19 2008 UTC vs.
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC

235# else 235# else
236# define EV_USE_EVENTFD 0 236# define EV_USE_EVENTFD 0
237# endif 237# endif
238#endif 238#endif
239 239
240#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 249
242#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
279} 287}
280# endif 288# endif
281#endif 289#endif
282 290
283/**/ 291/**/
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
284 303
285/* 304/*
286 * This is used to avoid floating point rounding problems. 305 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 306 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 307 * to ensure progress, time-wise, even when rounding
430 WL head; 449 WL head;
431} ANFS; 450} ANFS;
432#endif 451#endif
433 452
434/* Heap Entry */ 453/* Heap Entry */
435#define EV_HEAP_CACHE_AT 0
436#if EV_HEAP_CACHE_AT 454#if EV_HEAP_CACHE_AT
437 typedef struct { 455 typedef struct {
456 ev_tstamp at;
438 WT w; 457 WT w;
439 ev_tstamp at;
440 } ANHE; 458 } ANHE;
441 459
442 #define ANHE_w(he) (he).w /* access watcher, read-write */ 460 #define ANHE_w(he) (he).w /* access watcher, read-write */
443 #define ANHE_at(he) (he).at /* access cached at, read-only */ 461 #define ANHE_at(he) (he).at /* access cached at, read-only */
444 #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 */
445#else 463#else
446 typedef WT ANHE; 464 typedef WT ANHE;
447 465
448 #define ANHE_w(he) (he) 466 #define ANHE_w(he) (he)
449 #define ANHE_at(he) (he)->at 467 #define ANHE_at(he) (he)->at
450 #define ANHE_at_set(he) 468 #define ANHE_at_cache(he)
451#endif 469#endif
452 470
453#if EV_MULTIPLICITY 471#if EV_MULTIPLICITY
454 472
455 struct ev_loop 473 struct ev_loop
791 * at the moment we allow libev the luxury of two heaps, 809 * at the moment we allow libev the luxury of two heaps,
792 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap 810 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
793 * which is more cache-efficient. 811 * which is more cache-efficient.
794 * the difference is about 5% with 50000+ watchers. 812 * the difference is about 5% with 50000+ watchers.
795 */ 813 */
796#define EV_USE_4HEAP !EV_MINIMAL
797#if EV_USE_4HEAP 814#if EV_USE_4HEAP
798 815
799#define DHEAP 4 816#define DHEAP 4
800#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 817#define HEAP0 (DHEAP - 1) /* index of first element in heap */
801 818#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
802/* towards the root */ 819#define UPHEAP_DONE(p,k) ((p) == (k))
803void inline_speed
804upheap (ANHE *heap, int k)
805{
806 ANHE he = heap [k];
807
808 for (;;)
809 {
810 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
811
812 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
813 break;
814
815 heap [k] = heap [p];
816 ev_active (ANHE_w (heap [k])) = k;
817 k = p;
818 }
819
820 ev_active (ANHE_w (he)) = k;
821 heap [k] = he;
822}
823 820
824/* away from the root */ 821/* away from the root */
825void inline_speed 822void inline_speed
826downheap (ANHE *heap, int N, int k) 823downheap (ANHE *heap, int N, int k)
827{ 824{
830 827
831 for (;;) 828 for (;;)
832 { 829 {
833 ev_tstamp minat; 830 ev_tstamp minat;
834 ANHE *minpos; 831 ANHE *minpos;
835 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 832 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
836 833
837 // find minimum child 834 /* find minimum child */
838 if (expect_true (pos + DHEAP - 1 < E)) 835 if (expect_true (pos + DHEAP - 1 < E))
839 { 836 {
840 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 837 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
841 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));
842 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));
843 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));
844 } 841 }
845 else if (pos < E) 842 else if (pos < E)
846 { 843 {
847 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 844 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 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));
853 break; 850 break;
854 851
855 if (ANHE_at (he) <= minat) 852 if (ANHE_at (he) <= minat)
856 break; 853 break;
857 854
855 heap [k] = *minpos;
858 ev_active (ANHE_w (*minpos)) = k; 856 ev_active (ANHE_w (*minpos)) = k;
859 heap [k] = *minpos;
860 857
861 k = minpos - heap; 858 k = minpos - heap;
862 } 859 }
863 860
861 heap [k] = he;
864 ev_active (ANHE_w (he)) = k; 862 ev_active (ANHE_w (he)) = k;
865 heap [k] = he;
866} 863}
867 864
868#else // 4HEAP 865#else /* 4HEAP */
869 866
870#define HEAP0 1 867#define HEAP0 1
871 868#define HPARENT(k) ((k) >> 1)
872/* towards the root */ 869#define UPHEAP_DONE(p,k) (!(p))
873void inline_speed
874upheap (ANHE *heap, int k)
875{
876 ANHE he = heap [k];
877
878 for (;;)
879 {
880 int p = k >> 1;
881
882 /* maybe we could use a dummy element at heap [0]? */
883 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
884 break;
885
886 heap [k] = heap [p];
887 ev_active (ANHE_w (heap [k])) = k;
888 k = p;
889 }
890
891 heap [k] = w;
892 ev_active (ANHE_w (heap [k])) = k;
893}
894 870
895/* away from the root */ 871/* away from the root */
896void inline_speed 872void inline_speed
897downheap (ANHE *heap, int N, int k) 873downheap (ANHE *heap, int N, int k)
898{ 874{
900 876
901 for (;;) 877 for (;;)
902 { 878 {
903 int c = k << 1; 879 int c = k << 1;
904 880
905 if (c > N) 881 if (c > N + HEAP0 - 1)
906 break; 882 break;
907 883
908 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])
909 ? 1 : 0; 885 ? 1 : 0;
910 886
911 if (w->at <= ANHE_at (heap [c])) 887 if (ANHE_at (he) <= ANHE_at (heap [c]))
912 break; 888 break;
913 889
914 heap [k] = heap [c]; 890 heap [k] = heap [c];
915 ev_active (ANHE_w (heap [k])) = k; 891 ev_active (ANHE_w (heap [k])) = k;
916 892
920 heap [k] = he; 896 heap [k] = he;
921 ev_active (ANHE_w (he)) = k; 897 ev_active (ANHE_w (he)) = k;
922} 898}
923#endif 899#endif
924 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
925void inline_size 923void inline_size
926adjustheap (ANHE *heap, int N, int k) 924adjustheap (ANHE *heap, int N, int k)
927{ 925{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
928 upheap (heap, k); 927 upheap (heap, k);
928 else
929 downheap (heap, N, k); 929 downheap (heap, N, k);
930} 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
931 957
932/*****************************************************************************/ 958/*****************************************************************************/
933 959
934typedef struct 960typedef struct
935{ 961{
1479void 1505void
1480ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1481{ 1507{
1482 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1483} 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
1484#endif 1544#endif
1485 1545
1486#if EV_MULTIPLICITY 1546#if EV_MULTIPLICITY
1487struct ev_loop * 1547struct ev_loop *
1488ev_default_loop_init (unsigned int flags) 1548ev_default_loop_init (unsigned int flags)
1554void inline_speed 1614void inline_speed
1555call_pending (EV_P) 1615call_pending (EV_P)
1556{ 1616{
1557 int pri; 1617 int pri;
1558 1618
1619 EV_FREQUENT_CHECK;
1620
1559 for (pri = NUMPRI; pri--; ) 1621 for (pri = NUMPRI; pri--; )
1560 while (pendingcnt [pri]) 1622 while (pendingcnt [pri])
1561 { 1623 {
1562 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1563 1625
1567 1629
1568 p->w->pending = 0; 1630 p->w->pending = 0;
1569 EV_CB_INVOKE (p->w, p->events); 1631 EV_CB_INVOKE (p->w, p->events);
1570 } 1632 }
1571 } 1633 }
1634
1635 EV_FREQUENT_CHECK;
1572} 1636}
1573 1637
1574#if EV_IDLE_ENABLE 1638#if EV_IDLE_ENABLE
1575void inline_size 1639void inline_size
1576idle_reify (EV_P) 1640idle_reify (EV_P)
1595#endif 1659#endif
1596 1660
1597void inline_size 1661void inline_size
1598timers_reify (EV_P) 1662timers_reify (EV_P)
1599{ 1663{
1664 EV_FREQUENT_CHECK;
1665
1600 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1666 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1601 { 1667 {
1602 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1668 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1603 1669
1604 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1670 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1605 1671
1606 /* first reschedule or stop timer */ 1672 /* first reschedule or stop timer */
1607 if (w->repeat) 1673 if (w->repeat)
1608 { 1674 {
1609 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1610
1611 ev_at (w) += w->repeat; 1675 ev_at (w) += w->repeat;
1612 if (ev_at (w) < mn_now) 1676 if (ev_at (w) < mn_now)
1613 ev_at (w) = mn_now; 1677 ev_at (w) = mn_now;
1614 1678
1679 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1680
1615 ANHE_at_set (timers [HEAP0]); 1681 ANHE_at_cache (timers [HEAP0]);
1616 downheap (timers, timercnt, HEAP0); 1682 downheap (timers, timercnt, HEAP0);
1617 } 1683 }
1618 else 1684 else
1619 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1685 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1620 1686
1687 EV_FREQUENT_CHECK;
1621 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1688 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1622 } 1689 }
1623} 1690}
1624 1691
1625#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1626void inline_size 1693void inline_size
1627periodics_reify (EV_P) 1694periodics_reify (EV_P)
1628{ 1695{
1696 EV_FREQUENT_CHECK;
1629 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1630 { 1698 {
1631 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1632 1700
1633 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1634 1702
1635 /* first reschedule or stop timer */ 1703 /* first reschedule or stop timer */
1636 if (w->reschedule_cb) 1704 if (w->reschedule_cb)
1637 { 1705 {
1638 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1706 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707
1639 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));
1709
1640 ANHE_at_set (periodics [HEAP0]); 1710 ANHE_at_cache (periodics [HEAP0]);
1641 downheap (periodics, periodiccnt, HEAP0); 1711 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1642 } 1713 }
1643 else if (w->interval) 1714 else if (w->interval)
1644 { 1715 {
1645 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 */
1646 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1719 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1647 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1720 {
1721 ev_at (w) += w->interval;
1722
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 }
1729
1648 ANHE_at_set (periodics [HEAP0]); 1730 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1731 downheap (periodics, periodiccnt, HEAP0);
1650 } 1732 }
1651 else 1733 else
1652 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1734 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1653 1735
1736 EV_FREQUENT_CHECK;
1654 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1737 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1655 } 1738 }
1656} 1739}
1657 1740
1658static void noinline 1741static void noinline
1668 if (w->reschedule_cb) 1751 if (w->reschedule_cb)
1669 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1752 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1670 else if (w->interval) 1753 else if (w->interval)
1671 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;
1672 1755
1673 ANHE_at_set (periodics [i]); 1756 ANHE_at_cache (periodics [i]);
1674 } 1757 }
1675 1758
1676 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1677 for (i = periodiccnt >> 1; --i; )
1678 downheap (periodics, periodiccnt, i + HEAP0); 1759 reheap (periodics, periodiccnt);
1679} 1760}
1680#endif 1761#endif
1681 1762
1682void inline_speed 1763void inline_speed
1683time_update (EV_P_ ev_tstamp max_block) 1764time_update (EV_P_ ev_tstamp max_block)
1741 /* 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 */
1742 for (i = 0; i < timercnt; ++i) 1823 for (i = 0; i < timercnt; ++i)
1743 { 1824 {
1744 ANHE *he = timers + i + HEAP0; 1825 ANHE *he = timers + i + HEAP0;
1745 ANHE_w (*he)->at += ev_rt_now - mn_now; 1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1746 ANHE_at_set (*he); 1827 ANHE_at_cache (*he);
1747 } 1828 }
1748 } 1829 }
1749 1830
1750 mn_now = ev_rt_now; 1831 mn_now = ev_rt_now;
1751 } 1832 }
1976 if (expect_false (ev_is_active (w))) 2057 if (expect_false (ev_is_active (w)))
1977 return; 2058 return;
1978 2059
1979 assert (("ev_io_start called with negative fd", fd >= 0)); 2060 assert (("ev_io_start called with negative fd", fd >= 0));
1980 2061
2062 EV_FREQUENT_CHECK;
2063
1981 ev_start (EV_A_ (W)w, 1); 2064 ev_start (EV_A_ (W)w, 1);
1982 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1983 wlist_add (&anfds[fd].head, (WL)w); 2066 wlist_add (&anfds[fd].head, (WL)w);
1984 2067
1985 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1986 w->events &= ~EV_IOFDSET; 2069 w->events &= ~EV_IOFDSET;
2070
2071 EV_FREQUENT_CHECK;
1987} 2072}
1988 2073
1989void noinline 2074void noinline
1990ev_io_stop (EV_P_ ev_io *w) 2075ev_io_stop (EV_P_ ev_io *w)
1991{ 2076{
1993 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
1994 return; 2079 return;
1995 2080
1996 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));
1997 2082
2083 EV_FREQUENT_CHECK;
2084
1998 wlist_del (&anfds[w->fd].head, (WL)w); 2085 wlist_del (&anfds[w->fd].head, (WL)w);
1999 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
2000 2087
2001 fd_change (EV_A_ w->fd, 1); 2088 fd_change (EV_A_ w->fd, 1);
2089
2090 EV_FREQUENT_CHECK;
2002} 2091}
2003 2092
2004void noinline 2093void noinline
2005ev_timer_start (EV_P_ ev_timer *w) 2094ev_timer_start (EV_P_ ev_timer *w)
2006{ 2095{
2009 2098
2010 ev_at (w) += mn_now; 2099 ev_at (w) += mn_now;
2011 2100
2012 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.));
2013 2102
2103 EV_FREQUENT_CHECK;
2104
2105 ++timercnt;
2014 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2015 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2107 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2016 ANHE_w (timers [ev_active (w)]) = (WT)w; 2108 ANHE_w (timers [ev_active (w)]) = (WT)w;
2017 ANHE_at_set (timers [ev_active (w)]); 2109 ANHE_at_cache (timers [ev_active (w)]);
2018 upheap (timers, ev_active (w)); 2110 upheap (timers, ev_active (w));
2111
2112 EV_FREQUENT_CHECK;
2019 2113
2020 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2021} 2115}
2022 2116
2023void noinline 2117void noinline
2025{ 2119{
2026 clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
2027 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
2028 return; 2122 return;
2029 2123
2124 EV_FREQUENT_CHECK;
2125
2030 { 2126 {
2031 int active = ev_active (w); 2127 int active = ev_active (w);
2032 2128
2033 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2034 2130
2131 --timercnt;
2132
2035 if (expect_true (active < timercnt + HEAP0 - 1)) 2133 if (expect_true (active < timercnt + HEAP0))
2036 { 2134 {
2037 timers [active] = timers [timercnt + HEAP0 - 1]; 2135 timers [active] = timers [timercnt + HEAP0];
2038 adjustheap (timers, timercnt, active); 2136 adjustheap (timers, timercnt, active);
2039 } 2137 }
2040
2041 --timercnt;
2042 } 2138 }
2139
2140 EV_FREQUENT_CHECK;
2043 2141
2044 ev_at (w) -= mn_now; 2142 ev_at (w) -= mn_now;
2045 2143
2046 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
2047} 2145}
2048 2146
2049void noinline 2147void noinline
2050ev_timer_again (EV_P_ ev_timer *w) 2148ev_timer_again (EV_P_ ev_timer *w)
2051{ 2149{
2150 EV_FREQUENT_CHECK;
2151
2052 if (ev_is_active (w)) 2152 if (ev_is_active (w))
2053 { 2153 {
2054 if (w->repeat) 2154 if (w->repeat)
2055 { 2155 {
2056 ev_at (w) = mn_now + w->repeat; 2156 ev_at (w) = mn_now + w->repeat;
2057 ANHE_at_set (timers [ev_active (w)]); 2157 ANHE_at_cache (timers [ev_active (w)]);
2058 adjustheap (timers, timercnt, ev_active (w)); 2158 adjustheap (timers, timercnt, ev_active (w));
2059 } 2159 }
2060 else 2160 else
2061 ev_timer_stop (EV_A_ w); 2161 ev_timer_stop (EV_A_ w);
2062 } 2162 }
2063 else if (w->repeat) 2163 else if (w->repeat)
2064 { 2164 {
2065 ev_at (w) = w->repeat; 2165 ev_at (w) = w->repeat;
2066 ev_timer_start (EV_A_ w); 2166 ev_timer_start (EV_A_ w);
2067 } 2167 }
2168
2169 EV_FREQUENT_CHECK;
2068} 2170}
2069 2171
2070#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2071void noinline 2173void noinline
2072ev_periodic_start (EV_P_ ev_periodic *w) 2174ev_periodic_start (EV_P_ ev_periodic *w)
2083 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;
2084 } 2186 }
2085 else 2187 else
2086 ev_at (w) = w->offset; 2188 ev_at (w) = w->offset;
2087 2189
2190 EV_FREQUENT_CHECK;
2191
2192 ++periodiccnt;
2088 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2193 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2089 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2194 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2090 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2195 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2196 ANHE_at_cache (periodics [ev_active (w)]);
2091 upheap (periodics, ev_active (w)); 2197 upheap (periodics, ev_active (w));
2198
2199 EV_FREQUENT_CHECK;
2092 2200
2093 /*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));*/
2094} 2202}
2095 2203
2096void noinline 2204void noinline
2098{ 2206{
2099 clear_pending (EV_A_ (W)w); 2207 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2208 if (expect_false (!ev_is_active (w)))
2101 return; 2209 return;
2102 2210
2211 EV_FREQUENT_CHECK;
2212
2103 { 2213 {
2104 int active = ev_active (w); 2214 int active = ev_active (w);
2105 2215
2106 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2107 2217
2218 --periodiccnt;
2219
2108 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2220 if (expect_true (active < periodiccnt + HEAP0))
2109 { 2221 {
2110 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2222 periodics [active] = periodics [periodiccnt + HEAP0];
2111 adjustheap (periodics, periodiccnt, active); 2223 adjustheap (periodics, periodiccnt, active);
2112 } 2224 }
2113
2114 --periodiccnt;
2115 } 2225 }
2226
2227 EV_FREQUENT_CHECK;
2116 2228
2117 ev_stop (EV_A_ (W)w); 2229 ev_stop (EV_A_ (W)w);
2118} 2230}
2119 2231
2120void noinline 2232void noinline
2140 return; 2252 return;
2141 2253
2142 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));
2143 2255
2144 evpipe_init (EV_A); 2256 evpipe_init (EV_A);
2257
2258 EV_FREQUENT_CHECK;
2145 2259
2146 { 2260 {
2147#ifndef _WIN32 2261#ifndef _WIN32
2148 sigset_t full, prev; 2262 sigset_t full, prev;
2149 sigfillset (&full); 2263 sigfillset (&full);
2170 sigfillset (&sa.sa_mask); 2284 sigfillset (&sa.sa_mask);
2171 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 */
2172 sigaction (w->signum, &sa, 0); 2286 sigaction (w->signum, &sa, 0);
2173#endif 2287#endif
2174 } 2288 }
2289
2290 EV_FREQUENT_CHECK;
2175} 2291}
2176 2292
2177void noinline 2293void noinline
2178ev_signal_stop (EV_P_ ev_signal *w) 2294ev_signal_stop (EV_P_ ev_signal *w)
2179{ 2295{
2180 clear_pending (EV_A_ (W)w); 2296 clear_pending (EV_A_ (W)w);
2181 if (expect_false (!ev_is_active (w))) 2297 if (expect_false (!ev_is_active (w)))
2182 return; 2298 return;
2183 2299
2300 EV_FREQUENT_CHECK;
2301
2184 wlist_del (&signals [w->signum - 1].head, (WL)w); 2302 wlist_del (&signals [w->signum - 1].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2303 ev_stop (EV_A_ (W)w);
2186 2304
2187 if (!signals [w->signum - 1].head) 2305 if (!signals [w->signum - 1].head)
2188 signal (w->signum, SIG_DFL); 2306 signal (w->signum, SIG_DFL);
2307
2308 EV_FREQUENT_CHECK;
2189} 2309}
2190 2310
2191void 2311void
2192ev_child_start (EV_P_ ev_child *w) 2312ev_child_start (EV_P_ ev_child *w)
2193{ 2313{
2195 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));
2196#endif 2316#endif
2197 if (expect_false (ev_is_active (w))) 2317 if (expect_false (ev_is_active (w)))
2198 return; 2318 return;
2199 2319
2320 EV_FREQUENT_CHECK;
2321
2200 ev_start (EV_A_ (W)w, 1); 2322 ev_start (EV_A_ (W)w, 1);
2201 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;
2202} 2326}
2203 2327
2204void 2328void
2205ev_child_stop (EV_P_ ev_child *w) 2329ev_child_stop (EV_P_ ev_child *w)
2206{ 2330{
2207 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2208 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2209 return; 2333 return;
2210 2334
2335 EV_FREQUENT_CHECK;
2336
2211 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2337 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2212 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2339
2340 EV_FREQUENT_CHECK;
2213} 2341}
2214 2342
2215#if EV_STAT_ENABLE 2343#if EV_STAT_ENABLE
2216 2344
2217# ifdef _WIN32 2345# ifdef _WIN32
2445 else 2573 else
2446#endif 2574#endif
2447 ev_timer_start (EV_A_ &w->timer); 2575 ev_timer_start (EV_A_ &w->timer);
2448 2576
2449 ev_start (EV_A_ (W)w, 1); 2577 ev_start (EV_A_ (W)w, 1);
2578
2579 EV_FREQUENT_CHECK;
2450} 2580}
2451 2581
2452void 2582void
2453ev_stat_stop (EV_P_ ev_stat *w) 2583ev_stat_stop (EV_P_ ev_stat *w)
2454{ 2584{
2455 clear_pending (EV_A_ (W)w); 2585 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2586 if (expect_false (!ev_is_active (w)))
2457 return; 2587 return;
2458 2588
2589 EV_FREQUENT_CHECK;
2590
2459#if EV_USE_INOTIFY 2591#if EV_USE_INOTIFY
2460 infy_del (EV_A_ w); 2592 infy_del (EV_A_ w);
2461#endif 2593#endif
2462 ev_timer_stop (EV_A_ &w->timer); 2594 ev_timer_stop (EV_A_ &w->timer);
2463 2595
2464 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2597
2598 EV_FREQUENT_CHECK;
2465} 2599}
2466#endif 2600#endif
2467 2601
2468#if EV_IDLE_ENABLE 2602#if EV_IDLE_ENABLE
2469void 2603void
2471{ 2605{
2472 if (expect_false (ev_is_active (w))) 2606 if (expect_false (ev_is_active (w)))
2473 return; 2607 return;
2474 2608
2475 pri_adjust (EV_A_ (W)w); 2609 pri_adjust (EV_A_ (W)w);
2610
2611 EV_FREQUENT_CHECK;
2476 2612
2477 { 2613 {
2478 int active = ++idlecnt [ABSPRI (w)]; 2614 int active = ++idlecnt [ABSPRI (w)];
2479 2615
2480 ++idleall; 2616 ++idleall;
2481 ev_start (EV_A_ (W)w, active); 2617 ev_start (EV_A_ (W)w, active);
2482 2618
2483 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);
2484 idles [ABSPRI (w)][active - 1] = w; 2620 idles [ABSPRI (w)][active - 1] = w;
2485 } 2621 }
2622
2623 EV_FREQUENT_CHECK;
2486} 2624}
2487 2625
2488void 2626void
2489ev_idle_stop (EV_P_ ev_idle *w) 2627ev_idle_stop (EV_P_ ev_idle *w)
2490{ 2628{
2491 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
2492 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
2493 return; 2631 return;
2494 2632
2633 EV_FREQUENT_CHECK;
2634
2495 { 2635 {
2496 int active = ev_active (w); 2636 int active = ev_active (w);
2497 2637
2498 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2638 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2499 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2639 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2500 2640
2501 ev_stop (EV_A_ (W)w); 2641 ev_stop (EV_A_ (W)w);
2502 --idleall; 2642 --idleall;
2503 } 2643 }
2644
2645 EV_FREQUENT_CHECK;
2504} 2646}
2505#endif 2647#endif
2506 2648
2507void 2649void
2508ev_prepare_start (EV_P_ ev_prepare *w) 2650ev_prepare_start (EV_P_ ev_prepare *w)
2509{ 2651{
2510 if (expect_false (ev_is_active (w))) 2652 if (expect_false (ev_is_active (w)))
2511 return; 2653 return;
2654
2655 EV_FREQUENT_CHECK;
2512 2656
2513 ev_start (EV_A_ (W)w, ++preparecnt); 2657 ev_start (EV_A_ (W)w, ++preparecnt);
2514 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2658 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2515 prepares [preparecnt - 1] = w; 2659 prepares [preparecnt - 1] = w;
2660
2661 EV_FREQUENT_CHECK;
2516} 2662}
2517 2663
2518void 2664void
2519ev_prepare_stop (EV_P_ ev_prepare *w) 2665ev_prepare_stop (EV_P_ ev_prepare *w)
2520{ 2666{
2521 clear_pending (EV_A_ (W)w); 2667 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2668 if (expect_false (!ev_is_active (w)))
2523 return; 2669 return;
2524 2670
2671 EV_FREQUENT_CHECK;
2672
2525 { 2673 {
2526 int active = ev_active (w); 2674 int active = ev_active (w);
2527 2675
2528 prepares [active - 1] = prepares [--preparecnt]; 2676 prepares [active - 1] = prepares [--preparecnt];
2529 ev_active (prepares [active - 1]) = active; 2677 ev_active (prepares [active - 1]) = active;
2530 } 2678 }
2531 2679
2532 ev_stop (EV_A_ (W)w); 2680 ev_stop (EV_A_ (W)w);
2681
2682 EV_FREQUENT_CHECK;
2533} 2683}
2534 2684
2535void 2685void
2536ev_check_start (EV_P_ ev_check *w) 2686ev_check_start (EV_P_ ev_check *w)
2537{ 2687{
2538 if (expect_false (ev_is_active (w))) 2688 if (expect_false (ev_is_active (w)))
2539 return; 2689 return;
2690
2691 EV_FREQUENT_CHECK;
2540 2692
2541 ev_start (EV_A_ (W)w, ++checkcnt); 2693 ev_start (EV_A_ (W)w, ++checkcnt);
2542 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2694 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2543 checks [checkcnt - 1] = w; 2695 checks [checkcnt - 1] = w;
2696
2697 EV_FREQUENT_CHECK;
2544} 2698}
2545 2699
2546void 2700void
2547ev_check_stop (EV_P_ ev_check *w) 2701ev_check_stop (EV_P_ ev_check *w)
2548{ 2702{
2549 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2550 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2551 return; 2705 return;
2552 2706
2707 EV_FREQUENT_CHECK;
2708
2553 { 2709 {
2554 int active = ev_active (w); 2710 int active = ev_active (w);
2555 2711
2556 checks [active - 1] = checks [--checkcnt]; 2712 checks [active - 1] = checks [--checkcnt];
2557 ev_active (checks [active - 1]) = active; 2713 ev_active (checks [active - 1]) = active;
2558 } 2714 }
2559 2715
2560 ev_stop (EV_A_ (W)w); 2716 ev_stop (EV_A_ (W)w);
2717
2718 EV_FREQUENT_CHECK;
2561} 2719}
2562 2720
2563#if EV_EMBED_ENABLE 2721#if EV_EMBED_ENABLE
2564void noinline 2722void noinline
2565ev_embed_sweep (EV_P_ ev_embed *w) 2723ev_embed_sweep (EV_P_ ev_embed *w)
2612 struct ev_loop *loop = w->other; 2770 struct ev_loop *loop = w->other;
2613 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 ()));
2614 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);
2615 } 2773 }
2616 2774
2775 EV_FREQUENT_CHECK;
2776
2617 ev_set_priority (&w->io, ev_priority (w)); 2777 ev_set_priority (&w->io, ev_priority (w));
2618 ev_io_start (EV_A_ &w->io); 2778 ev_io_start (EV_A_ &w->io);
2619 2779
2620 ev_prepare_init (&w->prepare, embed_prepare_cb); 2780 ev_prepare_init (&w->prepare, embed_prepare_cb);
2621 ev_set_priority (&w->prepare, EV_MINPRI); 2781 ev_set_priority (&w->prepare, EV_MINPRI);
2622 ev_prepare_start (EV_A_ &w->prepare); 2782 ev_prepare_start (EV_A_ &w->prepare);
2623 2783
2624 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2625 2785
2626 ev_start (EV_A_ (W)w, 1); 2786 ev_start (EV_A_ (W)w, 1);
2787
2788 EV_FREQUENT_CHECK;
2627} 2789}
2628 2790
2629void 2791void
2630ev_embed_stop (EV_P_ ev_embed *w) 2792ev_embed_stop (EV_P_ ev_embed *w)
2631{ 2793{
2632 clear_pending (EV_A_ (W)w); 2794 clear_pending (EV_A_ (W)w);
2633 if (expect_false (!ev_is_active (w))) 2795 if (expect_false (!ev_is_active (w)))
2634 return; 2796 return;
2635 2797
2798 EV_FREQUENT_CHECK;
2799
2636 ev_io_stop (EV_A_ &w->io); 2800 ev_io_stop (EV_A_ &w->io);
2637 ev_prepare_stop (EV_A_ &w->prepare); 2801 ev_prepare_stop (EV_A_ &w->prepare);
2638 2802
2639 ev_stop (EV_A_ (W)w); 2803 ev_stop (EV_A_ (W)w);
2804
2805 EV_FREQUENT_CHECK;
2640} 2806}
2641#endif 2807#endif
2642 2808
2643#if EV_FORK_ENABLE 2809#if EV_FORK_ENABLE
2644void 2810void
2645ev_fork_start (EV_P_ ev_fork *w) 2811ev_fork_start (EV_P_ ev_fork *w)
2646{ 2812{
2647 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2648 return; 2814 return;
2815
2816 EV_FREQUENT_CHECK;
2649 2817
2650 ev_start (EV_A_ (W)w, ++forkcnt); 2818 ev_start (EV_A_ (W)w, ++forkcnt);
2651 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2819 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2652 forks [forkcnt - 1] = w; 2820 forks [forkcnt - 1] = w;
2821
2822 EV_FREQUENT_CHECK;
2653} 2823}
2654 2824
2655void 2825void
2656ev_fork_stop (EV_P_ ev_fork *w) 2826ev_fork_stop (EV_P_ ev_fork *w)
2657{ 2827{
2658 clear_pending (EV_A_ (W)w); 2828 clear_pending (EV_A_ (W)w);
2659 if (expect_false (!ev_is_active (w))) 2829 if (expect_false (!ev_is_active (w)))
2660 return; 2830 return;
2661 2831
2832 EV_FREQUENT_CHECK;
2833
2662 { 2834 {
2663 int active = ev_active (w); 2835 int active = ev_active (w);
2664 2836
2665 forks [active - 1] = forks [--forkcnt]; 2837 forks [active - 1] = forks [--forkcnt];
2666 ev_active (forks [active - 1]) = active; 2838 ev_active (forks [active - 1]) = active;
2667 } 2839 }
2668 2840
2669 ev_stop (EV_A_ (W)w); 2841 ev_stop (EV_A_ (W)w);
2842
2843 EV_FREQUENT_CHECK;
2670} 2844}
2671#endif 2845#endif
2672 2846
2673#if EV_ASYNC_ENABLE 2847#if EV_ASYNC_ENABLE
2674void 2848void
2676{ 2850{
2677 if (expect_false (ev_is_active (w))) 2851 if (expect_false (ev_is_active (w)))
2678 return; 2852 return;
2679 2853
2680 evpipe_init (EV_A); 2854 evpipe_init (EV_A);
2855
2856 EV_FREQUENT_CHECK;
2681 2857
2682 ev_start (EV_A_ (W)w, ++asynccnt); 2858 ev_start (EV_A_ (W)w, ++asynccnt);
2683 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2859 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2684 asyncs [asynccnt - 1] = w; 2860 asyncs [asynccnt - 1] = w;
2861
2862 EV_FREQUENT_CHECK;
2685} 2863}
2686 2864
2687void 2865void
2688ev_async_stop (EV_P_ ev_async *w) 2866ev_async_stop (EV_P_ ev_async *w)
2689{ 2867{
2690 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2691 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2692 return; 2870 return;
2693 2871
2872 EV_FREQUENT_CHECK;
2873
2694 { 2874 {
2695 int active = ev_active (w); 2875 int active = ev_active (w);
2696 2876
2697 asyncs [active - 1] = asyncs [--asynccnt]; 2877 asyncs [active - 1] = asyncs [--asynccnt];
2698 ev_active (asyncs [active - 1]) = active; 2878 ev_active (asyncs [active - 1]) = active;
2699 } 2879 }
2700 2880
2701 ev_stop (EV_A_ (W)w); 2881 ev_stop (EV_A_ (W)w);
2882
2883 EV_FREQUENT_CHECK;
2702} 2884}
2703 2885
2704void 2886void
2705ev_async_send (EV_P_ ev_async *w) 2887ev_async_send (EV_P_ ev_async *w)
2706{ 2888{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines