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

Comparing libev/ev.c (file contents):
Revision 1.247 by root, Wed May 21 21:22:10 2008 UTC vs.
Revision 1.262 by root, Wed Oct 1 04:25:25 2008 UTC

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

Diff Legend

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