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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines