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.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
… …
422 W w; 454 W w;
423 int events; 455 int events;
424} ANPENDING; 456} ANPENDING;
425 457
426#if EV_USE_INOTIFY 458#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */
427typedef struct 460typedef struct
428{ 461{
429 WL head; 462 WL head;
430} ANFS; 463} ANFS;
464#endif
465
466/* Heap Entry */
467#if EV_HEAP_CACHE_AT
468 typedef struct {
469 ev_tstamp at;
470 WT w;
471 } ANHE;
472
473 #define ANHE_w(he) (he).w /* access watcher, read-write */
474 #define ANHE_at(he) (he).at /* access cached at, read-only */
475 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
476#else
477 typedef WT ANHE;
478
479 #define ANHE_w(he) (he)
480 #define ANHE_at(he) (he)->at
481 #define ANHE_at_cache(he)
431#endif 482#endif
432 483
433#if EV_MULTIPLICITY 484#if EV_MULTIPLICITY
434 485
435 struct ev_loop 486 struct ev_loop
… …
759 } 810 }
760} 811}
761 812
762/*****************************************************************************/ 813/*****************************************************************************/
763 814
815/*
816 * the heap functions want a real array index. array index 0 uis guaranteed to not
817 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
818 * the branching factor of the d-tree.
819 */
820
821/*
822 * at the moment we allow libev the luxury of two heaps,
823 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
824 * which is more cache-efficient.
825 * the difference is about 5% with 50000+ watchers.
826 */
827#if EV_USE_4HEAP
828
829#define DHEAP 4
830#define HEAP0 (DHEAP - 1) /* index of first element in heap */
831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
832#define UPHEAP_DONE(p,k) ((p) == (k))
833
834/* away from the root */
835void inline_speed
836downheap (ANHE *heap, int N, int k)
837{
838 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0;
840
841 for (;;)
842 {
843 ev_tstamp minat;
844 ANHE *minpos;
845 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
846
847 /* find minimum child */
848 if (expect_true (pos + DHEAP - 1 < E))
849 {
850 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
851 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
852 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
853 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
854 }
855 else if (pos < E)
856 {
857 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
858 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
859 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
860 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
861 }
862 else
863 break;
864
865 if (ANHE_at (he) <= minat)
866 break;
867
868 heap [k] = *minpos;
869 ev_active (ANHE_w (*minpos)) = k;
870
871 k = minpos - heap;
872 }
873
874 heap [k] = he;
875 ev_active (ANHE_w (he)) = k;
876}
877
878#else /* 4HEAP */
879
880#define HEAP0 1
881#define HPARENT(k) ((k) >> 1)
882#define UPHEAP_DONE(p,k) (!(p))
883
884/* away from the root */
885void inline_speed
886downheap (ANHE *heap, int N, int k)
887{
888 ANHE he = heap [k];
889
890 for (;;)
891 {
892 int c = k << 1;
893
894 if (c > N + HEAP0 - 1)
895 break;
896
897 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
898 ? 1 : 0;
899
900 if (ANHE_at (he) <= ANHE_at (heap [c]))
901 break;
902
903 heap [k] = heap [c];
904 ev_active (ANHE_w (heap [k])) = k;
905
906 k = c;
907 }
908
909 heap [k] = he;
910 ev_active (ANHE_w (he)) = k;
911}
912#endif
913
764/* towards the root */ 914/* towards the root */
765void inline_speed 915void inline_speed
766upheap (WT *heap, int k) 916upheap (ANHE *heap, int k)
767{ 917{
768 WT w = heap [k]; 918 ANHE he = heap [k];
769 919
770 for (;;) 920 for (;;)
771 { 921 {
772 int p = k >> 1; 922 int p = HPARENT (k);
773 923
774 /* maybe we could use a dummy element at heap [0]? */ 924 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
775 if (!p || heap [p]->at <= w->at)
776 break; 925 break;
777 926
778 heap [k] = heap [p]; 927 heap [k] = heap [p];
779 ev_active (heap [k]) = k; 928 ev_active (ANHE_w (heap [k])) = k;
780 k = p; 929 k = p;
781 } 930 }
782 931
783 heap [k] = w; 932 heap [k] = he;
784 ev_active (heap [k]) = k; 933 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} 934}
815 935
816void inline_size 936void inline_size
817adjustheap (WT *heap, int N, int k) 937adjustheap (ANHE *heap, int N, int k)
818{ 938{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
819 upheap (heap, k); 940 upheap (heap, k);
941 else
820 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);
821} 955}
822 956
823/*****************************************************************************/ 957/*****************************************************************************/
824 958
825typedef struct 959typedef struct
… …
1343 1477
1344 postfork = 0; 1478 postfork = 0;
1345} 1479}
1346 1480
1347#if EV_MULTIPLICITY 1481#if EV_MULTIPLICITY
1482
1348struct ev_loop * 1483struct ev_loop *
1349ev_loop_new (unsigned int flags) 1484ev_loop_new (unsigned int flags)
1350{ 1485{
1351 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));
1352 1487
… …
1370void 1505void
1371ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1372{ 1507{
1373 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1374} 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)
1375#endif 1606# endif
1607#endif
1608}
1609
1610#endif /* multiplicity */
1376 1611
1377#if EV_MULTIPLICITY 1612#if EV_MULTIPLICITY
1378struct ev_loop * 1613struct ev_loop *
1379ev_default_loop_init (unsigned int flags) 1614ev_default_loop_init (unsigned int flags)
1380#else 1615#else
… …
1456 { 1691 {
1457 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1458 1693
1459 p->w->pending = 0; 1694 p->w->pending = 0;
1460 EV_CB_INVOKE (p->w, p->events); 1695 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK;
1461 } 1697 }
1462 } 1698 }
1463} 1699}
1464 1700
1465#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
… …
1486#endif 1722#endif
1487 1723
1488void inline_size 1724void inline_size
1489timers_reify (EV_P) 1725timers_reify (EV_P)
1490{ 1726{
1727 EV_FREQUENT_CHECK;
1728
1491 while (timercnt && ev_at (timers [1]) <= mn_now) 1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1492 { 1730 {
1493 ev_timer *w = (ev_timer *)timers [1]; 1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1494 1732
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496 1734
1497 /* first reschedule or stop timer */ 1735 /* first reschedule or stop timer */
1498 if (w->repeat) 1736 if (w->repeat)
1499 { 1737 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat; 1738 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now) 1739 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now; 1740 ev_at (w) = mn_now;
1505 1741
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743
1744 ANHE_at_cache (timers [HEAP0]);
1506 downheap (timers, timercnt, 1); 1745 downheap (timers, timercnt, HEAP0);
1507 } 1746 }
1508 else 1747 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510 1749
1750 EV_FREQUENT_CHECK;
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 } 1752 }
1513} 1753}
1514 1754
1515#if EV_PERIODIC_ENABLE 1755#if EV_PERIODIC_ENABLE
1516void inline_size 1756void inline_size
1517periodics_reify (EV_P) 1757periodics_reify (EV_P)
1518{ 1758{
1759 EV_FREQUENT_CHECK;
1760
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now) 1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1520 { 1762 {
1521 ev_periodic *w = (ev_periodic *)periodics [1]; 1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1522 1764
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524 1766
1525 /* first reschedule or stop timer */ 1767 /* first reschedule or stop timer */
1526 if (w->reschedule_cb) 1768 if (w->reschedule_cb)
1527 { 1769 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771
1529 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]);
1530 downheap (periodics, periodiccnt, 1); 1775 downheap (periodics, periodiccnt, HEAP0);
1531 } 1776 }
1532 else if (w->interval) 1777 else if (w->interval)
1533 { 1778 {
1534 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 */
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1782 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)); 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]);
1537 downheap (periodics, periodiccnt, 1); 1794 downheap (periodics, periodiccnt, HEAP0);
1538 } 1795 }
1539 else 1796 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1797 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541 1798
1799 EV_FREQUENT_CHECK;
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1800 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 } 1801 }
1544} 1802}
1545 1803
1546static void noinline 1804static void noinline
1547periodics_reschedule (EV_P) 1805periodics_reschedule (EV_P)
1548{ 1806{
1549 int i; 1807 int i;
1550 1808
1551 /* adjust periodics after time jump */ 1809 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i) 1810 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1553 { 1811 {
1554 ev_periodic *w = (ev_periodic *)periodics [i]; 1812 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1555 1813
1556 if (w->reschedule_cb) 1814 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval) 1816 else if (w->interval)
1559 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;
1560 }
1561 1818
1562 /* now rebuild the heap */ 1819 ANHE_at_cache (periodics [i]);
1563 for (i = periodiccnt >> 1; i--; ) 1820 }
1821
1564 downheap (periodics, periodiccnt, i); 1822 reheap (periodics, periodiccnt);
1565} 1823}
1566#endif 1824#endif
1567 1825
1568void inline_speed 1826void inline_speed
1569time_update (EV_P_ ev_tstamp max_block) 1827time_update (EV_P_ ev_tstamp max_block)
… …
1623 { 1881 {
1624#if EV_PERIODIC_ENABLE 1882#if EV_PERIODIC_ENABLE
1625 periodics_reschedule (EV_A); 1883 periodics_reschedule (EV_A);
1626#endif 1884#endif
1627 /* 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 */
1628 for (i = 1; i <= timercnt; ++i) 1886 for (i = 0; i < timercnt; ++i)
1629 ev_at (timers [i]) += ev_rt_now - mn_now; 1887 {
1888 ANHE *he = timers + i + HEAP0;
1889 ANHE_w (*he)->at += ev_rt_now - mn_now;
1890 ANHE_at_cache (*he);
1891 }
1630 } 1892 }
1631 1893
1632 mn_now = ev_rt_now; 1894 mn_now = ev_rt_now;
1633 } 1895 }
1634} 1896}
… …
1654 1916
1655 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 */
1656 1918
1657 do 1919 do
1658 { 1920 {
1921#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A);
1923#endif
1924
1659#ifndef _WIN32 1925#ifndef _WIN32
1660 if (expect_false (curpid)) /* penalise the forking check even more */ 1926 if (expect_false (curpid)) /* penalise the forking check even more */
1661 if (expect_false (getpid () != curpid)) 1927 if (expect_false (getpid () != curpid))
1662 { 1928 {
1663 curpid = getpid (); 1929 curpid = getpid ();
… …
1704 1970
1705 waittime = MAX_BLOCKTIME; 1971 waittime = MAX_BLOCKTIME;
1706 1972
1707 if (timercnt) 1973 if (timercnt)
1708 { 1974 {
1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 1975 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1710 if (waittime > to) waittime = to; 1976 if (waittime > to) waittime = to;
1711 } 1977 }
1712 1978
1713#if EV_PERIODIC_ENABLE 1979#if EV_PERIODIC_ENABLE
1714 if (periodiccnt) 1980 if (periodiccnt)
1715 { 1981 {
1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 1982 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1717 if (waittime > to) waittime = to; 1983 if (waittime > to) waittime = to;
1718 } 1984 }
1719#endif 1985#endif
1720 1986
1721 if (expect_false (waittime < timeout_blocktime)) 1987 if (expect_false (waittime < timeout_blocktime))
… …
1858 if (expect_false (ev_is_active (w))) 2124 if (expect_false (ev_is_active (w)))
1859 return; 2125 return;
1860 2126
1861 assert (("ev_io_start called with negative fd", fd >= 0)); 2127 assert (("ev_io_start called with negative fd", fd >= 0));
1862 2128
2129 EV_FREQUENT_CHECK;
2130
1863 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
1864 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1865 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
1866 2134
1867 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1868 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2137
2138 EV_FREQUENT_CHECK;
1869} 2139}
1870 2140
1871void noinline 2141void noinline
1872ev_io_stop (EV_P_ ev_io *w) 2142ev_io_stop (EV_P_ ev_io *w)
1873{ 2143{
1874 clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
1875 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
1876 return; 2146 return;
1877 2147
1878 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;
1879 2151
1880 wlist_del (&anfds[w->fd].head, (WL)w); 2152 wlist_del (&anfds[w->fd].head, (WL)w);
1881 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
1882 2154
1883 fd_change (EV_A_ w->fd, 1); 2155 fd_change (EV_A_ w->fd, 1);
2156
2157 EV_FREQUENT_CHECK;
1884} 2158}
1885 2159
1886void noinline 2160void noinline
1887ev_timer_start (EV_P_ ev_timer *w) 2161ev_timer_start (EV_P_ ev_timer *w)
1888{ 2162{
… …
1891 2165
1892 ev_at (w) += mn_now; 2166 ev_at (w) += mn_now;
1893 2167
1894 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.));
1895 2169
2170 EV_FREQUENT_CHECK;
2171
2172 ++timercnt;
1896 ev_start (EV_A_ (W)w, ++timercnt); 2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 2174 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1898 timers [timercnt] = (WT)w; 2175 ANHE_w (timers [ev_active (w)]) = (WT)w;
2176 ANHE_at_cache (timers [ev_active (w)]);
1899 upheap (timers, timercnt); 2177 upheap (timers, ev_active (w));
1900 2178
2179 EV_FREQUENT_CHECK;
2180
1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1902} 2182}
1903 2183
1904void noinline 2184void noinline
1905ev_timer_stop (EV_P_ ev_timer *w) 2185ev_timer_stop (EV_P_ ev_timer *w)
1906{ 2186{
1907 clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
1908 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
1909 return; 2189 return;
1910 2190
2191 EV_FREQUENT_CHECK;
2192
1911 { 2193 {
1912 int active = ev_active (w); 2194 int active = ev_active (w);
1913 2195
1914 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1915 2197
2198 --timercnt;
2199
1916 if (expect_true (active < timercnt)) 2200 if (expect_true (active < timercnt + HEAP0))
1917 { 2201 {
1918 timers [active] = timers [timercnt]; 2202 timers [active] = timers [timercnt + HEAP0];
1919 adjustheap (timers, timercnt, active); 2203 adjustheap (timers, timercnt, active);
1920 } 2204 }
1921
1922 --timercnt;
1923 } 2205 }
2206
2207 EV_FREQUENT_CHECK;
1924 2208
1925 ev_at (w) -= mn_now; 2209 ev_at (w) -= mn_now;
1926 2210
1927 ev_stop (EV_A_ (W)w); 2211 ev_stop (EV_A_ (W)w);
1928} 2212}
1929 2213
1930void noinline 2214void noinline
1931ev_timer_again (EV_P_ ev_timer *w) 2215ev_timer_again (EV_P_ ev_timer *w)
1932{ 2216{
2217 EV_FREQUENT_CHECK;
2218
1933 if (ev_is_active (w)) 2219 if (ev_is_active (w))
1934 { 2220 {
1935 if (w->repeat) 2221 if (w->repeat)
1936 { 2222 {
1937 ev_at (w) = mn_now + w->repeat; 2223 ev_at (w) = mn_now + w->repeat;
2224 ANHE_at_cache (timers [ev_active (w)]);
1938 adjustheap (timers, timercnt, ev_active (w)); 2225 adjustheap (timers, timercnt, ev_active (w));
1939 } 2226 }
1940 else 2227 else
1941 ev_timer_stop (EV_A_ w); 2228 ev_timer_stop (EV_A_ w);
1942 } 2229 }
1943 else if (w->repeat) 2230 else if (w->repeat)
1944 { 2231 {
1945 ev_at (w) = w->repeat; 2232 ev_at (w) = w->repeat;
1946 ev_timer_start (EV_A_ w); 2233 ev_timer_start (EV_A_ w);
1947 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
1948} 2237}
1949 2238
1950#if EV_PERIODIC_ENABLE 2239#if EV_PERIODIC_ENABLE
1951void noinline 2240void noinline
1952ev_periodic_start (EV_P_ ev_periodic *w) 2241ev_periodic_start (EV_P_ ev_periodic *w)
… …
1963 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;
1964 } 2253 }
1965 else 2254 else
1966 ev_at (w) = w->offset; 2255 ev_at (w) = w->offset;
1967 2256
2257 EV_FREQUENT_CHECK;
2258
2259 ++periodiccnt;
1968 ev_start (EV_A_ (W)w, ++periodiccnt); 2260 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2261 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1970 periodics [periodiccnt] = (WT)w; 2262 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1971 upheap (periodics, periodiccnt); 2263 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w));
1972 2265
2266 EV_FREQUENT_CHECK;
2267
1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1974} 2269}
1975 2270
1976void noinline 2271void noinline
1977ev_periodic_stop (EV_P_ ev_periodic *w) 2272ev_periodic_stop (EV_P_ ev_periodic *w)
1978{ 2273{
1979 clear_pending (EV_A_ (W)w); 2274 clear_pending (EV_A_ (W)w);
1980 if (expect_false (!ev_is_active (w))) 2275 if (expect_false (!ev_is_active (w)))
1981 return; 2276 return;
1982 2277
2278 EV_FREQUENT_CHECK;
2279
1983 { 2280 {
1984 int active = ev_active (w); 2281 int active = ev_active (w);
1985 2282
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
1987 2284
2285 --periodiccnt;
2286
1988 if (expect_true (active < periodiccnt)) 2287 if (expect_true (active < periodiccnt + HEAP0))
1989 { 2288 {
1990 periodics [active] = periodics [periodiccnt]; 2289 periodics [active] = periodics [periodiccnt + HEAP0];
1991 adjustheap (periodics, periodiccnt, active); 2290 adjustheap (periodics, periodiccnt, active);
1992 } 2291 }
1993
1994 --periodiccnt;
1995 } 2292 }
2293
2294 EV_FREQUENT_CHECK;
1996 2295
1997 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
1998} 2297}
1999 2298
2000void noinline 2299void noinline
… …
2020 return; 2319 return;
2021 2320
2022 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));
2023 2322
2024 evpipe_init (EV_A); 2323 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
2025 2326
2026 { 2327 {
2027#ifndef _WIN32 2328#ifndef _WIN32
2028 sigset_t full, prev; 2329 sigset_t full, prev;
2029 sigfillset (&full); 2330 sigfillset (&full);
… …
2050 sigfillset (&sa.sa_mask); 2351 sigfillset (&sa.sa_mask);
2051 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 */
2052 sigaction (w->signum, &sa, 0); 2353 sigaction (w->signum, &sa, 0);
2053#endif 2354#endif
2054 } 2355 }
2356
2357 EV_FREQUENT_CHECK;
2055} 2358}
2056 2359
2057void noinline 2360void noinline
2058ev_signal_stop (EV_P_ ev_signal *w) 2361ev_signal_stop (EV_P_ ev_signal *w)
2059{ 2362{
2060 clear_pending (EV_A_ (W)w); 2363 clear_pending (EV_A_ (W)w);
2061 if (expect_false (!ev_is_active (w))) 2364 if (expect_false (!ev_is_active (w)))
2062 return; 2365 return;
2063 2366
2367 EV_FREQUENT_CHECK;
2368
2064 wlist_del (&signals [w->signum - 1].head, (WL)w); 2369 wlist_del (&signals [w->signum - 1].head, (WL)w);
2065 ev_stop (EV_A_ (W)w); 2370 ev_stop (EV_A_ (W)w);
2066 2371
2067 if (!signals [w->signum - 1].head) 2372 if (!signals [w->signum - 1].head)
2068 signal (w->signum, SIG_DFL); 2373 signal (w->signum, SIG_DFL);
2374
2375 EV_FREQUENT_CHECK;
2069} 2376}
2070 2377
2071void 2378void
2072ev_child_start (EV_P_ ev_child *w) 2379ev_child_start (EV_P_ ev_child *w)
2073{ 2380{
… …
2075 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));
2076#endif 2383#endif
2077 if (expect_false (ev_is_active (w))) 2384 if (expect_false (ev_is_active (w)))
2078 return; 2385 return;
2079 2386
2387 EV_FREQUENT_CHECK;
2388
2080 ev_start (EV_A_ (W)w, 1); 2389 ev_start (EV_A_ (W)w, 1);
2081 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;
2082} 2393}
2083 2394
2084void 2395void
2085ev_child_stop (EV_P_ ev_child *w) 2396ev_child_stop (EV_P_ ev_child *w)
2086{ 2397{
2087 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2089 return; 2400 return;
2090 2401
2402 EV_FREQUENT_CHECK;
2403
2091 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2404 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2092 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2406
2407 EV_FREQUENT_CHECK;
2093} 2408}
2094 2409
2095#if EV_STAT_ENABLE 2410#if EV_STAT_ENABLE
2096 2411
2097# ifdef _WIN32 2412# ifdef _WIN32
… …
2325 else 2640 else
2326#endif 2641#endif
2327 ev_timer_start (EV_A_ &w->timer); 2642 ev_timer_start (EV_A_ &w->timer);
2328 2643
2329 ev_start (EV_A_ (W)w, 1); 2644 ev_start (EV_A_ (W)w, 1);
2645
2646 EV_FREQUENT_CHECK;
2330} 2647}
2331 2648
2332void 2649void
2333ev_stat_stop (EV_P_ ev_stat *w) 2650ev_stat_stop (EV_P_ ev_stat *w)
2334{ 2651{
2335 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2336 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2337 return; 2654 return;
2338 2655
2656 EV_FREQUENT_CHECK;
2657
2339#if EV_USE_INOTIFY 2658#if EV_USE_INOTIFY
2340 infy_del (EV_A_ w); 2659 infy_del (EV_A_ w);
2341#endif 2660#endif
2342 ev_timer_stop (EV_A_ &w->timer); 2661 ev_timer_stop (EV_A_ &w->timer);
2343 2662
2344 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2664
2665 EV_FREQUENT_CHECK;
2345} 2666}
2346#endif 2667#endif
2347 2668
2348#if EV_IDLE_ENABLE 2669#if EV_IDLE_ENABLE
2349void 2670void
… …
2351{ 2672{
2352 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2353 return; 2674 return;
2354 2675
2355 pri_adjust (EV_A_ (W)w); 2676 pri_adjust (EV_A_ (W)w);
2677
2678 EV_FREQUENT_CHECK;
2356 2679
2357 { 2680 {
2358 int active = ++idlecnt [ABSPRI (w)]; 2681 int active = ++idlecnt [ABSPRI (w)];
2359 2682
2360 ++idleall; 2683 ++idleall;
2361 ev_start (EV_A_ (W)w, active); 2684 ev_start (EV_A_ (W)w, active);
2362 2685
2363 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);
2364 idles [ABSPRI (w)][active - 1] = w; 2687 idles [ABSPRI (w)][active - 1] = w;
2365 } 2688 }
2689
2690 EV_FREQUENT_CHECK;
2366} 2691}
2367 2692
2368void 2693void
2369ev_idle_stop (EV_P_ ev_idle *w) 2694ev_idle_stop (EV_P_ ev_idle *w)
2370{ 2695{
2371 clear_pending (EV_A_ (W)w); 2696 clear_pending (EV_A_ (W)w);
2372 if (expect_false (!ev_is_active (w))) 2697 if (expect_false (!ev_is_active (w)))
2373 return; 2698 return;
2374 2699
2700 EV_FREQUENT_CHECK;
2701
2375 { 2702 {
2376 int active = ev_active (w); 2703 int active = ev_active (w);
2377 2704
2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2705 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2379 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2706 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2380 2707
2381 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2382 --idleall; 2709 --idleall;
2383 } 2710 }
2711
2712 EV_FREQUENT_CHECK;
2384} 2713}
2385#endif 2714#endif
2386 2715
2387void 2716void
2388ev_prepare_start (EV_P_ ev_prepare *w) 2717ev_prepare_start (EV_P_ ev_prepare *w)
2389{ 2718{
2390 if (expect_false (ev_is_active (w))) 2719 if (expect_false (ev_is_active (w)))
2391 return; 2720 return;
2721
2722 EV_FREQUENT_CHECK;
2392 2723
2393 ev_start (EV_A_ (W)w, ++preparecnt); 2724 ev_start (EV_A_ (W)w, ++preparecnt);
2394 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2725 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2395 prepares [preparecnt - 1] = w; 2726 prepares [preparecnt - 1] = w;
2727
2728 EV_FREQUENT_CHECK;
2396} 2729}
2397 2730
2398void 2731void
2399ev_prepare_stop (EV_P_ ev_prepare *w) 2732ev_prepare_stop (EV_P_ ev_prepare *w)
2400{ 2733{
2401 clear_pending (EV_A_ (W)w); 2734 clear_pending (EV_A_ (W)w);
2402 if (expect_false (!ev_is_active (w))) 2735 if (expect_false (!ev_is_active (w)))
2403 return; 2736 return;
2404 2737
2738 EV_FREQUENT_CHECK;
2739
2405 { 2740 {
2406 int active = ev_active (w); 2741 int active = ev_active (w);
2407 2742
2408 prepares [active - 1] = prepares [--preparecnt]; 2743 prepares [active - 1] = prepares [--preparecnt];
2409 ev_active (prepares [active - 1]) = active; 2744 ev_active (prepares [active - 1]) = active;
2410 } 2745 }
2411 2746
2412 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2413} 2750}
2414 2751
2415void 2752void
2416ev_check_start (EV_P_ ev_check *w) 2753ev_check_start (EV_P_ ev_check *w)
2417{ 2754{
2418 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2419 return; 2756 return;
2757
2758 EV_FREQUENT_CHECK;
2420 2759
2421 ev_start (EV_A_ (W)w, ++checkcnt); 2760 ev_start (EV_A_ (W)w, ++checkcnt);
2422 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2761 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2423 checks [checkcnt - 1] = w; 2762 checks [checkcnt - 1] = w;
2763
2764 EV_FREQUENT_CHECK;
2424} 2765}
2425 2766
2426void 2767void
2427ev_check_stop (EV_P_ ev_check *w) 2768ev_check_stop (EV_P_ ev_check *w)
2428{ 2769{
2429 clear_pending (EV_A_ (W)w); 2770 clear_pending (EV_A_ (W)w);
2430 if (expect_false (!ev_is_active (w))) 2771 if (expect_false (!ev_is_active (w)))
2431 return; 2772 return;
2432 2773
2774 EV_FREQUENT_CHECK;
2775
2433 { 2776 {
2434 int active = ev_active (w); 2777 int active = ev_active (w);
2435 2778
2436 checks [active - 1] = checks [--checkcnt]; 2779 checks [active - 1] = checks [--checkcnt];
2437 ev_active (checks [active - 1]) = active; 2780 ev_active (checks [active - 1]) = active;
2438 } 2781 }
2439 2782
2440 ev_stop (EV_A_ (W)w); 2783 ev_stop (EV_A_ (W)w);
2784
2785 EV_FREQUENT_CHECK;
2441} 2786}
2442 2787
2443#if EV_EMBED_ENABLE 2788#if EV_EMBED_ENABLE
2444void noinline 2789void noinline
2445ev_embed_sweep (EV_P_ ev_embed *w) 2790ev_embed_sweep (EV_P_ ev_embed *w)
… …
2492 struct ev_loop *loop = w->other; 2837 struct ev_loop *loop = w->other;
2493 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 ()));
2494 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);
2495 } 2840 }
2496 2841
2842 EV_FREQUENT_CHECK;
2843
2497 ev_set_priority (&w->io, ev_priority (w)); 2844 ev_set_priority (&w->io, ev_priority (w));
2498 ev_io_start (EV_A_ &w->io); 2845 ev_io_start (EV_A_ &w->io);
2499 2846
2500 ev_prepare_init (&w->prepare, embed_prepare_cb); 2847 ev_prepare_init (&w->prepare, embed_prepare_cb);
2501 ev_set_priority (&w->prepare, EV_MINPRI); 2848 ev_set_priority (&w->prepare, EV_MINPRI);
2502 ev_prepare_start (EV_A_ &w->prepare); 2849 ev_prepare_start (EV_A_ &w->prepare);
2503 2850
2504 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2505 2852
2506 ev_start (EV_A_ (W)w, 1); 2853 ev_start (EV_A_ (W)w, 1);
2854
2855 EV_FREQUENT_CHECK;
2507} 2856}
2508 2857
2509void 2858void
2510ev_embed_stop (EV_P_ ev_embed *w) 2859ev_embed_stop (EV_P_ ev_embed *w)
2511{ 2860{
2512 clear_pending (EV_A_ (W)w); 2861 clear_pending (EV_A_ (W)w);
2513 if (expect_false (!ev_is_active (w))) 2862 if (expect_false (!ev_is_active (w)))
2514 return; 2863 return;
2515 2864
2865 EV_FREQUENT_CHECK;
2866
2516 ev_io_stop (EV_A_ &w->io); 2867 ev_io_stop (EV_A_ &w->io);
2517 ev_prepare_stop (EV_A_ &w->prepare); 2868 ev_prepare_stop (EV_A_ &w->prepare);
2518 2869
2519 ev_stop (EV_A_ (W)w); 2870 ev_stop (EV_A_ (W)w);
2871
2872 EV_FREQUENT_CHECK;
2520} 2873}
2521#endif 2874#endif
2522 2875
2523#if EV_FORK_ENABLE 2876#if EV_FORK_ENABLE
2524void 2877void
2525ev_fork_start (EV_P_ ev_fork *w) 2878ev_fork_start (EV_P_ ev_fork *w)
2526{ 2879{
2527 if (expect_false (ev_is_active (w))) 2880 if (expect_false (ev_is_active (w)))
2528 return; 2881 return;
2882
2883 EV_FREQUENT_CHECK;
2529 2884
2530 ev_start (EV_A_ (W)w, ++forkcnt); 2885 ev_start (EV_A_ (W)w, ++forkcnt);
2531 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2886 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2532 forks [forkcnt - 1] = w; 2887 forks [forkcnt - 1] = w;
2888
2889 EV_FREQUENT_CHECK;
2533} 2890}
2534 2891
2535void 2892void
2536ev_fork_stop (EV_P_ ev_fork *w) 2893ev_fork_stop (EV_P_ ev_fork *w)
2537{ 2894{
2538 clear_pending (EV_A_ (W)w); 2895 clear_pending (EV_A_ (W)w);
2539 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2540 return; 2897 return;
2541 2898
2899 EV_FREQUENT_CHECK;
2900
2542 { 2901 {
2543 int active = ev_active (w); 2902 int active = ev_active (w);
2544 2903
2545 forks [active - 1] = forks [--forkcnt]; 2904 forks [active - 1] = forks [--forkcnt];
2546 ev_active (forks [active - 1]) = active; 2905 ev_active (forks [active - 1]) = active;
2547 } 2906 }
2548 2907
2549 ev_stop (EV_A_ (W)w); 2908 ev_stop (EV_A_ (W)w);
2909
2910 EV_FREQUENT_CHECK;
2550} 2911}
2551#endif 2912#endif
2552 2913
2553#if EV_ASYNC_ENABLE 2914#if EV_ASYNC_ENABLE
2554void 2915void
… …
2556{ 2917{
2557 if (expect_false (ev_is_active (w))) 2918 if (expect_false (ev_is_active (w)))
2558 return; 2919 return;
2559 2920
2560 evpipe_init (EV_A); 2921 evpipe_init (EV_A);
2922
2923 EV_FREQUENT_CHECK;
2561 2924
2562 ev_start (EV_A_ (W)w, ++asynccnt); 2925 ev_start (EV_A_ (W)w, ++asynccnt);
2563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2926 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2564 asyncs [asynccnt - 1] = w; 2927 asyncs [asynccnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2565} 2930}
2566 2931
2567void 2932void
2568ev_async_stop (EV_P_ ev_async *w) 2933ev_async_stop (EV_P_ ev_async *w)
2569{ 2934{
2570 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2571 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2572 return; 2937 return;
2573 2938
2939 EV_FREQUENT_CHECK;
2940
2574 { 2941 {
2575 int active = ev_active (w); 2942 int active = ev_active (w);
2576 2943
2577 asyncs [active - 1] = asyncs [--asynccnt]; 2944 asyncs [active - 1] = asyncs [--asynccnt];
2578 ev_active (asyncs [active - 1]) = active; 2945 ev_active (asyncs [active - 1]) = active;
2579 } 2946 }
2580 2947
2581 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2582} 2951}
2583 2952
2584void 2953void
2585ev_async_send (EV_P_ ev_async *w) 2954ev_async_send (EV_P_ ev_async *w)
2586{ 2955{

Diff Legend

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