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

Comparing libev/ev.c (file contents):
Revision 1.234 by root, Tue May 6 23:42:16 2008 UTC vs.
Revision 1.249 by root, Wed May 21 23:30:52 2008 UTC

… …
235# else 235# else
236# define EV_USE_EVENTFD 0 236# define EV_USE_EVENTFD 0
237# endif 237# endif
238#endif 238#endif
239 239
240#if 0 /* debugging */
241# define EV_VERIFY 1
242# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1
244#endif
245
246#ifndef EV_USE_4HEAP
247# define EV_USE_4HEAP !EV_MINIMAL
248#endif
249
250#ifndef EV_HEAP_CACHE_AT
251# define EV_HEAP_CACHE_AT !EV_MINIMAL
252#endif
253
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 254/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 255
242#ifndef CLOCK_MONOTONIC 256#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 257# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 258# define EV_USE_MONOTONIC 0
… …
279} 293}
280# endif 294# endif
281#endif 295#endif
282 296
283/**/ 297/**/
298
299/* EV_VERIFY: enable internal consistency checks
300 * undefined or zero: no verification done or available
301 * 1 or higher: ev_loop_verify function available
302 * 2 or higher: ev_loop_verify is called frequently
303 */
304#if EV_VERIFY >= 1
305# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
306#else
307# define EV_FREQUENT_CHECK do { } while (0)
308#endif
284 309
285/* 310/*
286 * This is used to avoid floating point rounding problems. 311 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 312 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 313 * to ensure progress, time-wise, even when rounding
… …
422 W w; 447 W w;
423 int events; 448 int events;
424} ANPENDING; 449} ANPENDING;
425 450
426#if EV_USE_INOTIFY 451#if EV_USE_INOTIFY
452/* hash table entry per inotify-id */
427typedef struct 453typedef struct
428{ 454{
429 WL head; 455 WL head;
430} ANFS; 456} ANFS;
457#endif
458
459/* Heap Entry */
460#if EV_HEAP_CACHE_AT
461 typedef struct {
462 ev_tstamp at;
463 WT w;
464 } ANHE;
465
466 #define ANHE_w(he) (he).w /* access watcher, read-write */
467 #define ANHE_at(he) (he).at /* access cached at, read-only */
468 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
469#else
470 typedef WT ANHE;
471
472 #define ANHE_w(he) (he)
473 #define ANHE_at(he) (he)->at
474 #define ANHE_at_cache(he)
431#endif 475#endif
432 476
433#if EV_MULTIPLICITY 477#if EV_MULTIPLICITY
434 478
435 struct ev_loop 479 struct ev_loop
… …
759 } 803 }
760} 804}
761 805
762/*****************************************************************************/ 806/*****************************************************************************/
763 807
808/*
809 * the heap functions want a real array index. array index 0 uis guaranteed to not
810 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
811 * the branching factor of the d-tree.
812 */
813
814/*
815 * at the moment we allow libev the luxury of two heaps,
816 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
817 * which is more cache-efficient.
818 * the difference is about 5% with 50000+ watchers.
819 */
820#if EV_USE_4HEAP
821
822#define DHEAP 4
823#define HEAP0 (DHEAP - 1) /* index of first element in heap */
824#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
825#define UPHEAP_DONE(p,k) ((p) == (k))
826
827/* away from the root */
828void inline_speed
829downheap (ANHE *heap, int N, int k)
830{
831 ANHE he = heap [k];
832 ANHE *E = heap + N + HEAP0;
833
834 for (;;)
835 {
836 ev_tstamp minat;
837 ANHE *minpos;
838 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
839
840 /* find minimum child */
841 if (expect_true (pos + DHEAP - 1 < E))
842 {
843 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
844 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
845 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
846 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
847 }
848 else if (pos < E)
849 {
850 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
851 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
852 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
853 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
854 }
855 else
856 break;
857
858 if (ANHE_at (he) <= minat)
859 break;
860
861 heap [k] = *minpos;
862 ev_active (ANHE_w (*minpos)) = k;
863
864 k = minpos - heap;
865 }
866
867 heap [k] = he;
868 ev_active (ANHE_w (he)) = k;
869}
870
871#else /* 4HEAP */
872
873#define HEAP0 1
874#define HPARENT(k) ((k) >> 1)
875#define UPHEAP_DONE(p,k) (!(p))
876
877/* away from the root */
878void inline_speed
879downheap (ANHE *heap, int N, int k)
880{
881 ANHE he = heap [k];
882
883 for (;;)
884 {
885 int c = k << 1;
886
887 if (c > N + HEAP0 - 1)
888 break;
889
890 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
891 ? 1 : 0;
892
893 if (ANHE_at (he) <= ANHE_at (heap [c]))
894 break;
895
896 heap [k] = heap [c];
897 ev_active (ANHE_w (heap [k])) = k;
898
899 k = c;
900 }
901
902 heap [k] = he;
903 ev_active (ANHE_w (he)) = k;
904}
905#endif
906
764/* towards the root */ 907/* towards the root */
765void inline_speed 908void inline_speed
766upheap (WT *heap, int k) 909upheap (ANHE *heap, int k)
767{ 910{
768 WT w = heap [k]; 911 ANHE he = heap [k];
769 912
770 for (;;) 913 for (;;)
771 { 914 {
772 int p = k >> 1; 915 int p = HPARENT (k);
773 916
774 /* maybe we could use a dummy element at heap [0]? */ 917 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
775 if (!p || heap [p]->at <= w->at)
776 break; 918 break;
777 919
778 heap [k] = heap [p]; 920 heap [k] = heap [p];
779 ev_active (heap [k]) = k; 921 ev_active (ANHE_w (heap [k])) = k;
780 k = p; 922 k = p;
781 } 923 }
782 924
783 heap [k] = w; 925 heap [k] = he;
784 ev_active (heap [k]) = k; 926 ev_active (ANHE_w (he)) = k;
785}
786
787/* away from the root */
788void inline_speed
789downheap (WT *heap, int N, int k)
790{
791 WT w = heap [k];
792
793 for (;;)
794 {
795 int c = k << 1;
796
797 if (c > N)
798 break;
799
800 c += c < N && heap [c]->at > heap [c + 1]->at
801 ? 1 : 0;
802
803 if (w->at <= heap [c]->at)
804 break;
805
806 heap [k] = heap [c];
807 ev_active (heap [k]) = k;
808
809 k = c;
810 }
811
812 heap [k] = w;
813 ev_active (heap [k]) = k;
814} 927}
815 928
816void inline_size 929void inline_size
817adjustheap (WT *heap, int N, int k) 930adjustheap (ANHE *heap, int N, int k)
818{ 931{
932 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
819 upheap (heap, k); 933 upheap (heap, k);
934 else
820 downheap (heap, N, k); 935 downheap (heap, N, k);
821} 936}
937
938/* rebuild the heap: this function is used only once and executed rarely */
939void inline_size
940reheap (ANHE *heap, int N)
941{
942 int i;
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
944 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
945 for (i = 0; i < N; ++i)
946 upheap (heap, i + HEAP0);
947}
948
949#if EV_VERIFY
950static void
951checkheap (ANHE *heap, int N)
952{
953 int i;
954
955 for (i = HEAP0; i < N + HEAP0; ++i)
956 {
957 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
958 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
959 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
960 }
961}
962#endif
822 963
823/*****************************************************************************/ 964/*****************************************************************************/
824 965
825typedef struct 966typedef struct
826{ 967{
… …
1370void 1511void
1371ev_loop_fork (EV_P) 1512ev_loop_fork (EV_P)
1372{ 1513{
1373 postfork = 1; /* must be in line with ev_default_fork */ 1514 postfork = 1; /* must be in line with ev_default_fork */
1374} 1515}
1516
1517#if EV_VERIFY
1518static void
1519array_check (W **ws, int cnt)
1520{
1521 while (cnt--)
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1523}
1524
1525static void
1526ev_loop_verify (EV_P)
1527{
1528 int i;
1529
1530 checkheap (timers, timercnt);
1531#if EV_PERIODIC_ENABLE
1532 checkheap (periodics, periodiccnt);
1533#endif
1534
1535#if EV_IDLE_ENABLE
1536 for (i = NUMPRI; i--; )
1537 array_check ((W **)idles [i], idlecnt [i]);
1538#endif
1539#if EV_FORK_ENABLE
1540 array_check ((W **)forks, forkcnt);
1541#endif
1542 array_check ((W **)prepares, preparecnt);
1543 array_check ((W **)checks, checkcnt);
1544#if EV_ASYNC_ENABLE
1545 array_check ((W **)asyncs, asynccnt);
1546#endif
1547}
1548#endif
1549
1375#endif 1550#endif
1376 1551
1377#if EV_MULTIPLICITY 1552#if EV_MULTIPLICITY
1378struct ev_loop * 1553struct ev_loop *
1379ev_default_loop_init (unsigned int flags) 1554ev_default_loop_init (unsigned int flags)
… …
1445void inline_speed 1620void inline_speed
1446call_pending (EV_P) 1621call_pending (EV_P)
1447{ 1622{
1448 int pri; 1623 int pri;
1449 1624
1625 EV_FREQUENT_CHECK;
1626
1450 for (pri = NUMPRI; pri--; ) 1627 for (pri = NUMPRI; pri--; )
1451 while (pendingcnt [pri]) 1628 while (pendingcnt [pri])
1452 { 1629 {
1453 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1454 1631
… …
1458 1635
1459 p->w->pending = 0; 1636 p->w->pending = 0;
1460 EV_CB_INVOKE (p->w, p->events); 1637 EV_CB_INVOKE (p->w, p->events);
1461 } 1638 }
1462 } 1639 }
1640
1641 EV_FREQUENT_CHECK;
1463} 1642}
1464 1643
1465#if EV_IDLE_ENABLE 1644#if EV_IDLE_ENABLE
1466void inline_size 1645void inline_size
1467idle_reify (EV_P) 1646idle_reify (EV_P)
… …
1486#endif 1665#endif
1487 1666
1488void inline_size 1667void inline_size
1489timers_reify (EV_P) 1668timers_reify (EV_P)
1490{ 1669{
1670 EV_FREQUENT_CHECK;
1671
1491 while (timercnt && ev_at (timers [1]) <= mn_now) 1672 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1492 { 1673 {
1493 ev_timer *w = (ev_timer *)timers [1]; 1674 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1494 1675
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1676 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496 1677
1497 /* first reschedule or stop timer */ 1678 /* first reschedule or stop timer */
1498 if (w->repeat) 1679 if (w->repeat)
1499 { 1680 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat; 1681 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now) 1682 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now; 1683 ev_at (w) = mn_now;
1505 1684
1685 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1686
1687 ANHE_at_cache (timers [HEAP0]);
1506 downheap (timers, timercnt, 1); 1688 downheap (timers, timercnt, HEAP0);
1507 } 1689 }
1508 else 1690 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1691 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510 1692
1693 EV_FREQUENT_CHECK;
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1694 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 } 1695 }
1513} 1696}
1514 1697
1515#if EV_PERIODIC_ENABLE 1698#if EV_PERIODIC_ENABLE
1516void inline_size 1699void inline_size
1517periodics_reify (EV_P) 1700periodics_reify (EV_P)
1518{ 1701{
1702 EV_FREQUENT_CHECK;
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now) 1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1520 { 1704 {
1521 ev_periodic *w = (ev_periodic *)periodics [1]; 1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1522 1706
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524 1708
1525 /* first reschedule or stop timer */ 1709 /* first reschedule or stop timer */
1526 if (w->reschedule_cb) 1710 if (w->reschedule_cb)
1527 { 1711 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1713
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1714 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1715
1716 ANHE_at_cache (periodics [HEAP0]);
1530 downheap (periodics, periodiccnt, 1); 1717 downheap (periodics, periodiccnt, HEAP0);
1718 EV_FREQUENT_CHECK;
1531 } 1719 }
1532 else if (w->interval) 1720 else if (w->interval)
1533 { 1721 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1722 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1723 /* if next trigger time is not sufficiently in the future, put it there */
1724 /* this might happen because of floating point inexactness */
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1725 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1726 {
1727 ev_at (w) += w->interval;
1728
1729 /* if interval is unreasonably low we might still have a time in the past */
1730 /* so correct this. this will make the periodic very inexact, but the user */
1731 /* has effectively asked to get triggered more often than possible */
1732 if (ev_at (w) < ev_rt_now)
1733 ev_at (w) = ev_rt_now;
1734 }
1735
1736 ANHE_at_cache (periodics [HEAP0]);
1537 downheap (periodics, periodiccnt, 1); 1737 downheap (periodics, periodiccnt, HEAP0);
1538 } 1738 }
1539 else 1739 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1740 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541 1741
1742 EV_FREQUENT_CHECK;
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1743 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 } 1744 }
1544} 1745}
1545 1746
1546static void noinline 1747static void noinline
1547periodics_reschedule (EV_P) 1748periodics_reschedule (EV_P)
1548{ 1749{
1549 int i; 1750 int i;
1550 1751
1551 /* adjust periodics after time jump */ 1752 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i) 1753 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1553 { 1754 {
1554 ev_periodic *w = (ev_periodic *)periodics [i]; 1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1555 1756
1556 if (w->reschedule_cb) 1757 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1758 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval) 1759 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1760 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561 1761
1562 /* now rebuild the heap */ 1762 ANHE_at_cache (periodics [i]);
1563 for (i = periodiccnt >> 1; i--; ) 1763 }
1764
1564 downheap (periodics, periodiccnt, i); 1765 reheap (periodics, periodiccnt);
1565} 1766}
1566#endif 1767#endif
1567 1768
1568void inline_speed 1769void inline_speed
1569time_update (EV_P_ ev_tstamp max_block) 1770time_update (EV_P_ ev_tstamp max_block)
… …
1623 { 1824 {
1624#if EV_PERIODIC_ENABLE 1825#if EV_PERIODIC_ENABLE
1625 periodics_reschedule (EV_A); 1826 periodics_reschedule (EV_A);
1626#endif 1827#endif
1627 /* adjust timers. this is easy, as the offset is the same for all of them */ 1828 /* adjust timers. this is easy, as the offset is the same for all of them */
1628 for (i = 1; i <= timercnt; ++i) 1829 for (i = 0; i < timercnt; ++i)
1629 ev_at (timers [i]) += ev_rt_now - mn_now; 1830 {
1831 ANHE *he = timers + i + HEAP0;
1832 ANHE_w (*he)->at += ev_rt_now - mn_now;
1833 ANHE_at_cache (*he);
1834 }
1630 } 1835 }
1631 1836
1632 mn_now = ev_rt_now; 1837 mn_now = ev_rt_now;
1633 } 1838 }
1634} 1839}
… …
1704 1909
1705 waittime = MAX_BLOCKTIME; 1910 waittime = MAX_BLOCKTIME;
1706 1911
1707 if (timercnt) 1912 if (timercnt)
1708 { 1913 {
1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1914 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1710 if (waittime > to) waittime = to; 1915 if (waittime > to) waittime = to;
1711 } 1916 }
1712 1917
1713#if EV_PERIODIC_ENABLE 1918#if EV_PERIODIC_ENABLE
1714 if (periodiccnt) 1919 if (periodiccnt)
1715 { 1920 {
1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1921 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1717 if (waittime > to) waittime = to; 1922 if (waittime > to) waittime = to;
1718 } 1923 }
1719#endif 1924#endif
1720 1925
1721 if (expect_false (waittime < timeout_blocktime)) 1926 if (expect_false (waittime < timeout_blocktime))
… …
1858 if (expect_false (ev_is_active (w))) 2063 if (expect_false (ev_is_active (w)))
1859 return; 2064 return;
1860 2065
1861 assert (("ev_io_start called with negative fd", fd >= 0)); 2066 assert (("ev_io_start called with negative fd", fd >= 0));
1862 2067
2068 EV_FREQUENT_CHECK;
2069
1863 ev_start (EV_A_ (W)w, 1); 2070 ev_start (EV_A_ (W)w, 1);
1864 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2071 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1865 wlist_add (&anfds[fd].head, (WL)w); 2072 wlist_add (&anfds[fd].head, (WL)w);
1866 2073
1867 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2074 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1868 w->events &= ~EV_IOFDSET; 2075 w->events &= ~EV_IOFDSET;
2076
2077 EV_FREQUENT_CHECK;
1869} 2078}
1870 2079
1871void noinline 2080void noinline
1872ev_io_stop (EV_P_ ev_io *w) 2081ev_io_stop (EV_P_ ev_io *w)
1873{ 2082{
1874 clear_pending (EV_A_ (W)w); 2083 clear_pending (EV_A_ (W)w);
1875 if (expect_false (!ev_is_active (w))) 2084 if (expect_false (!ev_is_active (w)))
1876 return; 2085 return;
1877 2086
1878 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2087 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2088
2089 EV_FREQUENT_CHECK;
1879 2090
1880 wlist_del (&anfds[w->fd].head, (WL)w); 2091 wlist_del (&anfds[w->fd].head, (WL)w);
1881 ev_stop (EV_A_ (W)w); 2092 ev_stop (EV_A_ (W)w);
1882 2093
1883 fd_change (EV_A_ w->fd, 1); 2094 fd_change (EV_A_ w->fd, 1);
2095
2096 EV_FREQUENT_CHECK;
1884} 2097}
1885 2098
1886void noinline 2099void noinline
1887ev_timer_start (EV_P_ ev_timer *w) 2100ev_timer_start (EV_P_ ev_timer *w)
1888{ 2101{
… …
1891 2104
1892 ev_at (w) += mn_now; 2105 ev_at (w) += mn_now;
1893 2106
1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2107 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1895 2108
2109 EV_FREQUENT_CHECK;
2110
2111 ++timercnt;
1896 ev_start (EV_A_ (W)w, ++timercnt); 2112 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 2113 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1898 timers [timercnt] = (WT)w; 2114 ANHE_w (timers [ev_active (w)]) = (WT)w;
2115 ANHE_at_cache (timers [ev_active (w)]);
1899 upheap (timers, timercnt); 2116 upheap (timers, ev_active (w));
1900 2117
2118 EV_FREQUENT_CHECK;
2119
1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2120 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1902} 2121}
1903 2122
1904void noinline 2123void noinline
1905ev_timer_stop (EV_P_ ev_timer *w) 2124ev_timer_stop (EV_P_ ev_timer *w)
1906{ 2125{
1907 clear_pending (EV_A_ (W)w); 2126 clear_pending (EV_A_ (W)w);
1908 if (expect_false (!ev_is_active (w))) 2127 if (expect_false (!ev_is_active (w)))
1909 return; 2128 return;
1910 2129
2130 EV_FREQUENT_CHECK;
2131
1911 { 2132 {
1912 int active = ev_active (w); 2133 int active = ev_active (w);
1913 2134
1914 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2135 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1915 2136
2137 --timercnt;
2138
1916 if (expect_true (active < timercnt)) 2139 if (expect_true (active < timercnt + HEAP0))
1917 { 2140 {
1918 timers [active] = timers [timercnt]; 2141 timers [active] = timers [timercnt + HEAP0];
1919 adjustheap (timers, timercnt, active); 2142 adjustheap (timers, timercnt, active);
1920 } 2143 }
1921
1922 --timercnt;
1923 } 2144 }
2145
2146 EV_FREQUENT_CHECK;
1924 2147
1925 ev_at (w) -= mn_now; 2148 ev_at (w) -= mn_now;
1926 2149
1927 ev_stop (EV_A_ (W)w); 2150 ev_stop (EV_A_ (W)w);
1928} 2151}
1929 2152
1930void noinline 2153void noinline
1931ev_timer_again (EV_P_ ev_timer *w) 2154ev_timer_again (EV_P_ ev_timer *w)
1932{ 2155{
2156 EV_FREQUENT_CHECK;
2157
1933 if (ev_is_active (w)) 2158 if (ev_is_active (w))
1934 { 2159 {
1935 if (w->repeat) 2160 if (w->repeat)
1936 { 2161 {
1937 ev_at (w) = mn_now + w->repeat; 2162 ev_at (w) = mn_now + w->repeat;
2163 ANHE_at_cache (timers [ev_active (w)]);
1938 adjustheap (timers, timercnt, ev_active (w)); 2164 adjustheap (timers, timercnt, ev_active (w));
1939 } 2165 }
1940 else 2166 else
1941 ev_timer_stop (EV_A_ w); 2167 ev_timer_stop (EV_A_ w);
1942 } 2168 }
1943 else if (w->repeat) 2169 else if (w->repeat)
1944 { 2170 {
1945 ev_at (w) = w->repeat; 2171 ev_at (w) = w->repeat;
1946 ev_timer_start (EV_A_ w); 2172 ev_timer_start (EV_A_ w);
1947 } 2173 }
2174
2175 EV_FREQUENT_CHECK;
1948} 2176}
1949 2177
1950#if EV_PERIODIC_ENABLE 2178#if EV_PERIODIC_ENABLE
1951void noinline 2179void noinline
1952ev_periodic_start (EV_P_ ev_periodic *w) 2180ev_periodic_start (EV_P_ ev_periodic *w)
… …
1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2191 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1964 } 2192 }
1965 else 2193 else
1966 ev_at (w) = w->offset; 2194 ev_at (w) = w->offset;
1967 2195
2196 EV_FREQUENT_CHECK;
2197
2198 ++periodiccnt;
1968 ev_start (EV_A_ (W)w, ++periodiccnt); 2199 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2200 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1970 periodics [periodiccnt] = (WT)w; 2201 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1971 upheap (periodics, periodiccnt); 2202 ANHE_at_cache (periodics [ev_active (w)]);
2203 upheap (periodics, ev_active (w));
1972 2204
2205 EV_FREQUENT_CHECK;
2206
1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2207 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1974} 2208}
1975 2209
1976void noinline 2210void noinline
1977ev_periodic_stop (EV_P_ ev_periodic *w) 2211ev_periodic_stop (EV_P_ ev_periodic *w)
1978{ 2212{
1979 clear_pending (EV_A_ (W)w); 2213 clear_pending (EV_A_ (W)w);
1980 if (expect_false (!ev_is_active (w))) 2214 if (expect_false (!ev_is_active (w)))
1981 return; 2215 return;
1982 2216
2217 EV_FREQUENT_CHECK;
2218
1983 { 2219 {
1984 int active = ev_active (w); 2220 int active = ev_active (w);
1985 2221
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2222 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
1987 2223
2224 --periodiccnt;
2225
1988 if (expect_true (active < periodiccnt)) 2226 if (expect_true (active < periodiccnt + HEAP0))
1989 { 2227 {
1990 periodics [active] = periodics [periodiccnt]; 2228 periodics [active] = periodics [periodiccnt + HEAP0];
1991 adjustheap (periodics, periodiccnt, active); 2229 adjustheap (periodics, periodiccnt, active);
1992 } 2230 }
1993
1994 --periodiccnt;
1995 } 2231 }
2232
2233 EV_FREQUENT_CHECK;
1996 2234
1997 ev_stop (EV_A_ (W)w); 2235 ev_stop (EV_A_ (W)w);
1998} 2236}
1999 2237
2000void noinline 2238void noinline
… …
2020 return; 2258 return;
2021 2259
2022 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2260 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2023 2261
2024 evpipe_init (EV_A); 2262 evpipe_init (EV_A);
2263
2264 EV_FREQUENT_CHECK;
2025 2265
2026 { 2266 {
2027#ifndef _WIN32 2267#ifndef _WIN32
2028 sigset_t full, prev; 2268 sigset_t full, prev;
2029 sigfillset (&full); 2269 sigfillset (&full);
… …
2050 sigfillset (&sa.sa_mask); 2290 sigfillset (&sa.sa_mask);
2051 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2291 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2052 sigaction (w->signum, &sa, 0); 2292 sigaction (w->signum, &sa, 0);
2053#endif 2293#endif
2054 } 2294 }
2295
2296 EV_FREQUENT_CHECK;
2055} 2297}
2056 2298
2057void noinline 2299void noinline
2058ev_signal_stop (EV_P_ ev_signal *w) 2300ev_signal_stop (EV_P_ ev_signal *w)
2059{ 2301{
2060 clear_pending (EV_A_ (W)w); 2302 clear_pending (EV_A_ (W)w);
2061 if (expect_false (!ev_is_active (w))) 2303 if (expect_false (!ev_is_active (w)))
2062 return; 2304 return;
2063 2305
2306 EV_FREQUENT_CHECK;
2307
2064 wlist_del (&signals [w->signum - 1].head, (WL)w); 2308 wlist_del (&signals [w->signum - 1].head, (WL)w);
2065 ev_stop (EV_A_ (W)w); 2309 ev_stop (EV_A_ (W)w);
2066 2310
2067 if (!signals [w->signum - 1].head) 2311 if (!signals [w->signum - 1].head)
2068 signal (w->signum, SIG_DFL); 2312 signal (w->signum, SIG_DFL);
2313
2314 EV_FREQUENT_CHECK;
2069} 2315}
2070 2316
2071void 2317void
2072ev_child_start (EV_P_ ev_child *w) 2318ev_child_start (EV_P_ ev_child *w)
2073{ 2319{
… …
2075 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2321 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2076#endif 2322#endif
2077 if (expect_false (ev_is_active (w))) 2323 if (expect_false (ev_is_active (w)))
2078 return; 2324 return;
2079 2325
2326 EV_FREQUENT_CHECK;
2327
2080 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2081 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2329 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2330
2331 EV_FREQUENT_CHECK;
2082} 2332}
2083 2333
2084void 2334void
2085ev_child_stop (EV_P_ ev_child *w) 2335ev_child_stop (EV_P_ ev_child *w)
2086{ 2336{
2087 clear_pending (EV_A_ (W)w); 2337 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2338 if (expect_false (!ev_is_active (w)))
2089 return; 2339 return;
2090 2340
2341 EV_FREQUENT_CHECK;
2342
2091 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2343 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2092 ev_stop (EV_A_ (W)w); 2344 ev_stop (EV_A_ (W)w);
2345
2346 EV_FREQUENT_CHECK;
2093} 2347}
2094 2348
2095#if EV_STAT_ENABLE 2349#if EV_STAT_ENABLE
2096 2350
2097# ifdef _WIN32 2351# ifdef _WIN32
… …
2325 else 2579 else
2326#endif 2580#endif
2327 ev_timer_start (EV_A_ &w->timer); 2581 ev_timer_start (EV_A_ &w->timer);
2328 2582
2329 ev_start (EV_A_ (W)w, 1); 2583 ev_start (EV_A_ (W)w, 1);
2584
2585 EV_FREQUENT_CHECK;
2330} 2586}
2331 2587
2332void 2588void
2333ev_stat_stop (EV_P_ ev_stat *w) 2589ev_stat_stop (EV_P_ ev_stat *w)
2334{ 2590{
2335 clear_pending (EV_A_ (W)w); 2591 clear_pending (EV_A_ (W)w);
2336 if (expect_false (!ev_is_active (w))) 2592 if (expect_false (!ev_is_active (w)))
2337 return; 2593 return;
2338 2594
2595 EV_FREQUENT_CHECK;
2596
2339#if EV_USE_INOTIFY 2597#if EV_USE_INOTIFY
2340 infy_del (EV_A_ w); 2598 infy_del (EV_A_ w);
2341#endif 2599#endif
2342 ev_timer_stop (EV_A_ &w->timer); 2600 ev_timer_stop (EV_A_ &w->timer);
2343 2601
2344 ev_stop (EV_A_ (W)w); 2602 ev_stop (EV_A_ (W)w);
2603
2604 EV_FREQUENT_CHECK;
2345} 2605}
2346#endif 2606#endif
2347 2607
2348#if EV_IDLE_ENABLE 2608#if EV_IDLE_ENABLE
2349void 2609void
… …
2351{ 2611{
2352 if (expect_false (ev_is_active (w))) 2612 if (expect_false (ev_is_active (w)))
2353 return; 2613 return;
2354 2614
2355 pri_adjust (EV_A_ (W)w); 2615 pri_adjust (EV_A_ (W)w);
2616
2617 EV_FREQUENT_CHECK;
2356 2618
2357 { 2619 {
2358 int active = ++idlecnt [ABSPRI (w)]; 2620 int active = ++idlecnt [ABSPRI (w)];
2359 2621
2360 ++idleall; 2622 ++idleall;
2361 ev_start (EV_A_ (W)w, active); 2623 ev_start (EV_A_ (W)w, active);
2362 2624
2363 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2625 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2364 idles [ABSPRI (w)][active - 1] = w; 2626 idles [ABSPRI (w)][active - 1] = w;
2365 } 2627 }
2628
2629 EV_FREQUENT_CHECK;
2366} 2630}
2367 2631
2368void 2632void
2369ev_idle_stop (EV_P_ ev_idle *w) 2633ev_idle_stop (EV_P_ ev_idle *w)
2370{ 2634{
2371 clear_pending (EV_A_ (W)w); 2635 clear_pending (EV_A_ (W)w);
2372 if (expect_false (!ev_is_active (w))) 2636 if (expect_false (!ev_is_active (w)))
2373 return; 2637 return;
2374 2638
2639 EV_FREQUENT_CHECK;
2640
2375 { 2641 {
2376 int active = ev_active (w); 2642 int active = ev_active (w);
2377 2643
2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2644 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2379 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2645 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2380 2646
2381 ev_stop (EV_A_ (W)w); 2647 ev_stop (EV_A_ (W)w);
2382 --idleall; 2648 --idleall;
2383 } 2649 }
2650
2651 EV_FREQUENT_CHECK;
2384} 2652}
2385#endif 2653#endif
2386 2654
2387void 2655void
2388ev_prepare_start (EV_P_ ev_prepare *w) 2656ev_prepare_start (EV_P_ ev_prepare *w)
2389{ 2657{
2390 if (expect_false (ev_is_active (w))) 2658 if (expect_false (ev_is_active (w)))
2391 return; 2659 return;
2660
2661 EV_FREQUENT_CHECK;
2392 2662
2393 ev_start (EV_A_ (W)w, ++preparecnt); 2663 ev_start (EV_A_ (W)w, ++preparecnt);
2394 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2664 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2395 prepares [preparecnt - 1] = w; 2665 prepares [preparecnt - 1] = w;
2666
2667 EV_FREQUENT_CHECK;
2396} 2668}
2397 2669
2398void 2670void
2399ev_prepare_stop (EV_P_ ev_prepare *w) 2671ev_prepare_stop (EV_P_ ev_prepare *w)
2400{ 2672{
2401 clear_pending (EV_A_ (W)w); 2673 clear_pending (EV_A_ (W)w);
2402 if (expect_false (!ev_is_active (w))) 2674 if (expect_false (!ev_is_active (w)))
2403 return; 2675 return;
2404 2676
2677 EV_FREQUENT_CHECK;
2678
2405 { 2679 {
2406 int active = ev_active (w); 2680 int active = ev_active (w);
2407 2681
2408 prepares [active - 1] = prepares [--preparecnt]; 2682 prepares [active - 1] = prepares [--preparecnt];
2409 ev_active (prepares [active - 1]) = active; 2683 ev_active (prepares [active - 1]) = active;
2410 } 2684 }
2411 2685
2412 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2413} 2689}
2414 2690
2415void 2691void
2416ev_check_start (EV_P_ ev_check *w) 2692ev_check_start (EV_P_ ev_check *w)
2417{ 2693{
2418 if (expect_false (ev_is_active (w))) 2694 if (expect_false (ev_is_active (w)))
2419 return; 2695 return;
2696
2697 EV_FREQUENT_CHECK;
2420 2698
2421 ev_start (EV_A_ (W)w, ++checkcnt); 2699 ev_start (EV_A_ (W)w, ++checkcnt);
2422 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2700 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2423 checks [checkcnt - 1] = w; 2701 checks [checkcnt - 1] = w;
2702
2703 EV_FREQUENT_CHECK;
2424} 2704}
2425 2705
2426void 2706void
2427ev_check_stop (EV_P_ ev_check *w) 2707ev_check_stop (EV_P_ ev_check *w)
2428{ 2708{
2429 clear_pending (EV_A_ (W)w); 2709 clear_pending (EV_A_ (W)w);
2430 if (expect_false (!ev_is_active (w))) 2710 if (expect_false (!ev_is_active (w)))
2431 return; 2711 return;
2432 2712
2713 EV_FREQUENT_CHECK;
2714
2433 { 2715 {
2434 int active = ev_active (w); 2716 int active = ev_active (w);
2435 2717
2436 checks [active - 1] = checks [--checkcnt]; 2718 checks [active - 1] = checks [--checkcnt];
2437 ev_active (checks [active - 1]) = active; 2719 ev_active (checks [active - 1]) = active;
2438 } 2720 }
2439 2721
2440 ev_stop (EV_A_ (W)w); 2722 ev_stop (EV_A_ (W)w);
2723
2724 EV_FREQUENT_CHECK;
2441} 2725}
2442 2726
2443#if EV_EMBED_ENABLE 2727#if EV_EMBED_ENABLE
2444void noinline 2728void noinline
2445ev_embed_sweep (EV_P_ ev_embed *w) 2729ev_embed_sweep (EV_P_ ev_embed *w)
… …
2492 struct ev_loop *loop = w->other; 2776 struct ev_loop *loop = w->other;
2493 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2777 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2494 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2778 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2495 } 2779 }
2496 2780
2781 EV_FREQUENT_CHECK;
2782
2497 ev_set_priority (&w->io, ev_priority (w)); 2783 ev_set_priority (&w->io, ev_priority (w));
2498 ev_io_start (EV_A_ &w->io); 2784 ev_io_start (EV_A_ &w->io);
2499 2785
2500 ev_prepare_init (&w->prepare, embed_prepare_cb); 2786 ev_prepare_init (&w->prepare, embed_prepare_cb);
2501 ev_set_priority (&w->prepare, EV_MINPRI); 2787 ev_set_priority (&w->prepare, EV_MINPRI);
2502 ev_prepare_start (EV_A_ &w->prepare); 2788 ev_prepare_start (EV_A_ &w->prepare);
2503 2789
2504 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2790 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2505 2791
2506 ev_start (EV_A_ (W)w, 1); 2792 ev_start (EV_A_ (W)w, 1);
2793
2794 EV_FREQUENT_CHECK;
2507} 2795}
2508 2796
2509void 2797void
2510ev_embed_stop (EV_P_ ev_embed *w) 2798ev_embed_stop (EV_P_ ev_embed *w)
2511{ 2799{
2512 clear_pending (EV_A_ (W)w); 2800 clear_pending (EV_A_ (W)w);
2513 if (expect_false (!ev_is_active (w))) 2801 if (expect_false (!ev_is_active (w)))
2514 return; 2802 return;
2515 2803
2804 EV_FREQUENT_CHECK;
2805
2516 ev_io_stop (EV_A_ &w->io); 2806 ev_io_stop (EV_A_ &w->io);
2517 ev_prepare_stop (EV_A_ &w->prepare); 2807 ev_prepare_stop (EV_A_ &w->prepare);
2518 2808
2519 ev_stop (EV_A_ (W)w); 2809 ev_stop (EV_A_ (W)w);
2810
2811 EV_FREQUENT_CHECK;
2520} 2812}
2521#endif 2813#endif
2522 2814
2523#if EV_FORK_ENABLE 2815#if EV_FORK_ENABLE
2524void 2816void
2525ev_fork_start (EV_P_ ev_fork *w) 2817ev_fork_start (EV_P_ ev_fork *w)
2526{ 2818{
2527 if (expect_false (ev_is_active (w))) 2819 if (expect_false (ev_is_active (w)))
2528 return; 2820 return;
2821
2822 EV_FREQUENT_CHECK;
2529 2823
2530 ev_start (EV_A_ (W)w, ++forkcnt); 2824 ev_start (EV_A_ (W)w, ++forkcnt);
2531 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2825 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2532 forks [forkcnt - 1] = w; 2826 forks [forkcnt - 1] = w;
2827
2828 EV_FREQUENT_CHECK;
2533} 2829}
2534 2830
2535void 2831void
2536ev_fork_stop (EV_P_ ev_fork *w) 2832ev_fork_stop (EV_P_ ev_fork *w)
2537{ 2833{
2538 clear_pending (EV_A_ (W)w); 2834 clear_pending (EV_A_ (W)w);
2539 if (expect_false (!ev_is_active (w))) 2835 if (expect_false (!ev_is_active (w)))
2540 return; 2836 return;
2541 2837
2838 EV_FREQUENT_CHECK;
2839
2542 { 2840 {
2543 int active = ev_active (w); 2841 int active = ev_active (w);
2544 2842
2545 forks [active - 1] = forks [--forkcnt]; 2843 forks [active - 1] = forks [--forkcnt];
2546 ev_active (forks [active - 1]) = active; 2844 ev_active (forks [active - 1]) = active;
2547 } 2845 }
2548 2846
2549 ev_stop (EV_A_ (W)w); 2847 ev_stop (EV_A_ (W)w);
2848
2849 EV_FREQUENT_CHECK;
2550} 2850}
2551#endif 2851#endif
2552 2852
2553#if EV_ASYNC_ENABLE 2853#if EV_ASYNC_ENABLE
2554void 2854void
… …
2556{ 2856{
2557 if (expect_false (ev_is_active (w))) 2857 if (expect_false (ev_is_active (w)))
2558 return; 2858 return;
2559 2859
2560 evpipe_init (EV_A); 2860 evpipe_init (EV_A);
2861
2862 EV_FREQUENT_CHECK;
2561 2863
2562 ev_start (EV_A_ (W)w, ++asynccnt); 2864 ev_start (EV_A_ (W)w, ++asynccnt);
2563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2865 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2564 asyncs [asynccnt - 1] = w; 2866 asyncs [asynccnt - 1] = w;
2867
2868 EV_FREQUENT_CHECK;
2565} 2869}
2566 2870
2567void 2871void
2568ev_async_stop (EV_P_ ev_async *w) 2872ev_async_stop (EV_P_ ev_async *w)
2569{ 2873{
2570 clear_pending (EV_A_ (W)w); 2874 clear_pending (EV_A_ (W)w);
2571 if (expect_false (!ev_is_active (w))) 2875 if (expect_false (!ev_is_active (w)))
2572 return; 2876 return;
2573 2877
2878 EV_FREQUENT_CHECK;
2879
2574 { 2880 {
2575 int active = ev_active (w); 2881 int active = ev_active (w);
2576 2882
2577 asyncs [active - 1] = asyncs [--asynccnt]; 2883 asyncs [active - 1] = asyncs [--asynccnt];
2578 ev_active (asyncs [active - 1]) = active; 2884 ev_active (asyncs [active - 1]) = active;
2579 } 2885 }
2580 2886
2581 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2888
2889 EV_FREQUENT_CHECK;
2582} 2890}
2583 2891
2584void 2892void
2585ev_async_send (EV_P_ ev_async *w) 2893ev_async_send (EV_P_ ev_async *w)
2586{ 2894{

Diff Legend

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