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

Comparing libev/ev.c (file contents):
Revision 1.238 by root, Thu May 8 20:49:12 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
… …
422 W w; 461 W w;
423 int events; 462 int events;
424} ANPENDING; 463} ANPENDING;
425 464
426#if EV_USE_INOTIFY 465#if EV_USE_INOTIFY
466/* hash table entry per inotify-id */
427typedef struct 467typedef struct
428{ 468{
429 WL head; 469 WL head;
430} ANFS; 470} ANFS;
471#endif
472
473/* Heap Entry */
474#if EV_HEAP_CACHE_AT
475 typedef struct {
476 ev_tstamp at;
477 WT w;
478 } ANHE;
479
480 #define ANHE_w(he) (he).w /* access watcher, read-write */
481 #define ANHE_at(he) (he).at /* access cached at, read-only */
482 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
483#else
484 typedef WT ANHE;
485
486 #define ANHE_w(he) (he)
487 #define ANHE_at(he) (he)->at
488 #define ANHE_at_cache(he)
431#endif 489#endif
432 490
433#if EV_MULTIPLICITY 491#if EV_MULTIPLICITY
434 492
435 struct ev_loop 493 struct ev_loop
… …
513 struct timeval tv; 571 struct timeval tv;
514 572
515 tv.tv_sec = (time_t)delay; 573 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517 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 */
518 select (0, 0, 0, 0, &tv); 579 select (0, 0, 0, 0, &tv);
519#endif 580#endif
520 } 581 }
521} 582}
522 583
… …
656 events |= (unsigned char)w->events; 717 events |= (unsigned char)w->events;
657 718
658#if EV_SELECT_IS_WINSOCKET 719#if EV_SELECT_IS_WINSOCKET
659 if (events) 720 if (events)
660 { 721 {
661 unsigned long argp; 722 unsigned long arg;
662 #ifdef EV_FD_TO_WIN32_HANDLE 723 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else 725 #else
665 anfd->handle = _get_osfhandle (fd); 726 anfd->handle = _get_osfhandle (fd);
666 #endif 727 #endif
667 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));
668 } 729 }
669#endif 730#endif
670 731
671 { 732 {
672 unsigned char o_events = anfd->events; 733 unsigned char o_events = anfd->events;
… …
725{ 786{
726 int fd; 787 int fd;
727 788
728 for (fd = 0; fd < anfdmax; ++fd) 789 for (fd = 0; fd < anfdmax; ++fd)
729 if (anfds [fd].events) 790 if (anfds [fd].events)
730 if (!fd_valid (fd) == -1 && errno == EBADF) 791 if (!fd_valid (fd) && errno == EBADF)
731 fd_kill (EV_A_ fd); 792 fd_kill (EV_A_ fd);
732} 793}
733 794
734/* 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 */
735static void noinline 796static void noinline
… …
760} 821}
761 822
762/*****************************************************************************/ 823/*****************************************************************************/
763 824
764/* 825/*
826 * the heap functions want a real array index. array index 0 uis guaranteed to not
827 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
828 * the branching factor of the d-tree.
829 */
830
831/*
765 * at the moment we allow libev the luxury of two heaps, 832 * at the moment we allow libev the luxury of two heaps,
766 * 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
767 * which is more cache-efficient. 834 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 835 * the difference is about 5% with 50000+ watchers.
769 */ 836 */
770#define USE_4HEAP !EV_MINIMAL
771#define USE_4HEAP 1/* they do not work corretcly */
772#if USE_4HEAP 837#if EV_USE_4HEAP
773 838
774#define DHEAP 4 839#define DHEAP 4
775#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 840#define HEAP0 (DHEAP - 1) /* index of first element in heap */
841#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
842#define UPHEAP_DONE(p,k) ((p) == (k))
843
844/* away from the root */
845void inline_speed
846downheap (ANHE *heap, int N, int k)
847{
848 ANHE he = heap [k];
849 ANHE *E = heap + N + HEAP0;
850
851 for (;;)
852 {
853 ev_tstamp minat;
854 ANHE *minpos;
855 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
856
857 /* find minimum child */
858 if (expect_true (pos + DHEAP - 1 < E))
859 {
860 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
861 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
862 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
863 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
864 }
865 else if (pos < E)
866 {
867 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
868 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
869 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
870 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
871 }
872 else
873 break;
874
875 if (ANHE_at (he) <= minat)
876 break;
877
878 heap [k] = *minpos;
879 ev_active (ANHE_w (*minpos)) = k;
880
881 k = minpos - heap;
882 }
883
884 heap [k] = he;
885 ev_active (ANHE_w (he)) = k;
886}
887
888#else /* 4HEAP */
889
890#define HEAP0 1
891#define HPARENT(k) ((k) >> 1)
892#define UPHEAP_DONE(p,k) (!(p))
893
894/* away from the root */
895void inline_speed
896downheap (ANHE *heap, int N, int k)
897{
898 ANHE he = heap [k];
899
900 for (;;)
901 {
902 int c = k << 1;
903
904 if (c > N + HEAP0 - 1)
905 break;
906
907 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
908 ? 1 : 0;
909
910 if (ANHE_at (he) <= ANHE_at (heap [c]))
911 break;
912
913 heap [k] = heap [c];
914 ev_active (ANHE_w (heap [k])) = k;
915
916 k = c;
917 }
918
919 heap [k] = he;
920 ev_active (ANHE_w (he)) = k;
921}
922#endif
776 923
777/* towards the root */ 924/* towards the root */
778void inline_speed 925void inline_speed
779upheap (WT *heap, int k) 926upheap (ANHE *heap, int k)
780{ 927{
781 WT w = heap [k]; 928 ANHE he = heap [k];
782 929
783 for (;;) 930 for (;;)
784 { 931 {
785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0; 932 int p = HPARENT (k);
786 933
787 if (p == k || heap [p]->at <= w->at) 934 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
788 break; 935 break;
789 936
790 heap [k] = heap [p]; 937 heap [k] = heap [p];
791 ev_active (heap [k]) = k; 938 ev_active (ANHE_w (heap [k])) = k;
792 k = p; 939 k = p;
793 } 940 }
794 941
795 heap [k] = w; 942 heap [k] = he;
796 ev_active (heap [k]) = k; 943 ev_active (ANHE_w (he)) = k;
797} 944}
798
799/* away from the root */
800void inline_speed
801downheap (WT *heap, int N, int k)
802{
803 WT w = heap [k];
804 WT *E = heap + N + HEAP0;
805
806 for (;;)
807 {
808 ev_tstamp minat;
809 WT *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
811
812 // find minimum child
813 if (expect_true (pos + DHEAP - 1 < E))
814 {
815 /* fast path */
816 (minpos = pos + 0), (minat = (*minpos)->at);
817 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
818 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
819 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
820 }
821 else
822 {
823 /* slow path */
824 if (pos >= E)
825 break;
826 (minpos = pos + 0), (minat = (*minpos)->at);
827 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
828 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
829 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
830 }
831
832 if (w->at <= minat)
833 break;
834
835 ev_active (*minpos) = k;
836 heap [k] = *minpos;
837
838 k = minpos - heap;
839 }
840
841 heap [k] = w;
842 ev_active (heap [k]) = k;
843}
844
845#else // 4HEAP
846
847#define HEAP0 1
848
849/* towards the root */
850void inline_speed
851upheap (WT *heap, int k)
852{
853 WT w = heap [k];
854
855 for (;;)
856 {
857 int p = k >> 1;
858
859 /* maybe we could use a dummy element at heap [0]? */
860 if (!p || heap [p]->at <= w->at)
861 break;
862
863 heap [k] = heap [p];
864 ev_active (heap [k]) = k;
865 k = p;
866 }
867
868 heap [k] = w;
869 ev_active (heap [k]) = k;
870}
871
872/* away from the root */
873void inline_speed
874downheap (WT *heap, int N, int k)
875{
876 WT w = heap [k];
877
878 for (;;)
879 {
880 int c = k << 1;
881
882 if (c > N)
883 break;
884
885 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
886 ? 1 : 0;
887
888 if (w->at <= heap [c]->at)
889 break;
890
891 heap [k] = heap [c];
892 ((W)heap [k])->active = k;
893
894 k = c;
895 }
896
897 heap [k] = w;
898 ev_active (heap [k]) = k;
899}
900#endif
901 945
902void inline_size 946void inline_size
903adjustheap (WT *heap, int N, int k) 947adjustheap (ANHE *heap, int N, int k)
904{ 948{
949 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
905 upheap (heap, k); 950 upheap (heap, k);
951 else
906 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);
907} 965}
908 966
909/*****************************************************************************/ 967/*****************************************************************************/
910 968
911typedef struct 969typedef struct
… …
935 993
936void inline_speed 994void inline_speed
937fd_intern (int fd) 995fd_intern (int fd)
938{ 996{
939#ifdef _WIN32 997#ifdef _WIN32
940 int arg = 1; 998 unsigned long arg = 1;
941 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
942#else 1000#else
943 fcntl (fd, F_SETFD, FD_CLOEXEC); 1001 fcntl (fd, F_SETFD, FD_CLOEXEC);
944 fcntl (fd, F_SETFL, O_NONBLOCK); 1002 fcntl (fd, F_SETFL, O_NONBLOCK);
945#endif 1003#endif
… …
1429 1487
1430 postfork = 0; 1488 postfork = 0;
1431} 1489}
1432 1490
1433#if EV_MULTIPLICITY 1491#if EV_MULTIPLICITY
1492
1434struct ev_loop * 1493struct ev_loop *
1435ev_loop_new (unsigned int flags) 1494ev_loop_new (unsigned int flags)
1436{ 1495{
1437 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));
1438 1497
… …
1456void 1515void
1457ev_loop_fork (EV_P) 1516ev_loop_fork (EV_P)
1458{ 1517{
1459 postfork = 1; /* must be in line with ev_default_fork */ 1518 postfork = 1; /* must be in line with ev_default_fork */
1460} 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)
1461#endif 1616# endif
1617#endif
1618}
1619
1620#endif /* multiplicity */
1462 1621
1463#if EV_MULTIPLICITY 1622#if EV_MULTIPLICITY
1464struct ev_loop * 1623struct ev_loop *
1465ev_default_loop_init (unsigned int flags) 1624ev_default_loop_init (unsigned int flags)
1466#else 1625#else
… …
1542 { 1701 {
1543 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1702 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1544 1703
1545 p->w->pending = 0; 1704 p->w->pending = 0;
1546 EV_CB_INVOKE (p->w, p->events); 1705 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK;
1547 } 1707 }
1548 } 1708 }
1549} 1709}
1550 1710
1551#if EV_IDLE_ENABLE 1711#if EV_IDLE_ENABLE
… …
1572#endif 1732#endif
1573 1733
1574void inline_size 1734void inline_size
1575timers_reify (EV_P) 1735timers_reify (EV_P)
1576{ 1736{
1737 EV_FREQUENT_CHECK;
1738
1577 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1578 { 1740 {
1579 ev_timer *w = (ev_timer *)timers [HEAP0]; 1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1580 1742
1581 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1582 1744
1583 /* first reschedule or stop timer */ 1745 /* first reschedule or stop timer */
1584 if (w->repeat) 1746 if (w->repeat)
1585 { 1747 {
1586 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1587
1588 ev_at (w) += w->repeat; 1748 ev_at (w) += w->repeat;
1589 if (ev_at (w) < mn_now) 1749 if (ev_at (w) < mn_now)
1590 ev_at (w) = mn_now; 1750 ev_at (w) = mn_now;
1591 1751
1752 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1753
1754 ANHE_at_cache (timers [HEAP0]);
1592 downheap (timers, timercnt, HEAP0); 1755 downheap (timers, timercnt, HEAP0);
1593 } 1756 }
1594 else 1757 else
1595 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1758 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1596 1759
1760 EV_FREQUENT_CHECK;
1597 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1761 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1598 } 1762 }
1599} 1763}
1600 1764
1601#if EV_PERIODIC_ENABLE 1765#if EV_PERIODIC_ENABLE
1602void inline_size 1766void inline_size
1603periodics_reify (EV_P) 1767periodics_reify (EV_P)
1604{ 1768{
1769 EV_FREQUENT_CHECK;
1770
1605 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1606 { 1772 {
1607 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1608 1774
1609 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1610 1776
1611 /* first reschedule or stop timer */ 1777 /* first reschedule or stop timer */
1612 if (w->reschedule_cb) 1778 if (w->reschedule_cb)
1613 { 1779 {
1614 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781
1615 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
1784 ANHE_at_cache (periodics [HEAP0]);
1616 downheap (periodics, periodiccnt, 1); 1785 downheap (periodics, periodiccnt, HEAP0);
1617 } 1786 }
1618 else if (w->interval) 1787 else if (w->interval)
1619 { 1788 {
1620 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 */
1621 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1792 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1622 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
1803 ANHE_at_cache (periodics [HEAP0]);
1623 downheap (periodics, periodiccnt, HEAP0); 1804 downheap (periodics, periodiccnt, HEAP0);
1624 } 1805 }
1625 else 1806 else
1626 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1807 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1627 1808
1809 EV_FREQUENT_CHECK;
1628 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1810 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1629 } 1811 }
1630} 1812}
1631 1813
1632static void noinline 1814static void noinline
1633periodics_reschedule (EV_P) 1815periodics_reschedule (EV_P)
1634{ 1816{
1635 int i; 1817 int i;
1636 1818
1637 /* adjust periodics after time jump */ 1819 /* adjust periodics after time jump */
1638 for (i = 1; i <= periodiccnt; ++i) 1820 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1639 { 1821 {
1640 ev_periodic *w = (ev_periodic *)periodics [i]; 1822 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1641 1823
1642 if (w->reschedule_cb) 1824 if (w->reschedule_cb)
1643 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1825 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1644 else if (w->interval) 1826 else if (w->interval)
1645 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;
1646 }
1647 1828
1648 /* now rebuild the heap */ 1829 ANHE_at_cache (periodics [i]);
1649 for (i = periodiccnt >> 1; --i; ) 1830 }
1831
1650 downheap (periodics, periodiccnt, i + HEAP0); 1832 reheap (periodics, periodiccnt);
1651} 1833}
1652#endif 1834#endif
1653 1835
1654void inline_speed 1836void inline_speed
1655time_update (EV_P_ ev_tstamp max_block) 1837time_update (EV_P_ ev_tstamp max_block)
… …
1709 { 1891 {
1710#if EV_PERIODIC_ENABLE 1892#if EV_PERIODIC_ENABLE
1711 periodics_reschedule (EV_A); 1893 periodics_reschedule (EV_A);
1712#endif 1894#endif
1713 /* 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 */
1714 for (i = 1; i <= timercnt; ++i) 1896 for (i = 0; i < timercnt; ++i)
1715 ev_at (timers [i]) += ev_rt_now - mn_now; 1897 {
1898 ANHE *he = timers + i + HEAP0;
1899 ANHE_w (*he)->at += ev_rt_now - mn_now;
1900 ANHE_at_cache (*he);
1901 }
1716 } 1902 }
1717 1903
1718 mn_now = ev_rt_now; 1904 mn_now = ev_rt_now;
1719 } 1905 }
1720} 1906}
… …
1729ev_unref (EV_P) 1915ev_unref (EV_P)
1730{ 1916{
1731 --activecnt; 1917 --activecnt;
1732} 1918}
1733 1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1734static int loop_done; 1926static int loop_done;
1735 1927
1736void 1928void
1737ev_loop (EV_P_ int flags) 1929ev_loop (EV_P_ int flags)
1738{ 1930{
… …
1740 1932
1741 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 */
1742 1934
1743 do 1935 do
1744 { 1936 {
1937#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A);
1939#endif
1940
1745#ifndef _WIN32 1941#ifndef _WIN32
1746 if (expect_false (curpid)) /* penalise the forking check even more */ 1942 if (expect_false (curpid)) /* penalise the forking check even more */
1747 if (expect_false (getpid () != curpid)) 1943 if (expect_false (getpid () != curpid))
1748 { 1944 {
1749 curpid = getpid (); 1945 curpid = getpid ();
… …
1790 1986
1791 waittime = MAX_BLOCKTIME; 1987 waittime = MAX_BLOCKTIME;
1792 1988
1793 if (timercnt) 1989 if (timercnt)
1794 { 1990 {
1795 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1991 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1796 if (waittime > to) waittime = to; 1992 if (waittime > to) waittime = to;
1797 } 1993 }
1798 1994
1799#if EV_PERIODIC_ENABLE 1995#if EV_PERIODIC_ENABLE
1800 if (periodiccnt) 1996 if (periodiccnt)
1801 { 1997 {
1802 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1998 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1803 if (waittime > to) waittime = to; 1999 if (waittime > to) waittime = to;
1804 } 2000 }
1805#endif 2001#endif
1806 2002
1807 if (expect_false (waittime < timeout_blocktime)) 2003 if (expect_false (waittime < timeout_blocktime))
… …
1944 if (expect_false (ev_is_active (w))) 2140 if (expect_false (ev_is_active (w)))
1945 return; 2141 return;
1946 2142
1947 assert (("ev_io_start called with negative fd", fd >= 0)); 2143 assert (("ev_io_start called with negative fd", fd >= 0));
1948 2144
2145 EV_FREQUENT_CHECK;
2146
1949 ev_start (EV_A_ (W)w, 1); 2147 ev_start (EV_A_ (W)w, 1);
1950 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1951 wlist_add (&anfds[fd].head, (WL)w); 2149 wlist_add (&anfds[fd].head, (WL)w);
1952 2150
1953 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1954 w->events &= ~EV_IOFDSET; 2152 w->events &= ~EV_IOFDSET;
2153
2154 EV_FREQUENT_CHECK;
1955} 2155}
1956 2156
1957void noinline 2157void noinline
1958ev_io_stop (EV_P_ ev_io *w) 2158ev_io_stop (EV_P_ ev_io *w)
1959{ 2159{
1960 clear_pending (EV_A_ (W)w); 2160 clear_pending (EV_A_ (W)w);
1961 if (expect_false (!ev_is_active (w))) 2161 if (expect_false (!ev_is_active (w)))
1962 return; 2162 return;
1963 2163
1964 assert (("ev_io_start 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));
2165
2166 EV_FREQUENT_CHECK;
1965 2167
1966 wlist_del (&anfds[w->fd].head, (WL)w); 2168 wlist_del (&anfds[w->fd].head, (WL)w);
1967 ev_stop (EV_A_ (W)w); 2169 ev_stop (EV_A_ (W)w);
1968 2170
1969 fd_change (EV_A_ w->fd, 1); 2171 fd_change (EV_A_ w->fd, 1);
2172
2173 EV_FREQUENT_CHECK;
1970} 2174}
1971 2175
1972void noinline 2176void noinline
1973ev_timer_start (EV_P_ ev_timer *w) 2177ev_timer_start (EV_P_ ev_timer *w)
1974{ 2178{
… …
1977 2181
1978 ev_at (w) += mn_now; 2182 ev_at (w) += mn_now;
1979 2183
1980 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.));
1981 2185
2186 EV_FREQUENT_CHECK;
2187
2188 ++timercnt;
1982 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1983 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2190 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1984 timers [ev_active (w)] = (WT)w; 2191 ANHE_w (timers [ev_active (w)]) = (WT)w;
2192 ANHE_at_cache (timers [ev_active (w)]);
1985 upheap (timers, ev_active (w)); 2193 upheap (timers, ev_active (w));
1986 2194
2195 EV_FREQUENT_CHECK;
2196
1987 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1988} 2198}
1989 2199
1990void noinline 2200void noinline
1991ev_timer_stop (EV_P_ ev_timer *w) 2201ev_timer_stop (EV_P_ ev_timer *w)
1992{ 2202{
1993 clear_pending (EV_A_ (W)w); 2203 clear_pending (EV_A_ (W)w);
1994 if (expect_false (!ev_is_active (w))) 2204 if (expect_false (!ev_is_active (w)))
1995 return; 2205 return;
1996 2206
2207 EV_FREQUENT_CHECK;
2208
1997 { 2209 {
1998 int active = ev_active (w); 2210 int active = ev_active (w);
1999 2211
2000 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2001 2213
2214 --timercnt;
2215
2002 if (expect_true (active < timercnt + HEAP0 - 1)) 2216 if (expect_true (active < timercnt + HEAP0))
2003 { 2217 {
2004 timers [active] = timers [timercnt + HEAP0 - 1]; 2218 timers [active] = timers [timercnt + HEAP0];
2005 adjustheap (timers, timercnt, active); 2219 adjustheap (timers, timercnt, active);
2006 } 2220 }
2007
2008 --timercnt;
2009 } 2221 }
2222
2223 EV_FREQUENT_CHECK;
2010 2224
2011 ev_at (w) -= mn_now; 2225 ev_at (w) -= mn_now;
2012 2226
2013 ev_stop (EV_A_ (W)w); 2227 ev_stop (EV_A_ (W)w);
2014} 2228}
2015 2229
2016void noinline 2230void noinline
2017ev_timer_again (EV_P_ ev_timer *w) 2231ev_timer_again (EV_P_ ev_timer *w)
2018{ 2232{
2233 EV_FREQUENT_CHECK;
2234
2019 if (ev_is_active (w)) 2235 if (ev_is_active (w))
2020 { 2236 {
2021 if (w->repeat) 2237 if (w->repeat)
2022 { 2238 {
2023 ev_at (w) = mn_now + w->repeat; 2239 ev_at (w) = mn_now + w->repeat;
2240 ANHE_at_cache (timers [ev_active (w)]);
2024 adjustheap (timers, timercnt, ev_active (w)); 2241 adjustheap (timers, timercnt, ev_active (w));
2025 } 2242 }
2026 else 2243 else
2027 ev_timer_stop (EV_A_ w); 2244 ev_timer_stop (EV_A_ w);
2028 } 2245 }
2029 else if (w->repeat) 2246 else if (w->repeat)
2030 { 2247 {
2031 ev_at (w) = w->repeat; 2248 ev_at (w) = w->repeat;
2032 ev_timer_start (EV_A_ w); 2249 ev_timer_start (EV_A_ w);
2033 } 2250 }
2251
2252 EV_FREQUENT_CHECK;
2034} 2253}
2035 2254
2036#if EV_PERIODIC_ENABLE 2255#if EV_PERIODIC_ENABLE
2037void noinline 2256void noinline
2038ev_periodic_start (EV_P_ ev_periodic *w) 2257ev_periodic_start (EV_P_ ev_periodic *w)
… …
2049 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;
2050 } 2269 }
2051 else 2270 else
2052 ev_at (w) = w->offset; 2271 ev_at (w) = w->offset;
2053 2272
2273 EV_FREQUENT_CHECK;
2274
2275 ++periodiccnt;
2054 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2276 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2055 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2277 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2056 periodics [ev_active (w)] = (WT)w; 2278 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2279 ANHE_at_cache (periodics [ev_active (w)]);
2057 upheap (periodics, ev_active (w)); 2280 upheap (periodics, ev_active (w));
2058 2281
2282 EV_FREQUENT_CHECK;
2283
2059 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2284 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2060} 2285}
2061 2286
2062void noinline 2287void noinline
2063ev_periodic_stop (EV_P_ ev_periodic *w) 2288ev_periodic_stop (EV_P_ ev_periodic *w)
2064{ 2289{
2065 clear_pending (EV_A_ (W)w); 2290 clear_pending (EV_A_ (W)w);
2066 if (expect_false (!ev_is_active (w))) 2291 if (expect_false (!ev_is_active (w)))
2067 return; 2292 return;
2068 2293
2294 EV_FREQUENT_CHECK;
2295
2069 { 2296 {
2070 int active = ev_active (w); 2297 int active = ev_active (w);
2071 2298
2072 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2073 2300
2301 --periodiccnt;
2302
2074 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2303 if (expect_true (active < periodiccnt + HEAP0))
2075 { 2304 {
2076 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2305 periodics [active] = periodics [periodiccnt + HEAP0];
2077 adjustheap (periodics, periodiccnt, active); 2306 adjustheap (periodics, periodiccnt, active);
2078 } 2307 }
2079
2080 --periodiccnt;
2081 } 2308 }
2309
2310 EV_FREQUENT_CHECK;
2082 2311
2083 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
2084} 2313}
2085 2314
2086void noinline 2315void noinline
… …
2106 return; 2335 return;
2107 2336
2108 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));
2109 2338
2110 evpipe_init (EV_A); 2339 evpipe_init (EV_A);
2340
2341 EV_FREQUENT_CHECK;
2111 2342
2112 { 2343 {
2113#ifndef _WIN32 2344#ifndef _WIN32
2114 sigset_t full, prev; 2345 sigset_t full, prev;
2115 sigfillset (&full); 2346 sigfillset (&full);
… …
2136 sigfillset (&sa.sa_mask); 2367 sigfillset (&sa.sa_mask);
2137 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 */
2138 sigaction (w->signum, &sa, 0); 2369 sigaction (w->signum, &sa, 0);
2139#endif 2370#endif
2140 } 2371 }
2372
2373 EV_FREQUENT_CHECK;
2141} 2374}
2142 2375
2143void noinline 2376void noinline
2144ev_signal_stop (EV_P_ ev_signal *w) 2377ev_signal_stop (EV_P_ ev_signal *w)
2145{ 2378{
2146 clear_pending (EV_A_ (W)w); 2379 clear_pending (EV_A_ (W)w);
2147 if (expect_false (!ev_is_active (w))) 2380 if (expect_false (!ev_is_active (w)))
2148 return; 2381 return;
2149 2382
2383 EV_FREQUENT_CHECK;
2384
2150 wlist_del (&signals [w->signum - 1].head, (WL)w); 2385 wlist_del (&signals [w->signum - 1].head, (WL)w);
2151 ev_stop (EV_A_ (W)w); 2386 ev_stop (EV_A_ (W)w);
2152 2387
2153 if (!signals [w->signum - 1].head) 2388 if (!signals [w->signum - 1].head)
2154 signal (w->signum, SIG_DFL); 2389 signal (w->signum, SIG_DFL);
2390
2391 EV_FREQUENT_CHECK;
2155} 2392}
2156 2393
2157void 2394void
2158ev_child_start (EV_P_ ev_child *w) 2395ev_child_start (EV_P_ ev_child *w)
2159{ 2396{
… …
2161 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));
2162#endif 2399#endif
2163 if (expect_false (ev_is_active (w))) 2400 if (expect_false (ev_is_active (w)))
2164 return; 2401 return;
2165 2402
2403 EV_FREQUENT_CHECK;
2404
2166 ev_start (EV_A_ (W)w, 1); 2405 ev_start (EV_A_ (W)w, 1);
2167 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;
2168} 2409}
2169 2410
2170void 2411void
2171ev_child_stop (EV_P_ ev_child *w) 2412ev_child_stop (EV_P_ ev_child *w)
2172{ 2413{
2173 clear_pending (EV_A_ (W)w); 2414 clear_pending (EV_A_ (W)w);
2174 if (expect_false (!ev_is_active (w))) 2415 if (expect_false (!ev_is_active (w)))
2175 return; 2416 return;
2176 2417
2418 EV_FREQUENT_CHECK;
2419
2177 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2420 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2178 ev_stop (EV_A_ (W)w); 2421 ev_stop (EV_A_ (W)w);
2422
2423 EV_FREQUENT_CHECK;
2179} 2424}
2180 2425
2181#if EV_STAT_ENABLE 2426#if EV_STAT_ENABLE
2182 2427
2183# ifdef _WIN32 2428# ifdef _WIN32
… …
2252 2497
2253static void noinline 2498static void noinline
2254infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2499infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2255{ 2500{
2256 if (slot < 0) 2501 if (slot < 0)
2257 /* overflow, need to check for all hahs slots */ 2502 /* overflow, need to check for all hash slots */
2258 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2503 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2259 infy_wd (EV_A_ slot, wd, ev); 2504 infy_wd (EV_A_ slot, wd, ev);
2260 else 2505 else
2261 { 2506 {
2262 WL w_; 2507 WL w_;
… …
2296infy_init (EV_P) 2541infy_init (EV_P)
2297{ 2542{
2298 if (fs_fd != -2) 2543 if (fs_fd != -2)
2299 return; 2544 return;
2300 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
2301 fs_fd = inotify_init (); 2567 fs_fd = inotify_init ();
2302 2568
2303 if (fs_fd >= 0) 2569 if (fs_fd >= 0)
2304 { 2570 {
2305 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2571 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2334 if (fs_fd >= 0) 2600 if (fs_fd >= 0)
2335 infy_add (EV_A_ w); /* re-add, no matter what */ 2601 infy_add (EV_A_ w); /* re-add, no matter what */
2336 else 2602 else
2337 ev_timer_start (EV_A_ &w->timer); 2603 ev_timer_start (EV_A_ &w->timer);
2338 } 2604 }
2339
2340 } 2605 }
2341} 2606}
2342 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)
2343#endif 2614#endif
2344 2615
2345void 2616void
2346ev_stat_stat (EV_P_ ev_stat *w) 2617ev_stat_stat (EV_P_ ev_stat *w)
2347{ 2618{
… …
2374 || w->prev.st_atime != w->attr.st_atime 2645 || w->prev.st_atime != w->attr.st_atime
2375 || w->prev.st_mtime != w->attr.st_mtime 2646 || w->prev.st_mtime != w->attr.st_mtime
2376 || w->prev.st_ctime != w->attr.st_ctime 2647 || w->prev.st_ctime != w->attr.st_ctime
2377 ) { 2648 ) {
2378 #if EV_USE_INOTIFY 2649 #if EV_USE_INOTIFY
2650 if (fs_fd >= 0)
2651 {
2379 infy_del (EV_A_ w); 2652 infy_del (EV_A_ w);
2380 infy_add (EV_A_ w); 2653 infy_add (EV_A_ w);
2381 ev_stat_stat (EV_A_ w); /* avoid race... */ 2654 ev_stat_stat (EV_A_ w); /* avoid race... */
2655 }
2382 #endif 2656 #endif
2383 2657
2384 ev_feed_event (EV_A_ w, EV_STAT); 2658 ev_feed_event (EV_A_ w, EV_STAT);
2385 } 2659 }
2386} 2660}
… …
2411 else 2685 else
2412#endif 2686#endif
2413 ev_timer_start (EV_A_ &w->timer); 2687 ev_timer_start (EV_A_ &w->timer);
2414 2688
2415 ev_start (EV_A_ (W)w, 1); 2689 ev_start (EV_A_ (W)w, 1);
2690
2691 EV_FREQUENT_CHECK;
2416} 2692}
2417 2693
2418void 2694void
2419ev_stat_stop (EV_P_ ev_stat *w) 2695ev_stat_stop (EV_P_ ev_stat *w)
2420{ 2696{
2421 clear_pending (EV_A_ (W)w); 2697 clear_pending (EV_A_ (W)w);
2422 if (expect_false (!ev_is_active (w))) 2698 if (expect_false (!ev_is_active (w)))
2423 return; 2699 return;
2424 2700
2701 EV_FREQUENT_CHECK;
2702
2425#if EV_USE_INOTIFY 2703#if EV_USE_INOTIFY
2426 infy_del (EV_A_ w); 2704 infy_del (EV_A_ w);
2427#endif 2705#endif
2428 ev_timer_stop (EV_A_ &w->timer); 2706 ev_timer_stop (EV_A_ &w->timer);
2429 2707
2430 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2431} 2711}
2432#endif 2712#endif
2433 2713
2434#if EV_IDLE_ENABLE 2714#if EV_IDLE_ENABLE
2435void 2715void
… …
2437{ 2717{
2438 if (expect_false (ev_is_active (w))) 2718 if (expect_false (ev_is_active (w)))
2439 return; 2719 return;
2440 2720
2441 pri_adjust (EV_A_ (W)w); 2721 pri_adjust (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2442 2724
2443 { 2725 {
2444 int active = ++idlecnt [ABSPRI (w)]; 2726 int active = ++idlecnt [ABSPRI (w)];
2445 2727
2446 ++idleall; 2728 ++idleall;
2447 ev_start (EV_A_ (W)w, active); 2729 ev_start (EV_A_ (W)w, active);
2448 2730
2449 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);
2450 idles [ABSPRI (w)][active - 1] = w; 2732 idles [ABSPRI (w)][active - 1] = w;
2451 } 2733 }
2734
2735 EV_FREQUENT_CHECK;
2452} 2736}
2453 2737
2454void 2738void
2455ev_idle_stop (EV_P_ ev_idle *w) 2739ev_idle_stop (EV_P_ ev_idle *w)
2456{ 2740{
2457 clear_pending (EV_A_ (W)w); 2741 clear_pending (EV_A_ (W)w);
2458 if (expect_false (!ev_is_active (w))) 2742 if (expect_false (!ev_is_active (w)))
2459 return; 2743 return;
2460 2744
2745 EV_FREQUENT_CHECK;
2746
2461 { 2747 {
2462 int active = ev_active (w); 2748 int active = ev_active (w);
2463 2749
2464 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2750 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2465 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2751 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2466 2752
2467 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2468 --idleall; 2754 --idleall;
2469 } 2755 }
2756
2757 EV_FREQUENT_CHECK;
2470} 2758}
2471#endif 2759#endif
2472 2760
2473void 2761void
2474ev_prepare_start (EV_P_ ev_prepare *w) 2762ev_prepare_start (EV_P_ ev_prepare *w)
2475{ 2763{
2476 if (expect_false (ev_is_active (w))) 2764 if (expect_false (ev_is_active (w)))
2477 return; 2765 return;
2766
2767 EV_FREQUENT_CHECK;
2478 2768
2479 ev_start (EV_A_ (W)w, ++preparecnt); 2769 ev_start (EV_A_ (W)w, ++preparecnt);
2480 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2770 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2481 prepares [preparecnt - 1] = w; 2771 prepares [preparecnt - 1] = w;
2772
2773 EV_FREQUENT_CHECK;
2482} 2774}
2483 2775
2484void 2776void
2485ev_prepare_stop (EV_P_ ev_prepare *w) 2777ev_prepare_stop (EV_P_ ev_prepare *w)
2486{ 2778{
2487 clear_pending (EV_A_ (W)w); 2779 clear_pending (EV_A_ (W)w);
2488 if (expect_false (!ev_is_active (w))) 2780 if (expect_false (!ev_is_active (w)))
2489 return; 2781 return;
2490 2782
2783 EV_FREQUENT_CHECK;
2784
2491 { 2785 {
2492 int active = ev_active (w); 2786 int active = ev_active (w);
2493 2787
2494 prepares [active - 1] = prepares [--preparecnt]; 2788 prepares [active - 1] = prepares [--preparecnt];
2495 ev_active (prepares [active - 1]) = active; 2789 ev_active (prepares [active - 1]) = active;
2496 } 2790 }
2497 2791
2498 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2793
2794 EV_FREQUENT_CHECK;
2499} 2795}
2500 2796
2501void 2797void
2502ev_check_start (EV_P_ ev_check *w) 2798ev_check_start (EV_P_ ev_check *w)
2503{ 2799{
2504 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2505 return; 2801 return;
2802
2803 EV_FREQUENT_CHECK;
2506 2804
2507 ev_start (EV_A_ (W)w, ++checkcnt); 2805 ev_start (EV_A_ (W)w, ++checkcnt);
2508 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2806 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2509 checks [checkcnt - 1] = w; 2807 checks [checkcnt - 1] = w;
2808
2809 EV_FREQUENT_CHECK;
2510} 2810}
2511 2811
2512void 2812void
2513ev_check_stop (EV_P_ ev_check *w) 2813ev_check_stop (EV_P_ ev_check *w)
2514{ 2814{
2515 clear_pending (EV_A_ (W)w); 2815 clear_pending (EV_A_ (W)w);
2516 if (expect_false (!ev_is_active (w))) 2816 if (expect_false (!ev_is_active (w)))
2517 return; 2817 return;
2518 2818
2819 EV_FREQUENT_CHECK;
2820
2519 { 2821 {
2520 int active = ev_active (w); 2822 int active = ev_active (w);
2521 2823
2522 checks [active - 1] = checks [--checkcnt]; 2824 checks [active - 1] = checks [--checkcnt];
2523 ev_active (checks [active - 1]) = active; 2825 ev_active (checks [active - 1]) = active;
2524 } 2826 }
2525 2827
2526 ev_stop (EV_A_ (W)w); 2828 ev_stop (EV_A_ (W)w);
2829
2830 EV_FREQUENT_CHECK;
2527} 2831}
2528 2832
2529#if EV_EMBED_ENABLE 2833#if EV_EMBED_ENABLE
2530void noinline 2834void noinline
2531ev_embed_sweep (EV_P_ ev_embed *w) 2835ev_embed_sweep (EV_P_ ev_embed *w)
… …
2558 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2862 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2559 } 2863 }
2560 } 2864 }
2561} 2865}
2562 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
2563#if 0 2879#if 0
2564static void 2880static void
2565embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2881embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2566{ 2882{
2567 ev_idle_stop (EV_A_ idle); 2883 ev_idle_stop (EV_A_ idle);
… …
2578 struct ev_loop *loop = w->other; 2894 struct ev_loop *loop = w->other;
2579 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 ()));
2580 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);
2581 } 2897 }
2582 2898
2899 EV_FREQUENT_CHECK;
2900
2583 ev_set_priority (&w->io, ev_priority (w)); 2901 ev_set_priority (&w->io, ev_priority (w));
2584 ev_io_start (EV_A_ &w->io); 2902 ev_io_start (EV_A_ &w->io);
2585 2903
2586 ev_prepare_init (&w->prepare, embed_prepare_cb); 2904 ev_prepare_init (&w->prepare, embed_prepare_cb);
2587 ev_set_priority (&w->prepare, EV_MINPRI); 2905 ev_set_priority (&w->prepare, EV_MINPRI);
2588 ev_prepare_start (EV_A_ &w->prepare); 2906 ev_prepare_start (EV_A_ &w->prepare);
2589 2907
2908 ev_fork_init (&w->fork, embed_fork_cb);
2909 ev_fork_start (EV_A_ &w->fork);
2910
2590 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2911 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2591 2912
2592 ev_start (EV_A_ (W)w, 1); 2913 ev_start (EV_A_ (W)w, 1);
2914
2915 EV_FREQUENT_CHECK;
2593} 2916}
2594 2917
2595void 2918void
2596ev_embed_stop (EV_P_ ev_embed *w) 2919ev_embed_stop (EV_P_ ev_embed *w)
2597{ 2920{
2598 clear_pending (EV_A_ (W)w); 2921 clear_pending (EV_A_ (W)w);
2599 if (expect_false (!ev_is_active (w))) 2922 if (expect_false (!ev_is_active (w)))
2600 return; 2923 return;
2601 2924
2925 EV_FREQUENT_CHECK;
2926
2602 ev_io_stop (EV_A_ &w->io); 2927 ev_io_stop (EV_A_ &w->io);
2603 ev_prepare_stop (EV_A_ &w->prepare); 2928 ev_prepare_stop (EV_A_ &w->prepare);
2929 ev_fork_stop (EV_A_ &w->fork);
2604 2930
2605 ev_stop (EV_A_ (W)w); 2931 EV_FREQUENT_CHECK;
2606} 2932}
2607#endif 2933#endif
2608 2934
2609#if EV_FORK_ENABLE 2935#if EV_FORK_ENABLE
2610void 2936void
2611ev_fork_start (EV_P_ ev_fork *w) 2937ev_fork_start (EV_P_ ev_fork *w)
2612{ 2938{
2613 if (expect_false (ev_is_active (w))) 2939 if (expect_false (ev_is_active (w)))
2614 return; 2940 return;
2941
2942 EV_FREQUENT_CHECK;
2615 2943
2616 ev_start (EV_A_ (W)w, ++forkcnt); 2944 ev_start (EV_A_ (W)w, ++forkcnt);
2617 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2945 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2618 forks [forkcnt - 1] = w; 2946 forks [forkcnt - 1] = w;
2947
2948 EV_FREQUENT_CHECK;
2619} 2949}
2620 2950
2621void 2951void
2622ev_fork_stop (EV_P_ ev_fork *w) 2952ev_fork_stop (EV_P_ ev_fork *w)
2623{ 2953{
2624 clear_pending (EV_A_ (W)w); 2954 clear_pending (EV_A_ (W)w);
2625 if (expect_false (!ev_is_active (w))) 2955 if (expect_false (!ev_is_active (w)))
2626 return; 2956 return;
2627 2957
2958 EV_FREQUENT_CHECK;
2959
2628 { 2960 {
2629 int active = ev_active (w); 2961 int active = ev_active (w);
2630 2962
2631 forks [active - 1] = forks [--forkcnt]; 2963 forks [active - 1] = forks [--forkcnt];
2632 ev_active (forks [active - 1]) = active; 2964 ev_active (forks [active - 1]) = active;
2633 } 2965 }
2634 2966
2635 ev_stop (EV_A_ (W)w); 2967 ev_stop (EV_A_ (W)w);
2968
2969 EV_FREQUENT_CHECK;
2636} 2970}
2637#endif 2971#endif
2638 2972
2639#if EV_ASYNC_ENABLE 2973#if EV_ASYNC_ENABLE
2640void 2974void
… …
2642{ 2976{
2643 if (expect_false (ev_is_active (w))) 2977 if (expect_false (ev_is_active (w)))
2644 return; 2978 return;
2645 2979
2646 evpipe_init (EV_A); 2980 evpipe_init (EV_A);
2981
2982 EV_FREQUENT_CHECK;
2647 2983
2648 ev_start (EV_A_ (W)w, ++asynccnt); 2984 ev_start (EV_A_ (W)w, ++asynccnt);
2649 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2985 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2650 asyncs [asynccnt - 1] = w; 2986 asyncs [asynccnt - 1] = w;
2987
2988 EV_FREQUENT_CHECK;
2651} 2989}
2652 2990
2653void 2991void
2654ev_async_stop (EV_P_ ev_async *w) 2992ev_async_stop (EV_P_ ev_async *w)
2655{ 2993{
2656 clear_pending (EV_A_ (W)w); 2994 clear_pending (EV_A_ (W)w);
2657 if (expect_false (!ev_is_active (w))) 2995 if (expect_false (!ev_is_active (w)))
2658 return; 2996 return;
2659 2997
2998 EV_FREQUENT_CHECK;
2999
2660 { 3000 {
2661 int active = ev_active (w); 3001 int active = ev_active (w);
2662 3002
2663 asyncs [active - 1] = asyncs [--asynccnt]; 3003 asyncs [active - 1] = asyncs [--asynccnt];
2664 ev_active (asyncs [active - 1]) = active; 3004 ev_active (asyncs [active - 1]) = active;
2665 } 3005 }
2666 3006
2667 ev_stop (EV_A_ (W)w); 3007 ev_stop (EV_A_ (W)w);
3008
3009 EV_FREQUENT_CHECK;
2668} 3010}
2669 3011
2670void 3012void
2671ev_async_send (EV_P_ ev_async *w) 3013ev_async_send (EV_P_ ev_async *w)
2672{ 3014{
… …
2689once_cb (EV_P_ struct ev_once *once, int revents) 3031once_cb (EV_P_ struct ev_once *once, int revents)
2690{ 3032{
2691 void (*cb)(int revents, void *arg) = once->cb; 3033 void (*cb)(int revents, void *arg) = once->cb;
2692 void *arg = once->arg; 3034 void *arg = once->arg;
2693 3035
2694 ev_io_stop (EV_A_ &once->io); 3036 ev_io_stop (EV_A_ &once->io);
2695 ev_timer_stop (EV_A_ &once->to); 3037 ev_timer_stop (EV_A_ &once->to);
2696 ev_free (once); 3038 ev_free (once);
2697 3039
2698 cb (revents, arg); 3040 cb (revents, arg);
2699} 3041}
2700 3042
2701static void 3043static void
2702once_cb_io (EV_P_ ev_io *w, int revents) 3044once_cb_io (EV_P_ ev_io *w, int revents)
2703{ 3045{
2704 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));
2705} 3049}
2706 3050
2707static void 3051static void
2708once_cb_to (EV_P_ ev_timer *w, int revents) 3052once_cb_to (EV_P_ ev_timer *w, int revents)
2709{ 3053{
2710 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));
2711} 3057}
2712 3058
2713void 3059void
2714ev_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)
2715{ 3061{

Diff Legend

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