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

Comparing libev/ev.c (file contents):
Revision 1.226 by root, Fri Apr 18 17:16:44 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
350#define ev_at(w) ((WT)(w))->at
351
330#if EV_USE_MONOTONIC 352#if EV_USE_MONOTONIC
331/* 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 */
332/* giving it a reasonably high chance of working on typical architetcures */ 354/* giving it a reasonably high chance of working on typical architetcures */
333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 355static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif 356#endif
… …
419 W w; 441 W w;
420 int events; 442 int events;
421} ANPENDING; 443} ANPENDING;
422 444
423#if EV_USE_INOTIFY 445#if EV_USE_INOTIFY
446/* hash table entry per inotify-id */
424typedef struct 447typedef struct
425{ 448{
426 WL head; 449 WL head;
427} 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)
428#endif 469#endif
429 470
430#if EV_MULTIPLICITY 471#if EV_MULTIPLICITY
431 472
432 struct ev_loop 473 struct ev_loop
… …
517 } 558 }
518} 559}
519 560
520/*****************************************************************************/ 561/*****************************************************************************/
521 562
563#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
564
522int inline_size 565int inline_size
523array_nextsize (int elem, int cur, int cnt) 566array_nextsize (int elem, int cur, int cnt)
524{ 567{
525 int ncur = cur + 1; 568 int ncur = cur + 1;
526 569
527 do 570 do
528 ncur <<= 1; 571 ncur <<= 1;
529 while (cnt > ncur); 572 while (cnt > ncur);
530 573
531 /* 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 */
532 if (elem * ncur > 4096) 575 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
533 { 576 {
534 ncur *= elem; 577 ncur *= elem;
535 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 578 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
536 ncur = ncur - sizeof (void *) * 4; 579 ncur = ncur - sizeof (void *) * 4;
537 ncur /= elem; 580 ncur /= elem;
538 } 581 }
539 582
540 return ncur; 583 return ncur;
… …
754 } 797 }
755} 798}
756 799
757/*****************************************************************************/ 800/*****************************************************************************/
758 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 */
759void inline_speed 822void inline_speed
760upheap (WT *heap, int k) 823downheap (ANHE *heap, int N, int k)
761{ 824{
762 WT w = heap [k]; 825 ANHE he = heap [k];
826 ANHE *E = heap + N + HEAP0;
763 827
764 while (k) 828 for (;;)
765 { 829 {
766 int p = (k - 1) >> 1; 830 ev_tstamp minat;
831 ANHE *minpos;
832 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
767 833
768 if (heap [p]->at <= w->at) 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
769 break; 850 break;
770 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
901/* towards the root */
902void inline_speed
903upheap (ANHE *heap, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int p = HPARENT (k);
910
911 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
912 break;
913
771 heap [k] = heap [p]; 914 heap [k] = heap [p];
772 ((W)heap [k])->active = k + 1; 915 ev_active (ANHE_w (heap [k])) = k;
773 k = p; 916 k = p;
774 } 917 }
775 918
776 heap [k] = w; 919 heap [k] = he;
777 ((W)heap [k])->active = k + 1; 920 ev_active (ANHE_w (he)) = k;
778}
779
780void inline_speed
781downheap (WT *heap, int N, int k)
782{
783 WT w = heap [k];
784
785 for (;;)
786 {
787 int c = (k << 1) + 1;
788
789 if (c >= N)
790 break;
791
792 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
793 ? 1 : 0;
794
795 if (w->at <= heap [c]->at)
796 break;
797
798 heap [k] = heap [c];
799 ((W)heap [k])->active = k + 1;
800
801 k = c;
802 }
803
804 heap [k] = w;
805 ((W)heap [k])->active = k + 1;
806} 921}
807 922
808void inline_size 923void inline_size
809adjustheap (WT *heap, int N, int k) 924adjustheap (ANHE *heap, int N, int k)
810{ 925{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
811 upheap (heap, k); 927 upheap (heap, k);
928 else
812 downheap (heap, N, k); 929 downheap (heap, N, k);
813} 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
814 957
815/*****************************************************************************/ 958/*****************************************************************************/
816 959
817typedef struct 960typedef struct
818{ 961{
… …
906pipecb (EV_P_ ev_io *iow, int revents) 1049pipecb (EV_P_ ev_io *iow, int revents)
907{ 1050{
908#if EV_USE_EVENTFD 1051#if EV_USE_EVENTFD
909 if (evfd >= 0) 1052 if (evfd >= 0)
910 { 1053 {
911 uint64_t counter = 1; 1054 uint64_t counter;
912 read (evfd, &counter, sizeof (uint64_t)); 1055 read (evfd, &counter, sizeof (uint64_t));
913 } 1056 }
914 else 1057 else
915#endif 1058#endif
916 { 1059 {
… …
1363ev_loop_fork (EV_P) 1506ev_loop_fork (EV_P)
1364{ 1507{
1365 postfork = 1; /* must be in line with ev_default_fork */ 1508 postfork = 1; /* must be in line with ev_default_fork */
1366} 1509}
1367 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
1368#endif 1544#endif
1369 1545
1370#if EV_MULTIPLICITY 1546#if EV_MULTIPLICITY
1371struct ev_loop * 1547struct ev_loop *
1372ev_default_loop_init (unsigned int flags) 1548ev_default_loop_init (unsigned int flags)
… …
1438void inline_speed 1614void inline_speed
1439call_pending (EV_P) 1615call_pending (EV_P)
1440{ 1616{
1441 int pri; 1617 int pri;
1442 1618
1619 EV_FREQUENT_CHECK;
1620
1443 for (pri = NUMPRI; pri--; ) 1621 for (pri = NUMPRI; pri--; )
1444 while (pendingcnt [pri]) 1622 while (pendingcnt [pri])
1445 { 1623 {
1446 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1447 1625
… …
1451 1629
1452 p->w->pending = 0; 1630 p->w->pending = 0;
1453 EV_CB_INVOKE (p->w, p->events); 1631 EV_CB_INVOKE (p->w, p->events);
1454 } 1632 }
1455 } 1633 }
1456}
1457 1634
1458void inline_size 1635 EV_FREQUENT_CHECK;
1459timers_reify (EV_P)
1460{
1461 while (timercnt && ((WT)timers [0])->at <= mn_now)
1462 {
1463 ev_timer *w = (ev_timer *)timers [0];
1464
1465 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1466
1467 /* first reschedule or stop timer */
1468 if (w->repeat)
1469 {
1470 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1471
1472 ((WT)w)->at += w->repeat;
1473 if (((WT)w)->at < mn_now)
1474 ((WT)w)->at = mn_now;
1475
1476 downheap (timers, timercnt, 0);
1477 }
1478 else
1479 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1480
1481 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1482 }
1483} 1636}
1484
1485#if EV_PERIODIC_ENABLE
1486void inline_size
1487periodics_reify (EV_P)
1488{
1489 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1490 {
1491 ev_periodic *w = (ev_periodic *)periodics [0];
1492
1493 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1494
1495 /* first reschedule or stop timer */
1496 if (w->reschedule_cb)
1497 {
1498 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1499 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1500 downheap (periodics, periodiccnt, 0);
1501 }
1502 else if (w->interval)
1503 {
1504 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1505 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1506 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1507 downheap (periodics, periodiccnt, 0);
1508 }
1509 else
1510 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1511
1512 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1513 }
1514}
1515
1516static void noinline
1517periodics_reschedule (EV_P)
1518{
1519 int i;
1520
1521 /* adjust periodics after time jump */
1522 for (i = 0; i < periodiccnt; ++i)
1523 {
1524 ev_periodic *w = (ev_periodic *)periodics [i];
1525
1526 if (w->reschedule_cb)
1527 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1528 else if (w->interval)
1529 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1530 }
1531
1532 /* now rebuild the heap */
1533 for (i = periodiccnt >> 1; i--; )
1534 downheap (periodics, periodiccnt, i);
1535}
1536#endif
1537 1637
1538#if EV_IDLE_ENABLE 1638#if EV_IDLE_ENABLE
1539void inline_size 1639void inline_size
1540idle_reify (EV_P) 1640idle_reify (EV_P)
1541{ 1641{
… …
1553 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1653 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1554 break; 1654 break;
1555 } 1655 }
1556 } 1656 }
1557 } 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);
1558} 1760}
1559#endif 1761#endif
1560 1762
1561void inline_speed 1763void inline_speed
1562time_update (EV_P_ ev_tstamp max_block) 1764time_update (EV_P_ ev_tstamp max_block)
… …
1591 */ 1793 */
1592 for (i = 4; --i; ) 1794 for (i = 4; --i; )
1593 { 1795 {
1594 rtmn_diff = ev_rt_now - mn_now; 1796 rtmn_diff = ev_rt_now - mn_now;
1595 1797
1596 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1798 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1597 return; /* all is well */ 1799 return; /* all is well */
1598 1800
1599 ev_rt_now = ev_time (); 1801 ev_rt_now = ev_time ();
1600 mn_now = get_clock (); 1802 mn_now = get_clock ();
1601 now_floor = mn_now; 1803 now_floor = mn_now;
… …
1617#if EV_PERIODIC_ENABLE 1819#if EV_PERIODIC_ENABLE
1618 periodics_reschedule (EV_A); 1820 periodics_reschedule (EV_A);
1619#endif 1821#endif
1620 /* 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 */
1621 for (i = 0; i < timercnt; ++i) 1823 for (i = 0; i < timercnt; ++i)
1824 {
1825 ANHE *he = timers + i + HEAP0;
1622 ((WT)timers [i])->at += ev_rt_now - mn_now; 1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1827 ANHE_at_cache (*he);
1828 }
1623 } 1829 }
1624 1830
1625 mn_now = ev_rt_now; 1831 mn_now = ev_rt_now;
1626 } 1832 }
1627} 1833}
… …
1697 1903
1698 waittime = MAX_BLOCKTIME; 1904 waittime = MAX_BLOCKTIME;
1699 1905
1700 if (timercnt) 1906 if (timercnt)
1701 { 1907 {
1702 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1908 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1703 if (waittime > to) waittime = to; 1909 if (waittime > to) waittime = to;
1704 } 1910 }
1705 1911
1706#if EV_PERIODIC_ENABLE 1912#if EV_PERIODIC_ENABLE
1707 if (periodiccnt) 1913 if (periodiccnt)
1708 { 1914 {
1709 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1915 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1710 if (waittime > to) waittime = to; 1916 if (waittime > to) waittime = to;
1711 } 1917 }
1712#endif 1918#endif
1713 1919
1714 if (expect_false (waittime < timeout_blocktime)) 1920 if (expect_false (waittime < timeout_blocktime))
… …
1851 if (expect_false (ev_is_active (w))) 2057 if (expect_false (ev_is_active (w)))
1852 return; 2058 return;
1853 2059
1854 assert (("ev_io_start called with negative fd", fd >= 0)); 2060 assert (("ev_io_start called with negative fd", fd >= 0));
1855 2061
2062 EV_FREQUENT_CHECK;
2063
1856 ev_start (EV_A_ (W)w, 1); 2064 ev_start (EV_A_ (W)w, 1);
1857 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1858 wlist_add (&anfds[fd].head, (WL)w); 2066 wlist_add (&anfds[fd].head, (WL)w);
1859 2067
1860 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1861 w->events &= ~EV_IOFDSET; 2069 w->events &= ~EV_IOFDSET;
2070
2071 EV_FREQUENT_CHECK;
1862} 2072}
1863 2073
1864void noinline 2074void noinline
1865ev_io_stop (EV_P_ ev_io *w) 2075ev_io_stop (EV_P_ ev_io *w)
1866{ 2076{
1867 clear_pending (EV_A_ (W)w); 2077 clear_pending (EV_A_ (W)w);
1868 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
1869 return; 2079 return;
1870 2080
1871 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;
1872 2084
1873 wlist_del (&anfds[w->fd].head, (WL)w); 2085 wlist_del (&anfds[w->fd].head, (WL)w);
1874 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
1875 2087
1876 fd_change (EV_A_ w->fd, 1); 2088 fd_change (EV_A_ w->fd, 1);
2089
2090 EV_FREQUENT_CHECK;
1877} 2091}
1878 2092
1879void noinline 2093void noinline
1880ev_timer_start (EV_P_ ev_timer *w) 2094ev_timer_start (EV_P_ ev_timer *w)
1881{ 2095{
1882 if (expect_false (ev_is_active (w))) 2096 if (expect_false (ev_is_active (w)))
1883 return; 2097 return;
1884 2098
1885 ((WT)w)->at += mn_now; 2099 ev_at (w) += mn_now;
1886 2100
1887 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.));
1888 2102
2103 EV_FREQUENT_CHECK;
2104
2105 ++timercnt;
1889 ev_start (EV_A_ (W)w, ++timercnt); 2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1890 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2107 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1891 timers [timercnt - 1] = (WT)w; 2108 ANHE_w (timers [ev_active (w)]) = (WT)w;
1892 upheap (timers, timercnt - 1); 2109 ANHE_at_cache (timers [ev_active (w)]);
2110 upheap (timers, ev_active (w));
1893 2111
2112 EV_FREQUENT_CHECK;
2113
1894 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1895} 2115}
1896 2116
1897void noinline 2117void noinline
1898ev_timer_stop (EV_P_ ev_timer *w) 2118ev_timer_stop (EV_P_ ev_timer *w)
1899{ 2119{
1900 clear_pending (EV_A_ (W)w); 2120 clear_pending (EV_A_ (W)w);
1901 if (expect_false (!ev_is_active (w))) 2121 if (expect_false (!ev_is_active (w)))
1902 return; 2122 return;
1903 2123
1904 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 2124 EV_FREQUENT_CHECK;
1905 2125
1906 { 2126 {
1907 int active = ((W)w)->active; 2127 int active = ev_active (w);
1908 2128
2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2130
2131 --timercnt;
2132
1909 if (expect_true (--active < --timercnt)) 2133 if (expect_true (active < timercnt + HEAP0))
1910 { 2134 {
1911 timers [active] = timers [timercnt]; 2135 timers [active] = timers [timercnt + HEAP0];
1912 adjustheap (timers, timercnt, active); 2136 adjustheap (timers, timercnt, active);
1913 } 2137 }
1914 } 2138 }
1915 2139
1916 ((WT)w)->at -= mn_now; 2140 EV_FREQUENT_CHECK;
2141
2142 ev_at (w) -= mn_now;
1917 2143
1918 ev_stop (EV_A_ (W)w); 2144 ev_stop (EV_A_ (W)w);
1919} 2145}
1920 2146
1921void noinline 2147void noinline
1922ev_timer_again (EV_P_ ev_timer *w) 2148ev_timer_again (EV_P_ ev_timer *w)
1923{ 2149{
2150 EV_FREQUENT_CHECK;
2151
1924 if (ev_is_active (w)) 2152 if (ev_is_active (w))
1925 { 2153 {
1926 if (w->repeat) 2154 if (w->repeat)
1927 { 2155 {
1928 ((WT)w)->at = mn_now + w->repeat; 2156 ev_at (w) = mn_now + w->repeat;
2157 ANHE_at_cache (timers [ev_active (w)]);
1929 adjustheap (timers, timercnt, ((W)w)->active - 1); 2158 adjustheap (timers, timercnt, ev_active (w));
1930 } 2159 }
1931 else 2160 else
1932 ev_timer_stop (EV_A_ w); 2161 ev_timer_stop (EV_A_ w);
1933 } 2162 }
1934 else if (w->repeat) 2163 else if (w->repeat)
1935 { 2164 {
1936 w->at = w->repeat; 2165 ev_at (w) = w->repeat;
1937 ev_timer_start (EV_A_ w); 2166 ev_timer_start (EV_A_ w);
1938 } 2167 }
2168
2169 EV_FREQUENT_CHECK;
1939} 2170}
1940 2171
1941#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
1942void noinline 2173void noinline
1943ev_periodic_start (EV_P_ ev_periodic *w) 2174ev_periodic_start (EV_P_ ev_periodic *w)
1944{ 2175{
1945 if (expect_false (ev_is_active (w))) 2176 if (expect_false (ev_is_active (w)))
1946 return; 2177 return;
1947 2178
1948 if (w->reschedule_cb) 2179 if (w->reschedule_cb)
1949 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2180 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1950 else if (w->interval) 2181 else if (w->interval)
1951 { 2182 {
1952 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2183 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1953 /* this formula differs from the one in periodic_reify because we do not always round up */ 2184 /* this formula differs from the one in periodic_reify because we do not always round up */
1954 ((WT)w)->at = 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;
1955 } 2186 }
1956 else 2187 else
1957 ((WT)w)->at = w->offset; 2188 ev_at (w) = w->offset;
1958 2189
2190 EV_FREQUENT_CHECK;
2191
2192 ++periodiccnt;
1959 ev_start (EV_A_ (W)w, ++periodiccnt); 2193 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1960 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2194 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1961 periodics [periodiccnt - 1] = (WT)w; 2195 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1962 upheap (periodics, periodiccnt - 1); 2196 ANHE_at_cache (periodics [ev_active (w)]);
2197 upheap (periodics, ev_active (w));
1963 2198
2199 EV_FREQUENT_CHECK;
2200
1964 /*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));*/
1965} 2202}
1966 2203
1967void noinline 2204void noinline
1968ev_periodic_stop (EV_P_ ev_periodic *w) 2205ev_periodic_stop (EV_P_ ev_periodic *w)
1969{ 2206{
1970 clear_pending (EV_A_ (W)w); 2207 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2208 if (expect_false (!ev_is_active (w)))
1972 return; 2209 return;
1973 2210
1974 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 2211 EV_FREQUENT_CHECK;
1975 2212
1976 { 2213 {
1977 int active = ((W)w)->active; 2214 int active = ev_active (w);
1978 2215
2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2217
2218 --periodiccnt;
2219
1979 if (expect_true (--active < --periodiccnt)) 2220 if (expect_true (active < periodiccnt + HEAP0))
1980 { 2221 {
1981 periodics [active] = periodics [periodiccnt]; 2222 periodics [active] = periodics [periodiccnt + HEAP0];
1982 adjustheap (periodics, periodiccnt, active); 2223 adjustheap (periodics, periodiccnt, active);
1983 } 2224 }
1984 } 2225 }
1985 2226
2227 EV_FREQUENT_CHECK;
2228
1986 ev_stop (EV_A_ (W)w); 2229 ev_stop (EV_A_ (W)w);
1987} 2230}
1988 2231
1989void noinline 2232void noinline
1990ev_periodic_again (EV_P_ ev_periodic *w) 2233ev_periodic_again (EV_P_ ev_periodic *w)
… …
2009 return; 2252 return;
2010 2253
2011 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));
2012 2255
2013 evpipe_init (EV_A); 2256 evpipe_init (EV_A);
2257
2258 EV_FREQUENT_CHECK;
2014 2259
2015 { 2260 {
2016#ifndef _WIN32 2261#ifndef _WIN32
2017 sigset_t full, prev; 2262 sigset_t full, prev;
2018 sigfillset (&full); 2263 sigfillset (&full);
… …
2039 sigfillset (&sa.sa_mask); 2284 sigfillset (&sa.sa_mask);
2040 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 */
2041 sigaction (w->signum, &sa, 0); 2286 sigaction (w->signum, &sa, 0);
2042#endif 2287#endif
2043 } 2288 }
2289
2290 EV_FREQUENT_CHECK;
2044} 2291}
2045 2292
2046void noinline 2293void noinline
2047ev_signal_stop (EV_P_ ev_signal *w) 2294ev_signal_stop (EV_P_ ev_signal *w)
2048{ 2295{
2049 clear_pending (EV_A_ (W)w); 2296 clear_pending (EV_A_ (W)w);
2050 if (expect_false (!ev_is_active (w))) 2297 if (expect_false (!ev_is_active (w)))
2051 return; 2298 return;
2052 2299
2300 EV_FREQUENT_CHECK;
2301
2053 wlist_del (&signals [w->signum - 1].head, (WL)w); 2302 wlist_del (&signals [w->signum - 1].head, (WL)w);
2054 ev_stop (EV_A_ (W)w); 2303 ev_stop (EV_A_ (W)w);
2055 2304
2056 if (!signals [w->signum - 1].head) 2305 if (!signals [w->signum - 1].head)
2057 signal (w->signum, SIG_DFL); 2306 signal (w->signum, SIG_DFL);
2307
2308 EV_FREQUENT_CHECK;
2058} 2309}
2059 2310
2060void 2311void
2061ev_child_start (EV_P_ ev_child *w) 2312ev_child_start (EV_P_ ev_child *w)
2062{ 2313{
… …
2064 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));
2065#endif 2316#endif
2066 if (expect_false (ev_is_active (w))) 2317 if (expect_false (ev_is_active (w)))
2067 return; 2318 return;
2068 2319
2320 EV_FREQUENT_CHECK;
2321
2069 ev_start (EV_A_ (W)w, 1); 2322 ev_start (EV_A_ (W)w, 1);
2070 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;
2071} 2326}
2072 2327
2073void 2328void
2074ev_child_stop (EV_P_ ev_child *w) 2329ev_child_stop (EV_P_ ev_child *w)
2075{ 2330{
2076 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2077 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2078 return; 2333 return;
2079 2334
2335 EV_FREQUENT_CHECK;
2336
2080 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2337 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2081 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2339
2340 EV_FREQUENT_CHECK;
2082} 2341}
2083 2342
2084#if EV_STAT_ENABLE 2343#if EV_STAT_ENABLE
2085 2344
2086# ifdef _WIN32 2345# ifdef _WIN32
… …
2104 if (w->wd < 0) 2363 if (w->wd < 0)
2105 { 2364 {
2106 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 */
2107 2366
2108 /* 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 */
2109 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2370 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2110 { 2371 {
2111 char path [4096]; 2372 char path [4096];
2112 strcpy (path, w->path); 2373 strcpy (path, w->path);
2113 2374
… …
2312 else 2573 else
2313#endif 2574#endif
2314 ev_timer_start (EV_A_ &w->timer); 2575 ev_timer_start (EV_A_ &w->timer);
2315 2576
2316 ev_start (EV_A_ (W)w, 1); 2577 ev_start (EV_A_ (W)w, 1);
2578
2579 EV_FREQUENT_CHECK;
2317} 2580}
2318 2581
2319void 2582void
2320ev_stat_stop (EV_P_ ev_stat *w) 2583ev_stat_stop (EV_P_ ev_stat *w)
2321{ 2584{
2322 clear_pending (EV_A_ (W)w); 2585 clear_pending (EV_A_ (W)w);
2323 if (expect_false (!ev_is_active (w))) 2586 if (expect_false (!ev_is_active (w)))
2324 return; 2587 return;
2325 2588
2589 EV_FREQUENT_CHECK;
2590
2326#if EV_USE_INOTIFY 2591#if EV_USE_INOTIFY
2327 infy_del (EV_A_ w); 2592 infy_del (EV_A_ w);
2328#endif 2593#endif
2329 ev_timer_stop (EV_A_ &w->timer); 2594 ev_timer_stop (EV_A_ &w->timer);
2330 2595
2331 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2597
2598 EV_FREQUENT_CHECK;
2332} 2599}
2333#endif 2600#endif
2334 2601
2335#if EV_IDLE_ENABLE 2602#if EV_IDLE_ENABLE
2336void 2603void
… …
2338{ 2605{
2339 if (expect_false (ev_is_active (w))) 2606 if (expect_false (ev_is_active (w)))
2340 return; 2607 return;
2341 2608
2342 pri_adjust (EV_A_ (W)w); 2609 pri_adjust (EV_A_ (W)w);
2610
2611 EV_FREQUENT_CHECK;
2343 2612
2344 { 2613 {
2345 int active = ++idlecnt [ABSPRI (w)]; 2614 int active = ++idlecnt [ABSPRI (w)];
2346 2615
2347 ++idleall; 2616 ++idleall;
2348 ev_start (EV_A_ (W)w, active); 2617 ev_start (EV_A_ (W)w, active);
2349 2618
2350 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);
2351 idles [ABSPRI (w)][active - 1] = w; 2620 idles [ABSPRI (w)][active - 1] = w;
2352 } 2621 }
2622
2623 EV_FREQUENT_CHECK;
2353} 2624}
2354 2625
2355void 2626void
2356ev_idle_stop (EV_P_ ev_idle *w) 2627ev_idle_stop (EV_P_ ev_idle *w)
2357{ 2628{
2358 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
2359 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
2360 return; 2631 return;
2361 2632
2633 EV_FREQUENT_CHECK;
2634
2362 { 2635 {
2363 int active = ((W)w)->active; 2636 int active = ev_active (w);
2364 2637
2365 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2638 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2366 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2639 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2367 2640
2368 ev_stop (EV_A_ (W)w); 2641 ev_stop (EV_A_ (W)w);
2369 --idleall; 2642 --idleall;
2370 } 2643 }
2644
2645 EV_FREQUENT_CHECK;
2371} 2646}
2372#endif 2647#endif
2373 2648
2374void 2649void
2375ev_prepare_start (EV_P_ ev_prepare *w) 2650ev_prepare_start (EV_P_ ev_prepare *w)
2376{ 2651{
2377 if (expect_false (ev_is_active (w))) 2652 if (expect_false (ev_is_active (w)))
2378 return; 2653 return;
2654
2655 EV_FREQUENT_CHECK;
2379 2656
2380 ev_start (EV_A_ (W)w, ++preparecnt); 2657 ev_start (EV_A_ (W)w, ++preparecnt);
2381 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2658 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2382 prepares [preparecnt - 1] = w; 2659 prepares [preparecnt - 1] = w;
2660
2661 EV_FREQUENT_CHECK;
2383} 2662}
2384 2663
2385void 2664void
2386ev_prepare_stop (EV_P_ ev_prepare *w) 2665ev_prepare_stop (EV_P_ ev_prepare *w)
2387{ 2666{
2388 clear_pending (EV_A_ (W)w); 2667 clear_pending (EV_A_ (W)w);
2389 if (expect_false (!ev_is_active (w))) 2668 if (expect_false (!ev_is_active (w)))
2390 return; 2669 return;
2391 2670
2671 EV_FREQUENT_CHECK;
2672
2392 { 2673 {
2393 int active = ((W)w)->active; 2674 int active = ev_active (w);
2675
2394 prepares [active - 1] = prepares [--preparecnt]; 2676 prepares [active - 1] = prepares [--preparecnt];
2395 ((W)prepares [active - 1])->active = active; 2677 ev_active (prepares [active - 1]) = active;
2396 } 2678 }
2397 2679
2398 ev_stop (EV_A_ (W)w); 2680 ev_stop (EV_A_ (W)w);
2681
2682 EV_FREQUENT_CHECK;
2399} 2683}
2400 2684
2401void 2685void
2402ev_check_start (EV_P_ ev_check *w) 2686ev_check_start (EV_P_ ev_check *w)
2403{ 2687{
2404 if (expect_false (ev_is_active (w))) 2688 if (expect_false (ev_is_active (w)))
2405 return; 2689 return;
2690
2691 EV_FREQUENT_CHECK;
2406 2692
2407 ev_start (EV_A_ (W)w, ++checkcnt); 2693 ev_start (EV_A_ (W)w, ++checkcnt);
2408 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2694 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2409 checks [checkcnt - 1] = w; 2695 checks [checkcnt - 1] = w;
2696
2697 EV_FREQUENT_CHECK;
2410} 2698}
2411 2699
2412void 2700void
2413ev_check_stop (EV_P_ ev_check *w) 2701ev_check_stop (EV_P_ ev_check *w)
2414{ 2702{
2415 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2416 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2417 return; 2705 return;
2418 2706
2707 EV_FREQUENT_CHECK;
2708
2419 { 2709 {
2420 int active = ((W)w)->active; 2710 int active = ev_active (w);
2711
2421 checks [active - 1] = checks [--checkcnt]; 2712 checks [active - 1] = checks [--checkcnt];
2422 ((W)checks [active - 1])->active = active; 2713 ev_active (checks [active - 1]) = active;
2423 } 2714 }
2424 2715
2425 ev_stop (EV_A_ (W)w); 2716 ev_stop (EV_A_ (W)w);
2717
2718 EV_FREQUENT_CHECK;
2426} 2719}
2427 2720
2428#if EV_EMBED_ENABLE 2721#if EV_EMBED_ENABLE
2429void noinline 2722void noinline
2430ev_embed_sweep (EV_P_ ev_embed *w) 2723ev_embed_sweep (EV_P_ ev_embed *w)
… …
2477 struct ev_loop *loop = w->other; 2770 struct ev_loop *loop = w->other;
2478 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 ()));
2479 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);
2480 } 2773 }
2481 2774
2775 EV_FREQUENT_CHECK;
2776
2482 ev_set_priority (&w->io, ev_priority (w)); 2777 ev_set_priority (&w->io, ev_priority (w));
2483 ev_io_start (EV_A_ &w->io); 2778 ev_io_start (EV_A_ &w->io);
2484 2779
2485 ev_prepare_init (&w->prepare, embed_prepare_cb); 2780 ev_prepare_init (&w->prepare, embed_prepare_cb);
2486 ev_set_priority (&w->prepare, EV_MINPRI); 2781 ev_set_priority (&w->prepare, EV_MINPRI);
2487 ev_prepare_start (EV_A_ &w->prepare); 2782 ev_prepare_start (EV_A_ &w->prepare);
2488 2783
2489 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2490 2785
2491 ev_start (EV_A_ (W)w, 1); 2786 ev_start (EV_A_ (W)w, 1);
2787
2788 EV_FREQUENT_CHECK;
2492} 2789}
2493 2790
2494void 2791void
2495ev_embed_stop (EV_P_ ev_embed *w) 2792ev_embed_stop (EV_P_ ev_embed *w)
2496{ 2793{
2497 clear_pending (EV_A_ (W)w); 2794 clear_pending (EV_A_ (W)w);
2498 if (expect_false (!ev_is_active (w))) 2795 if (expect_false (!ev_is_active (w)))
2499 return; 2796 return;
2500 2797
2798 EV_FREQUENT_CHECK;
2799
2501 ev_io_stop (EV_A_ &w->io); 2800 ev_io_stop (EV_A_ &w->io);
2502 ev_prepare_stop (EV_A_ &w->prepare); 2801 ev_prepare_stop (EV_A_ &w->prepare);
2503 2802
2504 ev_stop (EV_A_ (W)w); 2803 ev_stop (EV_A_ (W)w);
2804
2805 EV_FREQUENT_CHECK;
2505} 2806}
2506#endif 2807#endif
2507 2808
2508#if EV_FORK_ENABLE 2809#if EV_FORK_ENABLE
2509void 2810void
2510ev_fork_start (EV_P_ ev_fork *w) 2811ev_fork_start (EV_P_ ev_fork *w)
2511{ 2812{
2512 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2513 return; 2814 return;
2815
2816 EV_FREQUENT_CHECK;
2514 2817
2515 ev_start (EV_A_ (W)w, ++forkcnt); 2818 ev_start (EV_A_ (W)w, ++forkcnt);
2516 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2819 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2517 forks [forkcnt - 1] = w; 2820 forks [forkcnt - 1] = w;
2821
2822 EV_FREQUENT_CHECK;
2518} 2823}
2519 2824
2520void 2825void
2521ev_fork_stop (EV_P_ ev_fork *w) 2826ev_fork_stop (EV_P_ ev_fork *w)
2522{ 2827{
2523 clear_pending (EV_A_ (W)w); 2828 clear_pending (EV_A_ (W)w);
2524 if (expect_false (!ev_is_active (w))) 2829 if (expect_false (!ev_is_active (w)))
2525 return; 2830 return;
2526 2831
2832 EV_FREQUENT_CHECK;
2833
2527 { 2834 {
2528 int active = ((W)w)->active; 2835 int active = ev_active (w);
2836
2529 forks [active - 1] = forks [--forkcnt]; 2837 forks [active - 1] = forks [--forkcnt];
2530 ((W)forks [active - 1])->active = active; 2838 ev_active (forks [active - 1]) = active;
2531 } 2839 }
2532 2840
2533 ev_stop (EV_A_ (W)w); 2841 ev_stop (EV_A_ (W)w);
2842
2843 EV_FREQUENT_CHECK;
2534} 2844}
2535#endif 2845#endif
2536 2846
2537#if EV_ASYNC_ENABLE 2847#if EV_ASYNC_ENABLE
2538void 2848void
… …
2540{ 2850{
2541 if (expect_false (ev_is_active (w))) 2851 if (expect_false (ev_is_active (w)))
2542 return; 2852 return;
2543 2853
2544 evpipe_init (EV_A); 2854 evpipe_init (EV_A);
2855
2856 EV_FREQUENT_CHECK;
2545 2857
2546 ev_start (EV_A_ (W)w, ++asynccnt); 2858 ev_start (EV_A_ (W)w, ++asynccnt);
2547 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2859 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2548 asyncs [asynccnt - 1] = w; 2860 asyncs [asynccnt - 1] = w;
2861
2862 EV_FREQUENT_CHECK;
2549} 2863}
2550 2864
2551void 2865void
2552ev_async_stop (EV_P_ ev_async *w) 2866ev_async_stop (EV_P_ ev_async *w)
2553{ 2867{
2554 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2555 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2556 return; 2870 return;
2557 2871
2872 EV_FREQUENT_CHECK;
2873
2558 { 2874 {
2559 int active = ((W)w)->active; 2875 int active = ev_active (w);
2876
2560 asyncs [active - 1] = asyncs [--asynccnt]; 2877 asyncs [active - 1] = asyncs [--asynccnt];
2561 ((W)asyncs [active - 1])->active = active; 2878 ev_active (asyncs [active - 1]) = active;
2562 } 2879 }
2563 2880
2564 ev_stop (EV_A_ (W)w); 2881 ev_stop (EV_A_ (W)w);
2882
2883 EV_FREQUENT_CHECK;
2565} 2884}
2566 2885
2567void 2886void
2568ev_async_send (EV_P_ ev_async *w) 2887ev_async_send (EV_P_ ev_async *w)
2569{ 2888{

Diff Legend

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