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

Comparing libev/ev.c (file contents):
Revision 1.240 by root, Thu May 8 21:21:41 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
257#endif
258
259#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL
261#endif
262
263#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL
238#endif 265#endif
239 266
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 267/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 268
242#ifndef CLOCK_MONOTONIC 269#ifndef CLOCK_MONOTONIC
… …
279} 306}
280# endif 307# endif
281#endif 308#endif
282 309
283/**/ 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
284 317
285/* 318/*
286 * This is used to avoid floating point rounding problems. 319 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 320 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 321 * to ensure progress, time-wise, even when rounding
… …
422 W w; 455 W w;
423 int events; 456 int events;
424} ANPENDING; 457} ANPENDING;
425 458
426#if EV_USE_INOTIFY 459#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */
427typedef struct 461typedef struct
428{ 462{
429 WL head; 463 WL head;
430} ANFS; 464} ANFS;
465#endif
466
467/* Heap Entry */
468#if EV_HEAP_CACHE_AT
469 typedef struct {
470 ev_tstamp at;
471 WT w;
472 } ANHE;
473
474 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else
478 typedef WT ANHE;
479
480 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he)
431#endif 483#endif
432 484
433#if EV_MULTIPLICITY 485#if EV_MULTIPLICITY
434 486
435 struct ev_loop 487 struct ev_loop
… …
656 events |= (unsigned char)w->events; 708 events |= (unsigned char)w->events;
657 709
658#if EV_SELECT_IS_WINSOCKET 710#if EV_SELECT_IS_WINSOCKET
659 if (events) 711 if (events)
660 { 712 {
661 unsigned long argp; 713 unsigned long arg;
662 #ifdef EV_FD_TO_WIN32_HANDLE 714 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 715 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else 716 #else
665 anfd->handle = _get_osfhandle (fd); 717 anfd->handle = _get_osfhandle (fd);
666 #endif 718 #endif
667 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));
668 } 720 }
669#endif 721#endif
670 722
671 { 723 {
672 unsigned char o_events = anfd->events; 724 unsigned char o_events = anfd->events;
… …
725{ 777{
726 int fd; 778 int fd;
727 779
728 for (fd = 0; fd < anfdmax; ++fd) 780 for (fd = 0; fd < anfdmax; ++fd)
729 if (anfds [fd].events) 781 if (anfds [fd].events)
730 if (!fd_valid (fd) == -1 && errno == EBADF) 782 if (!fd_valid (fd) && errno == EBADF)
731 fd_kill (EV_A_ fd); 783 fd_kill (EV_A_ fd);
732} 784}
733 785
734/* 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 */
735static void noinline 787static void noinline
… …
760} 812}
761 813
762/*****************************************************************************/ 814/*****************************************************************************/
763 815
764/* 816/*
817 * the heap functions want a real array index. array index 0 uis guaranteed to not
818 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
819 * the branching factor of the d-tree.
820 */
821
822/*
765 * at the moment we allow libev the luxury of two heaps, 823 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap 824 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient. 825 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 826 * the difference is about 5% with 50000+ watchers.
769 */ 827 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP 828#if EV_USE_4HEAP
772 829
773#define DHEAP 4 830#define DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 831#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775 832#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
776/* towards the root */ 833#define UPHEAP_DONE(p,k) ((p) == (k))
777void inline_speed
778upheap (WT *heap, int k)
779{
780 WT w = heap [k];
781 ev_tstamp w_at = w->at;
782
783 for (;;)
784 {
785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
786
787 if (p == k || heap [p]->at <= w_at)
788 break;
789
790 heap [k] = heap [p];
791 ev_active (heap [k]) = k;
792 k = p;
793 }
794
795 heap [k] = w;
796 ev_active (heap [k]) = k;
797}
798 834
799/* away from the root */ 835/* away from the root */
800void inline_speed 836void inline_speed
801downheap (WT *heap, int N, int k) 837downheap (ANHE *heap, int N, int k)
802{ 838{
803 WT w = heap [k]; 839 ANHE he = heap [k];
804 WT *E = heap + N + HEAP0; 840 ANHE *E = heap + N + HEAP0;
805 841
806 for (;;) 842 for (;;)
807 { 843 {
808 ev_tstamp minat; 844 ev_tstamp minat;
809 WT *minpos; 845 ANHE *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 846 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
811 847
812 // find minimum child 848 /* find minimum child */
813 if (expect_true (pos + DHEAP - 1 < E)) 849 if (expect_true (pos + DHEAP - 1 < E))
814 { 850 {
815 /* fast path */ (minpos = pos + 0), (minat = (*minpos)->at); 851 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 852 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at); 853 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at); 854 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
819 } 855 }
820 else if (pos < E) 856 else if (pos < E)
821 { 857 {
822 /* slow path */ (minpos = pos + 0), (minat = (*minpos)->at); 858 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
823 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 859 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
824 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at); 860 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
825 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at); 861 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
826 } 862 }
827 else 863 else
828 break; 864 break;
829 865
830 if (w->at <= minat) 866 if (ANHE_at (he) <= minat)
831 break; 867 break;
832 868
833 ev_active (*minpos) = k;
834 heap [k] = *minpos; 869 heap [k] = *minpos;
870 ev_active (ANHE_w (*minpos)) = k;
835 871
836 k = minpos - heap; 872 k = minpos - heap;
837 } 873 }
838 874
839 heap [k] = w; 875 heap [k] = he;
840 ev_active (heap [k]) = k; 876 ev_active (ANHE_w (he)) = k;
841} 877}
842 878
843#else // 4HEAP 879#else /* 4HEAP */
844 880
845#define HEAP0 1 881#define HEAP0 1
882#define HPARENT(k) ((k) >> 1)
883#define UPHEAP_DONE(p,k) (!(p))
884
885/* away from the root */
886void inline_speed
887downheap (ANHE *heap, int N, int k)
888{
889 ANHE he = heap [k];
890
891 for (;;)
892 {
893 int c = k << 1;
894
895 if (c > N + HEAP0 - 1)
896 break;
897
898 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
899 ? 1 : 0;
900
901 if (ANHE_at (he) <= ANHE_at (heap [c]))
902 break;
903
904 heap [k] = heap [c];
905 ev_active (ANHE_w (heap [k])) = k;
906
907 k = c;
908 }
909
910 heap [k] = he;
911 ev_active (ANHE_w (he)) = k;
912}
913#endif
846 914
847/* towards the root */ 915/* towards the root */
848void inline_speed 916void inline_speed
849upheap (WT *heap, int k) 917upheap (ANHE *heap, int k)
850{ 918{
851 WT w = heap [k]; 919 ANHE he = heap [k];
852 920
853 for (;;) 921 for (;;)
854 { 922 {
855 int p = k >> 1; 923 int p = HPARENT (k);
856 924
857 /* maybe we could use a dummy element at heap [0]? */ 925 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
858 if (!p || heap [p]->at <= w->at)
859 break; 926 break;
860 927
861 heap [k] = heap [p]; 928 heap [k] = heap [p];
862 ev_active (heap [k]) = k; 929 ev_active (ANHE_w (heap [k])) = k;
863 k = p; 930 k = p;
864 } 931 }
865 932
866 heap [k] = w; 933 heap [k] = he;
867 ev_active (heap [k]) = k; 934 ev_active (ANHE_w (he)) = k;
868} 935}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
878 int c = k << 1;
879
880 if (c > N)
881 break;
882
883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
884 ? 1 : 0;
885
886 if (w->at <= heap [c]->at)
887 break;
888
889 heap [k] = heap [c];
890 ((W)heap [k])->active = k;
891
892 k = c;
893 }
894
895 heap [k] = w;
896 ev_active (heap [k]) = k;
897}
898#endif
899 936
900void inline_size 937void inline_size
901adjustheap (WT *heap, int N, int k) 938adjustheap (ANHE *heap, int N, int k)
902{ 939{
940 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
903 upheap (heap, k); 941 upheap (heap, k);
942 else
904 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);
905} 956}
906 957
907/*****************************************************************************/ 958/*****************************************************************************/
908 959
909typedef struct 960typedef struct
… …
933 984
934void inline_speed 985void inline_speed
935fd_intern (int fd) 986fd_intern (int fd)
936{ 987{
937#ifdef _WIN32 988#ifdef _WIN32
938 int arg = 1; 989 unsigned long arg = 1;
939 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
940#else 991#else
941 fcntl (fd, F_SETFD, FD_CLOEXEC); 992 fcntl (fd, F_SETFD, FD_CLOEXEC);
942 fcntl (fd, F_SETFL, O_NONBLOCK); 993 fcntl (fd, F_SETFL, O_NONBLOCK);
943#endif 994#endif
… …
1427 1478
1428 postfork = 0; 1479 postfork = 0;
1429} 1480}
1430 1481
1431#if EV_MULTIPLICITY 1482#if EV_MULTIPLICITY
1483
1432struct ev_loop * 1484struct ev_loop *
1433ev_loop_new (unsigned int flags) 1485ev_loop_new (unsigned int flags)
1434{ 1486{
1435 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));
1436 1488
… …
1454void 1506void
1455ev_loop_fork (EV_P) 1507ev_loop_fork (EV_P)
1456{ 1508{
1457 postfork = 1; /* must be in line with ev_default_fork */ 1509 postfork = 1; /* must be in line with ev_default_fork */
1458} 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)
1459#endif 1607# endif
1608#endif
1609}
1610
1611#endif /* multiplicity */
1460 1612
1461#if EV_MULTIPLICITY 1613#if EV_MULTIPLICITY
1462struct ev_loop * 1614struct ev_loop *
1463ev_default_loop_init (unsigned int flags) 1615ev_default_loop_init (unsigned int flags)
1464#else 1616#else
… …
1540 { 1692 {
1541 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1693 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1542 1694
1543 p->w->pending = 0; 1695 p->w->pending = 0;
1544 EV_CB_INVOKE (p->w, p->events); 1696 EV_CB_INVOKE (p->w, p->events);
1697 EV_FREQUENT_CHECK;
1545 } 1698 }
1546 } 1699 }
1547} 1700}
1548 1701
1549#if EV_IDLE_ENABLE 1702#if EV_IDLE_ENABLE
… …
1570#endif 1723#endif
1571 1724
1572void inline_size 1725void inline_size
1573timers_reify (EV_P) 1726timers_reify (EV_P)
1574{ 1727{
1728 EV_FREQUENT_CHECK;
1729
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1730 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1576 { 1731 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0]; 1732 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1578 1733
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1734 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580 1735
1581 /* first reschedule or stop timer */ 1736 /* first reschedule or stop timer */
1582 if (w->repeat) 1737 if (w->repeat)
1583 { 1738 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat; 1739 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now) 1740 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now; 1741 ev_at (w) = mn_now;
1589 1742
1743 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1744
1745 ANHE_at_cache (timers [HEAP0]);
1590 downheap (timers, timercnt, HEAP0); 1746 downheap (timers, timercnt, HEAP0);
1591 } 1747 }
1592 else 1748 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1749 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594 1750
1751 EV_FREQUENT_CHECK;
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1752 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 } 1753 }
1597} 1754}
1598 1755
1599#if EV_PERIODIC_ENABLE 1756#if EV_PERIODIC_ENABLE
1600void inline_size 1757void inline_size
1601periodics_reify (EV_P) 1758periodics_reify (EV_P)
1602{ 1759{
1760 EV_FREQUENT_CHECK;
1761
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1762 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1604 { 1763 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1764 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1606 1765
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1766 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608 1767
1609 /* first reschedule or stop timer */ 1768 /* first reschedule or stop timer */
1610 if (w->reschedule_cb) 1769 if (w->reschedule_cb)
1611 { 1770 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1771 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1772
1613 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));
1774
1775 ANHE_at_cache (periodics [HEAP0]);
1614 downheap (periodics, periodiccnt, 1); 1776 downheap (periodics, periodiccnt, HEAP0);
1615 } 1777 }
1616 else if (w->interval) 1778 else if (w->interval)
1617 { 1779 {
1618 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 */
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1783 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1784 {
1785 ev_at (w) += w->interval;
1786
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 }
1793
1794 ANHE_at_cache (periodics [HEAP0]);
1621 downheap (periodics, periodiccnt, HEAP0); 1795 downheap (periodics, periodiccnt, HEAP0);
1622 } 1796 }
1623 else 1797 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625 1799
1800 EV_FREQUENT_CHECK;
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1801 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 } 1802 }
1628} 1803}
1629 1804
1630static void noinline 1805static void noinline
1631periodics_reschedule (EV_P) 1806periodics_reschedule (EV_P)
1632{ 1807{
1633 int i; 1808 int i;
1634 1809
1635 /* adjust periodics after time jump */ 1810 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i) 1811 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1637 { 1812 {
1638 ev_periodic *w = (ev_periodic *)periodics [i]; 1813 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1639 1814
1640 if (w->reschedule_cb) 1815 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1816 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval) 1817 else if (w->interval)
1643 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;
1644 }
1645 1819
1646 /* now rebuild the heap */ 1820 ANHE_at_cache (periodics [i]);
1647 for (i = periodiccnt >> 1; --i; ) 1821 }
1822
1648 downheap (periodics, periodiccnt, i + HEAP0); 1823 reheap (periodics, periodiccnt);
1649} 1824}
1650#endif 1825#endif
1651 1826
1652void inline_speed 1827void inline_speed
1653time_update (EV_P_ ev_tstamp max_block) 1828time_update (EV_P_ ev_tstamp max_block)
… …
1707 { 1882 {
1708#if EV_PERIODIC_ENABLE 1883#if EV_PERIODIC_ENABLE
1709 periodics_reschedule (EV_A); 1884 periodics_reschedule (EV_A);
1710#endif 1885#endif
1711 /* 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 */
1712 for (i = 1; i <= timercnt; ++i) 1887 for (i = 0; i < timercnt; ++i)
1713 ev_at (timers [i]) += ev_rt_now - mn_now; 1888 {
1889 ANHE *he = timers + i + HEAP0;
1890 ANHE_w (*he)->at += ev_rt_now - mn_now;
1891 ANHE_at_cache (*he);
1892 }
1714 } 1893 }
1715 1894
1716 mn_now = ev_rt_now; 1895 mn_now = ev_rt_now;
1717 } 1896 }
1718} 1897}
… …
1738 1917
1739 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 */
1740 1919
1741 do 1920 do
1742 { 1921 {
1922#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A);
1924#endif
1925
1743#ifndef _WIN32 1926#ifndef _WIN32
1744 if (expect_false (curpid)) /* penalise the forking check even more */ 1927 if (expect_false (curpid)) /* penalise the forking check even more */
1745 if (expect_false (getpid () != curpid)) 1928 if (expect_false (getpid () != curpid))
1746 { 1929 {
1747 curpid = getpid (); 1930 curpid = getpid ();
… …
1788 1971
1789 waittime = MAX_BLOCKTIME; 1972 waittime = MAX_BLOCKTIME;
1790 1973
1791 if (timercnt) 1974 if (timercnt)
1792 { 1975 {
1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1976 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1794 if (waittime > to) waittime = to; 1977 if (waittime > to) waittime = to;
1795 } 1978 }
1796 1979
1797#if EV_PERIODIC_ENABLE 1980#if EV_PERIODIC_ENABLE
1798 if (periodiccnt) 1981 if (periodiccnt)
1799 { 1982 {
1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1983 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1801 if (waittime > to) waittime = to; 1984 if (waittime > to) waittime = to;
1802 } 1985 }
1803#endif 1986#endif
1804 1987
1805 if (expect_false (waittime < timeout_blocktime)) 1988 if (expect_false (waittime < timeout_blocktime))
… …
1942 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
1943 return; 2126 return;
1944 2127
1945 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
1946 2129
2130 EV_FREQUENT_CHECK;
2131
1947 ev_start (EV_A_ (W)w, 1); 2132 ev_start (EV_A_ (W)w, 1);
1948 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2133 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1949 wlist_add (&anfds[fd].head, (WL)w); 2134 wlist_add (&anfds[fd].head, (WL)w);
1950 2135
1951 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2136 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1952 w->events &= ~EV_IOFDSET; 2137 w->events &= ~EV_IOFDSET;
2138
2139 EV_FREQUENT_CHECK;
1953} 2140}
1954 2141
1955void noinline 2142void noinline
1956ev_io_stop (EV_P_ ev_io *w) 2143ev_io_stop (EV_P_ ev_io *w)
1957{ 2144{
1958 clear_pending (EV_A_ (W)w); 2145 clear_pending (EV_A_ (W)w);
1959 if (expect_false (!ev_is_active (w))) 2146 if (expect_false (!ev_is_active (w)))
1960 return; 2147 return;
1961 2148
1962 assert (("ev_io_start 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));
2150
2151 EV_FREQUENT_CHECK;
1963 2152
1964 wlist_del (&anfds[w->fd].head, (WL)w); 2153 wlist_del (&anfds[w->fd].head, (WL)w);
1965 ev_stop (EV_A_ (W)w); 2154 ev_stop (EV_A_ (W)w);
1966 2155
1967 fd_change (EV_A_ w->fd, 1); 2156 fd_change (EV_A_ w->fd, 1);
2157
2158 EV_FREQUENT_CHECK;
1968} 2159}
1969 2160
1970void noinline 2161void noinline
1971ev_timer_start (EV_P_ ev_timer *w) 2162ev_timer_start (EV_P_ ev_timer *w)
1972{ 2163{
… …
1975 2166
1976 ev_at (w) += mn_now; 2167 ev_at (w) += mn_now;
1977 2168
1978 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.));
1979 2170
2171 EV_FREQUENT_CHECK;
2172
2173 ++timercnt;
1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2174 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2175 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1982 timers [ev_active (w)] = (WT)w; 2176 ANHE_w (timers [ev_active (w)]) = (WT)w;
2177 ANHE_at_cache (timers [ev_active (w)]);
1983 upheap (timers, ev_active (w)); 2178 upheap (timers, ev_active (w));
1984 2179
2180 EV_FREQUENT_CHECK;
2181
1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2182 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1986} 2183}
1987 2184
1988void noinline 2185void noinline
1989ev_timer_stop (EV_P_ ev_timer *w) 2186ev_timer_stop (EV_P_ ev_timer *w)
1990{ 2187{
1991 clear_pending (EV_A_ (W)w); 2188 clear_pending (EV_A_ (W)w);
1992 if (expect_false (!ev_is_active (w))) 2189 if (expect_false (!ev_is_active (w)))
1993 return; 2190 return;
1994 2191
2192 EV_FREQUENT_CHECK;
2193
1995 { 2194 {
1996 int active = ev_active (w); 2195 int active = ev_active (w);
1997 2196
1998 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2197 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1999 2198
2199 --timercnt;
2200
2000 if (expect_true (active < timercnt + HEAP0 - 1)) 2201 if (expect_true (active < timercnt + HEAP0))
2001 { 2202 {
2002 timers [active] = timers [timercnt + HEAP0 - 1]; 2203 timers [active] = timers [timercnt + HEAP0];
2003 adjustheap (timers, timercnt, active); 2204 adjustheap (timers, timercnt, active);
2004 } 2205 }
2005
2006 --timercnt;
2007 } 2206 }
2207
2208 EV_FREQUENT_CHECK;
2008 2209
2009 ev_at (w) -= mn_now; 2210 ev_at (w) -= mn_now;
2010 2211
2011 ev_stop (EV_A_ (W)w); 2212 ev_stop (EV_A_ (W)w);
2012} 2213}
2013 2214
2014void noinline 2215void noinline
2015ev_timer_again (EV_P_ ev_timer *w) 2216ev_timer_again (EV_P_ ev_timer *w)
2016{ 2217{
2218 EV_FREQUENT_CHECK;
2219
2017 if (ev_is_active (w)) 2220 if (ev_is_active (w))
2018 { 2221 {
2019 if (w->repeat) 2222 if (w->repeat)
2020 { 2223 {
2021 ev_at (w) = mn_now + w->repeat; 2224 ev_at (w) = mn_now + w->repeat;
2225 ANHE_at_cache (timers [ev_active (w)]);
2022 adjustheap (timers, timercnt, ev_active (w)); 2226 adjustheap (timers, timercnt, ev_active (w));
2023 } 2227 }
2024 else 2228 else
2025 ev_timer_stop (EV_A_ w); 2229 ev_timer_stop (EV_A_ w);
2026 } 2230 }
2027 else if (w->repeat) 2231 else if (w->repeat)
2028 { 2232 {
2029 ev_at (w) = w->repeat; 2233 ev_at (w) = w->repeat;
2030 ev_timer_start (EV_A_ w); 2234 ev_timer_start (EV_A_ w);
2031 } 2235 }
2236
2237 EV_FREQUENT_CHECK;
2032} 2238}
2033 2239
2034#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
2035void noinline 2241void noinline
2036ev_periodic_start (EV_P_ ev_periodic *w) 2242ev_periodic_start (EV_P_ ev_periodic *w)
… …
2047 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;
2048 } 2254 }
2049 else 2255 else
2050 ev_at (w) = w->offset; 2256 ev_at (w) = w->offset;
2051 2257
2258 EV_FREQUENT_CHECK;
2259
2260 ++periodiccnt;
2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2261 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2262 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2054 periodics [ev_active (w)] = (WT)w; 2263 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2264 ANHE_at_cache (periodics [ev_active (w)]);
2055 upheap (periodics, ev_active (w)); 2265 upheap (periodics, ev_active (w));
2056 2266
2267 EV_FREQUENT_CHECK;
2268
2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2269 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2058} 2270}
2059 2271
2060void noinline 2272void noinline
2061ev_periodic_stop (EV_P_ ev_periodic *w) 2273ev_periodic_stop (EV_P_ ev_periodic *w)
2062{ 2274{
2063 clear_pending (EV_A_ (W)w); 2275 clear_pending (EV_A_ (W)w);
2064 if (expect_false (!ev_is_active (w))) 2276 if (expect_false (!ev_is_active (w)))
2065 return; 2277 return;
2066 2278
2279 EV_FREQUENT_CHECK;
2280
2067 { 2281 {
2068 int active = ev_active (w); 2282 int active = ev_active (w);
2069 2283
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2284 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2071 2285
2286 --periodiccnt;
2287
2072 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2288 if (expect_true (active < periodiccnt + HEAP0))
2073 { 2289 {
2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2290 periodics [active] = periodics [periodiccnt + HEAP0];
2075 adjustheap (periodics, periodiccnt, active); 2291 adjustheap (periodics, periodiccnt, active);
2076 } 2292 }
2077
2078 --periodiccnt;
2079 } 2293 }
2294
2295 EV_FREQUENT_CHECK;
2080 2296
2081 ev_stop (EV_A_ (W)w); 2297 ev_stop (EV_A_ (W)w);
2082} 2298}
2083 2299
2084void noinline 2300void noinline
… …
2104 return; 2320 return;
2105 2321
2106 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));
2107 2323
2108 evpipe_init (EV_A); 2324 evpipe_init (EV_A);
2325
2326 EV_FREQUENT_CHECK;
2109 2327
2110 { 2328 {
2111#ifndef _WIN32 2329#ifndef _WIN32
2112 sigset_t full, prev; 2330 sigset_t full, prev;
2113 sigfillset (&full); 2331 sigfillset (&full);
… …
2134 sigfillset (&sa.sa_mask); 2352 sigfillset (&sa.sa_mask);
2135 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 */
2136 sigaction (w->signum, &sa, 0); 2354 sigaction (w->signum, &sa, 0);
2137#endif 2355#endif
2138 } 2356 }
2357
2358 EV_FREQUENT_CHECK;
2139} 2359}
2140 2360
2141void noinline 2361void noinline
2142ev_signal_stop (EV_P_ ev_signal *w) 2362ev_signal_stop (EV_P_ ev_signal *w)
2143{ 2363{
2144 clear_pending (EV_A_ (W)w); 2364 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2365 if (expect_false (!ev_is_active (w)))
2146 return; 2366 return;
2147 2367
2368 EV_FREQUENT_CHECK;
2369
2148 wlist_del (&signals [w->signum - 1].head, (WL)w); 2370 wlist_del (&signals [w->signum - 1].head, (WL)w);
2149 ev_stop (EV_A_ (W)w); 2371 ev_stop (EV_A_ (W)w);
2150 2372
2151 if (!signals [w->signum - 1].head) 2373 if (!signals [w->signum - 1].head)
2152 signal (w->signum, SIG_DFL); 2374 signal (w->signum, SIG_DFL);
2375
2376 EV_FREQUENT_CHECK;
2153} 2377}
2154 2378
2155void 2379void
2156ev_child_start (EV_P_ ev_child *w) 2380ev_child_start (EV_P_ ev_child *w)
2157{ 2381{
… …
2159 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));
2160#endif 2384#endif
2161 if (expect_false (ev_is_active (w))) 2385 if (expect_false (ev_is_active (w)))
2162 return; 2386 return;
2163 2387
2388 EV_FREQUENT_CHECK;
2389
2164 ev_start (EV_A_ (W)w, 1); 2390 ev_start (EV_A_ (W)w, 1);
2165 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;
2166} 2394}
2167 2395
2168void 2396void
2169ev_child_stop (EV_P_ ev_child *w) 2397ev_child_stop (EV_P_ ev_child *w)
2170{ 2398{
2171 clear_pending (EV_A_ (W)w); 2399 clear_pending (EV_A_ (W)w);
2172 if (expect_false (!ev_is_active (w))) 2400 if (expect_false (!ev_is_active (w)))
2173 return; 2401 return;
2174 2402
2403 EV_FREQUENT_CHECK;
2404
2175 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2405 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2176 ev_stop (EV_A_ (W)w); 2406 ev_stop (EV_A_ (W)w);
2407
2408 EV_FREQUENT_CHECK;
2177} 2409}
2178 2410
2179#if EV_STAT_ENABLE 2411#if EV_STAT_ENABLE
2180 2412
2181# ifdef _WIN32 2413# ifdef _WIN32
… …
2336 } 2568 }
2337 2569
2338 } 2570 }
2339} 2571}
2340 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)
2341#endif 2579#endif
2342 2580
2343void 2581void
2344ev_stat_stat (EV_P_ ev_stat *w) 2582ev_stat_stat (EV_P_ ev_stat *w)
2345{ 2583{
… …
2409 else 2647 else
2410#endif 2648#endif
2411 ev_timer_start (EV_A_ &w->timer); 2649 ev_timer_start (EV_A_ &w->timer);
2412 2650
2413 ev_start (EV_A_ (W)w, 1); 2651 ev_start (EV_A_ (W)w, 1);
2652
2653 EV_FREQUENT_CHECK;
2414} 2654}
2415 2655
2416void 2656void
2417ev_stat_stop (EV_P_ ev_stat *w) 2657ev_stat_stop (EV_P_ ev_stat *w)
2418{ 2658{
2419 clear_pending (EV_A_ (W)w); 2659 clear_pending (EV_A_ (W)w);
2420 if (expect_false (!ev_is_active (w))) 2660 if (expect_false (!ev_is_active (w)))
2421 return; 2661 return;
2422 2662
2663 EV_FREQUENT_CHECK;
2664
2423#if EV_USE_INOTIFY 2665#if EV_USE_INOTIFY
2424 infy_del (EV_A_ w); 2666 infy_del (EV_A_ w);
2425#endif 2667#endif
2426 ev_timer_stop (EV_A_ &w->timer); 2668 ev_timer_stop (EV_A_ &w->timer);
2427 2669
2428 ev_stop (EV_A_ (W)w); 2670 ev_stop (EV_A_ (W)w);
2671
2672 EV_FREQUENT_CHECK;
2429} 2673}
2430#endif 2674#endif
2431 2675
2432#if EV_IDLE_ENABLE 2676#if EV_IDLE_ENABLE
2433void 2677void
… …
2435{ 2679{
2436 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2437 return; 2681 return;
2438 2682
2439 pri_adjust (EV_A_ (W)w); 2683 pri_adjust (EV_A_ (W)w);
2684
2685 EV_FREQUENT_CHECK;
2440 2686
2441 { 2687 {
2442 int active = ++idlecnt [ABSPRI (w)]; 2688 int active = ++idlecnt [ABSPRI (w)];
2443 2689
2444 ++idleall; 2690 ++idleall;
2445 ev_start (EV_A_ (W)w, active); 2691 ev_start (EV_A_ (W)w, active);
2446 2692
2447 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);
2448 idles [ABSPRI (w)][active - 1] = w; 2694 idles [ABSPRI (w)][active - 1] = w;
2449 } 2695 }
2696
2697 EV_FREQUENT_CHECK;
2450} 2698}
2451 2699
2452void 2700void
2453ev_idle_stop (EV_P_ ev_idle *w) 2701ev_idle_stop (EV_P_ ev_idle *w)
2454{ 2702{
2455 clear_pending (EV_A_ (W)w); 2703 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2704 if (expect_false (!ev_is_active (w)))
2457 return; 2705 return;
2458 2706
2707 EV_FREQUENT_CHECK;
2708
2459 { 2709 {
2460 int active = ev_active (w); 2710 int active = ev_active (w);
2461 2711
2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2712 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2463 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2713 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2464 2714
2465 ev_stop (EV_A_ (W)w); 2715 ev_stop (EV_A_ (W)w);
2466 --idleall; 2716 --idleall;
2467 } 2717 }
2718
2719 EV_FREQUENT_CHECK;
2468} 2720}
2469#endif 2721#endif
2470 2722
2471void 2723void
2472ev_prepare_start (EV_P_ ev_prepare *w) 2724ev_prepare_start (EV_P_ ev_prepare *w)
2473{ 2725{
2474 if (expect_false (ev_is_active (w))) 2726 if (expect_false (ev_is_active (w)))
2475 return; 2727 return;
2728
2729 EV_FREQUENT_CHECK;
2476 2730
2477 ev_start (EV_A_ (W)w, ++preparecnt); 2731 ev_start (EV_A_ (W)w, ++preparecnt);
2478 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2732 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2479 prepares [preparecnt - 1] = w; 2733 prepares [preparecnt - 1] = w;
2734
2735 EV_FREQUENT_CHECK;
2480} 2736}
2481 2737
2482void 2738void
2483ev_prepare_stop (EV_P_ ev_prepare *w) 2739ev_prepare_stop (EV_P_ ev_prepare *w)
2484{ 2740{
2485 clear_pending (EV_A_ (W)w); 2741 clear_pending (EV_A_ (W)w);
2486 if (expect_false (!ev_is_active (w))) 2742 if (expect_false (!ev_is_active (w)))
2487 return; 2743 return;
2488 2744
2745 EV_FREQUENT_CHECK;
2746
2489 { 2747 {
2490 int active = ev_active (w); 2748 int active = ev_active (w);
2491 2749
2492 prepares [active - 1] = prepares [--preparecnt]; 2750 prepares [active - 1] = prepares [--preparecnt];
2493 ev_active (prepares [active - 1]) = active; 2751 ev_active (prepares [active - 1]) = active;
2494 } 2752 }
2495 2753
2496 ev_stop (EV_A_ (W)w); 2754 ev_stop (EV_A_ (W)w);
2755
2756 EV_FREQUENT_CHECK;
2497} 2757}
2498 2758
2499void 2759void
2500ev_check_start (EV_P_ ev_check *w) 2760ev_check_start (EV_P_ ev_check *w)
2501{ 2761{
2502 if (expect_false (ev_is_active (w))) 2762 if (expect_false (ev_is_active (w)))
2503 return; 2763 return;
2764
2765 EV_FREQUENT_CHECK;
2504 2766
2505 ev_start (EV_A_ (W)w, ++checkcnt); 2767 ev_start (EV_A_ (W)w, ++checkcnt);
2506 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2768 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2507 checks [checkcnt - 1] = w; 2769 checks [checkcnt - 1] = w;
2770
2771 EV_FREQUENT_CHECK;
2508} 2772}
2509 2773
2510void 2774void
2511ev_check_stop (EV_P_ ev_check *w) 2775ev_check_stop (EV_P_ ev_check *w)
2512{ 2776{
2513 clear_pending (EV_A_ (W)w); 2777 clear_pending (EV_A_ (W)w);
2514 if (expect_false (!ev_is_active (w))) 2778 if (expect_false (!ev_is_active (w)))
2515 return; 2779 return;
2516 2780
2781 EV_FREQUENT_CHECK;
2782
2517 { 2783 {
2518 int active = ev_active (w); 2784 int active = ev_active (w);
2519 2785
2520 checks [active - 1] = checks [--checkcnt]; 2786 checks [active - 1] = checks [--checkcnt];
2521 ev_active (checks [active - 1]) = active; 2787 ev_active (checks [active - 1]) = active;
2522 } 2788 }
2523 2789
2524 ev_stop (EV_A_ (W)w); 2790 ev_stop (EV_A_ (W)w);
2791
2792 EV_FREQUENT_CHECK;
2525} 2793}
2526 2794
2527#if EV_EMBED_ENABLE 2795#if EV_EMBED_ENABLE
2528void noinline 2796void noinline
2529ev_embed_sweep (EV_P_ ev_embed *w) 2797ev_embed_sweep (EV_P_ ev_embed *w)
… …
2576 struct ev_loop *loop = w->other; 2844 struct ev_loop *loop = w->other;
2577 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 ()));
2578 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);
2579 } 2847 }
2580 2848
2849 EV_FREQUENT_CHECK;
2850
2581 ev_set_priority (&w->io, ev_priority (w)); 2851 ev_set_priority (&w->io, ev_priority (w));
2582 ev_io_start (EV_A_ &w->io); 2852 ev_io_start (EV_A_ &w->io);
2583 2853
2584 ev_prepare_init (&w->prepare, embed_prepare_cb); 2854 ev_prepare_init (&w->prepare, embed_prepare_cb);
2585 ev_set_priority (&w->prepare, EV_MINPRI); 2855 ev_set_priority (&w->prepare, EV_MINPRI);
2586 ev_prepare_start (EV_A_ &w->prepare); 2856 ev_prepare_start (EV_A_ &w->prepare);
2587 2857
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2858 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2589 2859
2590 ev_start (EV_A_ (W)w, 1); 2860 ev_start (EV_A_ (W)w, 1);
2861
2862 EV_FREQUENT_CHECK;
2591} 2863}
2592 2864
2593void 2865void
2594ev_embed_stop (EV_P_ ev_embed *w) 2866ev_embed_stop (EV_P_ ev_embed *w)
2595{ 2867{
2596 clear_pending (EV_A_ (W)w); 2868 clear_pending (EV_A_ (W)w);
2597 if (expect_false (!ev_is_active (w))) 2869 if (expect_false (!ev_is_active (w)))
2598 return; 2870 return;
2599 2871
2872 EV_FREQUENT_CHECK;
2873
2600 ev_io_stop (EV_A_ &w->io); 2874 ev_io_stop (EV_A_ &w->io);
2601 ev_prepare_stop (EV_A_ &w->prepare); 2875 ev_prepare_stop (EV_A_ &w->prepare);
2602 2876
2603 ev_stop (EV_A_ (W)w); 2877 ev_stop (EV_A_ (W)w);
2878
2879 EV_FREQUENT_CHECK;
2604} 2880}
2605#endif 2881#endif
2606 2882
2607#if EV_FORK_ENABLE 2883#if EV_FORK_ENABLE
2608void 2884void
2609ev_fork_start (EV_P_ ev_fork *w) 2885ev_fork_start (EV_P_ ev_fork *w)
2610{ 2886{
2611 if (expect_false (ev_is_active (w))) 2887 if (expect_false (ev_is_active (w)))
2612 return; 2888 return;
2889
2890 EV_FREQUENT_CHECK;
2613 2891
2614 ev_start (EV_A_ (W)w, ++forkcnt); 2892 ev_start (EV_A_ (W)w, ++forkcnt);
2615 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2893 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2616 forks [forkcnt - 1] = w; 2894 forks [forkcnt - 1] = w;
2895
2896 EV_FREQUENT_CHECK;
2617} 2897}
2618 2898
2619void 2899void
2620ev_fork_stop (EV_P_ ev_fork *w) 2900ev_fork_stop (EV_P_ ev_fork *w)
2621{ 2901{
2622 clear_pending (EV_A_ (W)w); 2902 clear_pending (EV_A_ (W)w);
2623 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2624 return; 2904 return;
2625 2905
2906 EV_FREQUENT_CHECK;
2907
2626 { 2908 {
2627 int active = ev_active (w); 2909 int active = ev_active (w);
2628 2910
2629 forks [active - 1] = forks [--forkcnt]; 2911 forks [active - 1] = forks [--forkcnt];
2630 ev_active (forks [active - 1]) = active; 2912 ev_active (forks [active - 1]) = active;
2631 } 2913 }
2632 2914
2633 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2916
2917 EV_FREQUENT_CHECK;
2634} 2918}
2635#endif 2919#endif
2636 2920
2637#if EV_ASYNC_ENABLE 2921#if EV_ASYNC_ENABLE
2638void 2922void
… …
2640{ 2924{
2641 if (expect_false (ev_is_active (w))) 2925 if (expect_false (ev_is_active (w)))
2642 return; 2926 return;
2643 2927
2644 evpipe_init (EV_A); 2928 evpipe_init (EV_A);
2929
2930 EV_FREQUENT_CHECK;
2645 2931
2646 ev_start (EV_A_ (W)w, ++asynccnt); 2932 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2933 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w; 2934 asyncs [asynccnt - 1] = w;
2935
2936 EV_FREQUENT_CHECK;
2649} 2937}
2650 2938
2651void 2939void
2652ev_async_stop (EV_P_ ev_async *w) 2940ev_async_stop (EV_P_ ev_async *w)
2653{ 2941{
2654 clear_pending (EV_A_ (W)w); 2942 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w))) 2943 if (expect_false (!ev_is_active (w)))
2656 return; 2944 return;
2657 2945
2946 EV_FREQUENT_CHECK;
2947
2658 { 2948 {
2659 int active = ev_active (w); 2949 int active = ev_active (w);
2660 2950
2661 asyncs [active - 1] = asyncs [--asynccnt]; 2951 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active; 2952 ev_active (asyncs [active - 1]) = active;
2663 } 2953 }
2664 2954
2665 ev_stop (EV_A_ (W)w); 2955 ev_stop (EV_A_ (W)w);
2956
2957 EV_FREQUENT_CHECK;
2666} 2958}
2667 2959
2668void 2960void
2669ev_async_send (EV_P_ ev_async *w) 2961ev_async_send (EV_P_ ev_async *w)
2670{ 2962{

Diff Legend

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