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.249 by root, Wed May 21 23:30:52 2008 UTC

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

Diff Legend

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