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.250 by root, Thu May 22 02:44:57 2008 UTC

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

Diff Legend

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