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

Comparing libev/ev.c (file contents):
Revision 1.235 by root, Wed May 7 14:45:17 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
422 W w; 441 W w;
423 int events; 442 int events;
424} ANPENDING; 443} ANPENDING;
425 444
426#if EV_USE_INOTIFY 445#if EV_USE_INOTIFY
446/* hash table entry per inotify-id */
427typedef struct 447typedef struct
428{ 448{
429 WL head; 449 WL head;
430} ANFS; 450} ANFS;
451#endif
452
453/* Heap Entry */
454#if EV_HEAP_CACHE_AT
455 typedef struct {
456 ev_tstamp at;
457 WT w;
458 } ANHE;
459
460 #define ANHE_w(he) (he).w /* access watcher, read-write */
461 #define ANHE_at(he) (he).at /* access cached at, read-only */
462 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
463#else
464 typedef WT ANHE;
465
466 #define ANHE_w(he) (he)
467 #define ANHE_at(he) (he)->at
468 #define ANHE_at_cache(he)
431#endif 469#endif
432 470
433#if EV_MULTIPLICITY 471#if EV_MULTIPLICITY
434 472
435 struct ev_loop 473 struct ev_loop
760} 798}
761 799
762/*****************************************************************************/ 800/*****************************************************************************/
763 801
764/* 802/*
803 * the heap functions want a real array index. array index 0 uis guaranteed to not
804 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
805 * the branching factor of the d-tree.
806 */
807
808/*
765 * at the moment we allow libev the luxury of two heaps, 809 * at the moment we allow libev the luxury of two heaps,
766 * 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
767 * which is more cache-efficient. 811 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 812 * the difference is about 5% with 50000+ watchers.
769 */ 813 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP 814#if EV_USE_4HEAP
772 815
816#define DHEAP 4
773#define HEAP0 3 /* index of first element in heap */ 817#define HEAP0 (DHEAP - 1) /* index of first element in heap */
818#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
819#define UPHEAP_DONE(p,k) ((p) == (k))
820
821/* away from the root */
822void inline_speed
823downheap (ANHE *heap, int N, int k)
824{
825 ANHE he = heap [k];
826 ANHE *E = heap + N + HEAP0;
827
828 for (;;)
829 {
830 ev_tstamp minat;
831 ANHE *minpos;
832 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
833
834 /* find minimum child */
835 if (expect_true (pos + DHEAP - 1 < E))
836 {
837 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
838 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
839 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
840 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
841 }
842 else if (pos < E)
843 {
844 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
845 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
846 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
847 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
848 }
849 else
850 break;
851
852 if (ANHE_at (he) <= minat)
853 break;
854
855 heap [k] = *minpos;
856 ev_active (ANHE_w (*minpos)) = k;
857
858 k = minpos - heap;
859 }
860
861 heap [k] = he;
862 ev_active (ANHE_w (he)) = k;
863}
864
865#else /* 4HEAP */
866
867#define HEAP0 1
868#define HPARENT(k) ((k) >> 1)
869#define UPHEAP_DONE(p,k) (!(p))
870
871/* away from the root */
872void inline_speed
873downheap (ANHE *heap, int N, int k)
874{
875 ANHE he = heap [k];
876
877 for (;;)
878 {
879 int c = k << 1;
880
881 if (c > N + HEAP0 - 1)
882 break;
883
884 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
885 ? 1 : 0;
886
887 if (ANHE_at (he) <= ANHE_at (heap [c]))
888 break;
889
890 heap [k] = heap [c];
891 ev_active (ANHE_w (heap [k])) = k;
892
893 k = c;
894 }
895
896 heap [k] = he;
897 ev_active (ANHE_w (he)) = k;
898}
899#endif
774 900
775/* towards the root */ 901/* towards the root */
776void inline_speed 902void inline_speed
777upheap (WT *heap, int k) 903upheap (ANHE *heap, int k)
778{ 904{
779 WT w = heap [k]; 905 ANHE he = heap [k];
780 906
781 for (;;) 907 for (;;)
782 { 908 {
783 int p = ((k - HEAP0 - 1) / 4) + HEAP0; 909 int p = HPARENT (k);
784 910
785 if (p >= HEAP0 || heap [p]->at <= w->at) 911 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
786 break; 912 break;
787 913
788 heap [k] = heap [p]; 914 heap [k] = heap [p];
789 ev_active (heap [k]) = k; 915 ev_active (ANHE_w (heap [k])) = k;
790 k = p; 916 k = p;
791 } 917 }
792 918
793 heap [k] = w; 919 heap [k] = he;
794 ev_active (heap [k]) = k; 920 ev_active (ANHE_w (he)) = k;
795} 921}
796
797/* away from the root */
798void inline_speed
799downheap (WT *heap, int N, int k)
800{
801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
803
804 for (;;)
805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 else
819 {
820 if (pos >= E)
821 break;
822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
829 if (w->at <= minat)
830 break;
831
832 ev_active (*minpos) = k;
833 heap [k] = *minpos;
834
835 k = minpos - heap;
836 }
837
838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
854 int p = k >> 1;
855
856 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at)
858 break;
859
860 heap [k] = heap [p];
861 ev_active (heap [k]) = k;
862 k = p;
863 }
864
865 heap [k] = w;
866 ev_active (heap [k]) = k;
867}
868
869/* away from the root */
870void inline_speed
871downheap (WT *heap, int N, int k)
872{
873 WT w = heap [k];
874
875 for (;;)
876 {
877 int c = k << 1;
878
879 if (c > N)
880 break;
881
882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
883 ? 1 : 0;
884
885 if (w->at <= heap [c]->at)
886 break;
887
888 heap [k] = heap [c];
889 ((W)heap [k])->active = k;
890
891 k = c;
892 }
893
894 heap [k] = w;
895 ev_active (heap [k]) = k;
896}
897#endif
898 922
899void inline_size 923void inline_size
900adjustheap (WT *heap, int N, int k) 924adjustheap (ANHE *heap, int N, int k)
901{ 925{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
902 upheap (heap, k); 927 upheap (heap, k);
928 else
903 downheap (heap, N, k); 929 downheap (heap, N, k);
904} 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
905 957
906/*****************************************************************************/ 958/*****************************************************************************/
907 959
908typedef struct 960typedef struct
909{ 961{
1453void 1505void
1454ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1455{ 1507{
1456 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1457} 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
1458#endif 1544#endif
1459 1545
1460#if EV_MULTIPLICITY 1546#if EV_MULTIPLICITY
1461struct ev_loop * 1547struct ev_loop *
1462ev_default_loop_init (unsigned int flags) 1548ev_default_loop_init (unsigned int flags)
1528void inline_speed 1614void inline_speed
1529call_pending (EV_P) 1615call_pending (EV_P)
1530{ 1616{
1531 int pri; 1617 int pri;
1532 1618
1619 EV_FREQUENT_CHECK;
1620
1533 for (pri = NUMPRI; pri--; ) 1621 for (pri = NUMPRI; pri--; )
1534 while (pendingcnt [pri]) 1622 while (pendingcnt [pri])
1535 { 1623 {
1536 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1537 1625
1541 1629
1542 p->w->pending = 0; 1630 p->w->pending = 0;
1543 EV_CB_INVOKE (p->w, p->events); 1631 EV_CB_INVOKE (p->w, p->events);
1544 } 1632 }
1545 } 1633 }
1634
1635 EV_FREQUENT_CHECK;
1546} 1636}
1547 1637
1548#if EV_IDLE_ENABLE 1638#if EV_IDLE_ENABLE
1549void inline_size 1639void inline_size
1550idle_reify (EV_P) 1640idle_reify (EV_P)
1569#endif 1659#endif
1570 1660
1571void inline_size 1661void inline_size
1572timers_reify (EV_P) 1662timers_reify (EV_P)
1573{ 1663{
1664 EV_FREQUENT_CHECK;
1665
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1666 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1575 { 1667 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0]; 1668 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1577 1669
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1670 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579 1671
1580 /* first reschedule or stop timer */ 1672 /* first reschedule or stop timer */
1581 if (w->repeat) 1673 if (w->repeat)
1582 { 1674 {
1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1584
1585 ev_at (w) += w->repeat; 1675 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now) 1676 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now; 1677 ev_at (w) = mn_now;
1588 1678
1679 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1680
1681 ANHE_at_cache (timers [HEAP0]);
1589 downheap (timers, timercnt, HEAP0); 1682 downheap (timers, timercnt, HEAP0);
1590 } 1683 }
1591 else 1684 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1685 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593 1686
1687 EV_FREQUENT_CHECK;
1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1688 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1595 } 1689 }
1596} 1690}
1597 1691
1598#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1599void inline_size 1693void inline_size
1600periodics_reify (EV_P) 1694periodics_reify (EV_P)
1601{ 1695{
1696 EV_FREQUENT_CHECK;
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1603 { 1698 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1605 1700
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607 1702
1608 /* first reschedule or stop timer */ 1703 /* first reschedule or stop timer */
1609 if (w->reschedule_cb) 1704 if (w->reschedule_cb)
1610 { 1705 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1706 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707
1612 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]);
1613 downheap (periodics, periodiccnt, 1); 1711 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1614 } 1713 }
1615 else if (w->interval) 1714 else if (w->interval)
1616 { 1715 {
1617 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 */
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1719 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1619 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]);
1620 downheap (periodics, periodiccnt, HEAP0); 1731 downheap (periodics, periodiccnt, HEAP0);
1621 } 1732 }
1622 else 1733 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1734 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624 1735
1736 EV_FREQUENT_CHECK;
1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1737 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1626 } 1738 }
1627} 1739}
1628 1740
1629static void noinline 1741static void noinline
1630periodics_reschedule (EV_P) 1742periodics_reschedule (EV_P)
1631{ 1743{
1632 int i; 1744 int i;
1633 1745
1634 /* adjust periodics after time jump */ 1746 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i) 1747 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1636 { 1748 {
1637 ev_periodic *w = (ev_periodic *)periodics [i]; 1749 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1638 1750
1639 if (w->reschedule_cb) 1751 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1752 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval) 1753 else if (w->interval)
1642 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;
1643 }
1644 1755
1645 /* now rebuild the heap */ 1756 ANHE_at_cache (periodics [i]);
1646 for (i = periodiccnt >> 1; --i; ) 1757 }
1758
1647 downheap (periodics, periodiccnt, i + HEAP0); 1759 reheap (periodics, periodiccnt);
1648} 1760}
1649#endif 1761#endif
1650 1762
1651void inline_speed 1763void inline_speed
1652time_update (EV_P_ ev_tstamp max_block) 1764time_update (EV_P_ ev_tstamp max_block)
1706 { 1818 {
1707#if EV_PERIODIC_ENABLE 1819#if EV_PERIODIC_ENABLE
1708 periodics_reschedule (EV_A); 1820 periodics_reschedule (EV_A);
1709#endif 1821#endif
1710 /* 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 */
1711 for (i = 1; i <= timercnt; ++i) 1823 for (i = 0; i < timercnt; ++i)
1712 ev_at (timers [i]) += ev_rt_now - mn_now; 1824 {
1825 ANHE *he = timers + i + HEAP0;
1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1827 ANHE_at_cache (*he);
1828 }
1713 } 1829 }
1714 1830
1715 mn_now = ev_rt_now; 1831 mn_now = ev_rt_now;
1716 } 1832 }
1717} 1833}
1787 1903
1788 waittime = MAX_BLOCKTIME; 1904 waittime = MAX_BLOCKTIME;
1789 1905
1790 if (timercnt) 1906 if (timercnt)
1791 { 1907 {
1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1908 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1793 if (waittime > to) waittime = to; 1909 if (waittime > to) waittime = to;
1794 } 1910 }
1795 1911
1796#if EV_PERIODIC_ENABLE 1912#if EV_PERIODIC_ENABLE
1797 if (periodiccnt) 1913 if (periodiccnt)
1798 { 1914 {
1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1915 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1800 if (waittime > to) waittime = to; 1916 if (waittime > to) waittime = to;
1801 } 1917 }
1802#endif 1918#endif
1803 1919
1804 if (expect_false (waittime < timeout_blocktime)) 1920 if (expect_false (waittime < timeout_blocktime))
1941 if (expect_false (ev_is_active (w))) 2057 if (expect_false (ev_is_active (w)))
1942 return; 2058 return;
1943 2059
1944 assert (("ev_io_start called with negative fd", fd >= 0)); 2060 assert (("ev_io_start called with negative fd", fd >= 0));
1945 2061
2062 EV_FREQUENT_CHECK;
2063
1946 ev_start (EV_A_ (W)w, 1); 2064 ev_start (EV_A_ (W)w, 1);
1947 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1948 wlist_add (&anfds[fd].head, (WL)w); 2066 wlist_add (&anfds[fd].head, (WL)w);
1949 2067
1950 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1951 w->events &= ~EV_IOFDSET; 2069 w->events &= ~EV_IOFDSET;
2070
2071 EV_FREQUENT_CHECK;
1952} 2072}
1953 2073
1954void noinline 2074void noinline
1955ev_io_stop (EV_P_ ev_io *w) 2075ev_io_stop (EV_P_ ev_io *w)
1956{ 2076{
1957 clear_pending (EV_A_ (W)w); 2077 clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
1959 return; 2079 return;
1960 2080
1961 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;
1962 2084
1963 wlist_del (&anfds[w->fd].head, (WL)w); 2085 wlist_del (&anfds[w->fd].head, (WL)w);
1964 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
1965 2087
1966 fd_change (EV_A_ w->fd, 1); 2088 fd_change (EV_A_ w->fd, 1);
2089
2090 EV_FREQUENT_CHECK;
1967} 2091}
1968 2092
1969void noinline 2093void noinline
1970ev_timer_start (EV_P_ ev_timer *w) 2094ev_timer_start (EV_P_ ev_timer *w)
1971{ 2095{
1974 2098
1975 ev_at (w) += mn_now; 2099 ev_at (w) += mn_now;
1976 2100
1977 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.));
1978 2102
2103 EV_FREQUENT_CHECK;
2104
2105 ++timercnt;
1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2107 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1981 timers [ev_active (w)] = (WT)w; 2108 ANHE_w (timers [ev_active (w)]) = (WT)w;
2109 ANHE_at_cache (timers [ev_active (w)]);
1982 upheap (timers, ev_active (w)); 2110 upheap (timers, ev_active (w));
1983 2111
2112 EV_FREQUENT_CHECK;
2113
1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1985} 2115}
1986 2116
1987void noinline 2117void noinline
1988ev_timer_stop (EV_P_ ev_timer *w) 2118ev_timer_stop (EV_P_ ev_timer *w)
1989{ 2119{
1990 clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
1991 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
1992 return; 2122 return;
1993 2123
2124 EV_FREQUENT_CHECK;
2125
1994 { 2126 {
1995 int active = ev_active (w); 2127 int active = ev_active (w);
1996 2128
1997 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1998 2130
2131 --timercnt;
2132
1999 if (expect_true (active < timercnt + HEAP0 - 1)) 2133 if (expect_true (active < timercnt + HEAP0))
2000 { 2134 {
2001 timers [active] = timers [timercnt + HEAP0 - 1]; 2135 timers [active] = timers [timercnt + HEAP0];
2002 adjustheap (timers, timercnt, active); 2136 adjustheap (timers, timercnt, active);
2003 } 2137 }
2004
2005 --timercnt;
2006 } 2138 }
2139
2140 EV_FREQUENT_CHECK;
2007 2141
2008 ev_at (w) -= mn_now; 2142 ev_at (w) -= mn_now;
2009 2143
2010 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
2011} 2145}
2012 2146
2013void noinline 2147void noinline
2014ev_timer_again (EV_P_ ev_timer *w) 2148ev_timer_again (EV_P_ ev_timer *w)
2015{ 2149{
2150 EV_FREQUENT_CHECK;
2151
2016 if (ev_is_active (w)) 2152 if (ev_is_active (w))
2017 { 2153 {
2018 if (w->repeat) 2154 if (w->repeat)
2019 { 2155 {
2020 ev_at (w) = mn_now + w->repeat; 2156 ev_at (w) = mn_now + w->repeat;
2157 ANHE_at_cache (timers [ev_active (w)]);
2021 adjustheap (timers, timercnt, ev_active (w)); 2158 adjustheap (timers, timercnt, ev_active (w));
2022 } 2159 }
2023 else 2160 else
2024 ev_timer_stop (EV_A_ w); 2161 ev_timer_stop (EV_A_ w);
2025 } 2162 }
2026 else if (w->repeat) 2163 else if (w->repeat)
2027 { 2164 {
2028 ev_at (w) = w->repeat; 2165 ev_at (w) = w->repeat;
2029 ev_timer_start (EV_A_ w); 2166 ev_timer_start (EV_A_ w);
2030 } 2167 }
2168
2169 EV_FREQUENT_CHECK;
2031} 2170}
2032 2171
2033#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2034void noinline 2173void noinline
2035ev_periodic_start (EV_P_ ev_periodic *w) 2174ev_periodic_start (EV_P_ ev_periodic *w)
2046 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;
2047 } 2186 }
2048 else 2187 else
2049 ev_at (w) = w->offset; 2188 ev_at (w) = w->offset;
2050 2189
2190 EV_FREQUENT_CHECK;
2191
2192 ++periodiccnt;
2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2193 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2194 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2053 periodics [ev_active (w)] = (WT)w; 2195 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2196 ANHE_at_cache (periodics [ev_active (w)]);
2054 upheap (periodics, ev_active (w)); 2197 upheap (periodics, ev_active (w));
2055 2198
2199 EV_FREQUENT_CHECK;
2200
2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2201 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2057} 2202}
2058 2203
2059void noinline 2204void noinline
2060ev_periodic_stop (EV_P_ ev_periodic *w) 2205ev_periodic_stop (EV_P_ ev_periodic *w)
2061{ 2206{
2062 clear_pending (EV_A_ (W)w); 2207 clear_pending (EV_A_ (W)w);
2063 if (expect_false (!ev_is_active (w))) 2208 if (expect_false (!ev_is_active (w)))
2064 return; 2209 return;
2065 2210
2211 EV_FREQUENT_CHECK;
2212
2066 { 2213 {
2067 int active = ev_active (w); 2214 int active = ev_active (w);
2068 2215
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2070 2217
2218 --periodiccnt;
2219
2071 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2220 if (expect_true (active < periodiccnt + HEAP0))
2072 { 2221 {
2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2222 periodics [active] = periodics [periodiccnt + HEAP0];
2074 adjustheap (periodics, periodiccnt, active); 2223 adjustheap (periodics, periodiccnt, active);
2075 } 2224 }
2076
2077 --periodiccnt;
2078 } 2225 }
2226
2227 EV_FREQUENT_CHECK;
2079 2228
2080 ev_stop (EV_A_ (W)w); 2229 ev_stop (EV_A_ (W)w);
2081} 2230}
2082 2231
2083void noinline 2232void noinline
2103 return; 2252 return;
2104 2253
2105 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));
2106 2255
2107 evpipe_init (EV_A); 2256 evpipe_init (EV_A);
2257
2258 EV_FREQUENT_CHECK;
2108 2259
2109 { 2260 {
2110#ifndef _WIN32 2261#ifndef _WIN32
2111 sigset_t full, prev; 2262 sigset_t full, prev;
2112 sigfillset (&full); 2263 sigfillset (&full);
2133 sigfillset (&sa.sa_mask); 2284 sigfillset (&sa.sa_mask);
2134 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 */
2135 sigaction (w->signum, &sa, 0); 2286 sigaction (w->signum, &sa, 0);
2136#endif 2287#endif
2137 } 2288 }
2289
2290 EV_FREQUENT_CHECK;
2138} 2291}
2139 2292
2140void noinline 2293void noinline
2141ev_signal_stop (EV_P_ ev_signal *w) 2294ev_signal_stop (EV_P_ ev_signal *w)
2142{ 2295{
2143 clear_pending (EV_A_ (W)w); 2296 clear_pending (EV_A_ (W)w);
2144 if (expect_false (!ev_is_active (w))) 2297 if (expect_false (!ev_is_active (w)))
2145 return; 2298 return;
2146 2299
2300 EV_FREQUENT_CHECK;
2301
2147 wlist_del (&signals [w->signum - 1].head, (WL)w); 2302 wlist_del (&signals [w->signum - 1].head, (WL)w);
2148 ev_stop (EV_A_ (W)w); 2303 ev_stop (EV_A_ (W)w);
2149 2304
2150 if (!signals [w->signum - 1].head) 2305 if (!signals [w->signum - 1].head)
2151 signal (w->signum, SIG_DFL); 2306 signal (w->signum, SIG_DFL);
2307
2308 EV_FREQUENT_CHECK;
2152} 2309}
2153 2310
2154void 2311void
2155ev_child_start (EV_P_ ev_child *w) 2312ev_child_start (EV_P_ ev_child *w)
2156{ 2313{
2158 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));
2159#endif 2316#endif
2160 if (expect_false (ev_is_active (w))) 2317 if (expect_false (ev_is_active (w)))
2161 return; 2318 return;
2162 2319
2320 EV_FREQUENT_CHECK;
2321
2163 ev_start (EV_A_ (W)w, 1); 2322 ev_start (EV_A_ (W)w, 1);
2164 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;
2165} 2326}
2166 2327
2167void 2328void
2168ev_child_stop (EV_P_ ev_child *w) 2329ev_child_stop (EV_P_ ev_child *w)
2169{ 2330{
2170 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2171 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2172 return; 2333 return;
2173 2334
2335 EV_FREQUENT_CHECK;
2336
2174 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2337 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2175 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2339
2340 EV_FREQUENT_CHECK;
2176} 2341}
2177 2342
2178#if EV_STAT_ENABLE 2343#if EV_STAT_ENABLE
2179 2344
2180# ifdef _WIN32 2345# ifdef _WIN32
2408 else 2573 else
2409#endif 2574#endif
2410 ev_timer_start (EV_A_ &w->timer); 2575 ev_timer_start (EV_A_ &w->timer);
2411 2576
2412 ev_start (EV_A_ (W)w, 1); 2577 ev_start (EV_A_ (W)w, 1);
2578
2579 EV_FREQUENT_CHECK;
2413} 2580}
2414 2581
2415void 2582void
2416ev_stat_stop (EV_P_ ev_stat *w) 2583ev_stat_stop (EV_P_ ev_stat *w)
2417{ 2584{
2418 clear_pending (EV_A_ (W)w); 2585 clear_pending (EV_A_ (W)w);
2419 if (expect_false (!ev_is_active (w))) 2586 if (expect_false (!ev_is_active (w)))
2420 return; 2587 return;
2421 2588
2589 EV_FREQUENT_CHECK;
2590
2422#if EV_USE_INOTIFY 2591#if EV_USE_INOTIFY
2423 infy_del (EV_A_ w); 2592 infy_del (EV_A_ w);
2424#endif 2593#endif
2425 ev_timer_stop (EV_A_ &w->timer); 2594 ev_timer_stop (EV_A_ &w->timer);
2426 2595
2427 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2597
2598 EV_FREQUENT_CHECK;
2428} 2599}
2429#endif 2600#endif
2430 2601
2431#if EV_IDLE_ENABLE 2602#if EV_IDLE_ENABLE
2432void 2603void
2434{ 2605{
2435 if (expect_false (ev_is_active (w))) 2606 if (expect_false (ev_is_active (w)))
2436 return; 2607 return;
2437 2608
2438 pri_adjust (EV_A_ (W)w); 2609 pri_adjust (EV_A_ (W)w);
2610
2611 EV_FREQUENT_CHECK;
2439 2612
2440 { 2613 {
2441 int active = ++idlecnt [ABSPRI (w)]; 2614 int active = ++idlecnt [ABSPRI (w)];
2442 2615
2443 ++idleall; 2616 ++idleall;
2444 ev_start (EV_A_ (W)w, active); 2617 ev_start (EV_A_ (W)w, active);
2445 2618
2446 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);
2447 idles [ABSPRI (w)][active - 1] = w; 2620 idles [ABSPRI (w)][active - 1] = w;
2448 } 2621 }
2622
2623 EV_FREQUENT_CHECK;
2449} 2624}
2450 2625
2451void 2626void
2452ev_idle_stop (EV_P_ ev_idle *w) 2627ev_idle_stop (EV_P_ ev_idle *w)
2453{ 2628{
2454 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
2455 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
2456 return; 2631 return;
2457 2632
2633 EV_FREQUENT_CHECK;
2634
2458 { 2635 {
2459 int active = ev_active (w); 2636 int active = ev_active (w);
2460 2637
2461 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2638 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2462 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2639 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2463 2640
2464 ev_stop (EV_A_ (W)w); 2641 ev_stop (EV_A_ (W)w);
2465 --idleall; 2642 --idleall;
2466 } 2643 }
2644
2645 EV_FREQUENT_CHECK;
2467} 2646}
2468#endif 2647#endif
2469 2648
2470void 2649void
2471ev_prepare_start (EV_P_ ev_prepare *w) 2650ev_prepare_start (EV_P_ ev_prepare *w)
2472{ 2651{
2473 if (expect_false (ev_is_active (w))) 2652 if (expect_false (ev_is_active (w)))
2474 return; 2653 return;
2654
2655 EV_FREQUENT_CHECK;
2475 2656
2476 ev_start (EV_A_ (W)w, ++preparecnt); 2657 ev_start (EV_A_ (W)w, ++preparecnt);
2477 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2658 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2478 prepares [preparecnt - 1] = w; 2659 prepares [preparecnt - 1] = w;
2660
2661 EV_FREQUENT_CHECK;
2479} 2662}
2480 2663
2481void 2664void
2482ev_prepare_stop (EV_P_ ev_prepare *w) 2665ev_prepare_stop (EV_P_ ev_prepare *w)
2483{ 2666{
2484 clear_pending (EV_A_ (W)w); 2667 clear_pending (EV_A_ (W)w);
2485 if (expect_false (!ev_is_active (w))) 2668 if (expect_false (!ev_is_active (w)))
2486 return; 2669 return;
2487 2670
2671 EV_FREQUENT_CHECK;
2672
2488 { 2673 {
2489 int active = ev_active (w); 2674 int active = ev_active (w);
2490 2675
2491 prepares [active - 1] = prepares [--preparecnt]; 2676 prepares [active - 1] = prepares [--preparecnt];
2492 ev_active (prepares [active - 1]) = active; 2677 ev_active (prepares [active - 1]) = active;
2493 } 2678 }
2494 2679
2495 ev_stop (EV_A_ (W)w); 2680 ev_stop (EV_A_ (W)w);
2681
2682 EV_FREQUENT_CHECK;
2496} 2683}
2497 2684
2498void 2685void
2499ev_check_start (EV_P_ ev_check *w) 2686ev_check_start (EV_P_ ev_check *w)
2500{ 2687{
2501 if (expect_false (ev_is_active (w))) 2688 if (expect_false (ev_is_active (w)))
2502 return; 2689 return;
2690
2691 EV_FREQUENT_CHECK;
2503 2692
2504 ev_start (EV_A_ (W)w, ++checkcnt); 2693 ev_start (EV_A_ (W)w, ++checkcnt);
2505 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2694 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2506 checks [checkcnt - 1] = w; 2695 checks [checkcnt - 1] = w;
2696
2697 EV_FREQUENT_CHECK;
2507} 2698}
2508 2699
2509void 2700void
2510ev_check_stop (EV_P_ ev_check *w) 2701ev_check_stop (EV_P_ ev_check *w)
2511{ 2702{
2512 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2513 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2514 return; 2705 return;
2515 2706
2707 EV_FREQUENT_CHECK;
2708
2516 { 2709 {
2517 int active = ev_active (w); 2710 int active = ev_active (w);
2518 2711
2519 checks [active - 1] = checks [--checkcnt]; 2712 checks [active - 1] = checks [--checkcnt];
2520 ev_active (checks [active - 1]) = active; 2713 ev_active (checks [active - 1]) = active;
2521 } 2714 }
2522 2715
2523 ev_stop (EV_A_ (W)w); 2716 ev_stop (EV_A_ (W)w);
2717
2718 EV_FREQUENT_CHECK;
2524} 2719}
2525 2720
2526#if EV_EMBED_ENABLE 2721#if EV_EMBED_ENABLE
2527void noinline 2722void noinline
2528ev_embed_sweep (EV_P_ ev_embed *w) 2723ev_embed_sweep (EV_P_ ev_embed *w)
2575 struct ev_loop *loop = w->other; 2770 struct ev_loop *loop = w->other;
2576 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 ()));
2577 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);
2578 } 2773 }
2579 2774
2775 EV_FREQUENT_CHECK;
2776
2580 ev_set_priority (&w->io, ev_priority (w)); 2777 ev_set_priority (&w->io, ev_priority (w));
2581 ev_io_start (EV_A_ &w->io); 2778 ev_io_start (EV_A_ &w->io);
2582 2779
2583 ev_prepare_init (&w->prepare, embed_prepare_cb); 2780 ev_prepare_init (&w->prepare, embed_prepare_cb);
2584 ev_set_priority (&w->prepare, EV_MINPRI); 2781 ev_set_priority (&w->prepare, EV_MINPRI);
2585 ev_prepare_start (EV_A_ &w->prepare); 2782 ev_prepare_start (EV_A_ &w->prepare);
2586 2783
2587 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2588 2785
2589 ev_start (EV_A_ (W)w, 1); 2786 ev_start (EV_A_ (W)w, 1);
2787
2788 EV_FREQUENT_CHECK;
2590} 2789}
2591 2790
2592void 2791void
2593ev_embed_stop (EV_P_ ev_embed *w) 2792ev_embed_stop (EV_P_ ev_embed *w)
2594{ 2793{
2595 clear_pending (EV_A_ (W)w); 2794 clear_pending (EV_A_ (W)w);
2596 if (expect_false (!ev_is_active (w))) 2795 if (expect_false (!ev_is_active (w)))
2597 return; 2796 return;
2598 2797
2798 EV_FREQUENT_CHECK;
2799
2599 ev_io_stop (EV_A_ &w->io); 2800 ev_io_stop (EV_A_ &w->io);
2600 ev_prepare_stop (EV_A_ &w->prepare); 2801 ev_prepare_stop (EV_A_ &w->prepare);
2601 2802
2602 ev_stop (EV_A_ (W)w); 2803 ev_stop (EV_A_ (W)w);
2804
2805 EV_FREQUENT_CHECK;
2603} 2806}
2604#endif 2807#endif
2605 2808
2606#if EV_FORK_ENABLE 2809#if EV_FORK_ENABLE
2607void 2810void
2608ev_fork_start (EV_P_ ev_fork *w) 2811ev_fork_start (EV_P_ ev_fork *w)
2609{ 2812{
2610 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2611 return; 2814 return;
2815
2816 EV_FREQUENT_CHECK;
2612 2817
2613 ev_start (EV_A_ (W)w, ++forkcnt); 2818 ev_start (EV_A_ (W)w, ++forkcnt);
2614 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2819 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2615 forks [forkcnt - 1] = w; 2820 forks [forkcnt - 1] = w;
2821
2822 EV_FREQUENT_CHECK;
2616} 2823}
2617 2824
2618void 2825void
2619ev_fork_stop (EV_P_ ev_fork *w) 2826ev_fork_stop (EV_P_ ev_fork *w)
2620{ 2827{
2621 clear_pending (EV_A_ (W)w); 2828 clear_pending (EV_A_ (W)w);
2622 if (expect_false (!ev_is_active (w))) 2829 if (expect_false (!ev_is_active (w)))
2623 return; 2830 return;
2624 2831
2832 EV_FREQUENT_CHECK;
2833
2625 { 2834 {
2626 int active = ev_active (w); 2835 int active = ev_active (w);
2627 2836
2628 forks [active - 1] = forks [--forkcnt]; 2837 forks [active - 1] = forks [--forkcnt];
2629 ev_active (forks [active - 1]) = active; 2838 ev_active (forks [active - 1]) = active;
2630 } 2839 }
2631 2840
2632 ev_stop (EV_A_ (W)w); 2841 ev_stop (EV_A_ (W)w);
2842
2843 EV_FREQUENT_CHECK;
2633} 2844}
2634#endif 2845#endif
2635 2846
2636#if EV_ASYNC_ENABLE 2847#if EV_ASYNC_ENABLE
2637void 2848void
2639{ 2850{
2640 if (expect_false (ev_is_active (w))) 2851 if (expect_false (ev_is_active (w)))
2641 return; 2852 return;
2642 2853
2643 evpipe_init (EV_A); 2854 evpipe_init (EV_A);
2855
2856 EV_FREQUENT_CHECK;
2644 2857
2645 ev_start (EV_A_ (W)w, ++asynccnt); 2858 ev_start (EV_A_ (W)w, ++asynccnt);
2646 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2859 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2647 asyncs [asynccnt - 1] = w; 2860 asyncs [asynccnt - 1] = w;
2861
2862 EV_FREQUENT_CHECK;
2648} 2863}
2649 2864
2650void 2865void
2651ev_async_stop (EV_P_ ev_async *w) 2866ev_async_stop (EV_P_ ev_async *w)
2652{ 2867{
2653 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2654 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2655 return; 2870 return;
2656 2871
2872 EV_FREQUENT_CHECK;
2873
2657 { 2874 {
2658 int active = ev_active (w); 2875 int active = ev_active (w);
2659 2876
2660 asyncs [active - 1] = asyncs [--asynccnt]; 2877 asyncs [active - 1] = asyncs [--asynccnt];
2661 ev_active (asyncs [active - 1]) = active; 2878 ev_active (asyncs [active - 1]) = active;
2662 } 2879 }
2663 2880
2664 ev_stop (EV_A_ (W)w); 2881 ev_stop (EV_A_ (W)w);
2882
2883 EV_FREQUENT_CHECK;
2665} 2884}
2666 2885
2667void 2886void
2668ev_async_send (EV_P_ ev_async *w) 2887ev_async_send (EV_P_ ev_async *w)
2669{ 2888{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines