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

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

Diff Legend

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