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.258 by root, Sun Sep 7 18:15:12 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
… …
540 struct timeval tv; 565 struct timeval tv;
541 566
542 tv.tv_sec = (time_t)delay; 567 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544 569
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */
545 select (0, 0, 0, 0, &tv); 573 select (0, 0, 0, 0, &tv);
546#endif 574#endif
547 } 575 }
548} 576}
549 577
… …
683 events |= (unsigned char)w->events; 711 events |= (unsigned char)w->events;
684 712
685#if EV_SELECT_IS_WINSOCKET 713#if EV_SELECT_IS_WINSOCKET
686 if (events) 714 if (events)
687 { 715 {
688 unsigned long argp; 716 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE 717 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else 719 #else
692 anfd->handle = _get_osfhandle (fd); 720 anfd->handle = _get_osfhandle (fd);
693 #endif 721 #endif
694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
695 } 723 }
696#endif 724#endif
697 725
698 { 726 {
699 unsigned char o_events = anfd->events; 727 unsigned char o_events = anfd->events;
… …
752{ 780{
753 int fd; 781 int fd;
754 782
755 for (fd = 0; fd < anfdmax; ++fd) 783 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 784 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 785 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 786 fd_kill (EV_A_ fd);
759} 787}
760 788
761/* called on ENOMEM in select/poll to kill some fds and retry */ 789/* called on ENOMEM in select/poll to kill some fds and retry */
762static void noinline 790static void noinline
… …
803#if EV_USE_4HEAP 831#if EV_USE_4HEAP
804 832
805#define DHEAP 4 833#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 834#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808 836#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 837
831/* away from the root */ 838/* away from the root */
832void inline_speed 839void inline_speed
833downheap (ANHE *heap, int N, int k) 840downheap (ANHE *heap, int N, int k)
834{ 841{
… …
837 844
838 for (;;) 845 for (;;)
839 { 846 {
840 ev_tstamp minat; 847 ev_tstamp minat;
841 ANHE *minpos; 848 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 849 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
843 850
844 // find minimum child 851 /* find minimum child */
845 if (expect_true (pos + DHEAP - 1 < E)) 852 if (expect_true (pos + DHEAP - 1 < E))
846 { 853 {
847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 854 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 855 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)); 856 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
… …
870 877
871 heap [k] = he; 878 heap [k] = he;
872 ev_active (ANHE_w (he)) = k; 879 ev_active (ANHE_w (he)) = k;
873} 880}
874 881
875#else // 4HEAP 882#else /* 4HEAP */
876 883
877#define HEAP0 1 884#define HEAP0 1
878#define HPARENT(k) ((k) >> 1) 885#define HPARENT(k) ((k) >> 1)
879 886#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 887
903/* away from the root */ 888/* away from the root */
904void inline_speed 889void inline_speed
905downheap (ANHE *heap, int N, int k) 890downheap (ANHE *heap, int N, int k)
906{ 891{
… …
908 893
909 for (;;) 894 for (;;)
910 { 895 {
911 int c = k << 1; 896 int c = k << 1;
912 897
913 if (c > N) 898 if (c > N + HEAP0 - 1)
914 break; 899 break;
915 900
916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 901 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917 ? 1 : 0; 902 ? 1 : 0;
918 903
919 if (ANHE_at (he) <= ANHE_at (heap [c])) 904 if (ANHE_at (he) <= ANHE_at (heap [c]))
920 break; 905 break;
921 906
… …
928 heap [k] = he; 913 heap [k] = he;
929 ev_active (ANHE_w (he)) = k; 914 ev_active (ANHE_w (he)) = k;
930} 915}
931#endif 916#endif
932 917
918/* towards the root */
919void inline_speed
920upheap (ANHE *heap, int k)
921{
922 ANHE he = heap [k];
923
924 for (;;)
925 {
926 int p = HPARENT (k);
927
928 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
929 break;
930
931 heap [k] = heap [p];
932 ev_active (ANHE_w (heap [k])) = k;
933 k = p;
934 }
935
936 heap [k] = he;
937 ev_active (ANHE_w (he)) = k;
938}
939
933void inline_size 940void inline_size
934adjustheap (ANHE *heap, int N, int k) 941adjustheap (ANHE *heap, int N, int k)
935{ 942{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937 upheap (heap, k); 944 upheap (heap, k);
938 else 945 else
939 downheap (heap, N, k); 946 downheap (heap, N, k);
940} 947}
941 948
949/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size
951reheap (ANHE *heap, int N)
952{
953 int i;
954
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
956 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
957 for (i = 0; i < N; ++i)
958 upheap (heap, i + HEAP0);
959}
960
942/*****************************************************************************/ 961/*****************************************************************************/
943 962
944typedef struct 963typedef struct
945{ 964{
946 WL head; 965 WL head;
… …
968 987
969void inline_speed 988void inline_speed
970fd_intern (int fd) 989fd_intern (int fd)
971{ 990{
972#ifdef _WIN32 991#ifdef _WIN32
973 int arg = 1; 992 unsigned long arg = 1;
974 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
975#else 994#else
976 fcntl (fd, F_SETFD, FD_CLOEXEC); 995 fcntl (fd, F_SETFD, FD_CLOEXEC);
977 fcntl (fd, F_SETFL, O_NONBLOCK); 996 fcntl (fd, F_SETFL, O_NONBLOCK);
978#endif 997#endif
… …
1462 1481
1463 postfork = 0; 1482 postfork = 0;
1464} 1483}
1465 1484
1466#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1486
1467struct ev_loop * 1487struct ev_loop *
1468ev_loop_new (unsigned int flags) 1488ev_loop_new (unsigned int flags)
1469{ 1489{
1470 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1471 1491
… …
1489void 1509void
1490ev_loop_fork (EV_P) 1510ev_loop_fork (EV_P)
1491{ 1511{
1492 postfork = 1; /* must be in line with ev_default_fork */ 1512 postfork = 1; /* must be in line with ev_default_fork */
1493} 1513}
1514
1515#if EV_VERIFY
1516static void noinline
1517verify_watcher (EV_P_ W w)
1518{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520
1521 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523}
1524
1525static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N)
1527{
1528 int i;
1529
1530 for (i = HEAP0; i < N + HEAP0; ++i)
1531 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 }
1538}
1539
1540static void noinline
1541array_verify (EV_P_ W *ws, int cnt)
1542{
1543 while (cnt--)
1544 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]);
1547 }
1548}
1549#endif
1550
1551void
1552ev_loop_verify (EV_P)
1553{
1554#if EV_VERIFY
1555 int i;
1556 WL w;
1557
1558 assert (activecnt >= -1);
1559
1560 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1563
1564 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next)
1567 {
1568 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 }
1572
1573 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt);
1575
1576#if EV_PERIODIC_ENABLE
1577 assert (periodicmax >= periodiccnt);
1578 verify_heap (EV_A_ periodics, periodiccnt);
1579#endif
1580
1581 for (i = NUMPRI; i--; )
1582 {
1583 assert (pendingmax [i] >= pendingcnt [i]);
1584#if EV_IDLE_ENABLE
1585 assert (idleall >= 0);
1586 assert (idlemax [i] >= idlecnt [i]);
1587 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1588#endif
1589 }
1590
1591#if EV_FORK_ENABLE
1592 assert (forkmax >= forkcnt);
1593 array_verify (EV_A_ (W *)forks, forkcnt);
1594#endif
1595
1596#if EV_ASYNC_ENABLE
1597 assert (asyncmax >= asynccnt);
1598 array_verify (EV_A_ (W *)asyncs, asynccnt);
1599#endif
1600
1601 assert (preparemax >= preparecnt);
1602 array_verify (EV_A_ (W *)prepares, preparecnt);
1603
1604 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt);
1606
1607# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1494#endif 1610# endif
1611#endif
1612}
1613
1614#endif /* multiplicity */
1495 1615
1496#if EV_MULTIPLICITY 1616#if EV_MULTIPLICITY
1497struct ev_loop * 1617struct ev_loop *
1498ev_default_loop_init (unsigned int flags) 1618ev_default_loop_init (unsigned int flags)
1499#else 1619#else
… …
1575 { 1695 {
1576 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1577 1697
1578 p->w->pending = 0; 1698 p->w->pending = 0;
1579 EV_CB_INVOKE (p->w, p->events); 1699 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK;
1580 } 1701 }
1581 } 1702 }
1582} 1703}
1583 1704
1584#if EV_IDLE_ENABLE 1705#if EV_IDLE_ENABLE
… …
1605#endif 1726#endif
1606 1727
1607void inline_size 1728void inline_size
1608timers_reify (EV_P) 1729timers_reify (EV_P)
1609{ 1730{
1731 EV_FREQUENT_CHECK;
1732
1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611 { 1734 {
1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1613 1736
1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
… …
1620 if (ev_at (w) < mn_now) 1743 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now; 1744 ev_at (w) = mn_now;
1622 1745
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624 1747
1625 ANHE_at_set (timers [HEAP0]); 1748 ANHE_at_cache (timers [HEAP0]);
1626 downheap (timers, timercnt, HEAP0); 1749 downheap (timers, timercnt, HEAP0);
1627 } 1750 }
1628 else 1751 else
1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630 1753
1754 EV_FREQUENT_CHECK;
1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632 } 1756 }
1633} 1757}
1634 1758
1635#if EV_PERIODIC_ENABLE 1759#if EV_PERIODIC_ENABLE
1636void inline_size 1760void inline_size
1637periodics_reify (EV_P) 1761periodics_reify (EV_P)
1638{ 1762{
1763 EV_FREQUENT_CHECK;
1764
1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640 { 1766 {
1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1642 1768
1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1647 { 1773 {
1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649 1775
1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651 1777
1652 ANHE_at_set (periodics [HEAP0]); 1778 ANHE_at_cache (periodics [HEAP0]);
1653 downheap (periodics, periodiccnt, HEAP0); 1779 downheap (periodics, periodiccnt, HEAP0);
1654 } 1780 }
1655 else if (w->interval) 1781 else if (w->interval)
1656 { 1782 {
1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1783 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 */ 1792 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now) 1793 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now; 1794 ev_at (w) = ev_rt_now;
1669 } 1795 }
1670 1796
1671 ANHE_at_set (periodics [HEAP0]); 1797 ANHE_at_cache (periodics [HEAP0]);
1672 downheap (periodics, periodiccnt, HEAP0); 1798 downheap (periodics, periodiccnt, HEAP0);
1673 } 1799 }
1674 else 1800 else
1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676 1802
1803 EV_FREQUENT_CHECK;
1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678 } 1805 }
1679} 1806}
1680 1807
1681static void noinline 1808static void noinline
… …
1691 if (w->reschedule_cb) 1818 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1819 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 1820 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1821 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 1822
1696 ANHE_at_set (periodics [i]); 1823 ANHE_at_cache (periodics [i]);
1697 } 1824 }
1698 1825
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1826 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} 1827}
1704#endif 1828#endif
1705 1829
1706void inline_speed 1830void inline_speed
1707time_update (EV_P_ ev_tstamp max_block) 1831time_update (EV_P_ ev_tstamp max_block)
… …
1765 /* adjust timers. this is easy, as the offset is the same for all of them */ 1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1766 for (i = 0; i < timercnt; ++i) 1890 for (i = 0; i < timercnt; ++i)
1767 { 1891 {
1768 ANHE *he = timers + i + HEAP0; 1892 ANHE *he = timers + i + HEAP0;
1769 ANHE_w (*he)->at += ev_rt_now - mn_now; 1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he); 1894 ANHE_at_cache (*he);
1771 } 1895 }
1772 } 1896 }
1773 1897
1774 mn_now = ev_rt_now; 1898 mn_now = ev_rt_now;
1775 } 1899 }
… …
1796 1920
1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1921 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1798 1922
1799 do 1923 do
1800 { 1924 {
1925#if EV_VERIFY >= 2
1926 ev_loop_verify (EV_A);
1927#endif
1928
1801#ifndef _WIN32 1929#ifndef _WIN32
1802 if (expect_false (curpid)) /* penalise the forking check even more */ 1930 if (expect_false (curpid)) /* penalise the forking check even more */
1803 if (expect_false (getpid () != curpid)) 1931 if (expect_false (getpid () != curpid))
1804 { 1932 {
1805 curpid = getpid (); 1933 curpid = getpid ();
… …
2000 if (expect_false (ev_is_active (w))) 2128 if (expect_false (ev_is_active (w)))
2001 return; 2129 return;
2002 2130
2003 assert (("ev_io_start called with negative fd", fd >= 0)); 2131 assert (("ev_io_start called with negative fd", fd >= 0));
2004 2132
2133 EV_FREQUENT_CHECK;
2134
2005 ev_start (EV_A_ (W)w, 1); 2135 ev_start (EV_A_ (W)w, 1);
2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
2007 wlist_add (&anfds[fd].head, (WL)w); 2137 wlist_add (&anfds[fd].head, (WL)w);
2008 2138
2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET; 2140 w->events &= ~EV_IOFDSET;
2141
2142 EV_FREQUENT_CHECK;
2011} 2143}
2012 2144
2013void noinline 2145void noinline
2014ev_io_stop (EV_P_ ev_io *w) 2146ev_io_stop (EV_P_ ev_io *w)
2015{ 2147{
… …
2017 if (expect_false (!ev_is_active (w))) 2149 if (expect_false (!ev_is_active (w)))
2018 return; 2150 return;
2019 2151
2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2021 2153
2154 EV_FREQUENT_CHECK;
2155
2022 wlist_del (&anfds[w->fd].head, (WL)w); 2156 wlist_del (&anfds[w->fd].head, (WL)w);
2023 ev_stop (EV_A_ (W)w); 2157 ev_stop (EV_A_ (W)w);
2024 2158
2025 fd_change (EV_A_ w->fd, 1); 2159 fd_change (EV_A_ w->fd, 1);
2160
2161 EV_FREQUENT_CHECK;
2026} 2162}
2027 2163
2028void noinline 2164void noinline
2029ev_timer_start (EV_P_ ev_timer *w) 2165ev_timer_start (EV_P_ ev_timer *w)
2030{ 2166{
… …
2033 2169
2034 ev_at (w) += mn_now; 2170 ev_at (w) += mn_now;
2035 2171
2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2037 2173
2174 EV_FREQUENT_CHECK;
2175
2176 ++timercnt;
2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2178 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040 ANHE_w (timers [ev_active (w)]) = (WT)w; 2179 ANHE_w (timers [ev_active (w)]) = (WT)w;
2041 ANHE_at_set (timers [ev_active (w)]); 2180 ANHE_at_cache (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w)); 2181 upheap (timers, ev_active (w));
2182
2183 EV_FREQUENT_CHECK;
2043 2184
2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2045} 2186}
2046 2187
2047void noinline 2188void noinline
… …
2049{ 2190{
2050 clear_pending (EV_A_ (W)w); 2191 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2192 if (expect_false (!ev_is_active (w)))
2052 return; 2193 return;
2053 2194
2195 EV_FREQUENT_CHECK;
2196
2054 { 2197 {
2055 int active = ev_active (w); 2198 int active = ev_active (w);
2056 2199
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058 2201
2202 --timercnt;
2203
2059 if (expect_true (active < timercnt + HEAP0 - 1)) 2204 if (expect_true (active < timercnt + HEAP0))
2060 { 2205 {
2061 timers [active] = timers [timercnt + HEAP0 - 1]; 2206 timers [active] = timers [timercnt + HEAP0];
2062 adjustheap (timers, timercnt, active); 2207 adjustheap (timers, timercnt, active);
2063 } 2208 }
2064
2065 --timercnt;
2066 } 2209 }
2210
2211 EV_FREQUENT_CHECK;
2067 2212
2068 ev_at (w) -= mn_now; 2213 ev_at (w) -= mn_now;
2069 2214
2070 ev_stop (EV_A_ (W)w); 2215 ev_stop (EV_A_ (W)w);
2071} 2216}
2072 2217
2073void noinline 2218void noinline
2074ev_timer_again (EV_P_ ev_timer *w) 2219ev_timer_again (EV_P_ ev_timer *w)
2075{ 2220{
2221 EV_FREQUENT_CHECK;
2222
2076 if (ev_is_active (w)) 2223 if (ev_is_active (w))
2077 { 2224 {
2078 if (w->repeat) 2225 if (w->repeat)
2079 { 2226 {
2080 ev_at (w) = mn_now + w->repeat; 2227 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2082 adjustheap (timers, timercnt, ev_active (w)); 2229 adjustheap (timers, timercnt, ev_active (w));
2083 } 2230 }
2084 else 2231 else
2085 ev_timer_stop (EV_A_ w); 2232 ev_timer_stop (EV_A_ w);
2086 } 2233 }
2087 else if (w->repeat) 2234 else if (w->repeat)
2088 { 2235 {
2089 ev_at (w) = w->repeat; 2236 ev_at (w) = w->repeat;
2090 ev_timer_start (EV_A_ w); 2237 ev_timer_start (EV_A_ w);
2091 } 2238 }
2239
2240 EV_FREQUENT_CHECK;
2092} 2241}
2093 2242
2094#if EV_PERIODIC_ENABLE 2243#if EV_PERIODIC_ENABLE
2095void noinline 2244void noinline
2096ev_periodic_start (EV_P_ ev_periodic *w) 2245ev_periodic_start (EV_P_ ev_periodic *w)
… …
2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108 } 2257 }
2109 else 2258 else
2110 ev_at (w) = w->offset; 2259 ev_at (w) = w->offset;
2111 2260
2261 EV_FREQUENT_CHECK;
2262
2263 ++periodiccnt;
2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2264 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2265 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2266 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115 ANHE_at_set (periodics [ev_active (w)]); 2267 ANHE_at_cache (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w)); 2268 upheap (periodics, ev_active (w));
2269
2270 EV_FREQUENT_CHECK;
2117 2271
2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2119} 2273}
2120 2274
2121void noinline 2275void noinline
… …
2123{ 2277{
2124 clear_pending (EV_A_ (W)w); 2278 clear_pending (EV_A_ (W)w);
2125 if (expect_false (!ev_is_active (w))) 2279 if (expect_false (!ev_is_active (w)))
2126 return; 2280 return;
2127 2281
2282 EV_FREQUENT_CHECK;
2283
2128 { 2284 {
2129 int active = ev_active (w); 2285 int active = ev_active (w);
2130 2286
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132 2288
2289 --periodiccnt;
2290
2133 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2291 if (expect_true (active < periodiccnt + HEAP0))
2134 { 2292 {
2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2293 periodics [active] = periodics [periodiccnt + HEAP0];
2136 adjustheap (periodics, periodiccnt, active); 2294 adjustheap (periodics, periodiccnt, active);
2137 } 2295 }
2138
2139 --periodiccnt;
2140 } 2296 }
2297
2298 EV_FREQUENT_CHECK;
2141 2299
2142 ev_stop (EV_A_ (W)w); 2300 ev_stop (EV_A_ (W)w);
2143} 2301}
2144 2302
2145void noinline 2303void noinline
… …
2165 return; 2323 return;
2166 2324
2167 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168 2326
2169 evpipe_init (EV_A); 2327 evpipe_init (EV_A);
2328
2329 EV_FREQUENT_CHECK;
2170 2330
2171 { 2331 {
2172#ifndef _WIN32 2332#ifndef _WIN32
2173 sigset_t full, prev; 2333 sigset_t full, prev;
2174 sigfillset (&full); 2334 sigfillset (&full);
… …
2195 sigfillset (&sa.sa_mask); 2355 sigfillset (&sa.sa_mask);
2196 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2356 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2197 sigaction (w->signum, &sa, 0); 2357 sigaction (w->signum, &sa, 0);
2198#endif 2358#endif
2199 } 2359 }
2360
2361 EV_FREQUENT_CHECK;
2200} 2362}
2201 2363
2202void noinline 2364void noinline
2203ev_signal_stop (EV_P_ ev_signal *w) 2365ev_signal_stop (EV_P_ ev_signal *w)
2204{ 2366{
2205 clear_pending (EV_A_ (W)w); 2367 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2368 if (expect_false (!ev_is_active (w)))
2207 return; 2369 return;
2208 2370
2371 EV_FREQUENT_CHECK;
2372
2209 wlist_del (&signals [w->signum - 1].head, (WL)w); 2373 wlist_del (&signals [w->signum - 1].head, (WL)w);
2210 ev_stop (EV_A_ (W)w); 2374 ev_stop (EV_A_ (W)w);
2211 2375
2212 if (!signals [w->signum - 1].head) 2376 if (!signals [w->signum - 1].head)
2213 signal (w->signum, SIG_DFL); 2377 signal (w->signum, SIG_DFL);
2378
2379 EV_FREQUENT_CHECK;
2214} 2380}
2215 2381
2216void 2382void
2217ev_child_start (EV_P_ ev_child *w) 2383ev_child_start (EV_P_ ev_child *w)
2218{ 2384{
… …
2220 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2221#endif 2387#endif
2222 if (expect_false (ev_is_active (w))) 2388 if (expect_false (ev_is_active (w)))
2223 return; 2389 return;
2224 2390
2391 EV_FREQUENT_CHECK;
2392
2225 ev_start (EV_A_ (W)w, 1); 2393 ev_start (EV_A_ (W)w, 1);
2226 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2394 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2395
2396 EV_FREQUENT_CHECK;
2227} 2397}
2228 2398
2229void 2399void
2230ev_child_stop (EV_P_ ev_child *w) 2400ev_child_stop (EV_P_ ev_child *w)
2231{ 2401{
2232 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2233 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2234 return; 2404 return;
2235 2405
2406 EV_FREQUENT_CHECK;
2407
2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2408 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2410
2411 EV_FREQUENT_CHECK;
2238} 2412}
2239 2413
2240#if EV_STAT_ENABLE 2414#if EV_STAT_ENABLE
2241 2415
2242# ifdef _WIN32 2416# ifdef _WIN32
… …
2397 } 2571 }
2398 2572
2399 } 2573 }
2400} 2574}
2401 2575
2576#endif
2577
2578#ifdef _WIN32
2579# define EV_LSTAT(p,b) _stati64 (p, b)
2580#else
2581# define EV_LSTAT(p,b) lstat (p, b)
2402#endif 2582#endif
2403 2583
2404void 2584void
2405ev_stat_stat (EV_P_ ev_stat *w) 2585ev_stat_stat (EV_P_ ev_stat *w)
2406{ 2586{
… …
2470 else 2650 else
2471#endif 2651#endif
2472 ev_timer_start (EV_A_ &w->timer); 2652 ev_timer_start (EV_A_ &w->timer);
2473 2653
2474 ev_start (EV_A_ (W)w, 1); 2654 ev_start (EV_A_ (W)w, 1);
2655
2656 EV_FREQUENT_CHECK;
2475} 2657}
2476 2658
2477void 2659void
2478ev_stat_stop (EV_P_ ev_stat *w) 2660ev_stat_stop (EV_P_ ev_stat *w)
2479{ 2661{
2480 clear_pending (EV_A_ (W)w); 2662 clear_pending (EV_A_ (W)w);
2481 if (expect_false (!ev_is_active (w))) 2663 if (expect_false (!ev_is_active (w)))
2482 return; 2664 return;
2483 2665
2666 EV_FREQUENT_CHECK;
2667
2484#if EV_USE_INOTIFY 2668#if EV_USE_INOTIFY
2485 infy_del (EV_A_ w); 2669 infy_del (EV_A_ w);
2486#endif 2670#endif
2487 ev_timer_stop (EV_A_ &w->timer); 2671 ev_timer_stop (EV_A_ &w->timer);
2488 2672
2489 ev_stop (EV_A_ (W)w); 2673 ev_stop (EV_A_ (W)w);
2674
2675 EV_FREQUENT_CHECK;
2490} 2676}
2491#endif 2677#endif
2492 2678
2493#if EV_IDLE_ENABLE 2679#if EV_IDLE_ENABLE
2494void 2680void
… …
2496{ 2682{
2497 if (expect_false (ev_is_active (w))) 2683 if (expect_false (ev_is_active (w)))
2498 return; 2684 return;
2499 2685
2500 pri_adjust (EV_A_ (W)w); 2686 pri_adjust (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2501 2689
2502 { 2690 {
2503 int active = ++idlecnt [ABSPRI (w)]; 2691 int active = ++idlecnt [ABSPRI (w)];
2504 2692
2505 ++idleall; 2693 ++idleall;
2506 ev_start (EV_A_ (W)w, active); 2694 ev_start (EV_A_ (W)w, active);
2507 2695
2508 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2696 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2509 idles [ABSPRI (w)][active - 1] = w; 2697 idles [ABSPRI (w)][active - 1] = w;
2510 } 2698 }
2699
2700 EV_FREQUENT_CHECK;
2511} 2701}
2512 2702
2513void 2703void
2514ev_idle_stop (EV_P_ ev_idle *w) 2704ev_idle_stop (EV_P_ ev_idle *w)
2515{ 2705{
2516 clear_pending (EV_A_ (W)w); 2706 clear_pending (EV_A_ (W)w);
2517 if (expect_false (!ev_is_active (w))) 2707 if (expect_false (!ev_is_active (w)))
2518 return; 2708 return;
2519 2709
2710 EV_FREQUENT_CHECK;
2711
2520 { 2712 {
2521 int active = ev_active (w); 2713 int active = ev_active (w);
2522 2714
2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2715 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2716 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525 2717
2526 ev_stop (EV_A_ (W)w); 2718 ev_stop (EV_A_ (W)w);
2527 --idleall; 2719 --idleall;
2528 } 2720 }
2721
2722 EV_FREQUENT_CHECK;
2529} 2723}
2530#endif 2724#endif
2531 2725
2532void 2726void
2533ev_prepare_start (EV_P_ ev_prepare *w) 2727ev_prepare_start (EV_P_ ev_prepare *w)
2534{ 2728{
2535 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2536 return; 2730 return;
2731
2732 EV_FREQUENT_CHECK;
2537 2733
2538 ev_start (EV_A_ (W)w, ++preparecnt); 2734 ev_start (EV_A_ (W)w, ++preparecnt);
2539 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2735 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540 prepares [preparecnt - 1] = w; 2736 prepares [preparecnt - 1] = w;
2737
2738 EV_FREQUENT_CHECK;
2541} 2739}
2542 2740
2543void 2741void
2544ev_prepare_stop (EV_P_ ev_prepare *w) 2742ev_prepare_stop (EV_P_ ev_prepare *w)
2545{ 2743{
2546 clear_pending (EV_A_ (W)w); 2744 clear_pending (EV_A_ (W)w);
2547 if (expect_false (!ev_is_active (w))) 2745 if (expect_false (!ev_is_active (w)))
2548 return; 2746 return;
2549 2747
2748 EV_FREQUENT_CHECK;
2749
2550 { 2750 {
2551 int active = ev_active (w); 2751 int active = ev_active (w);
2552 2752
2553 prepares [active - 1] = prepares [--preparecnt]; 2753 prepares [active - 1] = prepares [--preparecnt];
2554 ev_active (prepares [active - 1]) = active; 2754 ev_active (prepares [active - 1]) = active;
2555 } 2755 }
2556 2756
2557 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2758
2759 EV_FREQUENT_CHECK;
2558} 2760}
2559 2761
2560void 2762void
2561ev_check_start (EV_P_ ev_check *w) 2763ev_check_start (EV_P_ ev_check *w)
2562{ 2764{
2563 if (expect_false (ev_is_active (w))) 2765 if (expect_false (ev_is_active (w)))
2564 return; 2766 return;
2767
2768 EV_FREQUENT_CHECK;
2565 2769
2566 ev_start (EV_A_ (W)w, ++checkcnt); 2770 ev_start (EV_A_ (W)w, ++checkcnt);
2567 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2771 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568 checks [checkcnt - 1] = w; 2772 checks [checkcnt - 1] = w;
2773
2774 EV_FREQUENT_CHECK;
2569} 2775}
2570 2776
2571void 2777void
2572ev_check_stop (EV_P_ ev_check *w) 2778ev_check_stop (EV_P_ ev_check *w)
2573{ 2779{
2574 clear_pending (EV_A_ (W)w); 2780 clear_pending (EV_A_ (W)w);
2575 if (expect_false (!ev_is_active (w))) 2781 if (expect_false (!ev_is_active (w)))
2576 return; 2782 return;
2577 2783
2784 EV_FREQUENT_CHECK;
2785
2578 { 2786 {
2579 int active = ev_active (w); 2787 int active = ev_active (w);
2580 2788
2581 checks [active - 1] = checks [--checkcnt]; 2789 checks [active - 1] = checks [--checkcnt];
2582 ev_active (checks [active - 1]) = active; 2790 ev_active (checks [active - 1]) = active;
2583 } 2791 }
2584 2792
2585 ev_stop (EV_A_ (W)w); 2793 ev_stop (EV_A_ (W)w);
2794
2795 EV_FREQUENT_CHECK;
2586} 2796}
2587 2797
2588#if EV_EMBED_ENABLE 2798#if EV_EMBED_ENABLE
2589void noinline 2799void noinline
2590ev_embed_sweep (EV_P_ ev_embed *w) 2800ev_embed_sweep (EV_P_ ev_embed *w)
… …
2637 struct ev_loop *loop = w->other; 2847 struct ev_loop *loop = w->other;
2638 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2848 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); 2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2640 } 2850 }
2641 2851
2852 EV_FREQUENT_CHECK;
2853
2642 ev_set_priority (&w->io, ev_priority (w)); 2854 ev_set_priority (&w->io, ev_priority (w));
2643 ev_io_start (EV_A_ &w->io); 2855 ev_io_start (EV_A_ &w->io);
2644 2856
2645 ev_prepare_init (&w->prepare, embed_prepare_cb); 2857 ev_prepare_init (&w->prepare, embed_prepare_cb);
2646 ev_set_priority (&w->prepare, EV_MINPRI); 2858 ev_set_priority (&w->prepare, EV_MINPRI);
2647 ev_prepare_start (EV_A_ &w->prepare); 2859 ev_prepare_start (EV_A_ &w->prepare);
2648 2860
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650 2862
2651 ev_start (EV_A_ (W)w, 1); 2863 ev_start (EV_A_ (W)w, 1);
2864
2865 EV_FREQUENT_CHECK;
2652} 2866}
2653 2867
2654void 2868void
2655ev_embed_stop (EV_P_ ev_embed *w) 2869ev_embed_stop (EV_P_ ev_embed *w)
2656{ 2870{
2657 clear_pending (EV_A_ (W)w); 2871 clear_pending (EV_A_ (W)w);
2658 if (expect_false (!ev_is_active (w))) 2872 if (expect_false (!ev_is_active (w)))
2659 return; 2873 return;
2660 2874
2875 EV_FREQUENT_CHECK;
2876
2661 ev_io_stop (EV_A_ &w->io); 2877 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare); 2878 ev_prepare_stop (EV_A_ &w->prepare);
2663 2879
2664 ev_stop (EV_A_ (W)w); 2880 ev_stop (EV_A_ (W)w);
2881
2882 EV_FREQUENT_CHECK;
2665} 2883}
2666#endif 2884#endif
2667 2885
2668#if EV_FORK_ENABLE 2886#if EV_FORK_ENABLE
2669void 2887void
2670ev_fork_start (EV_P_ ev_fork *w) 2888ev_fork_start (EV_P_ ev_fork *w)
2671{ 2889{
2672 if (expect_false (ev_is_active (w))) 2890 if (expect_false (ev_is_active (w)))
2673 return; 2891 return;
2892
2893 EV_FREQUENT_CHECK;
2674 2894
2675 ev_start (EV_A_ (W)w, ++forkcnt); 2895 ev_start (EV_A_ (W)w, ++forkcnt);
2676 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2896 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677 forks [forkcnt - 1] = w; 2897 forks [forkcnt - 1] = w;
2898
2899 EV_FREQUENT_CHECK;
2678} 2900}
2679 2901
2680void 2902void
2681ev_fork_stop (EV_P_ ev_fork *w) 2903ev_fork_stop (EV_P_ ev_fork *w)
2682{ 2904{
2683 clear_pending (EV_A_ (W)w); 2905 clear_pending (EV_A_ (W)w);
2684 if (expect_false (!ev_is_active (w))) 2906 if (expect_false (!ev_is_active (w)))
2685 return; 2907 return;
2686 2908
2909 EV_FREQUENT_CHECK;
2910
2687 { 2911 {
2688 int active = ev_active (w); 2912 int active = ev_active (w);
2689 2913
2690 forks [active - 1] = forks [--forkcnt]; 2914 forks [active - 1] = forks [--forkcnt];
2691 ev_active (forks [active - 1]) = active; 2915 ev_active (forks [active - 1]) = active;
2692 } 2916 }
2693 2917
2694 ev_stop (EV_A_ (W)w); 2918 ev_stop (EV_A_ (W)w);
2919
2920 EV_FREQUENT_CHECK;
2695} 2921}
2696#endif 2922#endif
2697 2923
2698#if EV_ASYNC_ENABLE 2924#if EV_ASYNC_ENABLE
2699void 2925void
… …
2701{ 2927{
2702 if (expect_false (ev_is_active (w))) 2928 if (expect_false (ev_is_active (w)))
2703 return; 2929 return;
2704 2930
2705 evpipe_init (EV_A); 2931 evpipe_init (EV_A);
2932
2933 EV_FREQUENT_CHECK;
2706 2934
2707 ev_start (EV_A_ (W)w, ++asynccnt); 2935 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2936 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w; 2937 asyncs [asynccnt - 1] = w;
2938
2939 EV_FREQUENT_CHECK;
2710} 2940}
2711 2941
2712void 2942void
2713ev_async_stop (EV_P_ ev_async *w) 2943ev_async_stop (EV_P_ ev_async *w)
2714{ 2944{
2715 clear_pending (EV_A_ (W)w); 2945 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w))) 2946 if (expect_false (!ev_is_active (w)))
2717 return; 2947 return;
2718 2948
2949 EV_FREQUENT_CHECK;
2950
2719 { 2951 {
2720 int active = ev_active (w); 2952 int active = ev_active (w);
2721 2953
2722 asyncs [active - 1] = asyncs [--asynccnt]; 2954 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active; 2955 ev_active (asyncs [active - 1]) = active;
2724 } 2956 }
2725 2957
2726 ev_stop (EV_A_ (W)w); 2958 ev_stop (EV_A_ (W)w);
2959
2960 EV_FREQUENT_CHECK;
2727} 2961}
2728 2962
2729void 2963void
2730ev_async_send (EV_P_ ev_async *w) 2964ev_async_send (EV_P_ ev_async *w)
2731{ 2965{

Diff Legend

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