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.263 by root, Wed Oct 1 18:50:03 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
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 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
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
243 262
244#ifndef EV_HEAP_CACHE_AT 263#ifndef EV_HEAP_CACHE_AT
268# endif 287# endif
269#endif 288#endif
270 289
271#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
272# include <sys/inotify.h> 291# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0
296# endif
273#endif 297#endif
274 298
275#if EV_SELECT_IS_WINSOCKET 299#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 300# include <winsock.h>
277#endif 301#endif
287} 311}
288# endif 312# endif
289#endif 313#endif
290 314
291/**/ 315/**/
316
317#if EV_VERIFY >= 3
318# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
319#else
320# define EV_FREQUENT_CHECK do { } while (0)
321#endif
292 322
293/* 323/*
294 * This is used to avoid floating point rounding problems. 324 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 325 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 326 * to ensure progress, time-wise, even when rounding
444 typedef struct { 474 typedef struct {
445 ev_tstamp at; 475 ev_tstamp at;
446 WT w; 476 WT w;
447 } ANHE; 477 } ANHE;
448 478
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 479 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 480 #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 */ 481 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 482#else
453 typedef WT ANHE; 483 typedef WT ANHE;
454 484
455 #define ANHE_w(he) (he) 485 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 486 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 487 #define ANHE_at_cache(he)
458#endif 488#endif
459 489
460#if EV_MULTIPLICITY 490#if EV_MULTIPLICITY
461 491
462 struct ev_loop 492 struct ev_loop
540 struct timeval tv; 570 struct timeval tv;
541 571
542 tv.tv_sec = (time_t)delay; 572 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544 574
575 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */
545 select (0, 0, 0, 0, &tv); 578 select (0, 0, 0, 0, &tv);
546#endif 579#endif
547 } 580 }
548} 581}
549 582
683 events |= (unsigned char)w->events; 716 events |= (unsigned char)w->events;
684 717
685#if EV_SELECT_IS_WINSOCKET 718#if EV_SELECT_IS_WINSOCKET
686 if (events) 719 if (events)
687 { 720 {
688 unsigned long argp; 721 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE 722 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else 724 #else
692 anfd->handle = _get_osfhandle (fd); 725 anfd->handle = _get_osfhandle (fd);
693 #endif 726 #endif
694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
695 } 728 }
696#endif 729#endif
697 730
698 { 731 {
699 unsigned char o_events = anfd->events; 732 unsigned char o_events = anfd->events;
752{ 785{
753 int fd; 786 int fd;
754 787
755 for (fd = 0; fd < anfdmax; ++fd) 788 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 789 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 790 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 791 fd_kill (EV_A_ fd);
759} 792}
760 793
761/* called on ENOMEM in select/poll to kill some fds and retry */ 794/* called on ENOMEM in select/poll to kill some fds and retry */
762static void noinline 795static void noinline
803#if EV_USE_4HEAP 836#if EV_USE_4HEAP
804 837
805#define DHEAP 4 838#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 839#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808 841#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 842
831/* away from the root */ 843/* away from the root */
832void inline_speed 844void inline_speed
833downheap (ANHE *heap, int N, int k) 845downheap (ANHE *heap, int N, int k)
834{ 846{
837 849
838 for (;;) 850 for (;;)
839 { 851 {
840 ev_tstamp minat; 852 ev_tstamp minat;
841 ANHE *minpos; 853 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 854 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
843 855
844 // find minimum child 856 /* find minimum child */
845 if (expect_true (pos + DHEAP - 1 < E)) 857 if (expect_true (pos + DHEAP - 1 < E))
846 { 858 {
847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 859 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 860 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)); 861 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
870 882
871 heap [k] = he; 883 heap [k] = he;
872 ev_active (ANHE_w (he)) = k; 884 ev_active (ANHE_w (he)) = k;
873} 885}
874 886
875#else // 4HEAP 887#else /* 4HEAP */
876 888
877#define HEAP0 1 889#define HEAP0 1
878#define HPARENT(k) ((k) >> 1) 890#define HPARENT(k) ((k) >> 1)
879 891#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 892
903/* away from the root */ 893/* away from the root */
904void inline_speed 894void inline_speed
905downheap (ANHE *heap, int N, int k) 895downheap (ANHE *heap, int N, int k)
906{ 896{
908 898
909 for (;;) 899 for (;;)
910 { 900 {
911 int c = k << 1; 901 int c = k << 1;
912 902
913 if (c > N) 903 if (c > N + HEAP0 - 1)
914 break; 904 break;
915 905
916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 906 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
917 ? 1 : 0; 907 ? 1 : 0;
918 908
919 if (ANHE_at (he) <= ANHE_at (heap [c])) 909 if (ANHE_at (he) <= ANHE_at (heap [c]))
920 break; 910 break;
921 911
928 heap [k] = he; 918 heap [k] = he;
929 ev_active (ANHE_w (he)) = k; 919 ev_active (ANHE_w (he)) = k;
930} 920}
931#endif 921#endif
932 922
923/* towards the root */
924void inline_speed
925upheap (ANHE *heap, int k)
926{
927 ANHE he = heap [k];
928
929 for (;;)
930 {
931 int p = HPARENT (k);
932
933 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
934 break;
935
936 heap [k] = heap [p];
937 ev_active (ANHE_w (heap [k])) = k;
938 k = p;
939 }
940
941 heap [k] = he;
942 ev_active (ANHE_w (he)) = k;
943}
944
933void inline_size 945void inline_size
934adjustheap (ANHE *heap, int N, int k) 946adjustheap (ANHE *heap, int N, int k)
935{ 947{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
937 upheap (heap, k); 949 upheap (heap, k);
938 else 950 else
939 downheap (heap, N, k); 951 downheap (heap, N, k);
940} 952}
941 953
954/* rebuild the heap: this function is used only once and executed rarely */
955void inline_size
956reheap (ANHE *heap, int N)
957{
958 int i;
959
960 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
961 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
962 for (i = 0; i < N; ++i)
963 upheap (heap, i + HEAP0);
964}
965
942/*****************************************************************************/ 966/*****************************************************************************/
943 967
944typedef struct 968typedef struct
945{ 969{
946 WL head; 970 WL head;
968 992
969void inline_speed 993void inline_speed
970fd_intern (int fd) 994fd_intern (int fd)
971{ 995{
972#ifdef _WIN32 996#ifdef _WIN32
973 int arg = 1; 997 unsigned long arg = 1;
974 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
975#else 999#else
976 fcntl (fd, F_SETFD, FD_CLOEXEC); 1000 fcntl (fd, F_SETFD, FD_CLOEXEC);
977 fcntl (fd, F_SETFL, O_NONBLOCK); 1001 fcntl (fd, F_SETFL, O_NONBLOCK);
978#endif 1002#endif
1462 1486
1463 postfork = 0; 1487 postfork = 0;
1464} 1488}
1465 1489
1466#if EV_MULTIPLICITY 1490#if EV_MULTIPLICITY
1491
1467struct ev_loop * 1492struct ev_loop *
1468ev_loop_new (unsigned int flags) 1493ev_loop_new (unsigned int flags)
1469{ 1494{
1470 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1495 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1471 1496
1489void 1514void
1490ev_loop_fork (EV_P) 1515ev_loop_fork (EV_P)
1491{ 1516{
1492 postfork = 1; /* must be in line with ev_default_fork */ 1517 postfork = 1; /* must be in line with ev_default_fork */
1493} 1518}
1519
1520#if EV_VERIFY
1521static void noinline
1522verify_watcher (EV_P_ W w)
1523{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525
1526 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528}
1529
1530static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N)
1532{
1533 int i;
1534
1535 for (i = HEAP0; i < N + HEAP0; ++i)
1536 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 }
1543}
1544
1545static void noinline
1546array_verify (EV_P_ W *ws, int cnt)
1547{
1548 while (cnt--)
1549 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]);
1552 }
1553}
1554#endif
1555
1556void
1557ev_loop_verify (EV_P)
1558{
1559#if EV_VERIFY
1560 int i;
1561 WL w;
1562
1563 assert (activecnt >= -1);
1564
1565 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1568
1569 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next)
1572 {
1573 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 }
1577
1578 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt);
1580
1581#if EV_PERIODIC_ENABLE
1582 assert (periodicmax >= periodiccnt);
1583 verify_heap (EV_A_ periodics, periodiccnt);
1584#endif
1585
1586 for (i = NUMPRI; i--; )
1587 {
1588 assert (pendingmax [i] >= pendingcnt [i]);
1589#if EV_IDLE_ENABLE
1590 assert (idleall >= 0);
1591 assert (idlemax [i] >= idlecnt [i]);
1592 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1593#endif
1594 }
1595
1596#if EV_FORK_ENABLE
1597 assert (forkmax >= forkcnt);
1598 array_verify (EV_A_ (W *)forks, forkcnt);
1599#endif
1600
1601#if EV_ASYNC_ENABLE
1602 assert (asyncmax >= asynccnt);
1603 array_verify (EV_A_ (W *)asyncs, asynccnt);
1604#endif
1605
1606 assert (preparemax >= preparecnt);
1607 array_verify (EV_A_ (W *)prepares, preparecnt);
1608
1609 assert (checkmax >= checkcnt);
1610 array_verify (EV_A_ (W *)checks, checkcnt);
1611
1612# if 0
1613 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1494#endif 1615# endif
1616#endif
1617}
1618
1619#endif /* multiplicity */
1495 1620
1496#if EV_MULTIPLICITY 1621#if EV_MULTIPLICITY
1497struct ev_loop * 1622struct ev_loop *
1498ev_default_loop_init (unsigned int flags) 1623ev_default_loop_init (unsigned int flags)
1499#else 1624#else
1575 { 1700 {
1576 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1577 1702
1578 p->w->pending = 0; 1703 p->w->pending = 0;
1579 EV_CB_INVOKE (p->w, p->events); 1704 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK;
1580 } 1706 }
1581 } 1707 }
1582} 1708}
1583 1709
1584#if EV_IDLE_ENABLE 1710#if EV_IDLE_ENABLE
1605#endif 1731#endif
1606 1732
1607void inline_size 1733void inline_size
1608timers_reify (EV_P) 1734timers_reify (EV_P)
1609{ 1735{
1736 EV_FREQUENT_CHECK;
1737
1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611 { 1739 {
1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1613 1741
1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1620 if (ev_at (w) < mn_now) 1748 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now; 1749 ev_at (w) = mn_now;
1622 1750
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624 1752
1625 ANHE_at_set (timers [HEAP0]); 1753 ANHE_at_cache (timers [HEAP0]);
1626 downheap (timers, timercnt, HEAP0); 1754 downheap (timers, timercnt, HEAP0);
1627 } 1755 }
1628 else 1756 else
1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630 1758
1759 EV_FREQUENT_CHECK;
1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632 } 1761 }
1633} 1762}
1634 1763
1635#if EV_PERIODIC_ENABLE 1764#if EV_PERIODIC_ENABLE
1636void inline_size 1765void inline_size
1637periodics_reify (EV_P) 1766periodics_reify (EV_P)
1638{ 1767{
1768 EV_FREQUENT_CHECK;
1769
1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640 { 1771 {
1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1642 1773
1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1647 { 1778 {
1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649 1780
1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1781 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651 1782
1652 ANHE_at_set (periodics [HEAP0]); 1783 ANHE_at_cache (periodics [HEAP0]);
1653 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1654 } 1785 }
1655 else if (w->interval) 1786 else if (w->interval)
1656 { 1787 {
1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1788 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 */ 1797 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now) 1798 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now; 1799 ev_at (w) = ev_rt_now;
1669 } 1800 }
1670 1801
1671 ANHE_at_set (periodics [HEAP0]); 1802 ANHE_at_cache (periodics [HEAP0]);
1672 downheap (periodics, periodiccnt, HEAP0); 1803 downheap (periodics, periodiccnt, HEAP0);
1673 } 1804 }
1674 else 1805 else
1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676 1807
1808 EV_FREQUENT_CHECK;
1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678 } 1810 }
1679} 1811}
1680 1812
1681static void noinline 1813static void noinline
1691 if (w->reschedule_cb) 1823 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1824 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 1825 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1826 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 1827
1696 ANHE_at_set (periodics [i]); 1828 ANHE_at_cache (periodics [i]);
1697 } 1829 }
1698 1830
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1831 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} 1832}
1704#endif 1833#endif
1705 1834
1706void inline_speed 1835void inline_speed
1707time_update (EV_P_ ev_tstamp max_block) 1836time_update (EV_P_ ev_tstamp max_block)
1765 /* adjust timers. this is easy, as the offset is the same for all of them */ 1894 /* adjust timers. this is easy, as the offset is the same for all of them */
1766 for (i = 0; i < timercnt; ++i) 1895 for (i = 0; i < timercnt; ++i)
1767 { 1896 {
1768 ANHE *he = timers + i + HEAP0; 1897 ANHE *he = timers + i + HEAP0;
1769 ANHE_w (*he)->at += ev_rt_now - mn_now; 1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he); 1899 ANHE_at_cache (*he);
1771 } 1900 }
1772 } 1901 }
1773 1902
1774 mn_now = ev_rt_now; 1903 mn_now = ev_rt_now;
1775 } 1904 }
1785ev_unref (EV_P) 1914ev_unref (EV_P)
1786{ 1915{
1787 --activecnt; 1916 --activecnt;
1788} 1917}
1789 1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1790static int loop_done; 1925static int loop_done;
1791 1926
1792void 1927void
1793ev_loop (EV_P_ int flags) 1928ev_loop (EV_P_ int flags)
1794{ 1929{
1796 1931
1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1932 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1798 1933
1799 do 1934 do
1800 { 1935 {
1936#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A);
1938#endif
1939
1801#ifndef _WIN32 1940#ifndef _WIN32
1802 if (expect_false (curpid)) /* penalise the forking check even more */ 1941 if (expect_false (curpid)) /* penalise the forking check even more */
1803 if (expect_false (getpid () != curpid)) 1942 if (expect_false (getpid () != curpid))
1804 { 1943 {
1805 curpid = getpid (); 1944 curpid = getpid ();
2000 if (expect_false (ev_is_active (w))) 2139 if (expect_false (ev_is_active (w)))
2001 return; 2140 return;
2002 2141
2003 assert (("ev_io_start called with negative fd", fd >= 0)); 2142 assert (("ev_io_start called with negative fd", fd >= 0));
2004 2143
2144 EV_FREQUENT_CHECK;
2145
2005 ev_start (EV_A_ (W)w, 1); 2146 ev_start (EV_A_ (W)w, 1);
2006 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
2007 wlist_add (&anfds[fd].head, (WL)w); 2148 wlist_add (&anfds[fd].head, (WL)w);
2008 2149
2009 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2010 w->events &= ~EV_IOFDSET; 2151 w->events &= ~EV_IOFDSET;
2152
2153 EV_FREQUENT_CHECK;
2011} 2154}
2012 2155
2013void noinline 2156void noinline
2014ev_io_stop (EV_P_ ev_io *w) 2157ev_io_stop (EV_P_ ev_io *w)
2015{ 2158{
2017 if (expect_false (!ev_is_active (w))) 2160 if (expect_false (!ev_is_active (w)))
2018 return; 2161 return;
2019 2162
2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2021 2164
2165 EV_FREQUENT_CHECK;
2166
2022 wlist_del (&anfds[w->fd].head, (WL)w); 2167 wlist_del (&anfds[w->fd].head, (WL)w);
2023 ev_stop (EV_A_ (W)w); 2168 ev_stop (EV_A_ (W)w);
2024 2169
2025 fd_change (EV_A_ w->fd, 1); 2170 fd_change (EV_A_ w->fd, 1);
2171
2172 EV_FREQUENT_CHECK;
2026} 2173}
2027 2174
2028void noinline 2175void noinline
2029ev_timer_start (EV_P_ ev_timer *w) 2176ev_timer_start (EV_P_ ev_timer *w)
2030{ 2177{
2033 2180
2034 ev_at (w) += mn_now; 2181 ev_at (w) += mn_now;
2035 2182
2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2037 2184
2185 EV_FREQUENT_CHECK;
2186
2187 ++timercnt;
2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2189 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2040 ANHE_w (timers [ev_active (w)]) = (WT)w; 2190 ANHE_w (timers [ev_active (w)]) = (WT)w;
2041 ANHE_at_set (timers [ev_active (w)]); 2191 ANHE_at_cache (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w)); 2192 upheap (timers, ev_active (w));
2193
2194 EV_FREQUENT_CHECK;
2043 2195
2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2045} 2197}
2046 2198
2047void noinline 2199void noinline
2049{ 2201{
2050 clear_pending (EV_A_ (W)w); 2202 clear_pending (EV_A_ (W)w);
2051 if (expect_false (!ev_is_active (w))) 2203 if (expect_false (!ev_is_active (w)))
2052 return; 2204 return;
2053 2205
2206 EV_FREQUENT_CHECK;
2207
2054 { 2208 {
2055 int active = ev_active (w); 2209 int active = ev_active (w);
2056 2210
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058 2212
2213 --timercnt;
2214
2059 if (expect_true (active < timercnt + HEAP0 - 1)) 2215 if (expect_true (active < timercnt + HEAP0))
2060 { 2216 {
2061 timers [active] = timers [timercnt + HEAP0 - 1]; 2217 timers [active] = timers [timercnt + HEAP0];
2062 adjustheap (timers, timercnt, active); 2218 adjustheap (timers, timercnt, active);
2063 } 2219 }
2064
2065 --timercnt;
2066 } 2220 }
2221
2222 EV_FREQUENT_CHECK;
2067 2223
2068 ev_at (w) -= mn_now; 2224 ev_at (w) -= mn_now;
2069 2225
2070 ev_stop (EV_A_ (W)w); 2226 ev_stop (EV_A_ (W)w);
2071} 2227}
2072 2228
2073void noinline 2229void noinline
2074ev_timer_again (EV_P_ ev_timer *w) 2230ev_timer_again (EV_P_ ev_timer *w)
2075{ 2231{
2232 EV_FREQUENT_CHECK;
2233
2076 if (ev_is_active (w)) 2234 if (ev_is_active (w))
2077 { 2235 {
2078 if (w->repeat) 2236 if (w->repeat)
2079 { 2237 {
2080 ev_at (w) = mn_now + w->repeat; 2238 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]); 2239 ANHE_at_cache (timers [ev_active (w)]);
2082 adjustheap (timers, timercnt, ev_active (w)); 2240 adjustheap (timers, timercnt, ev_active (w));
2083 } 2241 }
2084 else 2242 else
2085 ev_timer_stop (EV_A_ w); 2243 ev_timer_stop (EV_A_ w);
2086 } 2244 }
2087 else if (w->repeat) 2245 else if (w->repeat)
2088 { 2246 {
2089 ev_at (w) = w->repeat; 2247 ev_at (w) = w->repeat;
2090 ev_timer_start (EV_A_ w); 2248 ev_timer_start (EV_A_ w);
2091 } 2249 }
2250
2251 EV_FREQUENT_CHECK;
2092} 2252}
2093 2253
2094#if EV_PERIODIC_ENABLE 2254#if EV_PERIODIC_ENABLE
2095void noinline 2255void noinline
2096ev_periodic_start (EV_P_ ev_periodic *w) 2256ev_periodic_start (EV_P_ ev_periodic *w)
2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2108 } 2268 }
2109 else 2269 else
2110 ev_at (w) = w->offset; 2270 ev_at (w) = w->offset;
2111 2271
2272 EV_FREQUENT_CHECK;
2273
2274 ++periodiccnt;
2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2275 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2276 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2114 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2277 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2115 ANHE_at_set (periodics [ev_active (w)]); 2278 ANHE_at_cache (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w)); 2279 upheap (periodics, ev_active (w));
2280
2281 EV_FREQUENT_CHECK;
2117 2282
2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2119} 2284}
2120 2285
2121void noinline 2286void noinline
2123{ 2288{
2124 clear_pending (EV_A_ (W)w); 2289 clear_pending (EV_A_ (W)w);
2125 if (expect_false (!ev_is_active (w))) 2290 if (expect_false (!ev_is_active (w)))
2126 return; 2291 return;
2127 2292
2293 EV_FREQUENT_CHECK;
2294
2128 { 2295 {
2129 int active = ev_active (w); 2296 int active = ev_active (w);
2130 2297
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132 2299
2300 --periodiccnt;
2301
2133 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2302 if (expect_true (active < periodiccnt + HEAP0))
2134 { 2303 {
2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2304 periodics [active] = periodics [periodiccnt + HEAP0];
2136 adjustheap (periodics, periodiccnt, active); 2305 adjustheap (periodics, periodiccnt, active);
2137 } 2306 }
2138
2139 --periodiccnt;
2140 } 2307 }
2308
2309 EV_FREQUENT_CHECK;
2141 2310
2142 ev_stop (EV_A_ (W)w); 2311 ev_stop (EV_A_ (W)w);
2143} 2312}
2144 2313
2145void noinline 2314void noinline
2165 return; 2334 return;
2166 2335
2167 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168 2337
2169 evpipe_init (EV_A); 2338 evpipe_init (EV_A);
2339
2340 EV_FREQUENT_CHECK;
2170 2341
2171 { 2342 {
2172#ifndef _WIN32 2343#ifndef _WIN32
2173 sigset_t full, prev; 2344 sigset_t full, prev;
2174 sigfillset (&full); 2345 sigfillset (&full);
2195 sigfillset (&sa.sa_mask); 2366 sigfillset (&sa.sa_mask);
2196 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2367 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2197 sigaction (w->signum, &sa, 0); 2368 sigaction (w->signum, &sa, 0);
2198#endif 2369#endif
2199 } 2370 }
2371
2372 EV_FREQUENT_CHECK;
2200} 2373}
2201 2374
2202void noinline 2375void noinline
2203ev_signal_stop (EV_P_ ev_signal *w) 2376ev_signal_stop (EV_P_ ev_signal *w)
2204{ 2377{
2205 clear_pending (EV_A_ (W)w); 2378 clear_pending (EV_A_ (W)w);
2206 if (expect_false (!ev_is_active (w))) 2379 if (expect_false (!ev_is_active (w)))
2207 return; 2380 return;
2208 2381
2382 EV_FREQUENT_CHECK;
2383
2209 wlist_del (&signals [w->signum - 1].head, (WL)w); 2384 wlist_del (&signals [w->signum - 1].head, (WL)w);
2210 ev_stop (EV_A_ (W)w); 2385 ev_stop (EV_A_ (W)w);
2211 2386
2212 if (!signals [w->signum - 1].head) 2387 if (!signals [w->signum - 1].head)
2213 signal (w->signum, SIG_DFL); 2388 signal (w->signum, SIG_DFL);
2389
2390 EV_FREQUENT_CHECK;
2214} 2391}
2215 2392
2216void 2393void
2217ev_child_start (EV_P_ ev_child *w) 2394ev_child_start (EV_P_ ev_child *w)
2218{ 2395{
2220 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2221#endif 2398#endif
2222 if (expect_false (ev_is_active (w))) 2399 if (expect_false (ev_is_active (w)))
2223 return; 2400 return;
2224 2401
2402 EV_FREQUENT_CHECK;
2403
2225 ev_start (EV_A_ (W)w, 1); 2404 ev_start (EV_A_ (W)w, 1);
2226 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2405 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2406
2407 EV_FREQUENT_CHECK;
2227} 2408}
2228 2409
2229void 2410void
2230ev_child_stop (EV_P_ ev_child *w) 2411ev_child_stop (EV_P_ ev_child *w)
2231{ 2412{
2232 clear_pending (EV_A_ (W)w); 2413 clear_pending (EV_A_ (W)w);
2233 if (expect_false (!ev_is_active (w))) 2414 if (expect_false (!ev_is_active (w)))
2234 return; 2415 return;
2235 2416
2417 EV_FREQUENT_CHECK;
2418
2236 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2419 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2237 ev_stop (EV_A_ (W)w); 2420 ev_stop (EV_A_ (W)w);
2421
2422 EV_FREQUENT_CHECK;
2238} 2423}
2239 2424
2240#if EV_STAT_ENABLE 2425#if EV_STAT_ENABLE
2241 2426
2242# ifdef _WIN32 2427# ifdef _WIN32
2397 } 2582 }
2398 2583
2399 } 2584 }
2400} 2585}
2401 2586
2587#endif
2588
2589#ifdef _WIN32
2590# define EV_LSTAT(p,b) _stati64 (p, b)
2591#else
2592# define EV_LSTAT(p,b) lstat (p, b)
2402#endif 2593#endif
2403 2594
2404void 2595void
2405ev_stat_stat (EV_P_ ev_stat *w) 2596ev_stat_stat (EV_P_ ev_stat *w)
2406{ 2597{
2470 else 2661 else
2471#endif 2662#endif
2472 ev_timer_start (EV_A_ &w->timer); 2663 ev_timer_start (EV_A_ &w->timer);
2473 2664
2474 ev_start (EV_A_ (W)w, 1); 2665 ev_start (EV_A_ (W)w, 1);
2666
2667 EV_FREQUENT_CHECK;
2475} 2668}
2476 2669
2477void 2670void
2478ev_stat_stop (EV_P_ ev_stat *w) 2671ev_stat_stop (EV_P_ ev_stat *w)
2479{ 2672{
2480 clear_pending (EV_A_ (W)w); 2673 clear_pending (EV_A_ (W)w);
2481 if (expect_false (!ev_is_active (w))) 2674 if (expect_false (!ev_is_active (w)))
2482 return; 2675 return;
2483 2676
2677 EV_FREQUENT_CHECK;
2678
2484#if EV_USE_INOTIFY 2679#if EV_USE_INOTIFY
2485 infy_del (EV_A_ w); 2680 infy_del (EV_A_ w);
2486#endif 2681#endif
2487 ev_timer_stop (EV_A_ &w->timer); 2682 ev_timer_stop (EV_A_ &w->timer);
2488 2683
2489 ev_stop (EV_A_ (W)w); 2684 ev_stop (EV_A_ (W)w);
2685
2686 EV_FREQUENT_CHECK;
2490} 2687}
2491#endif 2688#endif
2492 2689
2493#if EV_IDLE_ENABLE 2690#if EV_IDLE_ENABLE
2494void 2691void
2496{ 2693{
2497 if (expect_false (ev_is_active (w))) 2694 if (expect_false (ev_is_active (w)))
2498 return; 2695 return;
2499 2696
2500 pri_adjust (EV_A_ (W)w); 2697 pri_adjust (EV_A_ (W)w);
2698
2699 EV_FREQUENT_CHECK;
2501 2700
2502 { 2701 {
2503 int active = ++idlecnt [ABSPRI (w)]; 2702 int active = ++idlecnt [ABSPRI (w)];
2504 2703
2505 ++idleall; 2704 ++idleall;
2506 ev_start (EV_A_ (W)w, active); 2705 ev_start (EV_A_ (W)w, active);
2507 2706
2508 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2707 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2509 idles [ABSPRI (w)][active - 1] = w; 2708 idles [ABSPRI (w)][active - 1] = w;
2510 } 2709 }
2710
2711 EV_FREQUENT_CHECK;
2511} 2712}
2512 2713
2513void 2714void
2514ev_idle_stop (EV_P_ ev_idle *w) 2715ev_idle_stop (EV_P_ ev_idle *w)
2515{ 2716{
2516 clear_pending (EV_A_ (W)w); 2717 clear_pending (EV_A_ (W)w);
2517 if (expect_false (!ev_is_active (w))) 2718 if (expect_false (!ev_is_active (w)))
2518 return; 2719 return;
2519 2720
2721 EV_FREQUENT_CHECK;
2722
2520 { 2723 {
2521 int active = ev_active (w); 2724 int active = ev_active (w);
2522 2725
2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2726 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2524 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2727 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2525 2728
2526 ev_stop (EV_A_ (W)w); 2729 ev_stop (EV_A_ (W)w);
2527 --idleall; 2730 --idleall;
2528 } 2731 }
2732
2733 EV_FREQUENT_CHECK;
2529} 2734}
2530#endif 2735#endif
2531 2736
2532void 2737void
2533ev_prepare_start (EV_P_ ev_prepare *w) 2738ev_prepare_start (EV_P_ ev_prepare *w)
2534{ 2739{
2535 if (expect_false (ev_is_active (w))) 2740 if (expect_false (ev_is_active (w)))
2536 return; 2741 return;
2742
2743 EV_FREQUENT_CHECK;
2537 2744
2538 ev_start (EV_A_ (W)w, ++preparecnt); 2745 ev_start (EV_A_ (W)w, ++preparecnt);
2539 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2746 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2540 prepares [preparecnt - 1] = w; 2747 prepares [preparecnt - 1] = w;
2748
2749 EV_FREQUENT_CHECK;
2541} 2750}
2542 2751
2543void 2752void
2544ev_prepare_stop (EV_P_ ev_prepare *w) 2753ev_prepare_stop (EV_P_ ev_prepare *w)
2545{ 2754{
2546 clear_pending (EV_A_ (W)w); 2755 clear_pending (EV_A_ (W)w);
2547 if (expect_false (!ev_is_active (w))) 2756 if (expect_false (!ev_is_active (w)))
2548 return; 2757 return;
2549 2758
2759 EV_FREQUENT_CHECK;
2760
2550 { 2761 {
2551 int active = ev_active (w); 2762 int active = ev_active (w);
2552 2763
2553 prepares [active - 1] = prepares [--preparecnt]; 2764 prepares [active - 1] = prepares [--preparecnt];
2554 ev_active (prepares [active - 1]) = active; 2765 ev_active (prepares [active - 1]) = active;
2555 } 2766 }
2556 2767
2557 ev_stop (EV_A_ (W)w); 2768 ev_stop (EV_A_ (W)w);
2769
2770 EV_FREQUENT_CHECK;
2558} 2771}
2559 2772
2560void 2773void
2561ev_check_start (EV_P_ ev_check *w) 2774ev_check_start (EV_P_ ev_check *w)
2562{ 2775{
2563 if (expect_false (ev_is_active (w))) 2776 if (expect_false (ev_is_active (w)))
2564 return; 2777 return;
2778
2779 EV_FREQUENT_CHECK;
2565 2780
2566 ev_start (EV_A_ (W)w, ++checkcnt); 2781 ev_start (EV_A_ (W)w, ++checkcnt);
2567 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2782 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2568 checks [checkcnt - 1] = w; 2783 checks [checkcnt - 1] = w;
2784
2785 EV_FREQUENT_CHECK;
2569} 2786}
2570 2787
2571void 2788void
2572ev_check_stop (EV_P_ ev_check *w) 2789ev_check_stop (EV_P_ ev_check *w)
2573{ 2790{
2574 clear_pending (EV_A_ (W)w); 2791 clear_pending (EV_A_ (W)w);
2575 if (expect_false (!ev_is_active (w))) 2792 if (expect_false (!ev_is_active (w)))
2576 return; 2793 return;
2577 2794
2795 EV_FREQUENT_CHECK;
2796
2578 { 2797 {
2579 int active = ev_active (w); 2798 int active = ev_active (w);
2580 2799
2581 checks [active - 1] = checks [--checkcnt]; 2800 checks [active - 1] = checks [--checkcnt];
2582 ev_active (checks [active - 1]) = active; 2801 ev_active (checks [active - 1]) = active;
2583 } 2802 }
2584 2803
2585 ev_stop (EV_A_ (W)w); 2804 ev_stop (EV_A_ (W)w);
2805
2806 EV_FREQUENT_CHECK;
2586} 2807}
2587 2808
2588#if EV_EMBED_ENABLE 2809#if EV_EMBED_ENABLE
2589void noinline 2810void noinline
2590ev_embed_sweep (EV_P_ ev_embed *w) 2811ev_embed_sweep (EV_P_ ev_embed *w)
2617 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2838 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2618 } 2839 }
2619 } 2840 }
2620} 2841}
2621 2842
2843static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847
2848 {
2849 struct ev_loop *loop = w->other;
2850
2851 ev_loop_fork (EV_A);
2852 }
2853}
2854
2622#if 0 2855#if 0
2623static void 2856static void
2624embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2857embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2625{ 2858{
2626 ev_idle_stop (EV_A_ idle); 2859 ev_idle_stop (EV_A_ idle);
2637 struct ev_loop *loop = w->other; 2870 struct ev_loop *loop = w->other;
2638 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2871 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); 2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2640 } 2873 }
2641 2874
2875 EV_FREQUENT_CHECK;
2876
2642 ev_set_priority (&w->io, ev_priority (w)); 2877 ev_set_priority (&w->io, ev_priority (w));
2643 ev_io_start (EV_A_ &w->io); 2878 ev_io_start (EV_A_ &w->io);
2644 2879
2645 ev_prepare_init (&w->prepare, embed_prepare_cb); 2880 ev_prepare_init (&w->prepare, embed_prepare_cb);
2646 ev_set_priority (&w->prepare, EV_MINPRI); 2881 ev_set_priority (&w->prepare, EV_MINPRI);
2647 ev_prepare_start (EV_A_ &w->prepare); 2882 ev_prepare_start (EV_A_ &w->prepare);
2648 2883
2884 ev_fork_init (&w->fork, embed_fork_cb);
2885 ev_fork_start (EV_A_ &w->fork);
2886
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2887 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650 2888
2651 ev_start (EV_A_ (W)w, 1); 2889 ev_start (EV_A_ (W)w, 1);
2890
2891 EV_FREQUENT_CHECK;
2652} 2892}
2653 2893
2654void 2894void
2655ev_embed_stop (EV_P_ ev_embed *w) 2895ev_embed_stop (EV_P_ ev_embed *w)
2656{ 2896{
2657 clear_pending (EV_A_ (W)w); 2897 clear_pending (EV_A_ (W)w);
2658 if (expect_false (!ev_is_active (w))) 2898 if (expect_false (!ev_is_active (w)))
2659 return; 2899 return;
2660 2900
2901 EV_FREQUENT_CHECK;
2902
2661 ev_io_stop (EV_A_ &w->io); 2903 ev_io_stop (EV_A_ &w->io);
2662 ev_prepare_stop (EV_A_ &w->prepare); 2904 ev_prepare_stop (EV_A_ &w->prepare);
2905 ev_fork_stop (EV_A_ &w->fork);
2663 2906
2664 ev_stop (EV_A_ (W)w); 2907 EV_FREQUENT_CHECK;
2665} 2908}
2666#endif 2909#endif
2667 2910
2668#if EV_FORK_ENABLE 2911#if EV_FORK_ENABLE
2669void 2912void
2670ev_fork_start (EV_P_ ev_fork *w) 2913ev_fork_start (EV_P_ ev_fork *w)
2671{ 2914{
2672 if (expect_false (ev_is_active (w))) 2915 if (expect_false (ev_is_active (w)))
2673 return; 2916 return;
2917
2918 EV_FREQUENT_CHECK;
2674 2919
2675 ev_start (EV_A_ (W)w, ++forkcnt); 2920 ev_start (EV_A_ (W)w, ++forkcnt);
2676 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2921 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2677 forks [forkcnt - 1] = w; 2922 forks [forkcnt - 1] = w;
2923
2924 EV_FREQUENT_CHECK;
2678} 2925}
2679 2926
2680void 2927void
2681ev_fork_stop (EV_P_ ev_fork *w) 2928ev_fork_stop (EV_P_ ev_fork *w)
2682{ 2929{
2683 clear_pending (EV_A_ (W)w); 2930 clear_pending (EV_A_ (W)w);
2684 if (expect_false (!ev_is_active (w))) 2931 if (expect_false (!ev_is_active (w)))
2685 return; 2932 return;
2686 2933
2934 EV_FREQUENT_CHECK;
2935
2687 { 2936 {
2688 int active = ev_active (w); 2937 int active = ev_active (w);
2689 2938
2690 forks [active - 1] = forks [--forkcnt]; 2939 forks [active - 1] = forks [--forkcnt];
2691 ev_active (forks [active - 1]) = active; 2940 ev_active (forks [active - 1]) = active;
2692 } 2941 }
2693 2942
2694 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2944
2945 EV_FREQUENT_CHECK;
2695} 2946}
2696#endif 2947#endif
2697 2948
2698#if EV_ASYNC_ENABLE 2949#if EV_ASYNC_ENABLE
2699void 2950void
2701{ 2952{
2702 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2703 return; 2954 return;
2704 2955
2705 evpipe_init (EV_A); 2956 evpipe_init (EV_A);
2957
2958 EV_FREQUENT_CHECK;
2706 2959
2707 ev_start (EV_A_ (W)w, ++asynccnt); 2960 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2961 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w; 2962 asyncs [asynccnt - 1] = w;
2963
2964 EV_FREQUENT_CHECK;
2710} 2965}
2711 2966
2712void 2967void
2713ev_async_stop (EV_P_ ev_async *w) 2968ev_async_stop (EV_P_ ev_async *w)
2714{ 2969{
2715 clear_pending (EV_A_ (W)w); 2970 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w))) 2971 if (expect_false (!ev_is_active (w)))
2717 return; 2972 return;
2718 2973
2974 EV_FREQUENT_CHECK;
2975
2719 { 2976 {
2720 int active = ev_active (w); 2977 int active = ev_active (w);
2721 2978
2722 asyncs [active - 1] = asyncs [--asynccnt]; 2979 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active; 2980 ev_active (asyncs [active - 1]) = active;
2724 } 2981 }
2725 2982
2726 ev_stop (EV_A_ (W)w); 2983 ev_stop (EV_A_ (W)w);
2984
2985 EV_FREQUENT_CHECK;
2727} 2986}
2728 2987
2729void 2988void
2730ev_async_send (EV_P_ ev_async *w) 2989ev_async_send (EV_P_ ev_async *w)
2731{ 2990{
2748once_cb (EV_P_ struct ev_once *once, int revents) 3007once_cb (EV_P_ struct ev_once *once, int revents)
2749{ 3008{
2750 void (*cb)(int revents, void *arg) = once->cb; 3009 void (*cb)(int revents, void *arg) = once->cb;
2751 void *arg = once->arg; 3010 void *arg = once->arg;
2752 3011
2753 ev_io_stop (EV_A_ &once->io); 3012 ev_io_stop (EV_A_ &once->io);
2754 ev_timer_stop (EV_A_ &once->to); 3013 ev_timer_stop (EV_A_ &once->to);
2755 ev_free (once); 3014 ev_free (once);
2756 3015
2757 cb (revents, arg); 3016 cb (revents, arg);
2758} 3017}
2759 3018
2760static void 3019static void
2761once_cb_io (EV_P_ ev_io *w, int revents) 3020once_cb_io (EV_P_ ev_io *w, int revents)
2762{ 3021{
2763 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3022 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3023
3024 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2764} 3025}
2765 3026
2766static void 3027static void
2767once_cb_to (EV_P_ ev_timer *w, int revents) 3028once_cb_to (EV_P_ ev_timer *w, int revents)
2768{ 3029{
2769 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3030 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3031
3032 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2770} 3033}
2771 3034
2772void 3035void
2773ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3036ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2774{ 3037{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines