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

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 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
240#ifndef EV_USE_4HEAP 250#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 251# define EV_USE_4HEAP !EV_MINIMAL
242#endif 252#endif
243 253
244#ifndef EV_HEAP_CACHE_AT 254#ifndef EV_HEAP_CACHE_AT
287} 297}
288# endif 298# endif
289#endif 299#endif
290 300
291/**/ 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
292 308
293/* 309/*
294 * This is used to avoid floating point rounding problems. 310 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 311 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 312 * to ensure progress, time-wise, even when rounding
444 typedef struct { 460 typedef struct {
445 ev_tstamp at; 461 ev_tstamp at;
446 WT w; 462 WT w;
447 } ANHE; 463 } ANHE;
448 464
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 465 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 466 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */ 467 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 468#else
453 typedef WT ANHE; 469 typedef WT ANHE;
454 470
455 #define ANHE_w(he) (he) 471 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 472 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 473 #define ANHE_at_cache(he)
458#endif 474#endif
459 475
460#if EV_MULTIPLICITY 476#if EV_MULTIPLICITY
461 477
462 struct ev_loop 478 struct ev_loop
803#if EV_USE_4HEAP 819#if EV_USE_4HEAP
804 820
805#define DHEAP 4 821#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 822#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808 824#define UPHEAP_DONE(p,k) ((p) == (k))
809/* towards the root */
810void inline_speed
811upheap (ANHE *heap, int k)
812{
813 ANHE he = heap [k];
814
815 for (;;)
816 {
817 int p = HPARENT (k);
818
819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
820 break;
821
822 heap [k] = heap [p];
823 ev_active (ANHE_w (heap [k])) = k;
824 k = p;
825 }
826
827 heap [k] = he;
828 ev_active (ANHE_w (he)) = k;
829}
830 825
831/* away from the root */ 826/* away from the root */
832void inline_speed 827void inline_speed
833downheap (ANHE *heap, int N, int k) 828downheap (ANHE *heap, int N, int k)
834{ 829{
837 832
838 for (;;) 833 for (;;)
839 { 834 {
840 ev_tstamp minat; 835 ev_tstamp minat;
841 ANHE *minpos; 836 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 837 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
843 838
844 // find minimum child 839 /* find minimum child */
845 if (expect_true (pos + DHEAP - 1 < E)) 840 if (expect_true (pos + DHEAP - 1 < E))
846 { 841 {
847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 842 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 843 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 844 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
870 865
871 heap [k] = he; 866 heap [k] = he;
872 ev_active (ANHE_w (he)) = k; 867 ev_active (ANHE_w (he)) = k;
873} 868}
874 869
875#else // 4HEAP 870#else /* 4HEAP */
876 871
877#define HEAP0 1 872#define HEAP0 1
878#define HPARENT(k) ((k) >> 1) 873#define HPARENT(k) ((k) >> 1)
879 874#define UPHEAP_DONE(p,k) (!(p))
880/* towards the root */
881void inline_speed
882upheap (ANHE *heap, int k)
883{
884 ANHE he = heap [k];
885
886 for (;;)
887 {
888 int p = HPARENT (k);
889
890 /* maybe we could use a dummy element at heap [0]? */
891 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
892 break;
893
894 heap [k] = heap [p];
895 ev_active (ANHE_w (heap [k])) = k;
896 k = p;
897 }
898
899 heap [k] = he;
900 ev_active (ANHE_w (heap [k])) = k;
901}
902 875
903/* away from the root */ 876/* away from the root */
904void inline_speed 877void inline_speed
905downheap (ANHE *heap, int N, int k) 878downheap (ANHE *heap, int N, int k)
906{ 879{
908 881
909 for (;;) 882 for (;;)
910 { 883 {
911 int c = k << 1; 884 int c = k << 1;
912 885
913 if (c > N) 886 if (c > N + HEAP0 - 1)
914 break; 887 break;
915 888
916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 889 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917 ? 1 : 0; 890 ? 1 : 0;
918 891
919 if (ANHE_at (he) <= ANHE_at (heap [c])) 892 if (ANHE_at (he) <= ANHE_at (heap [c]))
920 break; 893 break;
921 894
928 heap [k] = he; 901 heap [k] = he;
929 ev_active (ANHE_w (he)) = k; 902 ev_active (ANHE_w (he)) = k;
930} 903}
931#endif 904#endif
932 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
919 heap [k] = heap [p];
920 ev_active (ANHE_w (heap [k])) = k;
921 k = p;
922 }
923
924 heap [k] = he;
925 ev_active (ANHE_w (he)) = k;
926}
927
933void inline_size 928void inline_size
934adjustheap (ANHE *heap, int N, int k) 929adjustheap (ANHE *heap, int N, int k)
935{ 930{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937 upheap (heap, k); 932 upheap (heap, k);
938 else 933 else
939 downheap (heap, N, k); 934 downheap (heap, N, k);
940} 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
941 962
942/*****************************************************************************/ 963/*****************************************************************************/
943 964
944typedef struct 965typedef struct
945{ 966{
1462 1483
1463 postfork = 0; 1484 postfork = 0;
1464} 1485}
1465 1486
1466#if EV_MULTIPLICITY 1487#if EV_MULTIPLICITY
1488
1467struct ev_loop * 1489struct ev_loop *
1468ev_loop_new (unsigned int flags) 1490ev_loop_new (unsigned int flags)
1469{ 1491{
1470 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));
1471 1493
1489void 1511void
1490ev_loop_fork (EV_P) 1512ev_loop_fork (EV_P)
1491{ 1513{
1492 postfork = 1; /* must be in line with ev_default_fork */ 1514 postfork = 1; /* must be in line with ev_default_fork */
1493} 1515}
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}
1494#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 */
1495 1553
1496#if EV_MULTIPLICITY 1554#if EV_MULTIPLICITY
1497struct ev_loop * 1555struct ev_loop *
1498ev_default_loop_init (unsigned int flags) 1556ev_default_loop_init (unsigned int flags)
1499#else 1557#else
1575 { 1633 {
1576 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1634 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1577 1635
1578 p->w->pending = 0; 1636 p->w->pending = 0;
1579 EV_CB_INVOKE (p->w, p->events); 1637 EV_CB_INVOKE (p->w, p->events);
1638 EV_FREQUENT_CHECK;
1580 } 1639 }
1581 } 1640 }
1582} 1641}
1583 1642
1584#if EV_IDLE_ENABLE 1643#if EV_IDLE_ENABLE
1605#endif 1664#endif
1606 1665
1607void inline_size 1666void inline_size
1608timers_reify (EV_P) 1667timers_reify (EV_P)
1609{ 1668{
1669 EV_FREQUENT_CHECK;
1670
1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1671 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611 { 1672 {
1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1673 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1613 1674
1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1675 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1620 if (ev_at (w) < mn_now) 1681 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now; 1682 ev_at (w) = mn_now;
1622 1683
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1684 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624 1685
1625 ANHE_at_set (timers [HEAP0]); 1686 ANHE_at_cache (timers [HEAP0]);
1626 downheap (timers, timercnt, HEAP0); 1687 downheap (timers, timercnt, HEAP0);
1627 } 1688 }
1628 else 1689 else
1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1690 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630 1691
1692 EV_FREQUENT_CHECK;
1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1693 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632 } 1694 }
1633} 1695}
1634 1696
1635#if EV_PERIODIC_ENABLE 1697#if EV_PERIODIC_ENABLE
1636void inline_size 1698void inline_size
1637periodics_reify (EV_P) 1699periodics_reify (EV_P)
1638{ 1700{
1701 EV_FREQUENT_CHECK;
1702
1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640 { 1704 {
1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1642 1706
1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1647 { 1711 {
1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649 1713
1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1714 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651 1715
1652 ANHE_at_set (periodics [HEAP0]); 1716 ANHE_at_cache (periodics [HEAP0]);
1653 downheap (periodics, periodiccnt, HEAP0); 1717 downheap (periodics, periodiccnt, HEAP0);
1654 } 1718 }
1655 else if (w->interval) 1719 else if (w->interval)
1656 { 1720 {
1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1721 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1666 /* has effectively asked to get triggered more often than possible */ 1730 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now) 1731 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now; 1732 ev_at (w) = ev_rt_now;
1669 } 1733 }
1670 1734
1671 ANHE_at_set (periodics [HEAP0]); 1735 ANHE_at_cache (periodics [HEAP0]);
1672 downheap (periodics, periodiccnt, HEAP0); 1736 downheap (periodics, periodiccnt, HEAP0);
1673 } 1737 }
1674 else 1738 else
1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1739 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676 1740
1741 EV_FREQUENT_CHECK;
1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1742 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678 } 1743 }
1679} 1744}
1680 1745
1681static void noinline 1746static void noinline
1691 if (w->reschedule_cb) 1756 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1757 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 1758 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1759 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 1760
1696 ANHE_at_set (periodics [i]); 1761 ANHE_at_cache (periodics [i]);
1697 } 1762 }
1698 1763
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1764 reheap (periodics, periodiccnt);
1700 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1701 for (i = 0; i < periodiccnt; ++i)
1702 upheap (periodics, i + HEAP0);
1703} 1765}
1704#endif 1766#endif
1705 1767
1706void inline_speed 1768void inline_speed
1707time_update (EV_P_ ev_tstamp max_block) 1769time_update (EV_P_ ev_tstamp max_block)
1765 /* 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 */
1766 for (i = 0; i < timercnt; ++i) 1828 for (i = 0; i < timercnt; ++i)
1767 { 1829 {
1768 ANHE *he = timers + i + HEAP0; 1830 ANHE *he = timers + i + HEAP0;
1769 ANHE_w (*he)->at += ev_rt_now - mn_now; 1831 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he); 1832 ANHE_at_cache (*he);
1771 } 1833 }
1772 } 1834 }
1773 1835
1774 mn_now = ev_rt_now; 1836 mn_now = ev_rt_now;
1775 } 1837 }
1796 1858
1797 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 */
1798 1860
1799 do 1861 do
1800 { 1862 {
1863#if EV_VERIFY >= 2
1864 ev_loop_verify (EV_A);
1865#endif
1866
1801#ifndef _WIN32 1867#ifndef _WIN32
1802 if (expect_false (curpid)) /* penalise the forking check even more */ 1868 if (expect_false (curpid)) /* penalise the forking check even more */
1803 if (expect_false (getpid () != curpid)) 1869 if (expect_false (getpid () != curpid))
1804 { 1870 {
1805 curpid = getpid (); 1871 curpid = getpid ();
2000 if (expect_false (ev_is_active (w))) 2066 if (expect_false (ev_is_active (w)))
2001 return; 2067 return;
2002 2068
2003 assert (("ev_io_start called with negative fd", fd >= 0)); 2069 assert (("ev_io_start called with negative fd", fd >= 0));
2004 2070
2071 EV_FREQUENT_CHECK;
2072
2005 ev_start (EV_A_ (W)w, 1); 2073 ev_start (EV_A_ (W)w, 1);
2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
2007 wlist_add (&anfds[fd].head, (WL)w); 2075 wlist_add (&anfds[fd].head, (WL)w);
2008 2076
2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET; 2078 w->events &= ~EV_IOFDSET;
2079
2080 EV_FREQUENT_CHECK;
2011} 2081}
2012 2082
2013void noinline 2083void noinline
2014ev_io_stop (EV_P_ ev_io *w) 2084ev_io_stop (EV_P_ ev_io *w)
2015{ 2085{
2017 if (expect_false (!ev_is_active (w))) 2087 if (expect_false (!ev_is_active (w)))
2018 return; 2088 return;
2019 2089
2020 assert (("ev_io_stop 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));
2021 2091
2092 EV_FREQUENT_CHECK;
2093
2022 wlist_del (&anfds[w->fd].head, (WL)w); 2094 wlist_del (&anfds[w->fd].head, (WL)w);
2023 ev_stop (EV_A_ (W)w); 2095 ev_stop (EV_A_ (W)w);
2024 2096
2025 fd_change (EV_A_ w->fd, 1); 2097 fd_change (EV_A_ w->fd, 1);
2098
2099 EV_FREQUENT_CHECK;
2026} 2100}
2027 2101
2028void noinline 2102void noinline
2029ev_timer_start (EV_P_ ev_timer *w) 2103ev_timer_start (EV_P_ ev_timer *w)
2030{ 2104{
2033 2107
2034 ev_at (w) += mn_now; 2108 ev_at (w) += mn_now;
2035 2109
2036 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.));
2037 2111
2112 EV_FREQUENT_CHECK;
2113
2114 ++timercnt;
2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2115 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2116 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040 ANHE_w (timers [ev_active (w)]) = (WT)w; 2117 ANHE_w (timers [ev_active (w)]) = (WT)w;
2041 ANHE_at_set (timers [ev_active (w)]); 2118 ANHE_at_cache (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w)); 2119 upheap (timers, ev_active (w));
2120
2121 EV_FREQUENT_CHECK;
2043 2122
2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2123 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2045} 2124}
2046 2125
2047void noinline 2126void noinline
2049{ 2128{
2050 clear_pending (EV_A_ (W)w); 2129 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2130 if (expect_false (!ev_is_active (w)))
2052 return; 2131 return;
2053 2132
2133 EV_FREQUENT_CHECK;
2134
2054 { 2135 {
2055 int active = ev_active (w); 2136 int active = ev_active (w);
2056 2137
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2138 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058 2139
2140 --timercnt;
2141
2059 if (expect_true (active < timercnt + HEAP0 - 1)) 2142 if (expect_true (active < timercnt + HEAP0))
2060 { 2143 {
2061 timers [active] = timers [timercnt + HEAP0 - 1]; 2144 timers [active] = timers [timercnt + HEAP0];
2062 adjustheap (timers, timercnt, active); 2145 adjustheap (timers, timercnt, active);
2063 } 2146 }
2064
2065 --timercnt;
2066 } 2147 }
2148
2149 EV_FREQUENT_CHECK;
2067 2150
2068 ev_at (w) -= mn_now; 2151 ev_at (w) -= mn_now;
2069 2152
2070 ev_stop (EV_A_ (W)w); 2153 ev_stop (EV_A_ (W)w);
2071} 2154}
2072 2155
2073void noinline 2156void noinline
2074ev_timer_again (EV_P_ ev_timer *w) 2157ev_timer_again (EV_P_ ev_timer *w)
2075{ 2158{
2159 EV_FREQUENT_CHECK;
2160
2076 if (ev_is_active (w)) 2161 if (ev_is_active (w))
2077 { 2162 {
2078 if (w->repeat) 2163 if (w->repeat)
2079 { 2164 {
2080 ev_at (w) = mn_now + w->repeat; 2165 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]); 2166 ANHE_at_cache (timers [ev_active (w)]);
2082 adjustheap (timers, timercnt, ev_active (w)); 2167 adjustheap (timers, timercnt, ev_active (w));
2083 } 2168 }
2084 else 2169 else
2085 ev_timer_stop (EV_A_ w); 2170 ev_timer_stop (EV_A_ w);
2086 } 2171 }
2087 else if (w->repeat) 2172 else if (w->repeat)
2088 { 2173 {
2089 ev_at (w) = w->repeat; 2174 ev_at (w) = w->repeat;
2090 ev_timer_start (EV_A_ w); 2175 ev_timer_start (EV_A_ w);
2091 } 2176 }
2177
2178 EV_FREQUENT_CHECK;
2092} 2179}
2093 2180
2094#if EV_PERIODIC_ENABLE 2181#if EV_PERIODIC_ENABLE
2095void noinline 2182void noinline
2096ev_periodic_start (EV_P_ ev_periodic *w) 2183ev_periodic_start (EV_P_ ev_periodic *w)
2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2194 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108 } 2195 }
2109 else 2196 else
2110 ev_at (w) = w->offset; 2197 ev_at (w) = w->offset;
2111 2198
2199 EV_FREQUENT_CHECK;
2200
2201 ++periodiccnt;
2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2202 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2203 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2204 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115 ANHE_at_set (periodics [ev_active (w)]); 2205 ANHE_at_cache (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w)); 2206 upheap (periodics, ev_active (w));
2207
2208 EV_FREQUENT_CHECK;
2117 2209
2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2210 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2119} 2211}
2120 2212
2121void noinline 2213void noinline
2123{ 2215{
2124 clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2125 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2126 return; 2218 return;
2127 2219
2220 EV_FREQUENT_CHECK;
2221
2128 { 2222 {
2129 int active = ev_active (w); 2223 int active = ev_active (w);
2130 2224
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2225 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132 2226
2227 --periodiccnt;
2228
2133 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2229 if (expect_true (active < periodiccnt + HEAP0))
2134 { 2230 {
2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2231 periodics [active] = periodics [periodiccnt + HEAP0];
2136 adjustheap (periodics, periodiccnt, active); 2232 adjustheap (periodics, periodiccnt, active);
2137 } 2233 }
2138
2139 --periodiccnt;
2140 } 2234 }
2235
2236 EV_FREQUENT_CHECK;
2141 2237
2142 ev_stop (EV_A_ (W)w); 2238 ev_stop (EV_A_ (W)w);
2143} 2239}
2144 2240
2145void noinline 2241void noinline
2165 return; 2261 return;
2166 2262
2167 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));
2168 2264
2169 evpipe_init (EV_A); 2265 evpipe_init (EV_A);
2266
2267 EV_FREQUENT_CHECK;
2170 2268
2171 { 2269 {
2172#ifndef _WIN32 2270#ifndef _WIN32
2173 sigset_t full, prev; 2271 sigset_t full, prev;
2174 sigfillset (&full); 2272 sigfillset (&full);
2195 sigfillset (&sa.sa_mask); 2293 sigfillset (&sa.sa_mask);
2196 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 */
2197 sigaction (w->signum, &sa, 0); 2295 sigaction (w->signum, &sa, 0);
2198#endif 2296#endif
2199 } 2297 }
2298
2299 EV_FREQUENT_CHECK;
2200} 2300}
2201 2301
2202void noinline 2302void noinline
2203ev_signal_stop (EV_P_ ev_signal *w) 2303ev_signal_stop (EV_P_ ev_signal *w)
2204{ 2304{
2205 clear_pending (EV_A_ (W)w); 2305 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2306 if (expect_false (!ev_is_active (w)))
2207 return; 2307 return;
2208 2308
2309 EV_FREQUENT_CHECK;
2310
2209 wlist_del (&signals [w->signum - 1].head, (WL)w); 2311 wlist_del (&signals [w->signum - 1].head, (WL)w);
2210 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
2211 2313
2212 if (!signals [w->signum - 1].head) 2314 if (!signals [w->signum - 1].head)
2213 signal (w->signum, SIG_DFL); 2315 signal (w->signum, SIG_DFL);
2316
2317 EV_FREQUENT_CHECK;
2214} 2318}
2215 2319
2216void 2320void
2217ev_child_start (EV_P_ ev_child *w) 2321ev_child_start (EV_P_ ev_child *w)
2218{ 2322{
2220 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));
2221#endif 2325#endif
2222 if (expect_false (ev_is_active (w))) 2326 if (expect_false (ev_is_active (w)))
2223 return; 2327 return;
2224 2328
2329 EV_FREQUENT_CHECK;
2330
2225 ev_start (EV_A_ (W)w, 1); 2331 ev_start (EV_A_ (W)w, 1);
2226 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;
2227} 2335}
2228 2336
2229void 2337void
2230ev_child_stop (EV_P_ ev_child *w) 2338ev_child_stop (EV_P_ ev_child *w)
2231{ 2339{
2232 clear_pending (EV_A_ (W)w); 2340 clear_pending (EV_A_ (W)w);
2233 if (expect_false (!ev_is_active (w))) 2341 if (expect_false (!ev_is_active (w)))
2234 return; 2342 return;
2235 2343
2344 EV_FREQUENT_CHECK;
2345
2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2346 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237 ev_stop (EV_A_ (W)w); 2347 ev_stop (EV_A_ (W)w);
2348
2349 EV_FREQUENT_CHECK;
2238} 2350}
2239 2351
2240#if EV_STAT_ENABLE 2352#if EV_STAT_ENABLE
2241 2353
2242# ifdef _WIN32 2354# ifdef _WIN32
2470 else 2582 else
2471#endif 2583#endif
2472 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
2473 2585
2474 ev_start (EV_A_ (W)w, 1); 2586 ev_start (EV_A_ (W)w, 1);
2587
2588 EV_FREQUENT_CHECK;
2475} 2589}
2476 2590
2477void 2591void
2478ev_stat_stop (EV_P_ ev_stat *w) 2592ev_stat_stop (EV_P_ ev_stat *w)
2479{ 2593{
2480 clear_pending (EV_A_ (W)w); 2594 clear_pending (EV_A_ (W)w);
2481 if (expect_false (!ev_is_active (w))) 2595 if (expect_false (!ev_is_active (w)))
2482 return; 2596 return;
2483 2597
2598 EV_FREQUENT_CHECK;
2599
2484#if EV_USE_INOTIFY 2600#if EV_USE_INOTIFY
2485 infy_del (EV_A_ w); 2601 infy_del (EV_A_ w);
2486#endif 2602#endif
2487 ev_timer_stop (EV_A_ &w->timer); 2603 ev_timer_stop (EV_A_ &w->timer);
2488 2604
2489 ev_stop (EV_A_ (W)w); 2605 ev_stop (EV_A_ (W)w);
2606
2607 EV_FREQUENT_CHECK;
2490} 2608}
2491#endif 2609#endif
2492 2610
2493#if EV_IDLE_ENABLE 2611#if EV_IDLE_ENABLE
2494void 2612void
2496{ 2614{
2497 if (expect_false (ev_is_active (w))) 2615 if (expect_false (ev_is_active (w)))
2498 return; 2616 return;
2499 2617
2500 pri_adjust (EV_A_ (W)w); 2618 pri_adjust (EV_A_ (W)w);
2619
2620 EV_FREQUENT_CHECK;
2501 2621
2502 { 2622 {
2503 int active = ++idlecnt [ABSPRI (w)]; 2623 int active = ++idlecnt [ABSPRI (w)];
2504 2624
2505 ++idleall; 2625 ++idleall;
2506 ev_start (EV_A_ (W)w, active); 2626 ev_start (EV_A_ (W)w, active);
2507 2627
2508 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);
2509 idles [ABSPRI (w)][active - 1] = w; 2629 idles [ABSPRI (w)][active - 1] = w;
2510 } 2630 }
2631
2632 EV_FREQUENT_CHECK;
2511} 2633}
2512 2634
2513void 2635void
2514ev_idle_stop (EV_P_ ev_idle *w) 2636ev_idle_stop (EV_P_ ev_idle *w)
2515{ 2637{
2516 clear_pending (EV_A_ (W)w); 2638 clear_pending (EV_A_ (W)w);
2517 if (expect_false (!ev_is_active (w))) 2639 if (expect_false (!ev_is_active (w)))
2518 return; 2640 return;
2519 2641
2642 EV_FREQUENT_CHECK;
2643
2520 { 2644 {
2521 int active = ev_active (w); 2645 int active = ev_active (w);
2522 2646
2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2647 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2648 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525 2649
2526 ev_stop (EV_A_ (W)w); 2650 ev_stop (EV_A_ (W)w);
2527 --idleall; 2651 --idleall;
2528 } 2652 }
2653
2654 EV_FREQUENT_CHECK;
2529} 2655}
2530#endif 2656#endif
2531 2657
2532void 2658void
2533ev_prepare_start (EV_P_ ev_prepare *w) 2659ev_prepare_start (EV_P_ ev_prepare *w)
2534{ 2660{
2535 if (expect_false (ev_is_active (w))) 2661 if (expect_false (ev_is_active (w)))
2536 return; 2662 return;
2663
2664 EV_FREQUENT_CHECK;
2537 2665
2538 ev_start (EV_A_ (W)w, ++preparecnt); 2666 ev_start (EV_A_ (W)w, ++preparecnt);
2539 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2667 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540 prepares [preparecnt - 1] = w; 2668 prepares [preparecnt - 1] = w;
2669
2670 EV_FREQUENT_CHECK;
2541} 2671}
2542 2672
2543void 2673void
2544ev_prepare_stop (EV_P_ ev_prepare *w) 2674ev_prepare_stop (EV_P_ ev_prepare *w)
2545{ 2675{
2546 clear_pending (EV_A_ (W)w); 2676 clear_pending (EV_A_ (W)w);
2547 if (expect_false (!ev_is_active (w))) 2677 if (expect_false (!ev_is_active (w)))
2548 return; 2678 return;
2549 2679
2680 EV_FREQUENT_CHECK;
2681
2550 { 2682 {
2551 int active = ev_active (w); 2683 int active = ev_active (w);
2552 2684
2553 prepares [active - 1] = prepares [--preparecnt]; 2685 prepares [active - 1] = prepares [--preparecnt];
2554 ev_active (prepares [active - 1]) = active; 2686 ev_active (prepares [active - 1]) = active;
2555 } 2687 }
2556 2688
2557 ev_stop (EV_A_ (W)w); 2689 ev_stop (EV_A_ (W)w);
2690
2691 EV_FREQUENT_CHECK;
2558} 2692}
2559 2693
2560void 2694void
2561ev_check_start (EV_P_ ev_check *w) 2695ev_check_start (EV_P_ ev_check *w)
2562{ 2696{
2563 if (expect_false (ev_is_active (w))) 2697 if (expect_false (ev_is_active (w)))
2564 return; 2698 return;
2699
2700 EV_FREQUENT_CHECK;
2565 2701
2566 ev_start (EV_A_ (W)w, ++checkcnt); 2702 ev_start (EV_A_ (W)w, ++checkcnt);
2567 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2703 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568 checks [checkcnt - 1] = w; 2704 checks [checkcnt - 1] = w;
2705
2706 EV_FREQUENT_CHECK;
2569} 2707}
2570 2708
2571void 2709void
2572ev_check_stop (EV_P_ ev_check *w) 2710ev_check_stop (EV_P_ ev_check *w)
2573{ 2711{
2574 clear_pending (EV_A_ (W)w); 2712 clear_pending (EV_A_ (W)w);
2575 if (expect_false (!ev_is_active (w))) 2713 if (expect_false (!ev_is_active (w)))
2576 return; 2714 return;
2577 2715
2716 EV_FREQUENT_CHECK;
2717
2578 { 2718 {
2579 int active = ev_active (w); 2719 int active = ev_active (w);
2580 2720
2581 checks [active - 1] = checks [--checkcnt]; 2721 checks [active - 1] = checks [--checkcnt];
2582 ev_active (checks [active - 1]) = active; 2722 ev_active (checks [active - 1]) = active;
2583 } 2723 }
2584 2724
2585 ev_stop (EV_A_ (W)w); 2725 ev_stop (EV_A_ (W)w);
2726
2727 EV_FREQUENT_CHECK;
2586} 2728}
2587 2729
2588#if EV_EMBED_ENABLE 2730#if EV_EMBED_ENABLE
2589void noinline 2731void noinline
2590ev_embed_sweep (EV_P_ ev_embed *w) 2732ev_embed_sweep (EV_P_ ev_embed *w)
2637 struct ev_loop *loop = w->other; 2779 struct ev_loop *loop = w->other;
2638 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 ()));
2639 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);
2640 } 2782 }
2641 2783
2784 EV_FREQUENT_CHECK;
2785
2642 ev_set_priority (&w->io, ev_priority (w)); 2786 ev_set_priority (&w->io, ev_priority (w));
2643 ev_io_start (EV_A_ &w->io); 2787 ev_io_start (EV_A_ &w->io);
2644 2788
2645 ev_prepare_init (&w->prepare, embed_prepare_cb); 2789 ev_prepare_init (&w->prepare, embed_prepare_cb);
2646 ev_set_priority (&w->prepare, EV_MINPRI); 2790 ev_set_priority (&w->prepare, EV_MINPRI);
2647 ev_prepare_start (EV_A_ &w->prepare); 2791 ev_prepare_start (EV_A_ &w->prepare);
2648 2792
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650 2794
2651 ev_start (EV_A_ (W)w, 1); 2795 ev_start (EV_A_ (W)w, 1);
2796
2797 EV_FREQUENT_CHECK;
2652} 2798}
2653 2799
2654void 2800void
2655ev_embed_stop (EV_P_ ev_embed *w) 2801ev_embed_stop (EV_P_ ev_embed *w)
2656{ 2802{
2657 clear_pending (EV_A_ (W)w); 2803 clear_pending (EV_A_ (W)w);
2658 if (expect_false (!ev_is_active (w))) 2804 if (expect_false (!ev_is_active (w)))
2659 return; 2805 return;
2660 2806
2807 EV_FREQUENT_CHECK;
2808
2661 ev_io_stop (EV_A_ &w->io); 2809 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare); 2810 ev_prepare_stop (EV_A_ &w->prepare);
2663 2811
2664 ev_stop (EV_A_ (W)w); 2812 ev_stop (EV_A_ (W)w);
2813
2814 EV_FREQUENT_CHECK;
2665} 2815}
2666#endif 2816#endif
2667 2817
2668#if EV_FORK_ENABLE 2818#if EV_FORK_ENABLE
2669void 2819void
2670ev_fork_start (EV_P_ ev_fork *w) 2820ev_fork_start (EV_P_ ev_fork *w)
2671{ 2821{
2672 if (expect_false (ev_is_active (w))) 2822 if (expect_false (ev_is_active (w)))
2673 return; 2823 return;
2824
2825 EV_FREQUENT_CHECK;
2674 2826
2675 ev_start (EV_A_ (W)w, ++forkcnt); 2827 ev_start (EV_A_ (W)w, ++forkcnt);
2676 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2828 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677 forks [forkcnt - 1] = w; 2829 forks [forkcnt - 1] = w;
2830
2831 EV_FREQUENT_CHECK;
2678} 2832}
2679 2833
2680void 2834void
2681ev_fork_stop (EV_P_ ev_fork *w) 2835ev_fork_stop (EV_P_ ev_fork *w)
2682{ 2836{
2683 clear_pending (EV_A_ (W)w); 2837 clear_pending (EV_A_ (W)w);
2684 if (expect_false (!ev_is_active (w))) 2838 if (expect_false (!ev_is_active (w)))
2685 return; 2839 return;
2686 2840
2841 EV_FREQUENT_CHECK;
2842
2687 { 2843 {
2688 int active = ev_active (w); 2844 int active = ev_active (w);
2689 2845
2690 forks [active - 1] = forks [--forkcnt]; 2846 forks [active - 1] = forks [--forkcnt];
2691 ev_active (forks [active - 1]) = active; 2847 ev_active (forks [active - 1]) = active;
2692 } 2848 }
2693 2849
2694 ev_stop (EV_A_ (W)w); 2850 ev_stop (EV_A_ (W)w);
2851
2852 EV_FREQUENT_CHECK;
2695} 2853}
2696#endif 2854#endif
2697 2855
2698#if EV_ASYNC_ENABLE 2856#if EV_ASYNC_ENABLE
2699void 2857void
2701{ 2859{
2702 if (expect_false (ev_is_active (w))) 2860 if (expect_false (ev_is_active (w)))
2703 return; 2861 return;
2704 2862
2705 evpipe_init (EV_A); 2863 evpipe_init (EV_A);
2864
2865 EV_FREQUENT_CHECK;
2706 2866
2707 ev_start (EV_A_ (W)w, ++asynccnt); 2867 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2868 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w; 2869 asyncs [asynccnt - 1] = w;
2870
2871 EV_FREQUENT_CHECK;
2710} 2872}
2711 2873
2712void 2874void
2713ev_async_stop (EV_P_ ev_async *w) 2875ev_async_stop (EV_P_ ev_async *w)
2714{ 2876{
2715 clear_pending (EV_A_ (W)w); 2877 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w))) 2878 if (expect_false (!ev_is_active (w)))
2717 return; 2879 return;
2718 2880
2881 EV_FREQUENT_CHECK;
2882
2719 { 2883 {
2720 int active = ev_active (w); 2884 int active = ev_active (w);
2721 2885
2722 asyncs [active - 1] = asyncs [--asynccnt]; 2886 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active; 2887 ev_active (asyncs [active - 1]) = active;
2724 } 2888 }
2725 2889
2726 ev_stop (EV_A_ (W)w); 2890 ev_stop (EV_A_ (W)w);
2891
2892 EV_FREQUENT_CHECK;
2727} 2893}
2728 2894
2729void 2895void
2730ev_async_send (EV_P_ ev_async *w) 2896ev_async_send (EV_P_ ev_async *w)
2731{ 2897{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines