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.253 by root, Sat May 31 03:13:27 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
164#endif 164#endif
165 165
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
167 167
168#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1
171# else
169# define EV_USE_MONOTONIC 0 172# define EV_USE_MONOTONIC 0
173# endif
170#endif 174#endif
171 175
172#ifndef EV_USE_REALTIME 176#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 177# define EV_USE_REALTIME 0
174#endif 178#endif
175 179
176#ifndef EV_USE_NANOSLEEP 180#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1
183# else
177# define EV_USE_NANOSLEEP 0 184# define EV_USE_NANOSLEEP 0
185# endif
178#endif 186#endif
179 187
180#ifndef EV_USE_SELECT 188#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 189# define EV_USE_SELECT 1
182#endif 190#endif
… …
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 241# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1 242# define EV_USE_EVENTFD 1
235# else 243# else
236# define EV_USE_EVENTFD 0 244# define EV_USE_EVENTFD 0
237# endif 245# endif
246#endif
247
248#if 0 /* debugging */
249# define EV_VERIFY 3
250# define EV_USE_4HEAP 1
251# define EV_HEAP_CACHE_AT 1
252#endif
253
254#ifndef EV_VERIFY
255# define EV_VERIFY !EV_MINIMAL
256#endif
257
258#ifndef EV_USE_4HEAP
259# define EV_USE_4HEAP !EV_MINIMAL
260#endif
261
262#ifndef EV_HEAP_CACHE_AT
263# define EV_HEAP_CACHE_AT !EV_MINIMAL
238#endif 264#endif
239 265
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 266/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 267
242#ifndef CLOCK_MONOTONIC 268#ifndef CLOCK_MONOTONIC
… …
279} 305}
280# endif 306# endif
281#endif 307#endif
282 308
283/**/ 309/**/
310
311#if EV_VERIFY >= 3
312# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
313#else
314# define EV_FREQUENT_CHECK do { } while (0)
315#endif
284 316
285/* 317/*
286 * This is used to avoid floating point rounding problems. 318 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 319 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 320 * to ensure progress, time-wise, even when rounding
… …
432#endif 464#endif
433 465
434/* Heap Entry */ 466/* Heap Entry */
435#if EV_HEAP_CACHE_AT 467#if EV_HEAP_CACHE_AT
436 typedef struct { 468 typedef struct {
469 ev_tstamp at;
437 WT w; 470 WT w;
438 ev_tstamp at;
439 } ANHE; 471 } ANHE;
440 472
441 #define ANHE_w(he) (he) /* access watcher, read-write */ 473 #define ANHE_w(he) (he).w /* access watcher, read-write */
442 #define ANHE_at(he) (he)->at /* acces cahced at, read-only */ 474 #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 */ 475 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
444#else 476#else
445 typedef WT ANHE; 477 typedef WT ANHE;
446 478
447 #define ANHE_w(he) (he) 479 #define ANHE_w(he) (he)
448 #define ANHE_at(he) (he)->at 480 #define ANHE_at(he) (he)->at
449 #define ANHE_at_set(he) 481 #define ANHE_at_cache(he)
450#endif 482#endif
451 483
452#if EV_MULTIPLICITY 484#if EV_MULTIPLICITY
453 485
454 struct ev_loop 486 struct ev_loop
… …
790 * at the moment we allow libev the luxury of two heaps, 822 * 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 823 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
792 * which is more cache-efficient. 824 * which is more cache-efficient.
793 * the difference is about 5% with 50000+ watchers. 825 * the difference is about 5% with 50000+ watchers.
794 */ 826 */
795#define EV_USE_4HEAP !EV_MINIMAL
796#if EV_USE_4HEAP 827#if EV_USE_4HEAP
797 828
798#define DHEAP 4 829#define DHEAP 4
799#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 830#define HEAP0 (DHEAP - 1) /* index of first element in heap */
800 831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
801/* towards the root */ 832#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 833
823/* away from the root */ 834/* away from the root */
824void inline_speed 835void inline_speed
825downheap (ANHE *heap, int N, int k) 836downheap (ANHE *heap, int N, int k)
826{ 837{
… …
829 840
830 for (;;) 841 for (;;)
831 { 842 {
832 ev_tstamp minat; 843 ev_tstamp minat;
833 ANHE *minpos; 844 ANHE *minpos;
834 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 845 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
835 846
836 // find minimum child 847 /* find minimum child */
837 if (expect_true (pos + DHEAP - 1 < E)) 848 if (expect_true (pos + DHEAP - 1 < E))
838 { 849 {
839 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 850 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
840 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 851 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)); 852 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)); 853 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
843 } 854 }
844 else if (pos < E) 855 else if (pos < E)
845 { 856 {
846 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 857 /* 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)); 858 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
… …
852 break; 863 break;
853 864
854 if (ANHE_at (he) <= minat) 865 if (ANHE_at (he) <= minat)
855 break; 866 break;
856 867
868 heap [k] = *minpos;
857 ev_active (ANHE_w (*minpos)) = k; 869 ev_active (ANHE_w (*minpos)) = k;
858 heap [k] = *minpos;
859 870
860 k = minpos - heap; 871 k = minpos - heap;
861 } 872 }
862 873
874 heap [k] = he;
863 ev_active (ANHE_w (he)) = k; 875 ev_active (ANHE_w (he)) = k;
864 heap [k] = he;
865} 876}
866 877
867#else // 4HEAP 878#else /* 4HEAP */
868 879
869#define HEAP0 1 880#define HEAP0 1
870 881#define HPARENT(k) ((k) >> 1)
871/* towards the root */ 882#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 883
894/* away from the root */ 884/* away from the root */
895void inline_speed 885void inline_speed
896downheap (ANHE *heap, int N, int k) 886downheap (ANHE *heap, int N, int k)
897{ 887{
… …
899 889
900 for (;;) 890 for (;;)
901 { 891 {
902 int c = k << 1; 892 int c = k << 1;
903 893
904 if (c > N) 894 if (c > N + HEAP0 - 1)
905 break; 895 break;
906 896
907 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 897 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
908 ? 1 : 0; 898 ? 1 : 0;
909 899
910 if (w->at <= ANHE_at (heap [c])) 900 if (ANHE_at (he) <= ANHE_at (heap [c]))
911 break; 901 break;
912 902
913 heap [k] = heap [c]; 903 heap [k] = heap [c];
914 ev_active (ANHE_w (heap [k])) = k; 904 ev_active (ANHE_w (heap [k])) = k;
915 905
… …
919 heap [k] = he; 909 heap [k] = he;
920 ev_active (ANHE_w (he)) = k; 910 ev_active (ANHE_w (he)) = k;
921} 911}
922#endif 912#endif
923 913
914/* towards the root */
915void inline_speed
916upheap (ANHE *heap, int k)
917{
918 ANHE he = heap [k];
919
920 for (;;)
921 {
922 int p = HPARENT (k);
923
924 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
925 break;
926
927 heap [k] = heap [p];
928 ev_active (ANHE_w (heap [k])) = k;
929 k = p;
930 }
931
932 heap [k] = he;
933 ev_active (ANHE_w (he)) = k;
934}
935
924void inline_size 936void inline_size
925adjustheap (ANHE *heap, int N, int k) 937adjustheap (ANHE *heap, int N, int k)
926{ 938{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
927 upheap (heap, k); 940 upheap (heap, k);
941 else
928 downheap (heap, N, k); 942 downheap (heap, N, k);
943}
944
945/* rebuild the heap: this function is used only once and executed rarely */
946void inline_size
947reheap (ANHE *heap, int N)
948{
949 int i;
950
951 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
952 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
953 for (i = 0; i < N; ++i)
954 upheap (heap, i + HEAP0);
929} 955}
930 956
931/*****************************************************************************/ 957/*****************************************************************************/
932 958
933typedef struct 959typedef struct
… …
1451 1477
1452 postfork = 0; 1478 postfork = 0;
1453} 1479}
1454 1480
1455#if EV_MULTIPLICITY 1481#if EV_MULTIPLICITY
1482
1456struct ev_loop * 1483struct ev_loop *
1457ev_loop_new (unsigned int flags) 1484ev_loop_new (unsigned int flags)
1458{ 1485{
1459 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1460 1487
… …
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
1512void noinline
1513verify_watcher (EV_P_ W w)
1514{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516
1517 if (w->pending)
1518 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1519}
1520
1521static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N)
1523{
1524 int i;
1525
1526 for (i = HEAP0; i < N + HEAP0; ++i)
1527 {
1528 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1529 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1530 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1531
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 }
1534}
1535
1536static void noinline
1537array_verify (EV_P_ W *ws, int cnt)
1538{
1539 while (cnt--)
1540 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]);
1543 }
1544}
1545#endif
1546
1547void
1548ev_loop_verify (EV_P)
1549{
1550#if EV_VERIFY
1551 int i;
1552 WL w;
1553
1554 assert (activecnt >= -1);
1555
1556 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1559
1560 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next)
1563 {
1564 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1566 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1567 }
1568
1569 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt);
1571
1572#if EV_PERIODIC_ENABLE
1573 assert (periodicmax >= periodiccnt);
1574 verify_heap (EV_A_ periodics, periodiccnt);
1575#endif
1576
1577 for (i = NUMPRI; i--; )
1578 {
1579 assert (pendingmax [i] >= pendingcnt [i]);
1580#if EV_IDLE_ENABLE
1581 assert (idleall >= 0);
1582 assert (idlemax [i] >= idlecnt [i]);
1583 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1584#endif
1585 }
1586
1587#if EV_FORK_ENABLE
1588 assert (forkmax >= forkcnt);
1589 array_verify (EV_A_ (W *)forks, forkcnt);
1590#endif
1591
1592#if EV_ASYNC_ENABLE
1593 assert (asyncmax >= asynccnt);
1594 array_verify (EV_A_ (W *)asyncs, asynccnt);
1595#endif
1596
1597 assert (preparemax >= preparecnt);
1598 array_verify (EV_A_ (W *)prepares, preparecnt);
1599
1600 assert (checkmax >= checkcnt);
1601 array_verify (EV_A_ (W *)checks, checkcnt);
1602
1603# if 0
1604 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1605 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1483#endif 1606# endif
1607#endif
1608}
1609
1610#endif /* multiplicity */
1484 1611
1485#if EV_MULTIPLICITY 1612#if EV_MULTIPLICITY
1486struct ev_loop * 1613struct ev_loop *
1487ev_default_loop_init (unsigned int flags) 1614ev_default_loop_init (unsigned int flags)
1488#else 1615#else
… …
1564 { 1691 {
1565 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1566 1693
1567 p->w->pending = 0; 1694 p->w->pending = 0;
1568 EV_CB_INVOKE (p->w, p->events); 1695 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK;
1569 } 1697 }
1570 } 1698 }
1571} 1699}
1572 1700
1573#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
… …
1594#endif 1722#endif
1595 1723
1596void inline_size 1724void inline_size
1597timers_reify (EV_P) 1725timers_reify (EV_P)
1598{ 1726{
1727 EV_FREQUENT_CHECK;
1728
1599 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1600 { 1730 {
1601 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1602 1732
1603 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1604 1734
1605 /* first reschedule or stop timer */ 1735 /* first reschedule or stop timer */
1606 if (w->repeat) 1736 if (w->repeat)
1607 { 1737 {
1608 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1609
1610 ev_at (w) += w->repeat; 1738 ev_at (w) += w->repeat;
1611 if (ev_at (w) < mn_now) 1739 if (ev_at (w) < mn_now)
1612 ev_at (w) = mn_now; 1740 ev_at (w) = mn_now;
1613 1741
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743
1744 ANHE_at_cache (timers [HEAP0]);
1614 downheap (timers, timercnt, HEAP0); 1745 downheap (timers, timercnt, HEAP0);
1615 } 1746 }
1616 else 1747 else
1617 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1618 1749
1750 EV_FREQUENT_CHECK;
1619 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1620 } 1752 }
1621} 1753}
1622 1754
1623#if EV_PERIODIC_ENABLE 1755#if EV_PERIODIC_ENABLE
1624void inline_size 1756void inline_size
1625periodics_reify (EV_P) 1757periodics_reify (EV_P)
1626{ 1758{
1759 EV_FREQUENT_CHECK;
1760
1627 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1628 { 1762 {
1629 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1630 1764
1631 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1632 1766
1633 /* first reschedule or stop timer */ 1767 /* first reschedule or stop timer */
1634 if (w->reschedule_cb) 1768 if (w->reschedule_cb)
1635 { 1769 {
1636 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771
1637 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1772 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1773
1774 ANHE_at_cache (periodics [HEAP0]);
1638 downheap (periodics, periodiccnt, 1); 1775 downheap (periodics, periodiccnt, HEAP0);
1639 } 1776 }
1640 else if (w->interval) 1777 else if (w->interval)
1641 { 1778 {
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1779 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1780 /* if next trigger time is not sufficiently in the future, put it there */
1781 /* this might happen because of floating point inexactness */
1643 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1782 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)); 1783 {
1784 ev_at (w) += w->interval;
1785
1786 /* if interval is unreasonably low we might still have a time in the past */
1787 /* so correct this. this will make the periodic very inexact, but the user */
1788 /* has effectively asked to get triggered more often than possible */
1789 if (ev_at (w) < ev_rt_now)
1790 ev_at (w) = ev_rt_now;
1791 }
1792
1793 ANHE_at_cache (periodics [HEAP0]);
1645 downheap (periodics, periodiccnt, HEAP0); 1794 downheap (periodics, periodiccnt, HEAP0);
1646 } 1795 }
1647 else 1796 else
1648 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1797 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1649 1798
1799 EV_FREQUENT_CHECK;
1650 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1800 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1651 } 1801 }
1652} 1802}
1653 1803
1654static void noinline 1804static void noinline
… …
1663 1813
1664 if (w->reschedule_cb) 1814 if (w->reschedule_cb)
1665 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1816 else if (w->interval)
1667 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1817 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1668 }
1669 1818
1670 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */ 1819 ANHE_at_cache (periodics [i]);
1671 for (i = periodiccnt >> 1; --i; ) 1820 }
1821
1672 downheap (periodics, periodiccnt, i + HEAP0); 1822 reheap (periodics, periodiccnt);
1673} 1823}
1674#endif 1824#endif
1675 1825
1676void inline_speed 1826void inline_speed
1677time_update (EV_P_ ev_tstamp max_block) 1827time_update (EV_P_ ev_tstamp max_block)
… …
1735 /* adjust timers. this is easy, as the offset is the same for all of them */ 1885 /* adjust timers. this is easy, as the offset is the same for all of them */
1736 for (i = 0; i < timercnt; ++i) 1886 for (i = 0; i < timercnt; ++i)
1737 { 1887 {
1738 ANHE *he = timers + i + HEAP0; 1888 ANHE *he = timers + i + HEAP0;
1739 ANHE_w (*he)->at += ev_rt_now - mn_now; 1889 ANHE_w (*he)->at += ev_rt_now - mn_now;
1740 ANHE_at_set (*he); 1890 ANHE_at_cache (*he);
1741 } 1891 }
1742 } 1892 }
1743 1893
1744 mn_now = ev_rt_now; 1894 mn_now = ev_rt_now;
1745 } 1895 }
… …
1766 1916
1767 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1917 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1768 1918
1769 do 1919 do
1770 { 1920 {
1921#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A);
1923#endif
1924
1771#ifndef _WIN32 1925#ifndef _WIN32
1772 if (expect_false (curpid)) /* penalise the forking check even more */ 1926 if (expect_false (curpid)) /* penalise the forking check even more */
1773 if (expect_false (getpid () != curpid)) 1927 if (expect_false (getpid () != curpid))
1774 { 1928 {
1775 curpid = getpid (); 1929 curpid = getpid ();
… …
1970 if (expect_false (ev_is_active (w))) 2124 if (expect_false (ev_is_active (w)))
1971 return; 2125 return;
1972 2126
1973 assert (("ev_io_start called with negative fd", fd >= 0)); 2127 assert (("ev_io_start called with negative fd", fd >= 0));
1974 2128
2129 EV_FREQUENT_CHECK;
2130
1975 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
1976 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1977 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
1978 2134
1979 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1980 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2137
2138 EV_FREQUENT_CHECK;
1981} 2139}
1982 2140
1983void noinline 2141void noinline
1984ev_io_stop (EV_P_ ev_io *w) 2142ev_io_stop (EV_P_ ev_io *w)
1985{ 2143{
1986 clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1987 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1988 return; 2146 return;
1989 2147
1990 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149
2150 EV_FREQUENT_CHECK;
1991 2151
1992 wlist_del (&anfds[w->fd].head, (WL)w); 2152 wlist_del (&anfds[w->fd].head, (WL)w);
1993 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
1994 2154
1995 fd_change (EV_A_ w->fd, 1); 2155 fd_change (EV_A_ w->fd, 1);
2156
2157 EV_FREQUENT_CHECK;
1996} 2158}
1997 2159
1998void noinline 2160void noinline
1999ev_timer_start (EV_P_ ev_timer *w) 2161ev_timer_start (EV_P_ ev_timer *w)
2000{ 2162{
… …
2003 2165
2004 ev_at (w) += mn_now; 2166 ev_at (w) += mn_now;
2005 2167
2006 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2007 2169
2170 EV_FREQUENT_CHECK;
2171
2172 ++timercnt;
2008 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2009 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2174 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2010 ANHE_w (timers [ev_active (w)]) = (WT)w; 2175 ANHE_w (timers [ev_active (w)]) = (WT)w;
2011 ANHE_at_set (timers [ev_active (w)]); 2176 ANHE_at_cache (timers [ev_active (w)]);
2012 upheap (timers, ev_active (w)); 2177 upheap (timers, ev_active (w));
2013 2178
2179 EV_FREQUENT_CHECK;
2180
2014 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2015} 2182}
2016 2183
2017void noinline 2184void noinline
2018ev_timer_stop (EV_P_ ev_timer *w) 2185ev_timer_stop (EV_P_ ev_timer *w)
2019{ 2186{
2020 clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
2021 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
2022 return; 2189 return;
2023 2190
2191 EV_FREQUENT_CHECK;
2192
2024 { 2193 {
2025 int active = ev_active (w); 2194 int active = ev_active (w);
2026 2195
2027 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2028 2197
2198 --timercnt;
2199
2029 if (expect_true (active < timercnt + HEAP0 - 1)) 2200 if (expect_true (active < timercnt + HEAP0))
2030 { 2201 {
2031 timers [active] = timers [timercnt + HEAP0 - 1]; 2202 timers [active] = timers [timercnt + HEAP0];
2032 adjustheap (timers, timercnt, active); 2203 adjustheap (timers, timercnt, active);
2033 } 2204 }
2034
2035 --timercnt;
2036 } 2205 }
2206
2207 EV_FREQUENT_CHECK;
2037 2208
2038 ev_at (w) -= mn_now; 2209 ev_at (w) -= mn_now;
2039 2210
2040 ev_stop (EV_A_ (W)w); 2211 ev_stop (EV_A_ (W)w);
2041} 2212}
2042 2213
2043void noinline 2214void noinline
2044ev_timer_again (EV_P_ ev_timer *w) 2215ev_timer_again (EV_P_ ev_timer *w)
2045{ 2216{
2217 EV_FREQUENT_CHECK;
2218
2046 if (ev_is_active (w)) 2219 if (ev_is_active (w))
2047 { 2220 {
2048 if (w->repeat) 2221 if (w->repeat)
2049 { 2222 {
2050 ev_at (w) = mn_now + w->repeat; 2223 ev_at (w) = mn_now + w->repeat;
2051 ANHE_at_set (timers [ev_active (w)]); 2224 ANHE_at_cache (timers [ev_active (w)]);
2052 adjustheap (timers, timercnt, ev_active (w)); 2225 adjustheap (timers, timercnt, ev_active (w));
2053 } 2226 }
2054 else 2227 else
2055 ev_timer_stop (EV_A_ w); 2228 ev_timer_stop (EV_A_ w);
2056 } 2229 }
2057 else if (w->repeat) 2230 else if (w->repeat)
2058 { 2231 {
2059 ev_at (w) = w->repeat; 2232 ev_at (w) = w->repeat;
2060 ev_timer_start (EV_A_ w); 2233 ev_timer_start (EV_A_ w);
2061 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
2062} 2237}
2063 2238
2064#if EV_PERIODIC_ENABLE 2239#if EV_PERIODIC_ENABLE
2065void noinline 2240void noinline
2066ev_periodic_start (EV_P_ ev_periodic *w) 2241ev_periodic_start (EV_P_ ev_periodic *w)
… …
2077 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2078 } 2253 }
2079 else 2254 else
2080 ev_at (w) = w->offset; 2255 ev_at (w) = w->offset;
2081 2256
2257 EV_FREQUENT_CHECK;
2258
2259 ++periodiccnt;
2082 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2260 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2083 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2261 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2084 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2262 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2263 ANHE_at_cache (periodics [ev_active (w)]);
2085 upheap (periodics, ev_active (w)); 2264 upheap (periodics, ev_active (w));
2265
2266 EV_FREQUENT_CHECK;
2086 2267
2087 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2088} 2269}
2089 2270
2090void noinline 2271void noinline
… …
2092{ 2273{
2093 clear_pending (EV_A_ (W)w); 2274 clear_pending (EV_A_ (W)w);
2094 if (expect_false (!ev_is_active (w))) 2275 if (expect_false (!ev_is_active (w)))
2095 return; 2276 return;
2096 2277
2278 EV_FREQUENT_CHECK;
2279
2097 { 2280 {
2098 int active = ev_active (w); 2281 int active = ev_active (w);
2099 2282
2100 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2101 2284
2285 --periodiccnt;
2286
2102 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2287 if (expect_true (active < periodiccnt + HEAP0))
2103 { 2288 {
2104 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2289 periodics [active] = periodics [periodiccnt + HEAP0];
2105 adjustheap (periodics, periodiccnt, active); 2290 adjustheap (periodics, periodiccnt, active);
2106 } 2291 }
2107
2108 --periodiccnt;
2109 } 2292 }
2293
2294 EV_FREQUENT_CHECK;
2110 2295
2111 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
2112} 2297}
2113 2298
2114void noinline 2299void noinline
… …
2134 return; 2319 return;
2135 2320
2136 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2137 2322
2138 evpipe_init (EV_A); 2323 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
2139 2326
2140 { 2327 {
2141#ifndef _WIN32 2328#ifndef _WIN32
2142 sigset_t full, prev; 2329 sigset_t full, prev;
2143 sigfillset (&full); 2330 sigfillset (&full);
… …
2164 sigfillset (&sa.sa_mask); 2351 sigfillset (&sa.sa_mask);
2165 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2166 sigaction (w->signum, &sa, 0); 2353 sigaction (w->signum, &sa, 0);
2167#endif 2354#endif
2168 } 2355 }
2356
2357 EV_FREQUENT_CHECK;
2169} 2358}
2170 2359
2171void noinline 2360void noinline
2172ev_signal_stop (EV_P_ ev_signal *w) 2361ev_signal_stop (EV_P_ ev_signal *w)
2173{ 2362{
2174 clear_pending (EV_A_ (W)w); 2363 clear_pending (EV_A_ (W)w);
2175 if (expect_false (!ev_is_active (w))) 2364 if (expect_false (!ev_is_active (w)))
2176 return; 2365 return;
2177 2366
2367 EV_FREQUENT_CHECK;
2368
2178 wlist_del (&signals [w->signum - 1].head, (WL)w); 2369 wlist_del (&signals [w->signum - 1].head, (WL)w);
2179 ev_stop (EV_A_ (W)w); 2370 ev_stop (EV_A_ (W)w);
2180 2371
2181 if (!signals [w->signum - 1].head) 2372 if (!signals [w->signum - 1].head)
2182 signal (w->signum, SIG_DFL); 2373 signal (w->signum, SIG_DFL);
2374
2375 EV_FREQUENT_CHECK;
2183} 2376}
2184 2377
2185void 2378void
2186ev_child_start (EV_P_ ev_child *w) 2379ev_child_start (EV_P_ ev_child *w)
2187{ 2380{
… …
2189 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2190#endif 2383#endif
2191 if (expect_false (ev_is_active (w))) 2384 if (expect_false (ev_is_active (w)))
2192 return; 2385 return;
2193 2386
2387 EV_FREQUENT_CHECK;
2388
2194 ev_start (EV_A_ (W)w, 1); 2389 ev_start (EV_A_ (W)w, 1);
2195 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2390 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2391
2392 EV_FREQUENT_CHECK;
2196} 2393}
2197 2394
2198void 2395void
2199ev_child_stop (EV_P_ ev_child *w) 2396ev_child_stop (EV_P_ ev_child *w)
2200{ 2397{
2201 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2202 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2203 return; 2400 return;
2204 2401
2402 EV_FREQUENT_CHECK;
2403
2205 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2404 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2206 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2406
2407 EV_FREQUENT_CHECK;
2207} 2408}
2208 2409
2209#if EV_STAT_ENABLE 2410#if EV_STAT_ENABLE
2210 2411
2211# ifdef _WIN32 2412# ifdef _WIN32
… …
2439 else 2640 else
2440#endif 2641#endif
2441 ev_timer_start (EV_A_ &w->timer); 2642 ev_timer_start (EV_A_ &w->timer);
2442 2643
2443 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2645
2646 EV_FREQUENT_CHECK;
2444} 2647}
2445 2648
2446void 2649void
2447ev_stat_stop (EV_P_ ev_stat *w) 2650ev_stat_stop (EV_P_ ev_stat *w)
2448{ 2651{
2449 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2450 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2451 return; 2654 return;
2452 2655
2656 EV_FREQUENT_CHECK;
2657
2453#if EV_USE_INOTIFY 2658#if EV_USE_INOTIFY
2454 infy_del (EV_A_ w); 2659 infy_del (EV_A_ w);
2455#endif 2660#endif
2456 ev_timer_stop (EV_A_ &w->timer); 2661 ev_timer_stop (EV_A_ &w->timer);
2457 2662
2458 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2664
2665 EV_FREQUENT_CHECK;
2459} 2666}
2460#endif 2667#endif
2461 2668
2462#if EV_IDLE_ENABLE 2669#if EV_IDLE_ENABLE
2463void 2670void
… …
2465{ 2672{
2466 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2467 return; 2674 return;
2468 2675
2469 pri_adjust (EV_A_ (W)w); 2676 pri_adjust (EV_A_ (W)w);
2677
2678 EV_FREQUENT_CHECK;
2470 2679
2471 { 2680 {
2472 int active = ++idlecnt [ABSPRI (w)]; 2681 int active = ++idlecnt [ABSPRI (w)];
2473 2682
2474 ++idleall; 2683 ++idleall;
2475 ev_start (EV_A_ (W)w, active); 2684 ev_start (EV_A_ (W)w, active);
2476 2685
2477 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2686 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2478 idles [ABSPRI (w)][active - 1] = w; 2687 idles [ABSPRI (w)][active - 1] = w;
2479 } 2688 }
2689
2690 EV_FREQUENT_CHECK;
2480} 2691}
2481 2692
2482void 2693void
2483ev_idle_stop (EV_P_ ev_idle *w) 2694ev_idle_stop (EV_P_ ev_idle *w)
2484{ 2695{
2485 clear_pending (EV_A_ (W)w); 2696 clear_pending (EV_A_ (W)w);
2486 if (expect_false (!ev_is_active (w))) 2697 if (expect_false (!ev_is_active (w)))
2487 return; 2698 return;
2488 2699
2700 EV_FREQUENT_CHECK;
2701
2489 { 2702 {
2490 int active = ev_active (w); 2703 int active = ev_active (w);
2491 2704
2492 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2705 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2493 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2706 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2494 2707
2495 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2496 --idleall; 2709 --idleall;
2497 } 2710 }
2711
2712 EV_FREQUENT_CHECK;
2498} 2713}
2499#endif 2714#endif
2500 2715
2501void 2716void
2502ev_prepare_start (EV_P_ ev_prepare *w) 2717ev_prepare_start (EV_P_ ev_prepare *w)
2503{ 2718{
2504 if (expect_false (ev_is_active (w))) 2719 if (expect_false (ev_is_active (w)))
2505 return; 2720 return;
2721
2722 EV_FREQUENT_CHECK;
2506 2723
2507 ev_start (EV_A_ (W)w, ++preparecnt); 2724 ev_start (EV_A_ (W)w, ++preparecnt);
2508 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2725 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2509 prepares [preparecnt - 1] = w; 2726 prepares [preparecnt - 1] = w;
2727
2728 EV_FREQUENT_CHECK;
2510} 2729}
2511 2730
2512void 2731void
2513ev_prepare_stop (EV_P_ ev_prepare *w) 2732ev_prepare_stop (EV_P_ ev_prepare *w)
2514{ 2733{
2515 clear_pending (EV_A_ (W)w); 2734 clear_pending (EV_A_ (W)w);
2516 if (expect_false (!ev_is_active (w))) 2735 if (expect_false (!ev_is_active (w)))
2517 return; 2736 return;
2518 2737
2738 EV_FREQUENT_CHECK;
2739
2519 { 2740 {
2520 int active = ev_active (w); 2741 int active = ev_active (w);
2521 2742
2522 prepares [active - 1] = prepares [--preparecnt]; 2743 prepares [active - 1] = prepares [--preparecnt];
2523 ev_active (prepares [active - 1]) = active; 2744 ev_active (prepares [active - 1]) = active;
2524 } 2745 }
2525 2746
2526 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2527} 2750}
2528 2751
2529void 2752void
2530ev_check_start (EV_P_ ev_check *w) 2753ev_check_start (EV_P_ ev_check *w)
2531{ 2754{
2532 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2533 return; 2756 return;
2757
2758 EV_FREQUENT_CHECK;
2534 2759
2535 ev_start (EV_A_ (W)w, ++checkcnt); 2760 ev_start (EV_A_ (W)w, ++checkcnt);
2536 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2761 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2537 checks [checkcnt - 1] = w; 2762 checks [checkcnt - 1] = w;
2763
2764 EV_FREQUENT_CHECK;
2538} 2765}
2539 2766
2540void 2767void
2541ev_check_stop (EV_P_ ev_check *w) 2768ev_check_stop (EV_P_ ev_check *w)
2542{ 2769{
2543 clear_pending (EV_A_ (W)w); 2770 clear_pending (EV_A_ (W)w);
2544 if (expect_false (!ev_is_active (w))) 2771 if (expect_false (!ev_is_active (w)))
2545 return; 2772 return;
2546 2773
2774 EV_FREQUENT_CHECK;
2775
2547 { 2776 {
2548 int active = ev_active (w); 2777 int active = ev_active (w);
2549 2778
2550 checks [active - 1] = checks [--checkcnt]; 2779 checks [active - 1] = checks [--checkcnt];
2551 ev_active (checks [active - 1]) = active; 2780 ev_active (checks [active - 1]) = active;
2552 } 2781 }
2553 2782
2554 ev_stop (EV_A_ (W)w); 2783 ev_stop (EV_A_ (W)w);
2784
2785 EV_FREQUENT_CHECK;
2555} 2786}
2556 2787
2557#if EV_EMBED_ENABLE 2788#if EV_EMBED_ENABLE
2558void noinline 2789void noinline
2559ev_embed_sweep (EV_P_ ev_embed *w) 2790ev_embed_sweep (EV_P_ ev_embed *w)
… …
2606 struct ev_loop *loop = w->other; 2837 struct ev_loop *loop = w->other;
2607 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2838 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); 2839 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2609 } 2840 }
2610 2841
2842 EV_FREQUENT_CHECK;
2843
2611 ev_set_priority (&w->io, ev_priority (w)); 2844 ev_set_priority (&w->io, ev_priority (w));
2612 ev_io_start (EV_A_ &w->io); 2845 ev_io_start (EV_A_ &w->io);
2613 2846
2614 ev_prepare_init (&w->prepare, embed_prepare_cb); 2847 ev_prepare_init (&w->prepare, embed_prepare_cb);
2615 ev_set_priority (&w->prepare, EV_MINPRI); 2848 ev_set_priority (&w->prepare, EV_MINPRI);
2616 ev_prepare_start (EV_A_ &w->prepare); 2849 ev_prepare_start (EV_A_ &w->prepare);
2617 2850
2618 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2619 2852
2620 ev_start (EV_A_ (W)w, 1); 2853 ev_start (EV_A_ (W)w, 1);
2854
2855 EV_FREQUENT_CHECK;
2621} 2856}
2622 2857
2623void 2858void
2624ev_embed_stop (EV_P_ ev_embed *w) 2859ev_embed_stop (EV_P_ ev_embed *w)
2625{ 2860{
2626 clear_pending (EV_A_ (W)w); 2861 clear_pending (EV_A_ (W)w);
2627 if (expect_false (!ev_is_active (w))) 2862 if (expect_false (!ev_is_active (w)))
2628 return; 2863 return;
2629 2864
2865 EV_FREQUENT_CHECK;
2866
2630 ev_io_stop (EV_A_ &w->io); 2867 ev_io_stop (EV_A_ &w->io);
2631 ev_prepare_stop (EV_A_ &w->prepare); 2868 ev_prepare_stop (EV_A_ &w->prepare);
2632 2869
2633 ev_stop (EV_A_ (W)w); 2870 ev_stop (EV_A_ (W)w);
2871
2872 EV_FREQUENT_CHECK;
2634} 2873}
2635#endif 2874#endif
2636 2875
2637#if EV_FORK_ENABLE 2876#if EV_FORK_ENABLE
2638void 2877void
2639ev_fork_start (EV_P_ ev_fork *w) 2878ev_fork_start (EV_P_ ev_fork *w)
2640{ 2879{
2641 if (expect_false (ev_is_active (w))) 2880 if (expect_false (ev_is_active (w)))
2642 return; 2881 return;
2882
2883 EV_FREQUENT_CHECK;
2643 2884
2644 ev_start (EV_A_ (W)w, ++forkcnt); 2885 ev_start (EV_A_ (W)w, ++forkcnt);
2645 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2886 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2646 forks [forkcnt - 1] = w; 2887 forks [forkcnt - 1] = w;
2888
2889 EV_FREQUENT_CHECK;
2647} 2890}
2648 2891
2649void 2892void
2650ev_fork_stop (EV_P_ ev_fork *w) 2893ev_fork_stop (EV_P_ ev_fork *w)
2651{ 2894{
2652 clear_pending (EV_A_ (W)w); 2895 clear_pending (EV_A_ (W)w);
2653 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2654 return; 2897 return;
2655 2898
2899 EV_FREQUENT_CHECK;
2900
2656 { 2901 {
2657 int active = ev_active (w); 2902 int active = ev_active (w);
2658 2903
2659 forks [active - 1] = forks [--forkcnt]; 2904 forks [active - 1] = forks [--forkcnt];
2660 ev_active (forks [active - 1]) = active; 2905 ev_active (forks [active - 1]) = active;
2661 } 2906 }
2662 2907
2663 ev_stop (EV_A_ (W)w); 2908 ev_stop (EV_A_ (W)w);
2909
2910 EV_FREQUENT_CHECK;
2664} 2911}
2665#endif 2912#endif
2666 2913
2667#if EV_ASYNC_ENABLE 2914#if EV_ASYNC_ENABLE
2668void 2915void
… …
2670{ 2917{
2671 if (expect_false (ev_is_active (w))) 2918 if (expect_false (ev_is_active (w)))
2672 return; 2919 return;
2673 2920
2674 evpipe_init (EV_A); 2921 evpipe_init (EV_A);
2922
2923 EV_FREQUENT_CHECK;
2675 2924
2676 ev_start (EV_A_ (W)w, ++asynccnt); 2925 ev_start (EV_A_ (W)w, ++asynccnt);
2677 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2926 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2678 asyncs [asynccnt - 1] = w; 2927 asyncs [asynccnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2679} 2930}
2680 2931
2681void 2932void
2682ev_async_stop (EV_P_ ev_async *w) 2933ev_async_stop (EV_P_ ev_async *w)
2683{ 2934{
2684 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2685 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2686 return; 2937 return;
2687 2938
2939 EV_FREQUENT_CHECK;
2940
2688 { 2941 {
2689 int active = ev_active (w); 2942 int active = ev_active (w);
2690 2943
2691 asyncs [active - 1] = asyncs [--asynccnt]; 2944 asyncs [active - 1] = asyncs [--asynccnt];
2692 ev_active (asyncs [active - 1]) = active; 2945 ev_active (asyncs [active - 1]) = active;
2693 } 2946 }
2694 2947
2695 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2696} 2951}
2697 2952
2698void 2953void
2699ev_async_send (EV_P_ ev_async *w) 2954ev_async_send (EV_P_ ev_async *w)
2700{ 2955{

Diff Legend

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