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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines