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

Comparing libev/ev.c (file contents):
Revision 1.243 by root, Fri May 9 15:52:13 2008 UTC vs.
Revision 1.256 by root, Thu Jun 19 06:53:49 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>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 242# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1 243# define EV_USE_EVENTFD 1
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
247#endif
248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
238#endif 257#endif
239 258
240#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
242#endif 261#endif
… …
287} 306}
288# endif 307# endif
289#endif 308#endif
290 309
291/**/ 310/**/
311
312#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
314#else
315# define EV_FREQUENT_CHECK do { } while (0)
316#endif
292 317
293/* 318/*
294 * This is used to avoid floating point rounding problems. 319 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 320 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 321 * to ensure progress, time-wise, even when rounding
… …
444 typedef struct { 469 typedef struct {
445 ev_tstamp at; 470 ev_tstamp at;
446 WT w; 471 WT w;
447 } ANHE; 472 } ANHE;
448 473
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 474 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 475 #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 */ 476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 477#else
453 typedef WT ANHE; 478 typedef WT ANHE;
454 479
455 #define ANHE_w(he) (he) 480 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 481 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 482 #define ANHE_at_cache(he)
458#endif 483#endif
459 484
460#if EV_MULTIPLICITY 485#if EV_MULTIPLICITY
461 486
462 struct ev_loop 487 struct ev_loop
… …
683 events |= (unsigned char)w->events; 708 events |= (unsigned char)w->events;
684 709
685#if EV_SELECT_IS_WINSOCKET 710#if EV_SELECT_IS_WINSOCKET
686 if (events) 711 if (events)
687 { 712 {
688 unsigned long argp; 713 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE 714 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 715 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else 716 #else
692 anfd->handle = _get_osfhandle (fd); 717 anfd->handle = _get_osfhandle (fd);
693 #endif 718 #endif
694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 719 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
695 } 720 }
696#endif 721#endif
697 722
698 { 723 {
699 unsigned char o_events = anfd->events; 724 unsigned char o_events = anfd->events;
… …
752{ 777{
753 int fd; 778 int fd;
754 779
755 for (fd = 0; fd < anfdmax; ++fd) 780 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 781 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 782 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 783 fd_kill (EV_A_ fd);
759} 784}
760 785
761/* called on ENOMEM in select/poll to kill some fds and retry */ 786/* called on ENOMEM in select/poll to kill some fds and retry */
762static void noinline 787static void noinline
… …
802 */ 827 */
803#if EV_USE_4HEAP 828#if EV_USE_4HEAP
804 829
805#define DHEAP 4 830#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 831#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807 832#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 833#define UPHEAP_DONE(p,k) ((p) == (k))
809void inline_speed
810upheap (ANHE *heap, int k)
811{
812 ANHE he = heap [k];
813
814 for (;;)
815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
821 heap [k] = heap [p];
822 ev_active (ANHE_w (heap [k])) = k;
823 k = p;
824 }
825
826 ev_active (ANHE_w (he)) = k;
827 heap [k] = he;
828}
829 834
830/* away from the root */ 835/* away from the root */
831void inline_speed 836void inline_speed
832downheap (ANHE *heap, int N, int k) 837downheap (ANHE *heap, int N, int k)
833{ 838{
… …
836 841
837 for (;;) 842 for (;;)
838 { 843 {
839 ev_tstamp minat; 844 ev_tstamp minat;
840 ANHE *minpos; 845 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 846 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 847
843 // find minimum child 848 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 849 if (expect_true (pos + DHEAP - 1 < E))
845 { 850 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 851 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 852 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 853 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 854 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 } 855 }
851 else if (pos < E) 856 else if (pos < E)
852 { 857 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 858 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 859 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
… …
859 break; 864 break;
860 865
861 if (ANHE_at (he) <= minat) 866 if (ANHE_at (he) <= minat)
862 break; 867 break;
863 868
869 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 870 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 871
867 k = minpos - heap; 872 k = minpos - heap;
868 } 873 }
869 874
875 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 876 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 877}
873 878
874#else // 4HEAP 879#else /* 4HEAP */
875 880
876#define HEAP0 1 881#define HEAP0 1
877 882#define HPARENT(k) ((k) >> 1)
878/* towards the root */ 883#define UPHEAP_DONE(p,k) (!(p))
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900 884
901/* away from the root */ 885/* away from the root */
902void inline_speed 886void inline_speed
903downheap (ANHE *heap, int N, int k) 887downheap (ANHE *heap, int N, int k)
904{ 888{
… …
906 890
907 for (;;) 891 for (;;)
908 { 892 {
909 int c = k << 1; 893 int c = k << 1;
910 894
911 if (c > N) 895 if (c > N + HEAP0 - 1)
912 break; 896 break;
913 897
914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 898 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
915 ? 1 : 0; 899 ? 1 : 0;
916 900
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 901 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 902 break;
919 903
… …
926 heap [k] = he; 910 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 911 ev_active (ANHE_w (he)) = k;
928} 912}
929#endif 913#endif
930 914
915/* towards the root */
916void inline_speed
917upheap (ANHE *heap, int k)
918{
919 ANHE he = heap [k];
920
921 for (;;)
922 {
923 int p = HPARENT (k);
924
925 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
926 break;
927
928 heap [k] = heap [p];
929 ev_active (ANHE_w (heap [k])) = k;
930 k = p;
931 }
932
933 heap [k] = he;
934 ev_active (ANHE_w (he)) = k;
935}
936
931void inline_size 937void inline_size
932adjustheap (ANHE *heap, int N, int k) 938adjustheap (ANHE *heap, int N, int k)
933{ 939{
940 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
934 upheap (heap, k); 941 upheap (heap, k);
942 else
935 downheap (heap, N, k); 943 downheap (heap, N, k);
944}
945
946/* rebuild the heap: this function is used only once and executed rarely */
947void inline_size
948reheap (ANHE *heap, int N)
949{
950 int i;
951
952 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
953 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
954 for (i = 0; i < N; ++i)
955 upheap (heap, i + HEAP0);
936} 956}
937 957
938/*****************************************************************************/ 958/*****************************************************************************/
939 959
940typedef struct 960typedef struct
… …
964 984
965void inline_speed 985void inline_speed
966fd_intern (int fd) 986fd_intern (int fd)
967{ 987{
968#ifdef _WIN32 988#ifdef _WIN32
969 int arg = 1; 989 unsigned long arg = 1;
970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
971#else 991#else
972 fcntl (fd, F_SETFD, FD_CLOEXEC); 992 fcntl (fd, F_SETFD, FD_CLOEXEC);
973 fcntl (fd, F_SETFL, O_NONBLOCK); 993 fcntl (fd, F_SETFL, O_NONBLOCK);
974#endif 994#endif
… …
1458 1478
1459 postfork = 0; 1479 postfork = 0;
1460} 1480}
1461 1481
1462#if EV_MULTIPLICITY 1482#if EV_MULTIPLICITY
1483
1463struct ev_loop * 1484struct ev_loop *
1464ev_loop_new (unsigned int flags) 1485ev_loop_new (unsigned int flags)
1465{ 1486{
1466 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1487 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1467 1488
… …
1485void 1506void
1486ev_loop_fork (EV_P) 1507ev_loop_fork (EV_P)
1487{ 1508{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1509 postfork = 1; /* must be in line with ev_default_fork */
1489} 1510}
1511
1512#if EV_VERIFY
1513void noinline
1514verify_watcher (EV_P_ W w)
1515{
1516 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517
1518 if (w->pending)
1519 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1520}
1521
1522static void noinline
1523verify_heap (EV_P_ ANHE *heap, int N)
1524{
1525 int i;
1526
1527 for (i = HEAP0; i < N + HEAP0; ++i)
1528 {
1529 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1530 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1531 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1532
1533 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1534 }
1535}
1536
1537static void noinline
1538array_verify (EV_P_ W *ws, int cnt)
1539{
1540 while (cnt--)
1541 {
1542 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1543 verify_watcher (EV_A_ ws [cnt]);
1544 }
1545}
1546#endif
1547
1548void
1549ev_loop_verify (EV_P)
1550{
1551#if EV_VERIFY
1552 int i;
1553 WL w;
1554
1555 assert (activecnt >= -1);
1556
1557 assert (fdchangemax >= fdchangecnt);
1558 for (i = 0; i < fdchangecnt; ++i)
1559 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1560
1561 assert (anfdmax >= 0);
1562 for (i = 0; i < anfdmax; ++i)
1563 for (w = anfds [i].head; w; w = w->next)
1564 {
1565 verify_watcher (EV_A_ (W)w);
1566 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1567 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1568 }
1569
1570 assert (timermax >= timercnt);
1571 verify_heap (EV_A_ timers, timercnt);
1572
1573#if EV_PERIODIC_ENABLE
1574 assert (periodicmax >= periodiccnt);
1575 verify_heap (EV_A_ periodics, periodiccnt);
1576#endif
1577
1578 for (i = NUMPRI; i--; )
1579 {
1580 assert (pendingmax [i] >= pendingcnt [i]);
1581#if EV_IDLE_ENABLE
1582 assert (idleall >= 0);
1583 assert (idlemax [i] >= idlecnt [i]);
1584 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1585#endif
1586 }
1587
1588#if EV_FORK_ENABLE
1589 assert (forkmax >= forkcnt);
1590 array_verify (EV_A_ (W *)forks, forkcnt);
1591#endif
1592
1593#if EV_ASYNC_ENABLE
1594 assert (asyncmax >= asynccnt);
1595 array_verify (EV_A_ (W *)asyncs, asynccnt);
1596#endif
1597
1598 assert (preparemax >= preparecnt);
1599 array_verify (EV_A_ (W *)prepares, preparecnt);
1600
1601 assert (checkmax >= checkcnt);
1602 array_verify (EV_A_ (W *)checks, checkcnt);
1603
1604# if 0
1605 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1606 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1490#endif 1607# endif
1608#endif
1609}
1610
1611#endif /* multiplicity */
1491 1612
1492#if EV_MULTIPLICITY 1613#if EV_MULTIPLICITY
1493struct ev_loop * 1614struct ev_loop *
1494ev_default_loop_init (unsigned int flags) 1615ev_default_loop_init (unsigned int flags)
1495#else 1616#else
… …
1571 { 1692 {
1572 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1693 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1573 1694
1574 p->w->pending = 0; 1695 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 1696 EV_CB_INVOKE (p->w, p->events);
1697 EV_FREQUENT_CHECK;
1576 } 1698 }
1577 } 1699 }
1578} 1700}
1579 1701
1580#if EV_IDLE_ENABLE 1702#if EV_IDLE_ENABLE
… …
1601#endif 1723#endif
1602 1724
1603void inline_size 1725void inline_size
1604timers_reify (EV_P) 1726timers_reify (EV_P)
1605{ 1727{
1728 EV_FREQUENT_CHECK;
1729
1606 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1730 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 1731 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1732 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609 1733
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1734 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611 1735
… …
1616 if (ev_at (w) < mn_now) 1740 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 1741 ev_at (w) = mn_now;
1618 1742
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1743 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620 1744
1621 ANHE_at_set (timers [HEAP0]); 1745 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0); 1746 downheap (timers, timercnt, HEAP0);
1623 } 1747 }
1624 else 1748 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1749 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 1750
1751 EV_FREQUENT_CHECK;
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1752 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 } 1753 }
1629} 1754}
1630 1755
1631#if EV_PERIODIC_ENABLE 1756#if EV_PERIODIC_ENABLE
1632void inline_size 1757void inline_size
1633periodics_reify (EV_P) 1758periodics_reify (EV_P)
1634{ 1759{
1760 EV_FREQUENT_CHECK;
1761
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1762 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 1763 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1764 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638 1765
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1766 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1640 1767
1641 /* first reschedule or stop timer */ 1768 /* first reschedule or stop timer */
1642 if (w->reschedule_cb) 1769 if (w->reschedule_cb)
1643 { 1770 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1771 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 1772
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1773 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647 1774
1648 ANHE_at_set (periodics [HEAP0]); 1775 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1776 downheap (periodics, periodiccnt, HEAP0);
1650 } 1777 }
1651 else if (w->interval) 1778 else if (w->interval)
1652 { 1779 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1780 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1781 /* if next trigger time is not sufficiently in the future, put it there */
1782 /* this might happen because of floating point inexactness */
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1783 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1784 {
1785 ev_at (w) += w->interval;
1655 1786
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1787 /* if interval is unreasonably low we might still have a time in the past */
1788 /* so correct this. this will make the periodic very inexact, but the user */
1789 /* has effectively asked to get triggered more often than possible */
1790 if (ev_at (w) < ev_rt_now)
1791 ev_at (w) = ev_rt_now;
1792 }
1657 1793
1658 ANHE_at_set (periodics [HEAP0]); 1794 ANHE_at_cache (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0); 1795 downheap (periodics, periodiccnt, HEAP0);
1660 } 1796 }
1661 else 1797 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663 1799
1800 EV_FREQUENT_CHECK;
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1801 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 } 1802 }
1666} 1803}
1667 1804
1668static void noinline 1805static void noinline
… …
1678 if (w->reschedule_cb) 1815 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1816 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 1817 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1818 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682 1819
1683 ANHE_at_set (periodics [i]); 1820 ANHE_at_cache (periodics [i]);
1684 } 1821 }
1685 1822
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1823 reheap (periodics, periodiccnt);
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1688 for (i = 0; i < periodiccnt; ++i)
1689 upheap (periodics, i + HEAP0);
1690} 1824}
1691#endif 1825#endif
1692 1826
1693void inline_speed 1827void inline_speed
1694time_update (EV_P_ ev_tstamp max_block) 1828time_update (EV_P_ ev_tstamp max_block)
… …
1752 /* adjust timers. this is easy, as the offset is the same for all of them */ 1886 /* adjust timers. this is easy, as the offset is the same for all of them */
1753 for (i = 0; i < timercnt; ++i) 1887 for (i = 0; i < timercnt; ++i)
1754 { 1888 {
1755 ANHE *he = timers + i + HEAP0; 1889 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now; 1890 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he); 1891 ANHE_at_cache (*he);
1758 } 1892 }
1759 } 1893 }
1760 1894
1761 mn_now = ev_rt_now; 1895 mn_now = ev_rt_now;
1762 } 1896 }
… …
1783 1917
1784 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1918 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1785 1919
1786 do 1920 do
1787 { 1921 {
1922#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A);
1924#endif
1925
1788#ifndef _WIN32 1926#ifndef _WIN32
1789 if (expect_false (curpid)) /* penalise the forking check even more */ 1927 if (expect_false (curpid)) /* penalise the forking check even more */
1790 if (expect_false (getpid () != curpid)) 1928 if (expect_false (getpid () != curpid))
1791 { 1929 {
1792 curpid = getpid (); 1930 curpid = getpid ();
… …
1987 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
1988 return; 2126 return;
1989 2127
1990 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
1991 2129
2130 EV_FREQUENT_CHECK;
2131
1992 ev_start (EV_A_ (W)w, 1); 2132 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2133 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1994 wlist_add (&anfds[fd].head, (WL)w); 2134 wlist_add (&anfds[fd].head, (WL)w);
1995 2135
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2136 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1997 w->events &= ~EV_IOFDSET; 2137 w->events &= ~EV_IOFDSET;
2138
2139 EV_FREQUENT_CHECK;
1998} 2140}
1999 2141
2000void noinline 2142void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2143ev_io_stop (EV_P_ ev_io *w)
2002{ 2144{
… …
2004 if (expect_false (!ev_is_active (w))) 2146 if (expect_false (!ev_is_active (w)))
2005 return; 2147 return;
2006 2148
2007 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2149 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2008 2150
2151 EV_FREQUENT_CHECK;
2152
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2153 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2154 ev_stop (EV_A_ (W)w);
2011 2155
2012 fd_change (EV_A_ w->fd, 1); 2156 fd_change (EV_A_ w->fd, 1);
2157
2158 EV_FREQUENT_CHECK;
2013} 2159}
2014 2160
2015void noinline 2161void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2162ev_timer_start (EV_P_ ev_timer *w)
2017{ 2163{
… …
2020 2166
2021 ev_at (w) += mn_now; 2167 ev_at (w) += mn_now;
2022 2168
2023 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2169 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2024 2170
2171 EV_FREQUENT_CHECK;
2172
2173 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2174 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2175 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2176 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2177 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2178 upheap (timers, ev_active (w));
2179
2180 EV_FREQUENT_CHECK;
2030 2181
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2182 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2183}
2033 2184
2034void noinline 2185void noinline
… …
2036{ 2187{
2037 clear_pending (EV_A_ (W)w); 2188 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2189 if (expect_false (!ev_is_active (w)))
2039 return; 2190 return;
2040 2191
2192 EV_FREQUENT_CHECK;
2193
2041 { 2194 {
2042 int active = ev_active (w); 2195 int active = ev_active (w);
2043 2196
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2197 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2198
2199 --timercnt;
2200
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2201 if (expect_true (active < timercnt + HEAP0))
2047 { 2202 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2203 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2204 adjustheap (timers, timercnt, active);
2050 } 2205 }
2051
2052 --timercnt;
2053 } 2206 }
2207
2208 EV_FREQUENT_CHECK;
2054 2209
2055 ev_at (w) -= mn_now; 2210 ev_at (w) -= mn_now;
2056 2211
2057 ev_stop (EV_A_ (W)w); 2212 ev_stop (EV_A_ (W)w);
2058} 2213}
2059 2214
2060void noinline 2215void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2216ev_timer_again (EV_P_ ev_timer *w)
2062{ 2217{
2218 EV_FREQUENT_CHECK;
2219
2063 if (ev_is_active (w)) 2220 if (ev_is_active (w))
2064 { 2221 {
2065 if (w->repeat) 2222 if (w->repeat)
2066 { 2223 {
2067 ev_at (w) = mn_now + w->repeat; 2224 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2225 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2226 adjustheap (timers, timercnt, ev_active (w));
2070 } 2227 }
2071 else 2228 else
2072 ev_timer_stop (EV_A_ w); 2229 ev_timer_stop (EV_A_ w);
2073 } 2230 }
2074 else if (w->repeat) 2231 else if (w->repeat)
2075 { 2232 {
2076 ev_at (w) = w->repeat; 2233 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2234 ev_timer_start (EV_A_ w);
2078 } 2235 }
2236
2237 EV_FREQUENT_CHECK;
2079} 2238}
2080 2239
2081#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
2082void noinline 2241void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2242ev_periodic_start (EV_P_ ev_periodic *w)
… …
2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2253 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2095 } 2254 }
2096 else 2255 else
2097 ev_at (w) = w->offset; 2256 ev_at (w) = w->offset;
2098 2257
2258 EV_FREQUENT_CHECK;
2259
2260 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2261 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2262 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2263 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2264 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2265 upheap (periodics, ev_active (w));
2266
2267 EV_FREQUENT_CHECK;
2104 2268
2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2269 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2106} 2270}
2107 2271
2108void noinline 2272void noinline
… …
2110{ 2274{
2111 clear_pending (EV_A_ (W)w); 2275 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2276 if (expect_false (!ev_is_active (w)))
2113 return; 2277 return;
2114 2278
2279 EV_FREQUENT_CHECK;
2280
2115 { 2281 {
2116 int active = ev_active (w); 2282 int active = ev_active (w);
2117 2283
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2284 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2285
2286 --periodiccnt;
2287
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2288 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2289 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2290 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2291 adjustheap (periodics, periodiccnt, active);
2124 } 2292 }
2125
2126 --periodiccnt;
2127 } 2293 }
2294
2295 EV_FREQUENT_CHECK;
2128 2296
2129 ev_stop (EV_A_ (W)w); 2297 ev_stop (EV_A_ (W)w);
2130} 2298}
2131 2299
2132void noinline 2300void noinline
… …
2152 return; 2320 return;
2153 2321
2154 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2322 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2155 2323
2156 evpipe_init (EV_A); 2324 evpipe_init (EV_A);
2325
2326 EV_FREQUENT_CHECK;
2157 2327
2158 { 2328 {
2159#ifndef _WIN32 2329#ifndef _WIN32
2160 sigset_t full, prev; 2330 sigset_t full, prev;
2161 sigfillset (&full); 2331 sigfillset (&full);
… …
2182 sigfillset (&sa.sa_mask); 2352 sigfillset (&sa.sa_mask);
2183 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2353 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2184 sigaction (w->signum, &sa, 0); 2354 sigaction (w->signum, &sa, 0);
2185#endif 2355#endif
2186 } 2356 }
2357
2358 EV_FREQUENT_CHECK;
2187} 2359}
2188 2360
2189void noinline 2361void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2362ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2363{
2192 clear_pending (EV_A_ (W)w); 2364 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2365 if (expect_false (!ev_is_active (w)))
2194 return; 2366 return;
2195 2367
2368 EV_FREQUENT_CHECK;
2369
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2370 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2371 ev_stop (EV_A_ (W)w);
2198 2372
2199 if (!signals [w->signum - 1].head) 2373 if (!signals [w->signum - 1].head)
2200 signal (w->signum, SIG_DFL); 2374 signal (w->signum, SIG_DFL);
2375
2376 EV_FREQUENT_CHECK;
2201} 2377}
2202 2378
2203void 2379void
2204ev_child_start (EV_P_ ev_child *w) 2380ev_child_start (EV_P_ ev_child *w)
2205{ 2381{
… …
2207 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2383 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2208#endif 2384#endif
2209 if (expect_false (ev_is_active (w))) 2385 if (expect_false (ev_is_active (w)))
2210 return; 2386 return;
2211 2387
2388 EV_FREQUENT_CHECK;
2389
2212 ev_start (EV_A_ (W)w, 1); 2390 ev_start (EV_A_ (W)w, 1);
2213 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2391 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2392
2393 EV_FREQUENT_CHECK;
2214} 2394}
2215 2395
2216void 2396void
2217ev_child_stop (EV_P_ ev_child *w) 2397ev_child_stop (EV_P_ ev_child *w)
2218{ 2398{
2219 clear_pending (EV_A_ (W)w); 2399 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2400 if (expect_false (!ev_is_active (w)))
2221 return; 2401 return;
2222 2402
2403 EV_FREQUENT_CHECK;
2404
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2405 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2406 ev_stop (EV_A_ (W)w);
2407
2408 EV_FREQUENT_CHECK;
2225} 2409}
2226 2410
2227#if EV_STAT_ENABLE 2411#if EV_STAT_ENABLE
2228 2412
2229# ifdef _WIN32 2413# ifdef _WIN32
… …
2384 } 2568 }
2385 2569
2386 } 2570 }
2387} 2571}
2388 2572
2573#endif
2574
2575#ifdef _WIN32
2576# define EV_LSTAT(p,b) _stati64 (p, b)
2577#else
2578# define EV_LSTAT(p,b) lstat (p, b)
2389#endif 2579#endif
2390 2580
2391void 2581void
2392ev_stat_stat (EV_P_ ev_stat *w) 2582ev_stat_stat (EV_P_ ev_stat *w)
2393{ 2583{
… …
2457 else 2647 else
2458#endif 2648#endif
2459 ev_timer_start (EV_A_ &w->timer); 2649 ev_timer_start (EV_A_ &w->timer);
2460 2650
2461 ev_start (EV_A_ (W)w, 1); 2651 ev_start (EV_A_ (W)w, 1);
2652
2653 EV_FREQUENT_CHECK;
2462} 2654}
2463 2655
2464void 2656void
2465ev_stat_stop (EV_P_ ev_stat *w) 2657ev_stat_stop (EV_P_ ev_stat *w)
2466{ 2658{
2467 clear_pending (EV_A_ (W)w); 2659 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 2660 if (expect_false (!ev_is_active (w)))
2469 return; 2661 return;
2470 2662
2663 EV_FREQUENT_CHECK;
2664
2471#if EV_USE_INOTIFY 2665#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 2666 infy_del (EV_A_ w);
2473#endif 2667#endif
2474 ev_timer_stop (EV_A_ &w->timer); 2668 ev_timer_stop (EV_A_ &w->timer);
2475 2669
2476 ev_stop (EV_A_ (W)w); 2670 ev_stop (EV_A_ (W)w);
2671
2672 EV_FREQUENT_CHECK;
2477} 2673}
2478#endif 2674#endif
2479 2675
2480#if EV_IDLE_ENABLE 2676#if EV_IDLE_ENABLE
2481void 2677void
… …
2483{ 2679{
2484 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2485 return; 2681 return;
2486 2682
2487 pri_adjust (EV_A_ (W)w); 2683 pri_adjust (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2488 2686
2489 { 2687 {
2490 int active = ++idlecnt [ABSPRI (w)]; 2688 int active = ++idlecnt [ABSPRI (w)];
2491 2689
2492 ++idleall; 2690 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 2691 ev_start (EV_A_ (W)w, active);
2494 2692
2495 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2693 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2496 idles [ABSPRI (w)][active - 1] = w; 2694 idles [ABSPRI (w)][active - 1] = w;
2497 } 2695 }
2696
2697 EV_FREQUENT_CHECK;
2498} 2698}
2499 2699
2500void 2700void
2501ev_idle_stop (EV_P_ ev_idle *w) 2701ev_idle_stop (EV_P_ ev_idle *w)
2502{ 2702{
2503 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2505 return; 2705 return;
2506 2706
2707 EV_FREQUENT_CHECK;
2708
2507 { 2709 {
2508 int active = ev_active (w); 2710 int active = ev_active (w);
2509 2711
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2712 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2713 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 2714
2513 ev_stop (EV_A_ (W)w); 2715 ev_stop (EV_A_ (W)w);
2514 --idleall; 2716 --idleall;
2515 } 2717 }
2718
2719 EV_FREQUENT_CHECK;
2516} 2720}
2517#endif 2721#endif
2518 2722
2519void 2723void
2520ev_prepare_start (EV_P_ ev_prepare *w) 2724ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 2725{
2522 if (expect_false (ev_is_active (w))) 2726 if (expect_false (ev_is_active (w)))
2523 return; 2727 return;
2728
2729 EV_FREQUENT_CHECK;
2524 2730
2525 ev_start (EV_A_ (W)w, ++preparecnt); 2731 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2732 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 2733 prepares [preparecnt - 1] = w;
2734
2735 EV_FREQUENT_CHECK;
2528} 2736}
2529 2737
2530void 2738void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 2739ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 2740{
2533 clear_pending (EV_A_ (W)w); 2741 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2742 if (expect_false (!ev_is_active (w)))
2535 return; 2743 return;
2536 2744
2745 EV_FREQUENT_CHECK;
2746
2537 { 2747 {
2538 int active = ev_active (w); 2748 int active = ev_active (w);
2539 2749
2540 prepares [active - 1] = prepares [--preparecnt]; 2750 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 2751 ev_active (prepares [active - 1]) = active;
2542 } 2752 }
2543 2753
2544 ev_stop (EV_A_ (W)w); 2754 ev_stop (EV_A_ (W)w);
2755
2756 EV_FREQUENT_CHECK;
2545} 2757}
2546 2758
2547void 2759void
2548ev_check_start (EV_P_ ev_check *w) 2760ev_check_start (EV_P_ ev_check *w)
2549{ 2761{
2550 if (expect_false (ev_is_active (w))) 2762 if (expect_false (ev_is_active (w)))
2551 return; 2763 return;
2764
2765 EV_FREQUENT_CHECK;
2552 2766
2553 ev_start (EV_A_ (W)w, ++checkcnt); 2767 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2768 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 2769 checks [checkcnt - 1] = w;
2770
2771 EV_FREQUENT_CHECK;
2556} 2772}
2557 2773
2558void 2774void
2559ev_check_stop (EV_P_ ev_check *w) 2775ev_check_stop (EV_P_ ev_check *w)
2560{ 2776{
2561 clear_pending (EV_A_ (W)w); 2777 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 2778 if (expect_false (!ev_is_active (w)))
2563 return; 2779 return;
2564 2780
2781 EV_FREQUENT_CHECK;
2782
2565 { 2783 {
2566 int active = ev_active (w); 2784 int active = ev_active (w);
2567 2785
2568 checks [active - 1] = checks [--checkcnt]; 2786 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 2787 ev_active (checks [active - 1]) = active;
2570 } 2788 }
2571 2789
2572 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2573} 2793}
2574 2794
2575#if EV_EMBED_ENABLE 2795#if EV_EMBED_ENABLE
2576void noinline 2796void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 2797ev_embed_sweep (EV_P_ ev_embed *w)
… …
2624 struct ev_loop *loop = w->other; 2844 struct ev_loop *loop = w->other;
2625 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2845 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2626 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2846 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2627 } 2847 }
2628 2848
2849 EV_FREQUENT_CHECK;
2850
2629 ev_set_priority (&w->io, ev_priority (w)); 2851 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 2852 ev_io_start (EV_A_ &w->io);
2631 2853
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 2854 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 2855 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 2856 ev_prepare_start (EV_A_ &w->prepare);
2635 2857
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2858 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 2859
2638 ev_start (EV_A_ (W)w, 1); 2860 ev_start (EV_A_ (W)w, 1);
2861
2862 EV_FREQUENT_CHECK;
2639} 2863}
2640 2864
2641void 2865void
2642ev_embed_stop (EV_P_ ev_embed *w) 2866ev_embed_stop (EV_P_ ev_embed *w)
2643{ 2867{
2644 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2646 return; 2870 return;
2647 2871
2872 EV_FREQUENT_CHECK;
2873
2648 ev_io_stop (EV_A_ &w->io); 2874 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 2875 ev_prepare_stop (EV_A_ &w->prepare);
2650 2876
2651 ev_stop (EV_A_ (W)w); 2877 ev_stop (EV_A_ (W)w);
2878
2879 EV_FREQUENT_CHECK;
2652} 2880}
2653#endif 2881#endif
2654 2882
2655#if EV_FORK_ENABLE 2883#if EV_FORK_ENABLE
2656void 2884void
2657ev_fork_start (EV_P_ ev_fork *w) 2885ev_fork_start (EV_P_ ev_fork *w)
2658{ 2886{
2659 if (expect_false (ev_is_active (w))) 2887 if (expect_false (ev_is_active (w)))
2660 return; 2888 return;
2889
2890 EV_FREQUENT_CHECK;
2661 2891
2662 ev_start (EV_A_ (W)w, ++forkcnt); 2892 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2893 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 2894 forks [forkcnt - 1] = w;
2895
2896 EV_FREQUENT_CHECK;
2665} 2897}
2666 2898
2667void 2899void
2668ev_fork_stop (EV_P_ ev_fork *w) 2900ev_fork_stop (EV_P_ ev_fork *w)
2669{ 2901{
2670 clear_pending (EV_A_ (W)w); 2902 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2672 return; 2904 return;
2673 2905
2906 EV_FREQUENT_CHECK;
2907
2674 { 2908 {
2675 int active = ev_active (w); 2909 int active = ev_active (w);
2676 2910
2677 forks [active - 1] = forks [--forkcnt]; 2911 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 2912 ev_active (forks [active - 1]) = active;
2679 } 2913 }
2680 2914
2681 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2916
2917 EV_FREQUENT_CHECK;
2682} 2918}
2683#endif 2919#endif
2684 2920
2685#if EV_ASYNC_ENABLE 2921#if EV_ASYNC_ENABLE
2686void 2922void
… …
2688{ 2924{
2689 if (expect_false (ev_is_active (w))) 2925 if (expect_false (ev_is_active (w)))
2690 return; 2926 return;
2691 2927
2692 evpipe_init (EV_A); 2928 evpipe_init (EV_A);
2929
2930 EV_FREQUENT_CHECK;
2693 2931
2694 ev_start (EV_A_ (W)w, ++asynccnt); 2932 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2933 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 2934 asyncs [asynccnt - 1] = w;
2935
2936 EV_FREQUENT_CHECK;
2697} 2937}
2698 2938
2699void 2939void
2700ev_async_stop (EV_P_ ev_async *w) 2940ev_async_stop (EV_P_ ev_async *w)
2701{ 2941{
2702 clear_pending (EV_A_ (W)w); 2942 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 2943 if (expect_false (!ev_is_active (w)))
2704 return; 2944 return;
2705 2945
2946 EV_FREQUENT_CHECK;
2947
2706 { 2948 {
2707 int active = ev_active (w); 2949 int active = ev_active (w);
2708 2950
2709 asyncs [active - 1] = asyncs [--asynccnt]; 2951 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 2952 ev_active (asyncs [active - 1]) = active;
2711 } 2953 }
2712 2954
2713 ev_stop (EV_A_ (W)w); 2955 ev_stop (EV_A_ (W)w);
2956
2957 EV_FREQUENT_CHECK;
2714} 2958}
2715 2959
2716void 2960void
2717ev_async_send (EV_P_ ev_async *w) 2961ev_async_send (EV_P_ ev_async *w)
2718{ 2962{

Diff Legend

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