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

Comparing libev/ev.c (file contents):
Revision 1.228 by root, Fri May 2 08:07:37 2008 UTC vs.
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC

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

Diff Legend

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