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

Comparing libev/ev.c (file contents):
Revision 1.240 by root, Thu May 8 21:21:41 2008 UTC vs.
Revision 1.265 by root, Thu Oct 23 04:56:49 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
410typedef struct 449typedef struct
411{ 450{
412 WL head; 451 WL head;
413 unsigned char events; 452 unsigned char events;
414 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */
415#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
416 SOCKET handle; 457 SOCKET handle;
417#endif 458#endif
418} ANFD; 459} ANFD;
419 460
422 W w; 463 W w;
423 int events; 464 int events;
424} ANPENDING; 465} ANPENDING;
425 466
426#if EV_USE_INOTIFY 467#if EV_USE_INOTIFY
468/* hash table entry per inotify-id */
427typedef struct 469typedef struct
428{ 470{
429 WL head; 471 WL head;
430} ANFS; 472} ANFS;
473#endif
474
475/* Heap Entry */
476#if EV_HEAP_CACHE_AT
477 typedef struct {
478 ev_tstamp at;
479 WT w;
480 } ANHE;
481
482 #define ANHE_w(he) (he).w /* access watcher, read-write */
483 #define ANHE_at(he) (he).at /* access cached at, read-only */
484 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
485#else
486 typedef WT ANHE;
487
488 #define ANHE_w(he) (he)
489 #define ANHE_at(he) (he)->at
490 #define ANHE_at_cache(he)
431#endif 491#endif
432 492
433#if EV_MULTIPLICITY 493#if EV_MULTIPLICITY
434 494
435 struct ev_loop 495 struct ev_loop
513 struct timeval tv; 573 struct timeval tv;
514 574
515 tv.tv_sec = (time_t)delay; 575 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517 577
578 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
579 /* somehting nto guaranteed by newer posix versions, but guaranteed */
580 /* by older ones */
518 select (0, 0, 0, 0, &tv); 581 select (0, 0, 0, 0, &tv);
519#endif 582#endif
520 } 583 }
521} 584}
522 585
549array_realloc (int elem, void *base, int *cur, int cnt) 612array_realloc (int elem, void *base, int *cur, int cnt)
550{ 613{
551 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
552 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
553} 616}
617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
554 620
555#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
556 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
557 { \ 623 { \
558 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
602 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
603} 669}
604 670
605/*****************************************************************************/ 671/*****************************************************************************/
606 672
607void inline_size
608anfds_init (ANFD *base, int count)
609{
610 while (count--)
611 {
612 base->head = 0;
613 base->events = EV_NONE;
614 base->reify = 0;
615
616 ++base;
617 }
618}
619
620void inline_speed 673void inline_speed
621fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
622{ 675{
623 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
624 ev_io *w; 677 ev_io *w;
656 events |= (unsigned char)w->events; 709 events |= (unsigned char)w->events;
657 710
658#if EV_SELECT_IS_WINSOCKET 711#if EV_SELECT_IS_WINSOCKET
659 if (events) 712 if (events)
660 { 713 {
661 unsigned long argp; 714 unsigned long arg;
662 #ifdef EV_FD_TO_WIN32_HANDLE 715 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else 717 #else
665 anfd->handle = _get_osfhandle (fd); 718 anfd->handle = _get_osfhandle (fd);
666 #endif 719 #endif
667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
668 } 721 }
669#endif 722#endif
670 723
671 { 724 {
672 unsigned char o_events = anfd->events; 725 unsigned char o_events = anfd->events;
725{ 778{
726 int fd; 779 int fd;
727 780
728 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
729 if (anfds [fd].events) 782 if (anfds [fd].events)
730 if (!fd_valid (fd) == -1 && errno == EBADF) 783 if (!fd_valid (fd) && errno == EBADF)
731 fd_kill (EV_A_ fd); 784 fd_kill (EV_A_ fd);
732} 785}
733 786
734/* called on ENOMEM in select/poll to kill some fds and retry */ 787/* called on ENOMEM in select/poll to kill some fds and retry */
735static void noinline 788static void noinline
760} 813}
761 814
762/*****************************************************************************/ 815/*****************************************************************************/
763 816
764/* 817/*
818 * the heap functions want a real array index. array index 0 uis guaranteed to not
819 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
820 * the branching factor of the d-tree.
821 */
822
823/*
765 * at the moment we allow libev the luxury of two heaps, 824 * 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 825 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient. 826 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers. 827 * the difference is about 5% with 50000+ watchers.
769 */ 828 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP 829#if EV_USE_4HEAP
772 830
773#define DHEAP 4 831#define DHEAP 4
774#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 832#define HEAP0 (DHEAP - 1) /* index of first element in heap */
775 833#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
776/* towards the root */ 834#define UPHEAP_DONE(p,k) ((p) == (k))
777void inline_speed
778upheap (WT *heap, int k)
779{
780 WT w = heap [k];
781 ev_tstamp w_at = w->at;
782
783 for (;;)
784 {
785 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
786
787 if (p == k || heap [p]->at <= w_at)
788 break;
789
790 heap [k] = heap [p];
791 ev_active (heap [k]) = k;
792 k = p;
793 }
794
795 heap [k] = w;
796 ev_active (heap [k]) = k;
797}
798 835
799/* away from the root */ 836/* away from the root */
800void inline_speed 837void inline_speed
801downheap (WT *heap, int N, int k) 838downheap (ANHE *heap, int N, int k)
802{ 839{
803 WT w = heap [k]; 840 ANHE he = heap [k];
804 WT *E = heap + N + HEAP0; 841 ANHE *E = heap + N + HEAP0;
805 842
806 for (;;) 843 for (;;)
807 { 844 {
808 ev_tstamp minat; 845 ev_tstamp minat;
809 WT *minpos; 846 ANHE *minpos;
810 WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 847 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
811 848
812 // find minimum child 849 /* find minimum child */
813 if (expect_true (pos + DHEAP - 1 < E)) 850 if (expect_true (pos + DHEAP - 1 < E))
814 { 851 {
815 /* fast path */ (minpos = pos + 0), (minat = (*minpos)->at); 852 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
816 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 853 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
817 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at); 854 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
818 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at); 855 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
819 } 856 }
820 else if (pos < E) 857 else if (pos < E)
821 { 858 {
822 /* slow path */ (minpos = pos + 0), (minat = (*minpos)->at); 859 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
823 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at); 860 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
824 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at); 861 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
825 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at); 862 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
826 } 863 }
827 else 864 else
828 break; 865 break;
829 866
830 if (w->at <= minat) 867 if (ANHE_at (he) <= minat)
831 break; 868 break;
832 869
833 ev_active (*minpos) = k;
834 heap [k] = *minpos; 870 heap [k] = *minpos;
871 ev_active (ANHE_w (*minpos)) = k;
835 872
836 k = minpos - heap; 873 k = minpos - heap;
837 } 874 }
838 875
839 heap [k] = w; 876 heap [k] = he;
840 ev_active (heap [k]) = k; 877 ev_active (ANHE_w (he)) = k;
841} 878}
842 879
843#else // 4HEAP 880#else /* 4HEAP */
844 881
845#define HEAP0 1 882#define HEAP0 1
883#define HPARENT(k) ((k) >> 1)
884#define UPHEAP_DONE(p,k) (!(p))
885
886/* away from the root */
887void inline_speed
888downheap (ANHE *heap, int N, int k)
889{
890 ANHE he = heap [k];
891
892 for (;;)
893 {
894 int c = k << 1;
895
896 if (c > N + HEAP0 - 1)
897 break;
898
899 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
900 ? 1 : 0;
901
902 if (ANHE_at (he) <= ANHE_at (heap [c]))
903 break;
904
905 heap [k] = heap [c];
906 ev_active (ANHE_w (heap [k])) = k;
907
908 k = c;
909 }
910
911 heap [k] = he;
912 ev_active (ANHE_w (he)) = k;
913}
914#endif
846 915
847/* towards the root */ 916/* towards the root */
848void inline_speed 917void inline_speed
849upheap (WT *heap, int k) 918upheap (ANHE *heap, int k)
850{ 919{
851 WT w = heap [k]; 920 ANHE he = heap [k];
852 921
853 for (;;) 922 for (;;)
854 { 923 {
855 int p = k >> 1; 924 int p = HPARENT (k);
856 925
857 /* maybe we could use a dummy element at heap [0]? */ 926 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
858 if (!p || heap [p]->at <= w->at)
859 break; 927 break;
860 928
861 heap [k] = heap [p]; 929 heap [k] = heap [p];
862 ev_active (heap [k]) = k; 930 ev_active (ANHE_w (heap [k])) = k;
863 k = p; 931 k = p;
864 } 932 }
865 933
866 heap [k] = w; 934 heap [k] = he;
867 ev_active (heap [k]) = k; 935 ev_active (ANHE_w (he)) = k;
868} 936}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
878 int c = k << 1;
879
880 if (c > N)
881 break;
882
883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
884 ? 1 : 0;
885
886 if (w->at <= heap [c]->at)
887 break;
888
889 heap [k] = heap [c];
890 ((W)heap [k])->active = k;
891
892 k = c;
893 }
894
895 heap [k] = w;
896 ev_active (heap [k]) = k;
897}
898#endif
899 937
900void inline_size 938void inline_size
901adjustheap (WT *heap, int N, int k) 939adjustheap (ANHE *heap, int N, int k)
902{ 940{
941 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
903 upheap (heap, k); 942 upheap (heap, k);
943 else
904 downheap (heap, N, k); 944 downheap (heap, N, k);
945}
946
947/* rebuild the heap: this function is used only once and executed rarely */
948void inline_size
949reheap (ANHE *heap, int N)
950{
951 int i;
952
953 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
954 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
955 for (i = 0; i < N; ++i)
956 upheap (heap, i + HEAP0);
905} 957}
906 958
907/*****************************************************************************/ 959/*****************************************************************************/
908 960
909typedef struct 961typedef struct
915static ANSIG *signals; 967static ANSIG *signals;
916static int signalmax; 968static int signalmax;
917 969
918static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
919 971
920void inline_size
921signals_init (ANSIG *base, int count)
922{
923 while (count--)
924 {
925 base->head = 0;
926 base->gotsig = 0;
927
928 ++base;
929 }
930}
931
932/*****************************************************************************/ 972/*****************************************************************************/
933 973
934void inline_speed 974void inline_speed
935fd_intern (int fd) 975fd_intern (int fd)
936{ 976{
937#ifdef _WIN32 977#ifdef _WIN32
938 int arg = 1; 978 unsigned long arg = 1;
939 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
940#else 980#else
941 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
942 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
943#endif 983#endif
1427 1467
1428 postfork = 0; 1468 postfork = 0;
1429} 1469}
1430 1470
1431#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1472
1432struct ev_loop * 1473struct ev_loop *
1433ev_loop_new (unsigned int flags) 1474ev_loop_new (unsigned int flags)
1434{ 1475{
1435 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1476 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1436 1477
1454void 1495void
1455ev_loop_fork (EV_P) 1496ev_loop_fork (EV_P)
1456{ 1497{
1457 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1458} 1499}
1500
1501#if EV_VERIFY
1502static void noinline
1503verify_watcher (EV_P_ W w)
1504{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506
1507 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509}
1510
1511static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N)
1513{
1514 int i;
1515
1516 for (i = HEAP0; i < N + HEAP0; ++i)
1517 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 }
1524}
1525
1526static void noinline
1527array_verify (EV_P_ W *ws, int cnt)
1528{
1529 while (cnt--)
1530 {
1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]);
1533 }
1534}
1535#endif
1536
1537void
1538ev_loop_verify (EV_P)
1539{
1540#if EV_VERIFY
1541 int i;
1542 WL w;
1543
1544 assert (activecnt >= -1);
1545
1546 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1549
1550 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next)
1553 {
1554 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 }
1558
1559 assert (timermax >= timercnt);
1560 verify_heap (EV_A_ timers, timercnt);
1561
1562#if EV_PERIODIC_ENABLE
1563 assert (periodicmax >= periodiccnt);
1564 verify_heap (EV_A_ periodics, periodiccnt);
1565#endif
1566
1567 for (i = NUMPRI; i--; )
1568 {
1569 assert (pendingmax [i] >= pendingcnt [i]);
1570#if EV_IDLE_ENABLE
1571 assert (idleall >= 0);
1572 assert (idlemax [i] >= idlecnt [i]);
1573 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1574#endif
1575 }
1576
1577#if EV_FORK_ENABLE
1578 assert (forkmax >= forkcnt);
1579 array_verify (EV_A_ (W *)forks, forkcnt);
1580#endif
1581
1582#if EV_ASYNC_ENABLE
1583 assert (asyncmax >= asynccnt);
1584 array_verify (EV_A_ (W *)asyncs, asynccnt);
1585#endif
1586
1587 assert (preparemax >= preparecnt);
1588 array_verify (EV_A_ (W *)prepares, preparecnt);
1589
1590 assert (checkmax >= checkcnt);
1591 array_verify (EV_A_ (W *)checks, checkcnt);
1592
1593# if 0
1594 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1595 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1459#endif 1596# endif
1597#endif
1598}
1599
1600#endif /* multiplicity */
1460 1601
1461#if EV_MULTIPLICITY 1602#if EV_MULTIPLICITY
1462struct ev_loop * 1603struct ev_loop *
1463ev_default_loop_init (unsigned int flags) 1604ev_default_loop_init (unsigned int flags)
1464#else 1605#else
1540 { 1681 {
1541 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1682 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1542 1683
1543 p->w->pending = 0; 1684 p->w->pending = 0;
1544 EV_CB_INVOKE (p->w, p->events); 1685 EV_CB_INVOKE (p->w, p->events);
1686 EV_FREQUENT_CHECK;
1545 } 1687 }
1546 } 1688 }
1547} 1689}
1548 1690
1549#if EV_IDLE_ENABLE 1691#if EV_IDLE_ENABLE
1570#endif 1712#endif
1571 1713
1572void inline_size 1714void inline_size
1573timers_reify (EV_P) 1715timers_reify (EV_P)
1574{ 1716{
1717 EV_FREQUENT_CHECK;
1718
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now) 1719 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1576 { 1720 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0]; 1721 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1578 1722
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1723 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580 1724
1581 /* first reschedule or stop timer */ 1725 /* first reschedule or stop timer */
1582 if (w->repeat) 1726 if (w->repeat)
1583 { 1727 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat; 1728 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now) 1729 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now; 1730 ev_at (w) = mn_now;
1589 1731
1732 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1733
1734 ANHE_at_cache (timers [HEAP0]);
1590 downheap (timers, timercnt, HEAP0); 1735 downheap (timers, timercnt, HEAP0);
1591 } 1736 }
1592 else 1737 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1738 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594 1739
1740 EV_FREQUENT_CHECK;
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1741 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 } 1742 }
1597} 1743}
1598 1744
1599#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1600void inline_size 1746void inline_size
1601periodics_reify (EV_P) 1747periodics_reify (EV_P)
1602{ 1748{
1749 EV_FREQUENT_CHECK;
1750
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now) 1751 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1604 { 1752 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0]; 1753 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1606 1754
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1755 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608 1756
1609 /* first reschedule or stop timer */ 1757 /* first reschedule or stop timer */
1610 if (w->reschedule_cb) 1758 if (w->reschedule_cb)
1611 { 1759 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1760 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1761
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1762 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1763
1764 ANHE_at_cache (periodics [HEAP0]);
1614 downheap (periodics, periodiccnt, 1); 1765 downheap (periodics, periodiccnt, HEAP0);
1615 } 1766 }
1616 else if (w->interval) 1767 else if (w->interval)
1617 { 1768 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1769 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1770 /* if next trigger time is not sufficiently in the future, put it there */
1771 /* this might happen because of floating point inexactness */
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1772 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now)); 1773 {
1774 ev_at (w) += w->interval;
1775
1776 /* if interval is unreasonably low we might still have a time in the past */
1777 /* so correct this. this will make the periodic very inexact, but the user */
1778 /* has effectively asked to get triggered more often than possible */
1779 if (ev_at (w) < ev_rt_now)
1780 ev_at (w) = ev_rt_now;
1781 }
1782
1783 ANHE_at_cache (periodics [HEAP0]);
1621 downheap (periodics, periodiccnt, HEAP0); 1784 downheap (periodics, periodiccnt, HEAP0);
1622 } 1785 }
1623 else 1786 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1787 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625 1788
1789 EV_FREQUENT_CHECK;
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1790 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 } 1791 }
1628} 1792}
1629 1793
1630static void noinline 1794static void noinline
1631periodics_reschedule (EV_P) 1795periodics_reschedule (EV_P)
1632{ 1796{
1633 int i; 1797 int i;
1634 1798
1635 /* adjust periodics after time jump */ 1799 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i) 1800 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1637 { 1801 {
1638 ev_periodic *w = (ev_periodic *)periodics [i]; 1802 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1639 1803
1640 if (w->reschedule_cb) 1804 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1805 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval) 1806 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1807 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645 1808
1646 /* now rebuild the heap */ 1809 ANHE_at_cache (periodics [i]);
1647 for (i = periodiccnt >> 1; --i; ) 1810 }
1811
1648 downheap (periodics, periodiccnt, i + HEAP0); 1812 reheap (periodics, periodiccnt);
1649} 1813}
1650#endif 1814#endif
1651 1815
1652void inline_speed 1816void inline_speed
1653time_update (EV_P_ ev_tstamp max_block) 1817time_update (EV_P_ ev_tstamp max_block)
1707 { 1871 {
1708#if EV_PERIODIC_ENABLE 1872#if EV_PERIODIC_ENABLE
1709 periodics_reschedule (EV_A); 1873 periodics_reschedule (EV_A);
1710#endif 1874#endif
1711 /* adjust timers. this is easy, as the offset is the same for all of them */ 1875 /* adjust timers. this is easy, as the offset is the same for all of them */
1712 for (i = 1; i <= timercnt; ++i) 1876 for (i = 0; i < timercnt; ++i)
1713 ev_at (timers [i]) += ev_rt_now - mn_now; 1877 {
1878 ANHE *he = timers + i + HEAP0;
1879 ANHE_w (*he)->at += ev_rt_now - mn_now;
1880 ANHE_at_cache (*he);
1881 }
1714 } 1882 }
1715 1883
1716 mn_now = ev_rt_now; 1884 mn_now = ev_rt_now;
1717 } 1885 }
1718} 1886}
1727ev_unref (EV_P) 1895ev_unref (EV_P)
1728{ 1896{
1729 --activecnt; 1897 --activecnt;
1730} 1898}
1731 1899
1900void
1901ev_now_update (EV_P)
1902{
1903 time_update (EV_A_ 1e100);
1904}
1905
1732static int loop_done; 1906static int loop_done;
1733 1907
1734void 1908void
1735ev_loop (EV_P_ int flags) 1909ev_loop (EV_P_ int flags)
1736{ 1910{
1738 1912
1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1913 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1740 1914
1741 do 1915 do
1742 { 1916 {
1917#if EV_VERIFY >= 2
1918 ev_loop_verify (EV_A);
1919#endif
1920
1743#ifndef _WIN32 1921#ifndef _WIN32
1744 if (expect_false (curpid)) /* penalise the forking check even more */ 1922 if (expect_false (curpid)) /* penalise the forking check even more */
1745 if (expect_false (getpid () != curpid)) 1923 if (expect_false (getpid () != curpid))
1746 { 1924 {
1747 curpid = getpid (); 1925 curpid = getpid ();
1788 1966
1789 waittime = MAX_BLOCKTIME; 1967 waittime = MAX_BLOCKTIME;
1790 1968
1791 if (timercnt) 1969 if (timercnt)
1792 { 1970 {
1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge; 1971 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1794 if (waittime > to) waittime = to; 1972 if (waittime > to) waittime = to;
1795 } 1973 }
1796 1974
1797#if EV_PERIODIC_ENABLE 1975#if EV_PERIODIC_ENABLE
1798 if (periodiccnt) 1976 if (periodiccnt)
1799 { 1977 {
1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 1978 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1801 if (waittime > to) waittime = to; 1979 if (waittime > to) waittime = to;
1802 } 1980 }
1803#endif 1981#endif
1804 1982
1805 if (expect_false (waittime < timeout_blocktime)) 1983 if (expect_false (waittime < timeout_blocktime))
1941 2119
1942 if (expect_false (ev_is_active (w))) 2120 if (expect_false (ev_is_active (w)))
1943 return; 2121 return;
1944 2122
1945 assert (("ev_io_start called with negative fd", fd >= 0)); 2123 assert (("ev_io_start called with negative fd", fd >= 0));
2124 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2125
2126 EV_FREQUENT_CHECK;
1946 2127
1947 ev_start (EV_A_ (W)w, 1); 2128 ev_start (EV_A_ (W)w, 1);
1948 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1949 wlist_add (&anfds[fd].head, (WL)w); 2130 wlist_add (&anfds[fd].head, (WL)w);
1950 2131
1951 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2132 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1952 w->events &= ~EV_IOFDSET; 2133 w->events &= ~EV_IOFDSET;
2134
2135 EV_FREQUENT_CHECK;
1953} 2136}
1954 2137
1955void noinline 2138void noinline
1956ev_io_stop (EV_P_ ev_io *w) 2139ev_io_stop (EV_P_ ev_io *w)
1957{ 2140{
1958 clear_pending (EV_A_ (W)w); 2141 clear_pending (EV_A_ (W)w);
1959 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
1960 return; 2143 return;
1961 2144
1962 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2145 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2146
2147 EV_FREQUENT_CHECK;
1963 2148
1964 wlist_del (&anfds[w->fd].head, (WL)w); 2149 wlist_del (&anfds[w->fd].head, (WL)w);
1965 ev_stop (EV_A_ (W)w); 2150 ev_stop (EV_A_ (W)w);
1966 2151
1967 fd_change (EV_A_ w->fd, 1); 2152 fd_change (EV_A_ w->fd, 1);
2153
2154 EV_FREQUENT_CHECK;
1968} 2155}
1969 2156
1970void noinline 2157void noinline
1971ev_timer_start (EV_P_ ev_timer *w) 2158ev_timer_start (EV_P_ ev_timer *w)
1972{ 2159{
1975 2162
1976 ev_at (w) += mn_now; 2163 ev_at (w) += mn_now;
1977 2164
1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2165 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1979 2166
2167 EV_FREQUENT_CHECK;
2168
2169 ++timercnt;
1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2170 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2); 2171 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1982 timers [ev_active (w)] = (WT)w; 2172 ANHE_w (timers [ev_active (w)]) = (WT)w;
2173 ANHE_at_cache (timers [ev_active (w)]);
1983 upheap (timers, ev_active (w)); 2174 upheap (timers, ev_active (w));
1984 2175
2176 EV_FREQUENT_CHECK;
2177
1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2178 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1986} 2179}
1987 2180
1988void noinline 2181void noinline
1989ev_timer_stop (EV_P_ ev_timer *w) 2182ev_timer_stop (EV_P_ ev_timer *w)
1990{ 2183{
1991 clear_pending (EV_A_ (W)w); 2184 clear_pending (EV_A_ (W)w);
1992 if (expect_false (!ev_is_active (w))) 2185 if (expect_false (!ev_is_active (w)))
1993 return; 2186 return;
1994 2187
2188 EV_FREQUENT_CHECK;
2189
1995 { 2190 {
1996 int active = ev_active (w); 2191 int active = ev_active (w);
1997 2192
1998 assert (("internal timer heap corruption", timers [active] == (WT)w)); 2193 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
1999 2194
2195 --timercnt;
2196
2000 if (expect_true (active < timercnt + HEAP0 - 1)) 2197 if (expect_true (active < timercnt + HEAP0))
2001 { 2198 {
2002 timers [active] = timers [timercnt + HEAP0 - 1]; 2199 timers [active] = timers [timercnt + HEAP0];
2003 adjustheap (timers, timercnt, active); 2200 adjustheap (timers, timercnt, active);
2004 } 2201 }
2005
2006 --timercnt;
2007 } 2202 }
2203
2204 EV_FREQUENT_CHECK;
2008 2205
2009 ev_at (w) -= mn_now; 2206 ev_at (w) -= mn_now;
2010 2207
2011 ev_stop (EV_A_ (W)w); 2208 ev_stop (EV_A_ (W)w);
2012} 2209}
2013 2210
2014void noinline 2211void noinline
2015ev_timer_again (EV_P_ ev_timer *w) 2212ev_timer_again (EV_P_ ev_timer *w)
2016{ 2213{
2214 EV_FREQUENT_CHECK;
2215
2017 if (ev_is_active (w)) 2216 if (ev_is_active (w))
2018 { 2217 {
2019 if (w->repeat) 2218 if (w->repeat)
2020 { 2219 {
2021 ev_at (w) = mn_now + w->repeat; 2220 ev_at (w) = mn_now + w->repeat;
2221 ANHE_at_cache (timers [ev_active (w)]);
2022 adjustheap (timers, timercnt, ev_active (w)); 2222 adjustheap (timers, timercnt, ev_active (w));
2023 } 2223 }
2024 else 2224 else
2025 ev_timer_stop (EV_A_ w); 2225 ev_timer_stop (EV_A_ w);
2026 } 2226 }
2027 else if (w->repeat) 2227 else if (w->repeat)
2028 { 2228 {
2029 ev_at (w) = w->repeat; 2229 ev_at (w) = w->repeat;
2030 ev_timer_start (EV_A_ w); 2230 ev_timer_start (EV_A_ w);
2031 } 2231 }
2232
2233 EV_FREQUENT_CHECK;
2032} 2234}
2033 2235
2034#if EV_PERIODIC_ENABLE 2236#if EV_PERIODIC_ENABLE
2035void noinline 2237void noinline
2036ev_periodic_start (EV_P_ ev_periodic *w) 2238ev_periodic_start (EV_P_ ev_periodic *w)
2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2048 } 2250 }
2049 else 2251 else
2050 ev_at (w) = w->offset; 2252 ev_at (w) = w->offset;
2051 2253
2254 EV_FREQUENT_CHECK;
2255
2256 ++periodiccnt;
2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2257 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2); 2258 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2054 periodics [ev_active (w)] = (WT)w; 2259 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2260 ANHE_at_cache (periodics [ev_active (w)]);
2055 upheap (periodics, ev_active (w)); 2261 upheap (periodics, ev_active (w));
2056 2262
2263 EV_FREQUENT_CHECK;
2264
2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/ 2265 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2058} 2266}
2059 2267
2060void noinline 2268void noinline
2061ev_periodic_stop (EV_P_ ev_periodic *w) 2269ev_periodic_stop (EV_P_ ev_periodic *w)
2062{ 2270{
2063 clear_pending (EV_A_ (W)w); 2271 clear_pending (EV_A_ (W)w);
2064 if (expect_false (!ev_is_active (w))) 2272 if (expect_false (!ev_is_active (w)))
2065 return; 2273 return;
2066 2274
2275 EV_FREQUENT_CHECK;
2276
2067 { 2277 {
2068 int active = ev_active (w); 2278 int active = ev_active (w);
2069 2279
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w)); 2280 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2071 2281
2282 --periodiccnt;
2283
2072 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2284 if (expect_true (active < periodiccnt + HEAP0))
2073 { 2285 {
2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2286 periodics [active] = periodics [periodiccnt + HEAP0];
2075 adjustheap (periodics, periodiccnt, active); 2287 adjustheap (periodics, periodiccnt, active);
2076 } 2288 }
2077
2078 --periodiccnt;
2079 } 2289 }
2290
2291 EV_FREQUENT_CHECK;
2080 2292
2081 ev_stop (EV_A_ (W)w); 2293 ev_stop (EV_A_ (W)w);
2082} 2294}
2083 2295
2084void noinline 2296void noinline
2104 return; 2316 return;
2105 2317
2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2318 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2107 2319
2108 evpipe_init (EV_A); 2320 evpipe_init (EV_A);
2321
2322 EV_FREQUENT_CHECK;
2109 2323
2110 { 2324 {
2111#ifndef _WIN32 2325#ifndef _WIN32
2112 sigset_t full, prev; 2326 sigset_t full, prev;
2113 sigfillset (&full); 2327 sigfillset (&full);
2114 sigprocmask (SIG_SETMASK, &full, &prev); 2328 sigprocmask (SIG_SETMASK, &full, &prev);
2115#endif 2329#endif
2116 2330
2117 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2331 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2118 2332
2119#ifndef _WIN32 2333#ifndef _WIN32
2120 sigprocmask (SIG_SETMASK, &prev, 0); 2334 sigprocmask (SIG_SETMASK, &prev, 0);
2121#endif 2335#endif
2122 } 2336 }
2134 sigfillset (&sa.sa_mask); 2348 sigfillset (&sa.sa_mask);
2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2349 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2136 sigaction (w->signum, &sa, 0); 2350 sigaction (w->signum, &sa, 0);
2137#endif 2351#endif
2138 } 2352 }
2353
2354 EV_FREQUENT_CHECK;
2139} 2355}
2140 2356
2141void noinline 2357void noinline
2142ev_signal_stop (EV_P_ ev_signal *w) 2358ev_signal_stop (EV_P_ ev_signal *w)
2143{ 2359{
2144 clear_pending (EV_A_ (W)w); 2360 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2361 if (expect_false (!ev_is_active (w)))
2146 return; 2362 return;
2147 2363
2364 EV_FREQUENT_CHECK;
2365
2148 wlist_del (&signals [w->signum - 1].head, (WL)w); 2366 wlist_del (&signals [w->signum - 1].head, (WL)w);
2149 ev_stop (EV_A_ (W)w); 2367 ev_stop (EV_A_ (W)w);
2150 2368
2151 if (!signals [w->signum - 1].head) 2369 if (!signals [w->signum - 1].head)
2152 signal (w->signum, SIG_DFL); 2370 signal (w->signum, SIG_DFL);
2371
2372 EV_FREQUENT_CHECK;
2153} 2373}
2154 2374
2155void 2375void
2156ev_child_start (EV_P_ ev_child *w) 2376ev_child_start (EV_P_ ev_child *w)
2157{ 2377{
2159 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2379 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2160#endif 2380#endif
2161 if (expect_false (ev_is_active (w))) 2381 if (expect_false (ev_is_active (w)))
2162 return; 2382 return;
2163 2383
2384 EV_FREQUENT_CHECK;
2385
2164 ev_start (EV_A_ (W)w, 1); 2386 ev_start (EV_A_ (W)w, 1);
2165 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2387 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2388
2389 EV_FREQUENT_CHECK;
2166} 2390}
2167 2391
2168void 2392void
2169ev_child_stop (EV_P_ ev_child *w) 2393ev_child_stop (EV_P_ ev_child *w)
2170{ 2394{
2171 clear_pending (EV_A_ (W)w); 2395 clear_pending (EV_A_ (W)w);
2172 if (expect_false (!ev_is_active (w))) 2396 if (expect_false (!ev_is_active (w)))
2173 return; 2397 return;
2174 2398
2399 EV_FREQUENT_CHECK;
2400
2175 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2401 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2176 ev_stop (EV_A_ (W)w); 2402 ev_stop (EV_A_ (W)w);
2403
2404 EV_FREQUENT_CHECK;
2177} 2405}
2178 2406
2179#if EV_STAT_ENABLE 2407#if EV_STAT_ENABLE
2180 2408
2181# ifdef _WIN32 2409# ifdef _WIN32
2250 2478
2251static void noinline 2479static void noinline
2252infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2480infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2253{ 2481{
2254 if (slot < 0) 2482 if (slot < 0)
2255 /* overflow, need to check for all hahs slots */ 2483 /* overflow, need to check for all hash slots */
2256 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2484 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2257 infy_wd (EV_A_ slot, wd, ev); 2485 infy_wd (EV_A_ slot, wd, ev);
2258 else 2486 else
2259 { 2487 {
2260 WL w_; 2488 WL w_;
2294infy_init (EV_P) 2522infy_init (EV_P)
2295{ 2523{
2296 if (fs_fd != -2) 2524 if (fs_fd != -2)
2297 return; 2525 return;
2298 2526
2527 /* kernels < 2.6.25 are borked
2528 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2529 */
2530 {
2531 struct utsname buf;
2532 int major, minor, micro;
2533
2534 fs_fd = -1;
2535
2536 if (uname (&buf))
2537 return;
2538
2539 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2540 return;
2541
2542 if (major < 2
2543 || (major == 2 && minor < 6)
2544 || (major == 2 && minor == 6 && micro < 25))
2545 return;
2546 }
2547
2299 fs_fd = inotify_init (); 2548 fs_fd = inotify_init ();
2300 2549
2301 if (fs_fd >= 0) 2550 if (fs_fd >= 0)
2302 { 2551 {
2303 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2552 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2332 if (fs_fd >= 0) 2581 if (fs_fd >= 0)
2333 infy_add (EV_A_ w); /* re-add, no matter what */ 2582 infy_add (EV_A_ w); /* re-add, no matter what */
2334 else 2583 else
2335 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
2336 } 2585 }
2337
2338 } 2586 }
2339} 2587}
2340 2588
2589#endif
2590
2591#ifdef _WIN32
2592# define EV_LSTAT(p,b) _stati64 (p, b)
2593#else
2594# define EV_LSTAT(p,b) lstat (p, b)
2341#endif 2595#endif
2342 2596
2343void 2597void
2344ev_stat_stat (EV_P_ ev_stat *w) 2598ev_stat_stat (EV_P_ ev_stat *w)
2345{ 2599{
2372 || w->prev.st_atime != w->attr.st_atime 2626 || w->prev.st_atime != w->attr.st_atime
2373 || w->prev.st_mtime != w->attr.st_mtime 2627 || w->prev.st_mtime != w->attr.st_mtime
2374 || w->prev.st_ctime != w->attr.st_ctime 2628 || w->prev.st_ctime != w->attr.st_ctime
2375 ) { 2629 ) {
2376 #if EV_USE_INOTIFY 2630 #if EV_USE_INOTIFY
2631 if (fs_fd >= 0)
2632 {
2377 infy_del (EV_A_ w); 2633 infy_del (EV_A_ w);
2378 infy_add (EV_A_ w); 2634 infy_add (EV_A_ w);
2379 ev_stat_stat (EV_A_ w); /* avoid race... */ 2635 ev_stat_stat (EV_A_ w); /* avoid race... */
2636 }
2380 #endif 2637 #endif
2381 2638
2382 ev_feed_event (EV_A_ w, EV_STAT); 2639 ev_feed_event (EV_A_ w, EV_STAT);
2383 } 2640 }
2384} 2641}
2409 else 2666 else
2410#endif 2667#endif
2411 ev_timer_start (EV_A_ &w->timer); 2668 ev_timer_start (EV_A_ &w->timer);
2412 2669
2413 ev_start (EV_A_ (W)w, 1); 2670 ev_start (EV_A_ (W)w, 1);
2671
2672 EV_FREQUENT_CHECK;
2414} 2673}
2415 2674
2416void 2675void
2417ev_stat_stop (EV_P_ ev_stat *w) 2676ev_stat_stop (EV_P_ ev_stat *w)
2418{ 2677{
2419 clear_pending (EV_A_ (W)w); 2678 clear_pending (EV_A_ (W)w);
2420 if (expect_false (!ev_is_active (w))) 2679 if (expect_false (!ev_is_active (w)))
2421 return; 2680 return;
2422 2681
2682 EV_FREQUENT_CHECK;
2683
2423#if EV_USE_INOTIFY 2684#if EV_USE_INOTIFY
2424 infy_del (EV_A_ w); 2685 infy_del (EV_A_ w);
2425#endif 2686#endif
2426 ev_timer_stop (EV_A_ &w->timer); 2687 ev_timer_stop (EV_A_ &w->timer);
2427 2688
2428 ev_stop (EV_A_ (W)w); 2689 ev_stop (EV_A_ (W)w);
2690
2691 EV_FREQUENT_CHECK;
2429} 2692}
2430#endif 2693#endif
2431 2694
2432#if EV_IDLE_ENABLE 2695#if EV_IDLE_ENABLE
2433void 2696void
2435{ 2698{
2436 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2437 return; 2700 return;
2438 2701
2439 pri_adjust (EV_A_ (W)w); 2702 pri_adjust (EV_A_ (W)w);
2703
2704 EV_FREQUENT_CHECK;
2440 2705
2441 { 2706 {
2442 int active = ++idlecnt [ABSPRI (w)]; 2707 int active = ++idlecnt [ABSPRI (w)];
2443 2708
2444 ++idleall; 2709 ++idleall;
2445 ev_start (EV_A_ (W)w, active); 2710 ev_start (EV_A_ (W)w, active);
2446 2711
2447 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2712 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2448 idles [ABSPRI (w)][active - 1] = w; 2713 idles [ABSPRI (w)][active - 1] = w;
2449 } 2714 }
2715
2716 EV_FREQUENT_CHECK;
2450} 2717}
2451 2718
2452void 2719void
2453ev_idle_stop (EV_P_ ev_idle *w) 2720ev_idle_stop (EV_P_ ev_idle *w)
2454{ 2721{
2455 clear_pending (EV_A_ (W)w); 2722 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2723 if (expect_false (!ev_is_active (w)))
2457 return; 2724 return;
2458 2725
2726 EV_FREQUENT_CHECK;
2727
2459 { 2728 {
2460 int active = ev_active (w); 2729 int active = ev_active (w);
2461 2730
2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2731 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2463 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2732 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2464 2733
2465 ev_stop (EV_A_ (W)w); 2734 ev_stop (EV_A_ (W)w);
2466 --idleall; 2735 --idleall;
2467 } 2736 }
2737
2738 EV_FREQUENT_CHECK;
2468} 2739}
2469#endif 2740#endif
2470 2741
2471void 2742void
2472ev_prepare_start (EV_P_ ev_prepare *w) 2743ev_prepare_start (EV_P_ ev_prepare *w)
2473{ 2744{
2474 if (expect_false (ev_is_active (w))) 2745 if (expect_false (ev_is_active (w)))
2475 return; 2746 return;
2747
2748 EV_FREQUENT_CHECK;
2476 2749
2477 ev_start (EV_A_ (W)w, ++preparecnt); 2750 ev_start (EV_A_ (W)w, ++preparecnt);
2478 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2751 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2479 prepares [preparecnt - 1] = w; 2752 prepares [preparecnt - 1] = w;
2753
2754 EV_FREQUENT_CHECK;
2480} 2755}
2481 2756
2482void 2757void
2483ev_prepare_stop (EV_P_ ev_prepare *w) 2758ev_prepare_stop (EV_P_ ev_prepare *w)
2484{ 2759{
2485 clear_pending (EV_A_ (W)w); 2760 clear_pending (EV_A_ (W)w);
2486 if (expect_false (!ev_is_active (w))) 2761 if (expect_false (!ev_is_active (w)))
2487 return; 2762 return;
2488 2763
2764 EV_FREQUENT_CHECK;
2765
2489 { 2766 {
2490 int active = ev_active (w); 2767 int active = ev_active (w);
2491 2768
2492 prepares [active - 1] = prepares [--preparecnt]; 2769 prepares [active - 1] = prepares [--preparecnt];
2493 ev_active (prepares [active - 1]) = active; 2770 ev_active (prepares [active - 1]) = active;
2494 } 2771 }
2495 2772
2496 ev_stop (EV_A_ (W)w); 2773 ev_stop (EV_A_ (W)w);
2774
2775 EV_FREQUENT_CHECK;
2497} 2776}
2498 2777
2499void 2778void
2500ev_check_start (EV_P_ ev_check *w) 2779ev_check_start (EV_P_ ev_check *w)
2501{ 2780{
2502 if (expect_false (ev_is_active (w))) 2781 if (expect_false (ev_is_active (w)))
2503 return; 2782 return;
2783
2784 EV_FREQUENT_CHECK;
2504 2785
2505 ev_start (EV_A_ (W)w, ++checkcnt); 2786 ev_start (EV_A_ (W)w, ++checkcnt);
2506 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2787 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2507 checks [checkcnt - 1] = w; 2788 checks [checkcnt - 1] = w;
2789
2790 EV_FREQUENT_CHECK;
2508} 2791}
2509 2792
2510void 2793void
2511ev_check_stop (EV_P_ ev_check *w) 2794ev_check_stop (EV_P_ ev_check *w)
2512{ 2795{
2513 clear_pending (EV_A_ (W)w); 2796 clear_pending (EV_A_ (W)w);
2514 if (expect_false (!ev_is_active (w))) 2797 if (expect_false (!ev_is_active (w)))
2515 return; 2798 return;
2516 2799
2800 EV_FREQUENT_CHECK;
2801
2517 { 2802 {
2518 int active = ev_active (w); 2803 int active = ev_active (w);
2519 2804
2520 checks [active - 1] = checks [--checkcnt]; 2805 checks [active - 1] = checks [--checkcnt];
2521 ev_active (checks [active - 1]) = active; 2806 ev_active (checks [active - 1]) = active;
2522 } 2807 }
2523 2808
2524 ev_stop (EV_A_ (W)w); 2809 ev_stop (EV_A_ (W)w);
2810
2811 EV_FREQUENT_CHECK;
2525} 2812}
2526 2813
2527#if EV_EMBED_ENABLE 2814#if EV_EMBED_ENABLE
2528void noinline 2815void noinline
2529ev_embed_sweep (EV_P_ ev_embed *w) 2816ev_embed_sweep (EV_P_ ev_embed *w)
2556 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2843 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2557 } 2844 }
2558 } 2845 }
2559} 2846}
2560 2847
2848static void
2849embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2850{
2851 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2852
2853 {
2854 struct ev_loop *loop = w->other;
2855
2856 ev_loop_fork (EV_A);
2857 }
2858}
2859
2561#if 0 2860#if 0
2562static void 2861static void
2563embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2862embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2564{ 2863{
2565 ev_idle_stop (EV_A_ idle); 2864 ev_idle_stop (EV_A_ idle);
2576 struct ev_loop *loop = w->other; 2875 struct ev_loop *loop = w->other;
2577 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2876 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2578 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2877 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2579 } 2878 }
2580 2879
2880 EV_FREQUENT_CHECK;
2881
2581 ev_set_priority (&w->io, ev_priority (w)); 2882 ev_set_priority (&w->io, ev_priority (w));
2582 ev_io_start (EV_A_ &w->io); 2883 ev_io_start (EV_A_ &w->io);
2583 2884
2584 ev_prepare_init (&w->prepare, embed_prepare_cb); 2885 ev_prepare_init (&w->prepare, embed_prepare_cb);
2585 ev_set_priority (&w->prepare, EV_MINPRI); 2886 ev_set_priority (&w->prepare, EV_MINPRI);
2586 ev_prepare_start (EV_A_ &w->prepare); 2887 ev_prepare_start (EV_A_ &w->prepare);
2587 2888
2889 ev_fork_init (&w->fork, embed_fork_cb);
2890 ev_fork_start (EV_A_ &w->fork);
2891
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2892 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2589 2893
2590 ev_start (EV_A_ (W)w, 1); 2894 ev_start (EV_A_ (W)w, 1);
2895
2896 EV_FREQUENT_CHECK;
2591} 2897}
2592 2898
2593void 2899void
2594ev_embed_stop (EV_P_ ev_embed *w) 2900ev_embed_stop (EV_P_ ev_embed *w)
2595{ 2901{
2596 clear_pending (EV_A_ (W)w); 2902 clear_pending (EV_A_ (W)w);
2597 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2598 return; 2904 return;
2599 2905
2906 EV_FREQUENT_CHECK;
2907
2600 ev_io_stop (EV_A_ &w->io); 2908 ev_io_stop (EV_A_ &w->io);
2601 ev_prepare_stop (EV_A_ &w->prepare); 2909 ev_prepare_stop (EV_A_ &w->prepare);
2910 ev_fork_stop (EV_A_ &w->fork);
2602 2911
2603 ev_stop (EV_A_ (W)w); 2912 EV_FREQUENT_CHECK;
2604} 2913}
2605#endif 2914#endif
2606 2915
2607#if EV_FORK_ENABLE 2916#if EV_FORK_ENABLE
2608void 2917void
2609ev_fork_start (EV_P_ ev_fork *w) 2918ev_fork_start (EV_P_ ev_fork *w)
2610{ 2919{
2611 if (expect_false (ev_is_active (w))) 2920 if (expect_false (ev_is_active (w)))
2612 return; 2921 return;
2922
2923 EV_FREQUENT_CHECK;
2613 2924
2614 ev_start (EV_A_ (W)w, ++forkcnt); 2925 ev_start (EV_A_ (W)w, ++forkcnt);
2615 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2926 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2616 forks [forkcnt - 1] = w; 2927 forks [forkcnt - 1] = w;
2928
2929 EV_FREQUENT_CHECK;
2617} 2930}
2618 2931
2619void 2932void
2620ev_fork_stop (EV_P_ ev_fork *w) 2933ev_fork_stop (EV_P_ ev_fork *w)
2621{ 2934{
2622 clear_pending (EV_A_ (W)w); 2935 clear_pending (EV_A_ (W)w);
2623 if (expect_false (!ev_is_active (w))) 2936 if (expect_false (!ev_is_active (w)))
2624 return; 2937 return;
2625 2938
2939 EV_FREQUENT_CHECK;
2940
2626 { 2941 {
2627 int active = ev_active (w); 2942 int active = ev_active (w);
2628 2943
2629 forks [active - 1] = forks [--forkcnt]; 2944 forks [active - 1] = forks [--forkcnt];
2630 ev_active (forks [active - 1]) = active; 2945 ev_active (forks [active - 1]) = active;
2631 } 2946 }
2632 2947
2633 ev_stop (EV_A_ (W)w); 2948 ev_stop (EV_A_ (W)w);
2949
2950 EV_FREQUENT_CHECK;
2634} 2951}
2635#endif 2952#endif
2636 2953
2637#if EV_ASYNC_ENABLE 2954#if EV_ASYNC_ENABLE
2638void 2955void
2640{ 2957{
2641 if (expect_false (ev_is_active (w))) 2958 if (expect_false (ev_is_active (w)))
2642 return; 2959 return;
2643 2960
2644 evpipe_init (EV_A); 2961 evpipe_init (EV_A);
2962
2963 EV_FREQUENT_CHECK;
2645 2964
2646 ev_start (EV_A_ (W)w, ++asynccnt); 2965 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2966 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w; 2967 asyncs [asynccnt - 1] = w;
2968
2969 EV_FREQUENT_CHECK;
2649} 2970}
2650 2971
2651void 2972void
2652ev_async_stop (EV_P_ ev_async *w) 2973ev_async_stop (EV_P_ ev_async *w)
2653{ 2974{
2654 clear_pending (EV_A_ (W)w); 2975 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w))) 2976 if (expect_false (!ev_is_active (w)))
2656 return; 2977 return;
2657 2978
2979 EV_FREQUENT_CHECK;
2980
2658 { 2981 {
2659 int active = ev_active (w); 2982 int active = ev_active (w);
2660 2983
2661 asyncs [active - 1] = asyncs [--asynccnt]; 2984 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active; 2985 ev_active (asyncs [active - 1]) = active;
2663 } 2986 }
2664 2987
2665 ev_stop (EV_A_ (W)w); 2988 ev_stop (EV_A_ (W)w);
2989
2990 EV_FREQUENT_CHECK;
2666} 2991}
2667 2992
2668void 2993void
2669ev_async_send (EV_P_ ev_async *w) 2994ev_async_send (EV_P_ ev_async *w)
2670{ 2995{
2687once_cb (EV_P_ struct ev_once *once, int revents) 3012once_cb (EV_P_ struct ev_once *once, int revents)
2688{ 3013{
2689 void (*cb)(int revents, void *arg) = once->cb; 3014 void (*cb)(int revents, void *arg) = once->cb;
2690 void *arg = once->arg; 3015 void *arg = once->arg;
2691 3016
2692 ev_io_stop (EV_A_ &once->io); 3017 ev_io_stop (EV_A_ &once->io);
2693 ev_timer_stop (EV_A_ &once->to); 3018 ev_timer_stop (EV_A_ &once->to);
2694 ev_free (once); 3019 ev_free (once);
2695 3020
2696 cb (revents, arg); 3021 cb (revents, arg);
2697} 3022}
2698 3023
2699static void 3024static void
2700once_cb_io (EV_P_ ev_io *w, int revents) 3025once_cb_io (EV_P_ ev_io *w, int revents)
2701{ 3026{
2702 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3027 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3028
3029 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2703} 3030}
2704 3031
2705static void 3032static void
2706once_cb_to (EV_P_ ev_timer *w, int revents) 3033once_cb_to (EV_P_ ev_timer *w, int revents)
2707{ 3034{
2708 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3035 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3036
3037 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2709} 3038}
2710 3039
2711void 3040void
2712ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3041ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2713{ 3042{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines