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

Comparing libev/ev.c (file contents):
Revision 1.246 by root, Wed May 21 12:51:38 2008 UTC vs.
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines