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

Comparing libev/ev.c (file contents):
Revision 1.242 by root, Fri May 9 14:07:19 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
259#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL
261#endif
262
263#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif
266
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 267/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 268
242#ifndef CLOCK_MONOTONIC 269#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 270# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 271# define EV_USE_MONOTONIC 0
… …
260# endif 287# endif
261#endif 288#endif
262 289
263#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
264# 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
265#endif 297#endif
266 298
267#if EV_SELECT_IS_WINSOCKET 299#if EV_SELECT_IS_WINSOCKET
268# include <winsock.h> 300# include <winsock.h>
269#endif 301#endif
… …
279} 311}
280# endif 312# endif
281#endif 313#endif
282 314
283/**/ 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
284 322
285/* 323/*
286 * This is used to avoid floating point rounding problems. 324 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 325 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 326 * to ensure progress, time-wise, even when rounding
… …
430 WL head; 468 WL head;
431} ANFS; 469} ANFS;
432#endif 470#endif
433 471
434/* Heap Entry */ 472/* Heap Entry */
435#define EV_HEAP_CACHE_AT 0
436#if EV_HEAP_CACHE_AT 473#if EV_HEAP_CACHE_AT
437 typedef struct { 474 typedef struct {
475 ev_tstamp at;
438 WT w; 476 WT w;
439 ev_tstamp at;
440 } ANHE; 477 } ANHE;
441 478
442 #define ANHE_w(he) (he).w /* access watcher, read-write */ 479 #define ANHE_w(he) (he).w /* access watcher, read-write */
443 #define ANHE_at(he) (he).at /* access cached at, read-only */ 480 #define ANHE_at(he) (he).at /* access cached at, read-only */
444 #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 */
445#else 482#else
446 typedef WT ANHE; 483 typedef WT ANHE;
447 484
448 #define ANHE_w(he) (he) 485 #define ANHE_w(he) (he)
449 #define ANHE_at(he) (he)->at 486 #define ANHE_at(he) (he)->at
450 #define ANHE_at_set(he) 487 #define ANHE_at_cache(he)
451#endif 488#endif
452 489
453#if EV_MULTIPLICITY 490#if EV_MULTIPLICITY
454 491
455 struct ev_loop 492 struct ev_loop
… …
533 struct timeval tv; 570 struct timeval tv;
534 571
535 tv.tv_sec = (time_t)delay; 572 tv.tv_sec = (time_t)delay;
536 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
537 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 */
538 select (0, 0, 0, 0, &tv); 578 select (0, 0, 0, 0, &tv);
539#endif 579#endif
540 } 580 }
541} 581}
542 582
… …
676 events |= (unsigned char)w->events; 716 events |= (unsigned char)w->events;
677 717
678#if EV_SELECT_IS_WINSOCKET 718#if EV_SELECT_IS_WINSOCKET
679 if (events) 719 if (events)
680 { 720 {
681 unsigned long argp; 721 unsigned long arg;
682 #ifdef EV_FD_TO_WIN32_HANDLE 722 #ifdef EV_FD_TO_WIN32_HANDLE
683 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
684 #else 724 #else
685 anfd->handle = _get_osfhandle (fd); 725 anfd->handle = _get_osfhandle (fd);
686 #endif 726 #endif
687 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));
688 } 728 }
689#endif 729#endif
690 730
691 { 731 {
692 unsigned char o_events = anfd->events; 732 unsigned char o_events = anfd->events;
… …
745{ 785{
746 int fd; 786 int fd;
747 787
748 for (fd = 0; fd < anfdmax; ++fd) 788 for (fd = 0; fd < anfdmax; ++fd)
749 if (anfds [fd].events) 789 if (anfds [fd].events)
750 if (!fd_valid (fd) == -1 && errno == EBADF) 790 if (!fd_valid (fd) && errno == EBADF)
751 fd_kill (EV_A_ fd); 791 fd_kill (EV_A_ fd);
752} 792}
753 793
754/* 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 */
755static void noinline 795static void noinline
… …
791 * at the moment we allow libev the luxury of two heaps, 831 * at the moment we allow libev the luxury of two heaps,
792 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap 832 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
793 * which is more cache-efficient. 833 * which is more cache-efficient.
794 * the difference is about 5% with 50000+ watchers. 834 * the difference is about 5% with 50000+ watchers.
795 */ 835 */
796#define EV_USE_4HEAP !EV_MINIMAL
797#if EV_USE_4HEAP 836#if EV_USE_4HEAP
798 837
799#define DHEAP 4 838#define DHEAP 4
800#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 839#define HEAP0 (DHEAP - 1) /* index of first element in heap */
801 840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
802/* towards the root */ 841#define UPHEAP_DONE(p,k) ((p) == (k))
803void inline_speed
804upheap (ANHE *heap, int k)
805{
806 ANHE he = heap [k];
807
808 for (;;)
809 {
810 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
811
812 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
813 break;
814
815 heap [k] = heap [p];
816 ev_active (ANHE_w (heap [k])) = k;
817 k = p;
818 }
819
820 ev_active (ANHE_w (he)) = k;
821 heap [k] = he;
822}
823 842
824/* away from the root */ 843/* away from the root */
825void inline_speed 844void inline_speed
826downheap (ANHE *heap, int N, int k) 845downheap (ANHE *heap, int N, int k)
827{ 846{
… …
830 849
831 for (;;) 850 for (;;)
832 { 851 {
833 ev_tstamp minat; 852 ev_tstamp minat;
834 ANHE *minpos; 853 ANHE *minpos;
835 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 854 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
836 855
837 // find minimum child 856 /* find minimum child */
838 if (expect_true (pos + DHEAP - 1 < E)) 857 if (expect_true (pos + DHEAP - 1 < E))
839 { 858 {
840 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 859 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
841 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));
842 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));
843 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));
844 } 863 }
845 else if (pos < E) 864 else if (pos < E)
846 { 865 {
847 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 866 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 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));
… …
853 break; 872 break;
854 873
855 if (ANHE_at (he) <= minat) 874 if (ANHE_at (he) <= minat)
856 break; 875 break;
857 876
877 heap [k] = *minpos;
858 ev_active (ANHE_w (*minpos)) = k; 878 ev_active (ANHE_w (*minpos)) = k;
859 heap [k] = *minpos;
860 879
861 k = minpos - heap; 880 k = minpos - heap;
862 } 881 }
863 882
883 heap [k] = he;
864 ev_active (ANHE_w (he)) = k; 884 ev_active (ANHE_w (he)) = k;
865 heap [k] = he;
866} 885}
867 886
868#else // 4HEAP 887#else /* 4HEAP */
869 888
870#define HEAP0 1 889#define HEAP0 1
871 890#define HPARENT(k) ((k) >> 1)
872/* towards the root */ 891#define UPHEAP_DONE(p,k) (!(p))
873void inline_speed
874upheap (ANHE *heap, int k)
875{
876 ANHE he = heap [k];
877
878 for (;;)
879 {
880 int p = k >> 1;
881
882 /* maybe we could use a dummy element at heap [0]? */
883 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
884 break;
885
886 heap [k] = heap [p];
887 ev_active (ANHE_w (heap [k])) = k;
888 k = p;
889 }
890
891 heap [k] = w;
892 ev_active (ANHE_w (heap [k])) = k;
893}
894 892
895/* away from the root */ 893/* away from the root */
896void inline_speed 894void inline_speed
897downheap (ANHE *heap, int N, int k) 895downheap (ANHE *heap, int N, int k)
898{ 896{
… …
900 898
901 for (;;) 899 for (;;)
902 { 900 {
903 int c = k << 1; 901 int c = k << 1;
904 902
905 if (c > N) 903 if (c > N + HEAP0 - 1)
906 break; 904 break;
907 905
908 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])
909 ? 1 : 0; 907 ? 1 : 0;
910 908
911 if (w->at <= ANHE_at (heap [c])) 909 if (ANHE_at (he) <= ANHE_at (heap [c]))
912 break; 910 break;
913 911
914 heap [k] = heap [c]; 912 heap [k] = heap [c];
915 ev_active (ANHE_w (heap [k])) = k; 913 ev_active (ANHE_w (heap [k])) = k;
916 914
… …
920 heap [k] = he; 918 heap [k] = he;
921 ev_active (ANHE_w (he)) = k; 919 ev_active (ANHE_w (he)) = k;
922} 920}
923#endif 921#endif
924 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
925void inline_size 945void inline_size
926adjustheap (ANHE *heap, int N, int k) 946adjustheap (ANHE *heap, int N, int k)
927{ 947{
948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
928 upheap (heap, k); 949 upheap (heap, k);
950 else
929 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);
930} 964}
931 965
932/*****************************************************************************/ 966/*****************************************************************************/
933 967
934typedef struct 968typedef struct
… …
958 992
959void inline_speed 993void inline_speed
960fd_intern (int fd) 994fd_intern (int fd)
961{ 995{
962#ifdef _WIN32 996#ifdef _WIN32
963 int arg = 1; 997 unsigned long arg = 1;
964 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
965#else 999#else
966 fcntl (fd, F_SETFD, FD_CLOEXEC); 1000 fcntl (fd, F_SETFD, FD_CLOEXEC);
967 fcntl (fd, F_SETFL, O_NONBLOCK); 1001 fcntl (fd, F_SETFL, O_NONBLOCK);
968#endif 1002#endif
… …
1452 1486
1453 postfork = 0; 1487 postfork = 0;
1454} 1488}
1455 1489
1456#if EV_MULTIPLICITY 1490#if EV_MULTIPLICITY
1491
1457struct ev_loop * 1492struct ev_loop *
1458ev_loop_new (unsigned int flags) 1493ev_loop_new (unsigned int flags)
1459{ 1494{
1460 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));
1461 1496
… …
1479void 1514void
1480ev_loop_fork (EV_P) 1515ev_loop_fork (EV_P)
1481{ 1516{
1482 postfork = 1; /* must be in line with ev_default_fork */ 1517 postfork = 1; /* must be in line with ev_default_fork */
1483} 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)
1484#endif 1615# endif
1616#endif
1617}
1618
1619#endif /* multiplicity */
1485 1620
1486#if EV_MULTIPLICITY 1621#if EV_MULTIPLICITY
1487struct ev_loop * 1622struct ev_loop *
1488ev_default_loop_init (unsigned int flags) 1623ev_default_loop_init (unsigned int flags)
1489#else 1624#else
… …
1565 { 1700 {
1566 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1567 1702
1568 p->w->pending = 0; 1703 p->w->pending = 0;
1569 EV_CB_INVOKE (p->w, p->events); 1704 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK;
1570 } 1706 }
1571 } 1707 }
1572} 1708}
1573 1709
1574#if EV_IDLE_ENABLE 1710#if EV_IDLE_ENABLE
… …
1595#endif 1731#endif
1596 1732
1597void inline_size 1733void inline_size
1598timers_reify (EV_P) 1734timers_reify (EV_P)
1599{ 1735{
1736 EV_FREQUENT_CHECK;
1737
1600 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1601 { 1739 {
1602 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1603 1741
1604 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1605 1743
1606 /* first reschedule or stop timer */ 1744 /* first reschedule or stop timer */
1607 if (w->repeat) 1745 if (w->repeat)
1608 { 1746 {
1609 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1610
1611 ev_at (w) += w->repeat; 1747 ev_at (w) += w->repeat;
1612 if (ev_at (w) < mn_now) 1748 if (ev_at (w) < mn_now)
1613 ev_at (w) = mn_now; 1749 ev_at (w) = mn_now;
1614 1750
1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1752
1615 ANHE_at_set (timers [HEAP0]); 1753 ANHE_at_cache (timers [HEAP0]);
1616 downheap (timers, timercnt, HEAP0); 1754 downheap (timers, timercnt, HEAP0);
1617 } 1755 }
1618 else 1756 else
1619 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1620 1758
1759 EV_FREQUENT_CHECK;
1621 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1622 } 1761 }
1623} 1762}
1624 1763
1625#if EV_PERIODIC_ENABLE 1764#if EV_PERIODIC_ENABLE
1626void inline_size 1765void inline_size
1627periodics_reify (EV_P) 1766periodics_reify (EV_P)
1628{ 1767{
1768 EV_FREQUENT_CHECK;
1769
1629 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1630 { 1771 {
1631 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1632 1773
1633 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1634 1775
1635 /* first reschedule or stop timer */ 1776 /* first reschedule or stop timer */
1636 if (w->reschedule_cb) 1777 if (w->reschedule_cb)
1637 { 1778 {
1638 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780
1639 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));
1782
1640 ANHE_at_set (periodics [HEAP0]); 1783 ANHE_at_cache (periodics [HEAP0]);
1641 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1642 } 1785 }
1643 else if (w->interval) 1786 else if (w->interval)
1644 { 1787 {
1645 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 */
1646 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1647 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1792 {
1793 ev_at (w) += w->interval;
1794
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 }
1801
1648 ANHE_at_set (periodics [HEAP0]); 1802 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0); 1803 downheap (periodics, periodiccnt, HEAP0);
1650 } 1804 }
1651 else 1805 else
1652 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1653 1807
1808 EV_FREQUENT_CHECK;
1654 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1655 } 1810 }
1656} 1811}
1657 1812
1658static void noinline 1813static void noinline
… …
1668 if (w->reschedule_cb) 1823 if (w->reschedule_cb)
1669 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1824 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1670 else if (w->interval) 1825 else if (w->interval)
1671 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;
1672 1827
1673 ANHE_at_set (periodics [i]); 1828 ANHE_at_cache (periodics [i]);
1674 } 1829 }
1675 1830
1676 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1677 for (i = periodiccnt >> 1; --i; )
1678 downheap (periodics, periodiccnt, i + HEAP0); 1831 reheap (periodics, periodiccnt);
1679} 1832}
1680#endif 1833#endif
1681 1834
1682void inline_speed 1835void inline_speed
1683time_update (EV_P_ ev_tstamp max_block) 1836time_update (EV_P_ ev_tstamp max_block)
… …
1741 /* 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 */
1742 for (i = 0; i < timercnt; ++i) 1895 for (i = 0; i < timercnt; ++i)
1743 { 1896 {
1744 ANHE *he = timers + i + HEAP0; 1897 ANHE *he = timers + i + HEAP0;
1745 ANHE_w (*he)->at += ev_rt_now - mn_now; 1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1746 ANHE_at_set (*he); 1899 ANHE_at_cache (*he);
1747 } 1900 }
1748 } 1901 }
1749 1902
1750 mn_now = ev_rt_now; 1903 mn_now = ev_rt_now;
1751 } 1904 }
… …
1761ev_unref (EV_P) 1914ev_unref (EV_P)
1762{ 1915{
1763 --activecnt; 1916 --activecnt;
1764} 1917}
1765 1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1766static int loop_done; 1925static int loop_done;
1767 1926
1768void 1927void
1769ev_loop (EV_P_ int flags) 1928ev_loop (EV_P_ int flags)
1770{ 1929{
… …
1772 1931
1773 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 */
1774 1933
1775 do 1934 do
1776 { 1935 {
1936#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A);
1938#endif
1939
1777#ifndef _WIN32 1940#ifndef _WIN32
1778 if (expect_false (curpid)) /* penalise the forking check even more */ 1941 if (expect_false (curpid)) /* penalise the forking check even more */
1779 if (expect_false (getpid () != curpid)) 1942 if (expect_false (getpid () != curpid))
1780 { 1943 {
1781 curpid = getpid (); 1944 curpid = getpid ();
… …
1976 if (expect_false (ev_is_active (w))) 2139 if (expect_false (ev_is_active (w)))
1977 return; 2140 return;
1978 2141
1979 assert (("ev_io_start called with negative fd", fd >= 0)); 2142 assert (("ev_io_start called with negative fd", fd >= 0));
1980 2143
2144 EV_FREQUENT_CHECK;
2145
1981 ev_start (EV_A_ (W)w, 1); 2146 ev_start (EV_A_ (W)w, 1);
1982 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1983 wlist_add (&anfds[fd].head, (WL)w); 2148 wlist_add (&anfds[fd].head, (WL)w);
1984 2149
1985 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1986 w->events &= ~EV_IOFDSET; 2151 w->events &= ~EV_IOFDSET;
2152
2153 EV_FREQUENT_CHECK;
1987} 2154}
1988 2155
1989void noinline 2156void noinline
1990ev_io_stop (EV_P_ ev_io *w) 2157ev_io_stop (EV_P_ ev_io *w)
1991{ 2158{
… …
1993 if (expect_false (!ev_is_active (w))) 2160 if (expect_false (!ev_is_active (w)))
1994 return; 2161 return;
1995 2162
1996 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));
1997 2164
2165 EV_FREQUENT_CHECK;
2166
1998 wlist_del (&anfds[w->fd].head, (WL)w); 2167 wlist_del (&anfds[w->fd].head, (WL)w);
1999 ev_stop (EV_A_ (W)w); 2168 ev_stop (EV_A_ (W)w);
2000 2169
2001 fd_change (EV_A_ w->fd, 1); 2170 fd_change (EV_A_ w->fd, 1);
2171
2172 EV_FREQUENT_CHECK;
2002} 2173}
2003 2174
2004void noinline 2175void noinline
2005ev_timer_start (EV_P_ ev_timer *w) 2176ev_timer_start (EV_P_ ev_timer *w)
2006{ 2177{
… …
2009 2180
2010 ev_at (w) += mn_now; 2181 ev_at (w) += mn_now;
2011 2182
2012 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.));
2013 2184
2185 EV_FREQUENT_CHECK;
2186
2187 ++timercnt;
2014 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2015 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2189 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2016 ANHE_w (timers [ev_active (w)]) = (WT)w; 2190 ANHE_w (timers [ev_active (w)]) = (WT)w;
2017 ANHE_at_set (timers [ev_active (w)]); 2191 ANHE_at_cache (timers [ev_active (w)]);
2018 upheap (timers, ev_active (w)); 2192 upheap (timers, ev_active (w));
2193
2194 EV_FREQUENT_CHECK;
2019 2195
2020 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2021} 2197}
2022 2198
2023void noinline 2199void noinline
… …
2025{ 2201{
2026 clear_pending (EV_A_ (W)w); 2202 clear_pending (EV_A_ (W)w);
2027 if (expect_false (!ev_is_active (w))) 2203 if (expect_false (!ev_is_active (w)))
2028 return; 2204 return;
2029 2205
2206 EV_FREQUENT_CHECK;
2207
2030 { 2208 {
2031 int active = ev_active (w); 2209 int active = ev_active (w);
2032 2210
2033 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2034 2212
2213 --timercnt;
2214
2035 if (expect_true (active < timercnt + HEAP0 - 1)) 2215 if (expect_true (active < timercnt + HEAP0))
2036 { 2216 {
2037 timers [active] = timers [timercnt + HEAP0 - 1]; 2217 timers [active] = timers [timercnt + HEAP0];
2038 adjustheap (timers, timercnt, active); 2218 adjustheap (timers, timercnt, active);
2039 } 2219 }
2040
2041 --timercnt;
2042 } 2220 }
2221
2222 EV_FREQUENT_CHECK;
2043 2223
2044 ev_at (w) -= mn_now; 2224 ev_at (w) -= mn_now;
2045 2225
2046 ev_stop (EV_A_ (W)w); 2226 ev_stop (EV_A_ (W)w);
2047} 2227}
2048 2228
2049void noinline 2229void noinline
2050ev_timer_again (EV_P_ ev_timer *w) 2230ev_timer_again (EV_P_ ev_timer *w)
2051{ 2231{
2232 EV_FREQUENT_CHECK;
2233
2052 if (ev_is_active (w)) 2234 if (ev_is_active (w))
2053 { 2235 {
2054 if (w->repeat) 2236 if (w->repeat)
2055 { 2237 {
2056 ev_at (w) = mn_now + w->repeat; 2238 ev_at (w) = mn_now + w->repeat;
2057 ANHE_at_set (timers [ev_active (w)]); 2239 ANHE_at_cache (timers [ev_active (w)]);
2058 adjustheap (timers, timercnt, ev_active (w)); 2240 adjustheap (timers, timercnt, ev_active (w));
2059 } 2241 }
2060 else 2242 else
2061 ev_timer_stop (EV_A_ w); 2243 ev_timer_stop (EV_A_ w);
2062 } 2244 }
2063 else if (w->repeat) 2245 else if (w->repeat)
2064 { 2246 {
2065 ev_at (w) = w->repeat; 2247 ev_at (w) = w->repeat;
2066 ev_timer_start (EV_A_ w); 2248 ev_timer_start (EV_A_ w);
2067 } 2249 }
2250
2251 EV_FREQUENT_CHECK;
2068} 2252}
2069 2253
2070#if EV_PERIODIC_ENABLE 2254#if EV_PERIODIC_ENABLE
2071void noinline 2255void noinline
2072ev_periodic_start (EV_P_ ev_periodic *w) 2256ev_periodic_start (EV_P_ ev_periodic *w)
… …
2083 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;
2084 } 2268 }
2085 else 2269 else
2086 ev_at (w) = w->offset; 2270 ev_at (w) = w->offset;
2087 2271
2272 EV_FREQUENT_CHECK;
2273
2274 ++periodiccnt;
2088 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2275 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2089 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2276 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2090 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2277 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2278 ANHE_at_cache (periodics [ev_active (w)]);
2091 upheap (periodics, ev_active (w)); 2279 upheap (periodics, ev_active (w));
2280
2281 EV_FREQUENT_CHECK;
2092 2282
2093 /*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));*/
2094} 2284}
2095 2285
2096void noinline 2286void noinline
… …
2098{ 2288{
2099 clear_pending (EV_A_ (W)w); 2289 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2290 if (expect_false (!ev_is_active (w)))
2101 return; 2291 return;
2102 2292
2293 EV_FREQUENT_CHECK;
2294
2103 { 2295 {
2104 int active = ev_active (w); 2296 int active = ev_active (w);
2105 2297
2106 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2107 2299
2300 --periodiccnt;
2301
2108 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2302 if (expect_true (active < periodiccnt + HEAP0))
2109 { 2303 {
2110 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2304 periodics [active] = periodics [periodiccnt + HEAP0];
2111 adjustheap (periodics, periodiccnt, active); 2305 adjustheap (periodics, periodiccnt, active);
2112 } 2306 }
2113
2114 --periodiccnt;
2115 } 2307 }
2308
2309 EV_FREQUENT_CHECK;
2116 2310
2117 ev_stop (EV_A_ (W)w); 2311 ev_stop (EV_A_ (W)w);
2118} 2312}
2119 2313
2120void noinline 2314void noinline
… …
2140 return; 2334 return;
2141 2335
2142 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));
2143 2337
2144 evpipe_init (EV_A); 2338 evpipe_init (EV_A);
2339
2340 EV_FREQUENT_CHECK;
2145 2341
2146 { 2342 {
2147#ifndef _WIN32 2343#ifndef _WIN32
2148 sigset_t full, prev; 2344 sigset_t full, prev;
2149 sigfillset (&full); 2345 sigfillset (&full);
… …
2170 sigfillset (&sa.sa_mask); 2366 sigfillset (&sa.sa_mask);
2171 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 */
2172 sigaction (w->signum, &sa, 0); 2368 sigaction (w->signum, &sa, 0);
2173#endif 2369#endif
2174 } 2370 }
2371
2372 EV_FREQUENT_CHECK;
2175} 2373}
2176 2374
2177void noinline 2375void noinline
2178ev_signal_stop (EV_P_ ev_signal *w) 2376ev_signal_stop (EV_P_ ev_signal *w)
2179{ 2377{
2180 clear_pending (EV_A_ (W)w); 2378 clear_pending (EV_A_ (W)w);
2181 if (expect_false (!ev_is_active (w))) 2379 if (expect_false (!ev_is_active (w)))
2182 return; 2380 return;
2183 2381
2382 EV_FREQUENT_CHECK;
2383
2184 wlist_del (&signals [w->signum - 1].head, (WL)w); 2384 wlist_del (&signals [w->signum - 1].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2385 ev_stop (EV_A_ (W)w);
2186 2386
2187 if (!signals [w->signum - 1].head) 2387 if (!signals [w->signum - 1].head)
2188 signal (w->signum, SIG_DFL); 2388 signal (w->signum, SIG_DFL);
2389
2390 EV_FREQUENT_CHECK;
2189} 2391}
2190 2392
2191void 2393void
2192ev_child_start (EV_P_ ev_child *w) 2394ev_child_start (EV_P_ ev_child *w)
2193{ 2395{
… …
2195 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));
2196#endif 2398#endif
2197 if (expect_false (ev_is_active (w))) 2399 if (expect_false (ev_is_active (w)))
2198 return; 2400 return;
2199 2401
2402 EV_FREQUENT_CHECK;
2403
2200 ev_start (EV_A_ (W)w, 1); 2404 ev_start (EV_A_ (W)w, 1);
2201 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;
2202} 2408}
2203 2409
2204void 2410void
2205ev_child_stop (EV_P_ ev_child *w) 2411ev_child_stop (EV_P_ ev_child *w)
2206{ 2412{
2207 clear_pending (EV_A_ (W)w); 2413 clear_pending (EV_A_ (W)w);
2208 if (expect_false (!ev_is_active (w))) 2414 if (expect_false (!ev_is_active (w)))
2209 return; 2415 return;
2210 2416
2417 EV_FREQUENT_CHECK;
2418
2211 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2419 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2212 ev_stop (EV_A_ (W)w); 2420 ev_stop (EV_A_ (W)w);
2421
2422 EV_FREQUENT_CHECK;
2213} 2423}
2214 2424
2215#if EV_STAT_ENABLE 2425#if EV_STAT_ENABLE
2216 2426
2217# ifdef _WIN32 2427# ifdef _WIN32
… …
2372 } 2582 }
2373 2583
2374 } 2584 }
2375} 2585}
2376 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)
2377#endif 2593#endif
2378 2594
2379void 2595void
2380ev_stat_stat (EV_P_ ev_stat *w) 2596ev_stat_stat (EV_P_ ev_stat *w)
2381{ 2597{
… …
2445 else 2661 else
2446#endif 2662#endif
2447 ev_timer_start (EV_A_ &w->timer); 2663 ev_timer_start (EV_A_ &w->timer);
2448 2664
2449 ev_start (EV_A_ (W)w, 1); 2665 ev_start (EV_A_ (W)w, 1);
2666
2667 EV_FREQUENT_CHECK;
2450} 2668}
2451 2669
2452void 2670void
2453ev_stat_stop (EV_P_ ev_stat *w) 2671ev_stat_stop (EV_P_ ev_stat *w)
2454{ 2672{
2455 clear_pending (EV_A_ (W)w); 2673 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2674 if (expect_false (!ev_is_active (w)))
2457 return; 2675 return;
2458 2676
2677 EV_FREQUENT_CHECK;
2678
2459#if EV_USE_INOTIFY 2679#if EV_USE_INOTIFY
2460 infy_del (EV_A_ w); 2680 infy_del (EV_A_ w);
2461#endif 2681#endif
2462 ev_timer_stop (EV_A_ &w->timer); 2682 ev_timer_stop (EV_A_ &w->timer);
2463 2683
2464 ev_stop (EV_A_ (W)w); 2684 ev_stop (EV_A_ (W)w);
2685
2686 EV_FREQUENT_CHECK;
2465} 2687}
2466#endif 2688#endif
2467 2689
2468#if EV_IDLE_ENABLE 2690#if EV_IDLE_ENABLE
2469void 2691void
… …
2471{ 2693{
2472 if (expect_false (ev_is_active (w))) 2694 if (expect_false (ev_is_active (w)))
2473 return; 2695 return;
2474 2696
2475 pri_adjust (EV_A_ (W)w); 2697 pri_adjust (EV_A_ (W)w);
2698
2699 EV_FREQUENT_CHECK;
2476 2700
2477 { 2701 {
2478 int active = ++idlecnt [ABSPRI (w)]; 2702 int active = ++idlecnt [ABSPRI (w)];
2479 2703
2480 ++idleall; 2704 ++idleall;
2481 ev_start (EV_A_ (W)w, active); 2705 ev_start (EV_A_ (W)w, active);
2482 2706
2483 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);
2484 idles [ABSPRI (w)][active - 1] = w; 2708 idles [ABSPRI (w)][active - 1] = w;
2485 } 2709 }
2710
2711 EV_FREQUENT_CHECK;
2486} 2712}
2487 2713
2488void 2714void
2489ev_idle_stop (EV_P_ ev_idle *w) 2715ev_idle_stop (EV_P_ ev_idle *w)
2490{ 2716{
2491 clear_pending (EV_A_ (W)w); 2717 clear_pending (EV_A_ (W)w);
2492 if (expect_false (!ev_is_active (w))) 2718 if (expect_false (!ev_is_active (w)))
2493 return; 2719 return;
2494 2720
2721 EV_FREQUENT_CHECK;
2722
2495 { 2723 {
2496 int active = ev_active (w); 2724 int active = ev_active (w);
2497 2725
2498 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2726 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2499 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2727 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2500 2728
2501 ev_stop (EV_A_ (W)w); 2729 ev_stop (EV_A_ (W)w);
2502 --idleall; 2730 --idleall;
2503 } 2731 }
2732
2733 EV_FREQUENT_CHECK;
2504} 2734}
2505#endif 2735#endif
2506 2736
2507void 2737void
2508ev_prepare_start (EV_P_ ev_prepare *w) 2738ev_prepare_start (EV_P_ ev_prepare *w)
2509{ 2739{
2510 if (expect_false (ev_is_active (w))) 2740 if (expect_false (ev_is_active (w)))
2511 return; 2741 return;
2742
2743 EV_FREQUENT_CHECK;
2512 2744
2513 ev_start (EV_A_ (W)w, ++preparecnt); 2745 ev_start (EV_A_ (W)w, ++preparecnt);
2514 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2746 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2515 prepares [preparecnt - 1] = w; 2747 prepares [preparecnt - 1] = w;
2748
2749 EV_FREQUENT_CHECK;
2516} 2750}
2517 2751
2518void 2752void
2519ev_prepare_stop (EV_P_ ev_prepare *w) 2753ev_prepare_stop (EV_P_ ev_prepare *w)
2520{ 2754{
2521 clear_pending (EV_A_ (W)w); 2755 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2756 if (expect_false (!ev_is_active (w)))
2523 return; 2757 return;
2524 2758
2759 EV_FREQUENT_CHECK;
2760
2525 { 2761 {
2526 int active = ev_active (w); 2762 int active = ev_active (w);
2527 2763
2528 prepares [active - 1] = prepares [--preparecnt]; 2764 prepares [active - 1] = prepares [--preparecnt];
2529 ev_active (prepares [active - 1]) = active; 2765 ev_active (prepares [active - 1]) = active;
2530 } 2766 }
2531 2767
2532 ev_stop (EV_A_ (W)w); 2768 ev_stop (EV_A_ (W)w);
2769
2770 EV_FREQUENT_CHECK;
2533} 2771}
2534 2772
2535void 2773void
2536ev_check_start (EV_P_ ev_check *w) 2774ev_check_start (EV_P_ ev_check *w)
2537{ 2775{
2538 if (expect_false (ev_is_active (w))) 2776 if (expect_false (ev_is_active (w)))
2539 return; 2777 return;
2778
2779 EV_FREQUENT_CHECK;
2540 2780
2541 ev_start (EV_A_ (W)w, ++checkcnt); 2781 ev_start (EV_A_ (W)w, ++checkcnt);
2542 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2782 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2543 checks [checkcnt - 1] = w; 2783 checks [checkcnt - 1] = w;
2784
2785 EV_FREQUENT_CHECK;
2544} 2786}
2545 2787
2546void 2788void
2547ev_check_stop (EV_P_ ev_check *w) 2789ev_check_stop (EV_P_ ev_check *w)
2548{ 2790{
2549 clear_pending (EV_A_ (W)w); 2791 clear_pending (EV_A_ (W)w);
2550 if (expect_false (!ev_is_active (w))) 2792 if (expect_false (!ev_is_active (w)))
2551 return; 2793 return;
2552 2794
2795 EV_FREQUENT_CHECK;
2796
2553 { 2797 {
2554 int active = ev_active (w); 2798 int active = ev_active (w);
2555 2799
2556 checks [active - 1] = checks [--checkcnt]; 2800 checks [active - 1] = checks [--checkcnt];
2557 ev_active (checks [active - 1]) = active; 2801 ev_active (checks [active - 1]) = active;
2558 } 2802 }
2559 2803
2560 ev_stop (EV_A_ (W)w); 2804 ev_stop (EV_A_ (W)w);
2805
2806 EV_FREQUENT_CHECK;
2561} 2807}
2562 2808
2563#if EV_EMBED_ENABLE 2809#if EV_EMBED_ENABLE
2564void noinline 2810void noinline
2565ev_embed_sweep (EV_P_ ev_embed *w) 2811ev_embed_sweep (EV_P_ ev_embed *w)
… …
2592 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2838 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2593 } 2839 }
2594 } 2840 }
2595} 2841}
2596 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
2597#if 0 2855#if 0
2598static void 2856static void
2599embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2857embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2600{ 2858{
2601 ev_idle_stop (EV_A_ idle); 2859 ev_idle_stop (EV_A_ idle);
… …
2612 struct ev_loop *loop = w->other; 2870 struct ev_loop *loop = w->other;
2613 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 ()));
2614 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);
2615 } 2873 }
2616 2874
2875 EV_FREQUENT_CHECK;
2876
2617 ev_set_priority (&w->io, ev_priority (w)); 2877 ev_set_priority (&w->io, ev_priority (w));
2618 ev_io_start (EV_A_ &w->io); 2878 ev_io_start (EV_A_ &w->io);
2619 2879
2620 ev_prepare_init (&w->prepare, embed_prepare_cb); 2880 ev_prepare_init (&w->prepare, embed_prepare_cb);
2621 ev_set_priority (&w->prepare, EV_MINPRI); 2881 ev_set_priority (&w->prepare, EV_MINPRI);
2622 ev_prepare_start (EV_A_ &w->prepare); 2882 ev_prepare_start (EV_A_ &w->prepare);
2623 2883
2884 ev_fork_init (&w->fork, embed_fork_cb);
2885 ev_fork_start (EV_A_ &w->fork);
2886
2624 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2887 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2625 2888
2626 ev_start (EV_A_ (W)w, 1); 2889 ev_start (EV_A_ (W)w, 1);
2890
2891 EV_FREQUENT_CHECK;
2627} 2892}
2628 2893
2629void 2894void
2630ev_embed_stop (EV_P_ ev_embed *w) 2895ev_embed_stop (EV_P_ ev_embed *w)
2631{ 2896{
2632 clear_pending (EV_A_ (W)w); 2897 clear_pending (EV_A_ (W)w);
2633 if (expect_false (!ev_is_active (w))) 2898 if (expect_false (!ev_is_active (w)))
2634 return; 2899 return;
2635 2900
2901 EV_FREQUENT_CHECK;
2902
2636 ev_io_stop (EV_A_ &w->io); 2903 ev_io_stop (EV_A_ &w->io);
2637 ev_prepare_stop (EV_A_ &w->prepare); 2904 ev_prepare_stop (EV_A_ &w->prepare);
2905 ev_fork_stop (EV_A_ &w->fork);
2638 2906
2639 ev_stop (EV_A_ (W)w); 2907 EV_FREQUENT_CHECK;
2640} 2908}
2641#endif 2909#endif
2642 2910
2643#if EV_FORK_ENABLE 2911#if EV_FORK_ENABLE
2644void 2912void
2645ev_fork_start (EV_P_ ev_fork *w) 2913ev_fork_start (EV_P_ ev_fork *w)
2646{ 2914{
2647 if (expect_false (ev_is_active (w))) 2915 if (expect_false (ev_is_active (w)))
2648 return; 2916 return;
2917
2918 EV_FREQUENT_CHECK;
2649 2919
2650 ev_start (EV_A_ (W)w, ++forkcnt); 2920 ev_start (EV_A_ (W)w, ++forkcnt);
2651 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2921 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2652 forks [forkcnt - 1] = w; 2922 forks [forkcnt - 1] = w;
2923
2924 EV_FREQUENT_CHECK;
2653} 2925}
2654 2926
2655void 2927void
2656ev_fork_stop (EV_P_ ev_fork *w) 2928ev_fork_stop (EV_P_ ev_fork *w)
2657{ 2929{
2658 clear_pending (EV_A_ (W)w); 2930 clear_pending (EV_A_ (W)w);
2659 if (expect_false (!ev_is_active (w))) 2931 if (expect_false (!ev_is_active (w)))
2660 return; 2932 return;
2661 2933
2934 EV_FREQUENT_CHECK;
2935
2662 { 2936 {
2663 int active = ev_active (w); 2937 int active = ev_active (w);
2664 2938
2665 forks [active - 1] = forks [--forkcnt]; 2939 forks [active - 1] = forks [--forkcnt];
2666 ev_active (forks [active - 1]) = active; 2940 ev_active (forks [active - 1]) = active;
2667 } 2941 }
2668 2942
2669 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2944
2945 EV_FREQUENT_CHECK;
2670} 2946}
2671#endif 2947#endif
2672 2948
2673#if EV_ASYNC_ENABLE 2949#if EV_ASYNC_ENABLE
2674void 2950void
… …
2676{ 2952{
2677 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2678 return; 2954 return;
2679 2955
2680 evpipe_init (EV_A); 2956 evpipe_init (EV_A);
2957
2958 EV_FREQUENT_CHECK;
2681 2959
2682 ev_start (EV_A_ (W)w, ++asynccnt); 2960 ev_start (EV_A_ (W)w, ++asynccnt);
2683 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2961 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2684 asyncs [asynccnt - 1] = w; 2962 asyncs [asynccnt - 1] = w;
2963
2964 EV_FREQUENT_CHECK;
2685} 2965}
2686 2966
2687void 2967void
2688ev_async_stop (EV_P_ ev_async *w) 2968ev_async_stop (EV_P_ ev_async *w)
2689{ 2969{
2690 clear_pending (EV_A_ (W)w); 2970 clear_pending (EV_A_ (W)w);
2691 if (expect_false (!ev_is_active (w))) 2971 if (expect_false (!ev_is_active (w)))
2692 return; 2972 return;
2693 2973
2974 EV_FREQUENT_CHECK;
2975
2694 { 2976 {
2695 int active = ev_active (w); 2977 int active = ev_active (w);
2696 2978
2697 asyncs [active - 1] = asyncs [--asynccnt]; 2979 asyncs [active - 1] = asyncs [--asynccnt];
2698 ev_active (asyncs [active - 1]) = active; 2980 ev_active (asyncs [active - 1]) = active;
2699 } 2981 }
2700 2982
2701 ev_stop (EV_A_ (W)w); 2983 ev_stop (EV_A_ (W)w);
2984
2985 EV_FREQUENT_CHECK;
2702} 2986}
2703 2987
2704void 2988void
2705ev_async_send (EV_P_ ev_async *w) 2989ev_async_send (EV_P_ ev_async *w)
2706{ 2990{
… …
2723once_cb (EV_P_ struct ev_once *once, int revents) 3007once_cb (EV_P_ struct ev_once *once, int revents)
2724{ 3008{
2725 void (*cb)(int revents, void *arg) = once->cb; 3009 void (*cb)(int revents, void *arg) = once->cb;
2726 void *arg = once->arg; 3010 void *arg = once->arg;
2727 3011
2728 ev_io_stop (EV_A_ &once->io); 3012 ev_io_stop (EV_A_ &once->io);
2729 ev_timer_stop (EV_A_ &once->to); 3013 ev_timer_stop (EV_A_ &once->to);
2730 ev_free (once); 3014 ev_free (once);
2731 3015
2732 cb (revents, arg); 3016 cb (revents, arg);
2733} 3017}
2734 3018
2735static void 3019static void
2736once_cb_io (EV_P_ ev_io *w, int revents) 3020once_cb_io (EV_P_ ev_io *w, int revents)
2737{ 3021{
2738 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));
2739} 3025}
2740 3026
2741static void 3027static void
2742once_cb_to (EV_P_ ev_timer *w, int revents) 3028once_cb_to (EV_P_ ev_timer *w, int revents)
2743{ 3029{
2744 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));
2745} 3033}
2746 3034
2747void 3035void
2748ev_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)
2749{ 3037{

Diff Legend

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