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

Diff Legend

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