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

Comparing libev/ev.c (file contents):
Revision 1.243 by root, Fri May 9 15:52:13 2008 UTC vs.
Revision 1.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
802 */ 835 */
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 840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 841#define UPHEAP_DONE(p,k) ((p) == (k))
809void inline_speed
810upheap (ANHE *heap, int k)
811{
812 ANHE he = heap [k];
813
814 for (;;)
815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
821 heap [k] = heap [p];
822 ev_active (ANHE_w (heap [k])) = k;
823 k = p;
824 }
825
826 ev_active (ANHE_w (he)) = k;
827 heap [k] = he;
828}
829 842
830/* away from the root */ 843/* away from the root */
831void inline_speed 844void inline_speed
832downheap (ANHE *heap, int N, int k) 845downheap (ANHE *heap, int N, int k)
833{ 846{
836 849
837 for (;;) 850 for (;;)
838 { 851 {
839 ev_tstamp minat; 852 ev_tstamp minat;
840 ANHE *minpos; 853 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 854 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 855
843 // find minimum child 856 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 857 if (expect_true (pos + DHEAP - 1 < E))
845 { 858 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 859 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 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));
848 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));
849 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 862 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 } 863 }
851 else if (pos < E) 864 else if (pos < E)
852 { 865 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 866 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 867 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
859 break; 872 break;
860 873
861 if (ANHE_at (he) <= minat) 874 if (ANHE_at (he) <= minat)
862 break; 875 break;
863 876
877 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 878 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 879
867 k = minpos - heap; 880 k = minpos - heap;
868 } 881 }
869 882
883 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 884 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 885}
873 886
874#else // 4HEAP 887#else /* 4HEAP */
875 888
876#define HEAP0 1 889#define HEAP0 1
877 890#define HPARENT(k) ((k) >> 1)
878/* towards the root */ 891#define UPHEAP_DONE(p,k) (!(p))
879void inline_speed
880upheap (ANHE *heap, int k)
881{
882 ANHE he = heap [k];
883
884 for (;;)
885 {
886 int p = k >> 1;
887
888 /* maybe we could use a dummy element at heap [0]? */
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break;
891
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900 892
901/* away from the root */ 893/* away from the root */
902void inline_speed 894void inline_speed
903downheap (ANHE *heap, int N, int k) 895downheap (ANHE *heap, int N, int k)
904{ 896{
906 898
907 for (;;) 899 for (;;)
908 { 900 {
909 int c = k << 1; 901 int c = k << 1;
910 902
911 if (c > N) 903 if (c > N + HEAP0 - 1)
912 break; 904 break;
913 905
914 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])
915 ? 1 : 0; 907 ? 1 : 0;
916 908
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 909 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 910 break;
919 911
926 heap [k] = he; 918 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 919 ev_active (ANHE_w (he)) = k;
928} 920}
929#endif 921#endif
930 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
931void inline_size 945void inline_size
932adjustheap (ANHE *heap, int N, int k) 946adjustheap (ANHE *heap, int N, int k)
933{ 947{
948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
934 upheap (heap, k); 949 upheap (heap, k);
950 else
935 downheap (heap, N, k); 951 downheap (heap, N, k);
952}
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);
936} 964}
937 965
938/*****************************************************************************/ 966/*****************************************************************************/
939 967
940typedef struct 968typedef struct
964 992
965void inline_speed 993void inline_speed
966fd_intern (int fd) 994fd_intern (int fd)
967{ 995{
968#ifdef _WIN32 996#ifdef _WIN32
969 int arg = 1; 997 unsigned long arg = 1;
970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
971#else 999#else
972 fcntl (fd, F_SETFD, FD_CLOEXEC); 1000 fcntl (fd, F_SETFD, FD_CLOEXEC);
973 fcntl (fd, F_SETFL, O_NONBLOCK); 1001 fcntl (fd, F_SETFL, O_NONBLOCK);
974#endif 1002#endif
1458 1486
1459 postfork = 0; 1487 postfork = 0;
1460} 1488}
1461 1489
1462#if EV_MULTIPLICITY 1490#if EV_MULTIPLICITY
1491
1463struct ev_loop * 1492struct ev_loop *
1464ev_loop_new (unsigned int flags) 1493ev_loop_new (unsigned int flags)
1465{ 1494{
1466 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));
1467 1496
1485void 1514void
1486ev_loop_fork (EV_P) 1515ev_loop_fork (EV_P)
1487{ 1516{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1517 postfork = 1; /* must be in line with ev_default_fork */
1489} 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)
1490#endif 1615# endif
1616#endif
1617}
1618
1619#endif /* multiplicity */
1491 1620
1492#if EV_MULTIPLICITY 1621#if EV_MULTIPLICITY
1493struct ev_loop * 1622struct ev_loop *
1494ev_default_loop_init (unsigned int flags) 1623ev_default_loop_init (unsigned int flags)
1495#else 1624#else
1571 { 1700 {
1572 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1573 1702
1574 p->w->pending = 0; 1703 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 1704 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK;
1576 } 1706 }
1577 } 1707 }
1578} 1708}
1579 1709
1580#if EV_IDLE_ENABLE 1710#if EV_IDLE_ENABLE
1601#endif 1731#endif
1602 1732
1603void inline_size 1733void inline_size
1604timers_reify (EV_P) 1734timers_reify (EV_P)
1605{ 1735{
1736 EV_FREQUENT_CHECK;
1737
1606 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 1739 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1609 1741
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611 1743
1616 if (ev_at (w) < mn_now) 1748 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 1749 ev_at (w) = mn_now;
1618 1750
1619 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.));
1620 1752
1621 ANHE_at_set (timers [HEAP0]); 1753 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, HEAP0); 1754 downheap (timers, timercnt, HEAP0);
1623 } 1755 }
1624 else 1756 else
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 1758
1759 EV_FREQUENT_CHECK;
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1628 } 1761 }
1629} 1762}
1630 1763
1631#if EV_PERIODIC_ENABLE 1764#if EV_PERIODIC_ENABLE
1632void inline_size 1765void inline_size
1633periodics_reify (EV_P) 1766periodics_reify (EV_P)
1634{ 1767{
1768 EV_FREQUENT_CHECK;
1769
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 1771 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1638 1773
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1640 1775
1641 /* first reschedule or stop timer */ 1776 /* first reschedule or stop timer */
1642 if (w->reschedule_cb) 1777 if (w->reschedule_cb)
1643 { 1778 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 1780
1646 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));
1647 1782
1648 ANHE_at_set (periodics [HEAP0]); 1783 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1650 } 1785 }
1651 else if (w->interval) 1786 else if (w->interval)
1652 { 1787 {
1653 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;
1789 /* if next trigger time is not sufficiently in the future, put it there */
1790 /* this might happen because of floating point inexactness */
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1792 {
1793 ev_at (w) += w->interval;
1655 1794
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1795 /* if interval is unreasonably low we might still have a time in the past */
1796 /* so correct this. this will make the periodic very inexact, but the user */
1797 /* has effectively asked to get triggered more often than possible */
1798 if (ev_at (w) < ev_rt_now)
1799 ev_at (w) = ev_rt_now;
1800 }
1657 1801
1658 ANHE_at_set (periodics [HEAP0]); 1802 ANHE_at_cache (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0); 1803 downheap (periodics, periodiccnt, HEAP0);
1660 } 1804 }
1661 else 1805 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663 1807
1808 EV_FREQUENT_CHECK;
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1665 } 1810 }
1666} 1811}
1667 1812
1668static void noinline 1813static void noinline
1678 if (w->reschedule_cb) 1823 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1824 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 1825 else if (w->interval)
1681 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;
1682 1827
1683 ANHE_at_set (periodics [i]); 1828 ANHE_at_cache (periodics [i]);
1684 } 1829 }
1685 1830
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 1831 reheap (periodics, periodiccnt);
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1688 for (i = 0; i < periodiccnt; ++i)
1689 upheap (periodics, i + HEAP0);
1690} 1832}
1691#endif 1833#endif
1692 1834
1693void inline_speed 1835void inline_speed
1694time_update (EV_P_ ev_tstamp max_block) 1836time_update (EV_P_ ev_tstamp max_block)
1752 /* 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 */
1753 for (i = 0; i < timercnt; ++i) 1895 for (i = 0; i < timercnt; ++i)
1754 { 1896 {
1755 ANHE *he = timers + i + HEAP0; 1897 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now; 1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he); 1899 ANHE_at_cache (*he);
1758 } 1900 }
1759 } 1901 }
1760 1902
1761 mn_now = ev_rt_now; 1903 mn_now = ev_rt_now;
1762 } 1904 }
1772ev_unref (EV_P) 1914ev_unref (EV_P)
1773{ 1915{
1774 --activecnt; 1916 --activecnt;
1775} 1917}
1776 1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1777static int loop_done; 1925static int loop_done;
1778 1926
1779void 1927void
1780ev_loop (EV_P_ int flags) 1928ev_loop (EV_P_ int flags)
1781{ 1929{
1783 1931
1784 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 */
1785 1933
1786 do 1934 do
1787 { 1935 {
1936#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A);
1938#endif
1939
1788#ifndef _WIN32 1940#ifndef _WIN32
1789 if (expect_false (curpid)) /* penalise the forking check even more */ 1941 if (expect_false (curpid)) /* penalise the forking check even more */
1790 if (expect_false (getpid () != curpid)) 1942 if (expect_false (getpid () != curpid))
1791 { 1943 {
1792 curpid = getpid (); 1944 curpid = getpid ();
1987 if (expect_false (ev_is_active (w))) 2139 if (expect_false (ev_is_active (w)))
1988 return; 2140 return;
1989 2141
1990 assert (("ev_io_start called with negative fd", fd >= 0)); 2142 assert (("ev_io_start called with negative fd", fd >= 0));
1991 2143
2144 EV_FREQUENT_CHECK;
2145
1992 ev_start (EV_A_ (W)w, 1); 2146 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1994 wlist_add (&anfds[fd].head, (WL)w); 2148 wlist_add (&anfds[fd].head, (WL)w);
1995 2149
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1997 w->events &= ~EV_IOFDSET; 2151 w->events &= ~EV_IOFDSET;
2152
2153 EV_FREQUENT_CHECK;
1998} 2154}
1999 2155
2000void noinline 2156void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2157ev_io_stop (EV_P_ ev_io *w)
2002{ 2158{
2004 if (expect_false (!ev_is_active (w))) 2160 if (expect_false (!ev_is_active (w)))
2005 return; 2161 return;
2006 2162
2007 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));
2008 2164
2165 EV_FREQUENT_CHECK;
2166
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2167 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2168 ev_stop (EV_A_ (W)w);
2011 2169
2012 fd_change (EV_A_ w->fd, 1); 2170 fd_change (EV_A_ w->fd, 1);
2171
2172 EV_FREQUENT_CHECK;
2013} 2173}
2014 2174
2015void noinline 2175void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2176ev_timer_start (EV_P_ ev_timer *w)
2017{ 2177{
2020 2180
2021 ev_at (w) += mn_now; 2181 ev_at (w) += mn_now;
2022 2182
2023 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.));
2024 2184
2185 EV_FREQUENT_CHECK;
2186
2187 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2189 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2190 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2191 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2192 upheap (timers, ev_active (w));
2193
2194 EV_FREQUENT_CHECK;
2030 2195
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2197}
2033 2198
2034void noinline 2199void noinline
2036{ 2201{
2037 clear_pending (EV_A_ (W)w); 2202 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2203 if (expect_false (!ev_is_active (w)))
2039 return; 2204 return;
2040 2205
2206 EV_FREQUENT_CHECK;
2207
2041 { 2208 {
2042 int active = ev_active (w); 2209 int active = ev_active (w);
2043 2210
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2212
2213 --timercnt;
2214
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2215 if (expect_true (active < timercnt + HEAP0))
2047 { 2216 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2217 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2218 adjustheap (timers, timercnt, active);
2050 } 2219 }
2051
2052 --timercnt;
2053 } 2220 }
2221
2222 EV_FREQUENT_CHECK;
2054 2223
2055 ev_at (w) -= mn_now; 2224 ev_at (w) -= mn_now;
2056 2225
2057 ev_stop (EV_A_ (W)w); 2226 ev_stop (EV_A_ (W)w);
2058} 2227}
2059 2228
2060void noinline 2229void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2230ev_timer_again (EV_P_ ev_timer *w)
2062{ 2231{
2232 EV_FREQUENT_CHECK;
2233
2063 if (ev_is_active (w)) 2234 if (ev_is_active (w))
2064 { 2235 {
2065 if (w->repeat) 2236 if (w->repeat)
2066 { 2237 {
2067 ev_at (w) = mn_now + w->repeat; 2238 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2239 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2240 adjustheap (timers, timercnt, ev_active (w));
2070 } 2241 }
2071 else 2242 else
2072 ev_timer_stop (EV_A_ w); 2243 ev_timer_stop (EV_A_ w);
2073 } 2244 }
2074 else if (w->repeat) 2245 else if (w->repeat)
2075 { 2246 {
2076 ev_at (w) = w->repeat; 2247 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2248 ev_timer_start (EV_A_ w);
2078 } 2249 }
2250
2251 EV_FREQUENT_CHECK;
2079} 2252}
2080 2253
2081#if EV_PERIODIC_ENABLE 2254#if EV_PERIODIC_ENABLE
2082void noinline 2255void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2256ev_periodic_start (EV_P_ ev_periodic *w)
2094 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;
2095 } 2268 }
2096 else 2269 else
2097 ev_at (w) = w->offset; 2270 ev_at (w) = w->offset;
2098 2271
2272 EV_FREQUENT_CHECK;
2273
2274 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2275 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2276 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2277 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2278 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2279 upheap (periodics, ev_active (w));
2280
2281 EV_FREQUENT_CHECK;
2104 2282
2105 /*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));*/
2106} 2284}
2107 2285
2108void noinline 2286void noinline
2110{ 2288{
2111 clear_pending (EV_A_ (W)w); 2289 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2290 if (expect_false (!ev_is_active (w)))
2113 return; 2291 return;
2114 2292
2293 EV_FREQUENT_CHECK;
2294
2115 { 2295 {
2116 int active = ev_active (w); 2296 int active = ev_active (w);
2117 2297
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2299
2300 --periodiccnt;
2301
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2302 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2303 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2304 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2305 adjustheap (periodics, periodiccnt, active);
2124 } 2306 }
2125
2126 --periodiccnt;
2127 } 2307 }
2308
2309 EV_FREQUENT_CHECK;
2128 2310
2129 ev_stop (EV_A_ (W)w); 2311 ev_stop (EV_A_ (W)w);
2130} 2312}
2131 2313
2132void noinline 2314void noinline
2152 return; 2334 return;
2153 2335
2154 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));
2155 2337
2156 evpipe_init (EV_A); 2338 evpipe_init (EV_A);
2339
2340 EV_FREQUENT_CHECK;
2157 2341
2158 { 2342 {
2159#ifndef _WIN32 2343#ifndef _WIN32
2160 sigset_t full, prev; 2344 sigset_t full, prev;
2161 sigfillset (&full); 2345 sigfillset (&full);
2182 sigfillset (&sa.sa_mask); 2366 sigfillset (&sa.sa_mask);
2183 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 */
2184 sigaction (w->signum, &sa, 0); 2368 sigaction (w->signum, &sa, 0);
2185#endif 2369#endif
2186 } 2370 }
2371
2372 EV_FREQUENT_CHECK;
2187} 2373}
2188 2374
2189void noinline 2375void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2376ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2377{
2192 clear_pending (EV_A_ (W)w); 2378 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2379 if (expect_false (!ev_is_active (w)))
2194 return; 2380 return;
2195 2381
2382 EV_FREQUENT_CHECK;
2383
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2384 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2385 ev_stop (EV_A_ (W)w);
2198 2386
2199 if (!signals [w->signum - 1].head) 2387 if (!signals [w->signum - 1].head)
2200 signal (w->signum, SIG_DFL); 2388 signal (w->signum, SIG_DFL);
2389
2390 EV_FREQUENT_CHECK;
2201} 2391}
2202 2392
2203void 2393void
2204ev_child_start (EV_P_ ev_child *w) 2394ev_child_start (EV_P_ ev_child *w)
2205{ 2395{
2207 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));
2208#endif 2398#endif
2209 if (expect_false (ev_is_active (w))) 2399 if (expect_false (ev_is_active (w)))
2210 return; 2400 return;
2211 2401
2402 EV_FREQUENT_CHECK;
2403
2212 ev_start (EV_A_ (W)w, 1); 2404 ev_start (EV_A_ (W)w, 1);
2213 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;
2214} 2408}
2215 2409
2216void 2410void
2217ev_child_stop (EV_P_ ev_child *w) 2411ev_child_stop (EV_P_ ev_child *w)
2218{ 2412{
2219 clear_pending (EV_A_ (W)w); 2413 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2414 if (expect_false (!ev_is_active (w)))
2221 return; 2415 return;
2222 2416
2417 EV_FREQUENT_CHECK;
2418
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2419 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2420 ev_stop (EV_A_ (W)w);
2421
2422 EV_FREQUENT_CHECK;
2225} 2423}
2226 2424
2227#if EV_STAT_ENABLE 2425#if EV_STAT_ENABLE
2228 2426
2229# ifdef _WIN32 2427# ifdef _WIN32
2384 } 2582 }
2385 2583
2386 } 2584 }
2387} 2585}
2388 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)
2389#endif 2593#endif
2390 2594
2391void 2595void
2392ev_stat_stat (EV_P_ ev_stat *w) 2596ev_stat_stat (EV_P_ ev_stat *w)
2393{ 2597{
2457 else 2661 else
2458#endif 2662#endif
2459 ev_timer_start (EV_A_ &w->timer); 2663 ev_timer_start (EV_A_ &w->timer);
2460 2664
2461 ev_start (EV_A_ (W)w, 1); 2665 ev_start (EV_A_ (W)w, 1);
2666
2667 EV_FREQUENT_CHECK;
2462} 2668}
2463 2669
2464void 2670void
2465ev_stat_stop (EV_P_ ev_stat *w) 2671ev_stat_stop (EV_P_ ev_stat *w)
2466{ 2672{
2467 clear_pending (EV_A_ (W)w); 2673 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 2674 if (expect_false (!ev_is_active (w)))
2469 return; 2675 return;
2470 2676
2677 EV_FREQUENT_CHECK;
2678
2471#if EV_USE_INOTIFY 2679#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 2680 infy_del (EV_A_ w);
2473#endif 2681#endif
2474 ev_timer_stop (EV_A_ &w->timer); 2682 ev_timer_stop (EV_A_ &w->timer);
2475 2683
2476 ev_stop (EV_A_ (W)w); 2684 ev_stop (EV_A_ (W)w);
2685
2686 EV_FREQUENT_CHECK;
2477} 2687}
2478#endif 2688#endif
2479 2689
2480#if EV_IDLE_ENABLE 2690#if EV_IDLE_ENABLE
2481void 2691void
2483{ 2693{
2484 if (expect_false (ev_is_active (w))) 2694 if (expect_false (ev_is_active (w)))
2485 return; 2695 return;
2486 2696
2487 pri_adjust (EV_A_ (W)w); 2697 pri_adjust (EV_A_ (W)w);
2698
2699 EV_FREQUENT_CHECK;
2488 2700
2489 { 2701 {
2490 int active = ++idlecnt [ABSPRI (w)]; 2702 int active = ++idlecnt [ABSPRI (w)];
2491 2703
2492 ++idleall; 2704 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 2705 ev_start (EV_A_ (W)w, active);
2494 2706
2495 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);
2496 idles [ABSPRI (w)][active - 1] = w; 2708 idles [ABSPRI (w)][active - 1] = w;
2497 } 2709 }
2710
2711 EV_FREQUENT_CHECK;
2498} 2712}
2499 2713
2500void 2714void
2501ev_idle_stop (EV_P_ ev_idle *w) 2715ev_idle_stop (EV_P_ ev_idle *w)
2502{ 2716{
2503 clear_pending (EV_A_ (W)w); 2717 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 2718 if (expect_false (!ev_is_active (w)))
2505 return; 2719 return;
2506 2720
2721 EV_FREQUENT_CHECK;
2722
2507 { 2723 {
2508 int active = ev_active (w); 2724 int active = ev_active (w);
2509 2725
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2726 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2727 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 2728
2513 ev_stop (EV_A_ (W)w); 2729 ev_stop (EV_A_ (W)w);
2514 --idleall; 2730 --idleall;
2515 } 2731 }
2732
2733 EV_FREQUENT_CHECK;
2516} 2734}
2517#endif 2735#endif
2518 2736
2519void 2737void
2520ev_prepare_start (EV_P_ ev_prepare *w) 2738ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 2739{
2522 if (expect_false (ev_is_active (w))) 2740 if (expect_false (ev_is_active (w)))
2523 return; 2741 return;
2742
2743 EV_FREQUENT_CHECK;
2524 2744
2525 ev_start (EV_A_ (W)w, ++preparecnt); 2745 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2746 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 2747 prepares [preparecnt - 1] = w;
2748
2749 EV_FREQUENT_CHECK;
2528} 2750}
2529 2751
2530void 2752void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 2753ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 2754{
2533 clear_pending (EV_A_ (W)w); 2755 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 2756 if (expect_false (!ev_is_active (w)))
2535 return; 2757 return;
2536 2758
2759 EV_FREQUENT_CHECK;
2760
2537 { 2761 {
2538 int active = ev_active (w); 2762 int active = ev_active (w);
2539 2763
2540 prepares [active - 1] = prepares [--preparecnt]; 2764 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 2765 ev_active (prepares [active - 1]) = active;
2542 } 2766 }
2543 2767
2544 ev_stop (EV_A_ (W)w); 2768 ev_stop (EV_A_ (W)w);
2769
2770 EV_FREQUENT_CHECK;
2545} 2771}
2546 2772
2547void 2773void
2548ev_check_start (EV_P_ ev_check *w) 2774ev_check_start (EV_P_ ev_check *w)
2549{ 2775{
2550 if (expect_false (ev_is_active (w))) 2776 if (expect_false (ev_is_active (w)))
2551 return; 2777 return;
2778
2779 EV_FREQUENT_CHECK;
2552 2780
2553 ev_start (EV_A_ (W)w, ++checkcnt); 2781 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2782 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 2783 checks [checkcnt - 1] = w;
2784
2785 EV_FREQUENT_CHECK;
2556} 2786}
2557 2787
2558void 2788void
2559ev_check_stop (EV_P_ ev_check *w) 2789ev_check_stop (EV_P_ ev_check *w)
2560{ 2790{
2561 clear_pending (EV_A_ (W)w); 2791 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 2792 if (expect_false (!ev_is_active (w)))
2563 return; 2793 return;
2564 2794
2795 EV_FREQUENT_CHECK;
2796
2565 { 2797 {
2566 int active = ev_active (w); 2798 int active = ev_active (w);
2567 2799
2568 checks [active - 1] = checks [--checkcnt]; 2800 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 2801 ev_active (checks [active - 1]) = active;
2570 } 2802 }
2571 2803
2572 ev_stop (EV_A_ (W)w); 2804 ev_stop (EV_A_ (W)w);
2805
2806 EV_FREQUENT_CHECK;
2573} 2807}
2574 2808
2575#if EV_EMBED_ENABLE 2809#if EV_EMBED_ENABLE
2576void noinline 2810void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 2811ev_embed_sweep (EV_P_ ev_embed *w)
2604 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2838 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2605 } 2839 }
2606 } 2840 }
2607} 2841}
2608 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
2609#if 0 2855#if 0
2610static void 2856static void
2611embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2857embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2612{ 2858{
2613 ev_idle_stop (EV_A_ idle); 2859 ev_idle_stop (EV_A_ idle);
2624 struct ev_loop *loop = w->other; 2870 struct ev_loop *loop = w->other;
2625 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 ()));
2626 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);
2627 } 2873 }
2628 2874
2875 EV_FREQUENT_CHECK;
2876
2629 ev_set_priority (&w->io, ev_priority (w)); 2877 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 2878 ev_io_start (EV_A_ &w->io);
2631 2879
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 2880 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 2881 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 2882 ev_prepare_start (EV_A_ &w->prepare);
2635 2883
2884 ev_fork_init (&w->fork, embed_fork_cb);
2885 ev_fork_start (EV_A_ &w->fork);
2886
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2887 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 2888
2638 ev_start (EV_A_ (W)w, 1); 2889 ev_start (EV_A_ (W)w, 1);
2890
2891 EV_FREQUENT_CHECK;
2639} 2892}
2640 2893
2641void 2894void
2642ev_embed_stop (EV_P_ ev_embed *w) 2895ev_embed_stop (EV_P_ ev_embed *w)
2643{ 2896{
2644 clear_pending (EV_A_ (W)w); 2897 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 2898 if (expect_false (!ev_is_active (w)))
2646 return; 2899 return;
2647 2900
2901 EV_FREQUENT_CHECK;
2902
2648 ev_io_stop (EV_A_ &w->io); 2903 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 2904 ev_prepare_stop (EV_A_ &w->prepare);
2905 ev_fork_stop (EV_A_ &w->fork);
2650 2906
2651 ev_stop (EV_A_ (W)w); 2907 EV_FREQUENT_CHECK;
2652} 2908}
2653#endif 2909#endif
2654 2910
2655#if EV_FORK_ENABLE 2911#if EV_FORK_ENABLE
2656void 2912void
2657ev_fork_start (EV_P_ ev_fork *w) 2913ev_fork_start (EV_P_ ev_fork *w)
2658{ 2914{
2659 if (expect_false (ev_is_active (w))) 2915 if (expect_false (ev_is_active (w)))
2660 return; 2916 return;
2917
2918 EV_FREQUENT_CHECK;
2661 2919
2662 ev_start (EV_A_ (W)w, ++forkcnt); 2920 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2921 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 2922 forks [forkcnt - 1] = w;
2923
2924 EV_FREQUENT_CHECK;
2665} 2925}
2666 2926
2667void 2927void
2668ev_fork_stop (EV_P_ ev_fork *w) 2928ev_fork_stop (EV_P_ ev_fork *w)
2669{ 2929{
2670 clear_pending (EV_A_ (W)w); 2930 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 2931 if (expect_false (!ev_is_active (w)))
2672 return; 2932 return;
2673 2933
2934 EV_FREQUENT_CHECK;
2935
2674 { 2936 {
2675 int active = ev_active (w); 2937 int active = ev_active (w);
2676 2938
2677 forks [active - 1] = forks [--forkcnt]; 2939 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 2940 ev_active (forks [active - 1]) = active;
2679 } 2941 }
2680 2942
2681 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2944
2945 EV_FREQUENT_CHECK;
2682} 2946}
2683#endif 2947#endif
2684 2948
2685#if EV_ASYNC_ENABLE 2949#if EV_ASYNC_ENABLE
2686void 2950void
2688{ 2952{
2689 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2690 return; 2954 return;
2691 2955
2692 evpipe_init (EV_A); 2956 evpipe_init (EV_A);
2957
2958 EV_FREQUENT_CHECK;
2693 2959
2694 ev_start (EV_A_ (W)w, ++asynccnt); 2960 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2961 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 2962 asyncs [asynccnt - 1] = w;
2963
2964 EV_FREQUENT_CHECK;
2697} 2965}
2698 2966
2699void 2967void
2700ev_async_stop (EV_P_ ev_async *w) 2968ev_async_stop (EV_P_ ev_async *w)
2701{ 2969{
2702 clear_pending (EV_A_ (W)w); 2970 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 2971 if (expect_false (!ev_is_active (w)))
2704 return; 2972 return;
2705 2973
2974 EV_FREQUENT_CHECK;
2975
2706 { 2976 {
2707 int active = ev_active (w); 2977 int active = ev_active (w);
2708 2978
2709 asyncs [active - 1] = asyncs [--asynccnt]; 2979 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 2980 ev_active (asyncs [active - 1]) = active;
2711 } 2981 }
2712 2982
2713 ev_stop (EV_A_ (W)w); 2983 ev_stop (EV_A_ (W)w);
2984
2985 EV_FREQUENT_CHECK;
2714} 2986}
2715 2987
2716void 2988void
2717ev_async_send (EV_P_ ev_async *w) 2989ev_async_send (EV_P_ ev_async *w)
2718{ 2990{
2735once_cb (EV_P_ struct ev_once *once, int revents) 3007once_cb (EV_P_ struct ev_once *once, int revents)
2736{ 3008{
2737 void (*cb)(int revents, void *arg) = once->cb; 3009 void (*cb)(int revents, void *arg) = once->cb;
2738 void *arg = once->arg; 3010 void *arg = once->arg;
2739 3011
2740 ev_io_stop (EV_A_ &once->io); 3012 ev_io_stop (EV_A_ &once->io);
2741 ev_timer_stop (EV_A_ &once->to); 3013 ev_timer_stop (EV_A_ &once->to);
2742 ev_free (once); 3014 ev_free (once);
2743 3015
2744 cb (revents, arg); 3016 cb (revents, arg);
2745} 3017}
2746 3018
2747static void 3019static void
2748once_cb_io (EV_P_ ev_io *w, int revents) 3020once_cb_io (EV_P_ ev_io *w, int revents)
2749{ 3021{
2750 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));
2751} 3025}
2752 3026
2753static void 3027static void
2754once_cb_to (EV_P_ ev_timer *w, int revents) 3028once_cb_to (EV_P_ ev_timer *w, int revents)
2755{ 3029{
2756 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));
2757} 3033}
2758 3034
2759void 3035void
2760ev_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)
2761{ 3037{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines