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

Comparing libev/ev.c (file contents):
Revision 1.241 by root, Fri May 9 13:57:00 2008 UTC vs.
Revision 1.272 by root, Mon Nov 3 12:17:40 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
432#endif 476#endif
433 477
434/* Heap Entry */ 478/* Heap Entry */
435#if EV_HEAP_CACHE_AT 479#if EV_HEAP_CACHE_AT
436 typedef struct { 480 typedef struct {
481 ev_tstamp at;
437 WT w; 482 WT w;
438 ev_tstamp at;
439 } ANHE; 483 } ANHE;
440 484
441 #define ANHE_w(he) (he) /* access watcher, read-write */ 485 #define ANHE_w(he) (he).w /* access watcher, read-write */
442 #define ANHE_at(he) (he)->at /* acces cahced at, read-only */ 486 #define ANHE_at(he) (he).at /* access cached at, read-only */
443 #define ANHE_at_set(he) (he)->at = (he)->w->at /* update at from watcher */ 487 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
444#else 488#else
445 typedef WT ANHE; 489 typedef WT ANHE;
446 490
447 #define ANHE_w(he) (he) 491 #define ANHE_w(he) (he)
448 #define ANHE_at(he) (he)->at 492 #define ANHE_at(he) (he)->at
449 #define ANHE_at_set(he) 493 #define ANHE_at_cache(he)
450#endif 494#endif
451 495
452#if EV_MULTIPLICITY 496#if EV_MULTIPLICITY
453 497
454 struct ev_loop 498 struct ev_loop
532 struct timeval tv; 576 struct timeval tv;
533 577
534 tv.tv_sec = (time_t)delay; 578 tv.tv_sec = (time_t)delay;
535 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
536 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 */
537 select (0, 0, 0, 0, &tv); 584 select (0, 0, 0, 0, &tv);
538#endif 585#endif
539 } 586 }
540} 587}
541 588
568array_realloc (int elem, void *base, int *cur, int cnt) 615array_realloc (int elem, void *base, int *cur, int cnt)
569{ 616{
570 *cur = array_nextsize (elem, *cur, cnt); 617 *cur = array_nextsize (elem, *cur, cnt);
571 return ev_realloc (base, elem * *cur); 618 return ev_realloc (base, elem * *cur);
572} 619}
620
621#define array_init_zero(base,count) \
622 memset ((void *)(base), 0, sizeof (*(base)) * (count))
573 623
574#define array_needsize(type,base,cur,cnt,init) \ 624#define array_needsize(type,base,cur,cnt,init) \
575 if (expect_false ((cnt) > (cur))) \ 625 if (expect_false ((cnt) > (cur))) \
576 { \ 626 { \
577 int ocur_ = (cur); \ 627 int ocur_ = (cur); \
621 ev_feed_event (EV_A_ events [i], type); 671 ev_feed_event (EV_A_ events [i], type);
622} 672}
623 673
624/*****************************************************************************/ 674/*****************************************************************************/
625 675
626void inline_size
627anfds_init (ANFD *base, int count)
628{
629 while (count--)
630 {
631 base->head = 0;
632 base->events = EV_NONE;
633 base->reify = 0;
634
635 ++base;
636 }
637}
638
639void inline_speed 676void inline_speed
640fd_event (EV_P_ int fd, int revents) 677fd_event (EV_P_ int fd, int revents)
641{ 678{
642 ANFD *anfd = anfds + fd; 679 ANFD *anfd = anfds + fd;
643 ev_io *w; 680 ev_io *w;
675 events |= (unsigned char)w->events; 712 events |= (unsigned char)w->events;
676 713
677#if EV_SELECT_IS_WINSOCKET 714#if EV_SELECT_IS_WINSOCKET
678 if (events) 715 if (events)
679 { 716 {
680 unsigned long argp; 717 unsigned long arg;
681 #ifdef EV_FD_TO_WIN32_HANDLE 718 #ifdef EV_FD_TO_WIN32_HANDLE
682 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
683 #else 720 #else
684 anfd->handle = _get_osfhandle (fd); 721 anfd->handle = _get_osfhandle (fd);
685 #endif 722 #endif
686 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));
687 } 724 }
688#endif 725#endif
689 726
690 { 727 {
691 unsigned char o_events = anfd->events; 728 unsigned char o_events = anfd->events;
744{ 781{
745 int fd; 782 int fd;
746 783
747 for (fd = 0; fd < anfdmax; ++fd) 784 for (fd = 0; fd < anfdmax; ++fd)
748 if (anfds [fd].events) 785 if (anfds [fd].events)
749 if (!fd_valid (fd) == -1 && errno == EBADF) 786 if (!fd_valid (fd) && errno == EBADF)
750 fd_kill (EV_A_ fd); 787 fd_kill (EV_A_ fd);
751} 788}
752 789
753/* 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 */
754static void noinline 791static void noinline
772 809
773 for (fd = 0; fd < anfdmax; ++fd) 810 for (fd = 0; fd < anfdmax; ++fd)
774 if (anfds [fd].events) 811 if (anfds [fd].events)
775 { 812 {
776 anfds [fd].events = 0; 813 anfds [fd].events = 0;
814 anfds [fd].emask = 0;
777 fd_change (EV_A_ fd, EV_IOFDSET | 1); 815 fd_change (EV_A_ fd, EV_IOFDSET | 1);
778 } 816 }
779} 817}
780 818
781/*****************************************************************************/ 819/*****************************************************************************/
790 * at the moment we allow libev the luxury of two heaps, 828 * at the moment we allow libev the luxury of two heaps,
791 * 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
792 * which is more cache-efficient. 830 * which is more cache-efficient.
793 * the difference is about 5% with 50000+ watchers. 831 * the difference is about 5% with 50000+ watchers.
794 */ 832 */
795#define EV_USE_4HEAP !EV_MINIMAL
796#if EV_USE_4HEAP 833#if EV_USE_4HEAP
797 834
798#define DHEAP 4 835#define DHEAP 4
799#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 836#define HEAP0 (DHEAP - 1) /* index of first element in heap */
800 837#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
801/* towards the root */ 838#define UPHEAP_DONE(p,k) ((p) == (k))
802void inline_speed
803upheap (ANHE *heap, int k)
804{
805 ANHE he = heap [k];
806
807 for (;;)
808 {
809 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
810
811 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
812 break;
813
814 heap [k] = heap [p];
815 ev_active (ANHE_w (heap [k])) = k;
816 k = p;
817 }
818
819 ev_active (ANHE_w (he)) = k;
820 heap [k] = he;
821}
822 839
823/* away from the root */ 840/* away from the root */
824void inline_speed 841void inline_speed
825downheap (ANHE *heap, int N, int k) 842downheap (ANHE *heap, int N, int k)
826{ 843{
829 846
830 for (;;) 847 for (;;)
831 { 848 {
832 ev_tstamp minat; 849 ev_tstamp minat;
833 ANHE *minpos; 850 ANHE *minpos;
834 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 851 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
835 852
836 // find minimum child 853 /* find minimum child */
837 if (expect_true (pos + DHEAP - 1 < E)) 854 if (expect_true (pos + DHEAP - 1 < E))
838 { 855 {
839 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 856 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
840 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 857 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
841 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 858 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
842 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 859 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
843 } 860 }
844 else if (pos < E) 861 else if (pos < E)
845 { 862 {
846 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 863 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 864 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
852 break; 869 break;
853 870
854 if (ANHE_at (he) <= minat) 871 if (ANHE_at (he) <= minat)
855 break; 872 break;
856 873
874 heap [k] = *minpos;
857 ev_active (ANHE_w (*minpos)) = k; 875 ev_active (ANHE_w (*minpos)) = k;
858 heap [k] = *minpos;
859 876
860 k = minpos - heap; 877 k = minpos - heap;
861 } 878 }
862 879
880 heap [k] = he;
863 ev_active (ANHE_w (he)) = k; 881 ev_active (ANHE_w (he)) = k;
864 heap [k] = he;
865} 882}
866 883
867#else // 4HEAP 884#else /* 4HEAP */
868 885
869#define HEAP0 1 886#define HEAP0 1
870 887#define HPARENT(k) ((k) >> 1)
871/* towards the root */ 888#define UPHEAP_DONE(p,k) (!(p))
872void inline_speed
873upheap (ANHE *heap, int k)
874{
875 ANHE he = heap [k];
876
877 for (;;)
878 {
879 int p = k >> 1;
880
881 /* maybe we could use a dummy element at heap [0]? */
882 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
883 break;
884
885 heap [k] = heap [p];
886 ev_active (ANHE_w (heap [k])) = k;
887 k = p;
888 }
889
890 heap [k] = w;
891 ev_active (ANHE_w (heap [k])) = k;
892}
893 889
894/* away from the root */ 890/* away from the root */
895void inline_speed 891void inline_speed
896downheap (ANHE *heap, int N, int k) 892downheap (ANHE *heap, int N, int k)
897{ 893{
899 895
900 for (;;) 896 for (;;)
901 { 897 {
902 int c = k << 1; 898 int c = k << 1;
903 899
904 if (c > N) 900 if (c > N + HEAP0 - 1)
905 break; 901 break;
906 902
907 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 903 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
908 ? 1 : 0; 904 ? 1 : 0;
909 905
910 if (w->at <= ANHE_at (heap [c])) 906 if (ANHE_at (he) <= ANHE_at (heap [c]))
911 break; 907 break;
912 908
913 heap [k] = heap [c]; 909 heap [k] = heap [c];
914 ev_active (ANHE_w (heap [k])) = k; 910 ev_active (ANHE_w (heap [k])) = k;
915 911
919 heap [k] = he; 915 heap [k] = he;
920 ev_active (ANHE_w (he)) = k; 916 ev_active (ANHE_w (he)) = k;
921} 917}
922#endif 918#endif
923 919
920/* towards the root */
921void inline_speed
922upheap (ANHE *heap, int k)
923{
924 ANHE he = heap [k];
925
926 for (;;)
927 {
928 int p = HPARENT (k);
929
930 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
931 break;
932
933 heap [k] = heap [p];
934 ev_active (ANHE_w (heap [k])) = k;
935 k = p;
936 }
937
938 heap [k] = he;
939 ev_active (ANHE_w (he)) = k;
940}
941
924void inline_size 942void inline_size
925adjustheap (ANHE *heap, int N, int k) 943adjustheap (ANHE *heap, int N, int k)
926{ 944{
945 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
927 upheap (heap, k); 946 upheap (heap, k);
947 else
928 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);
929} 961}
930 962
931/*****************************************************************************/ 963/*****************************************************************************/
932 964
933typedef struct 965typedef struct
939static ANSIG *signals; 971static ANSIG *signals;
940static int signalmax; 972static int signalmax;
941 973
942static EV_ATOMIC_T gotsig; 974static EV_ATOMIC_T gotsig;
943 975
944void inline_size
945signals_init (ANSIG *base, int count)
946{
947 while (count--)
948 {
949 base->head = 0;
950 base->gotsig = 0;
951
952 ++base;
953 }
954}
955
956/*****************************************************************************/ 976/*****************************************************************************/
957 977
958void inline_speed 978void inline_speed
959fd_intern (int fd) 979fd_intern (int fd)
960{ 980{
961#ifdef _WIN32 981#ifdef _WIN32
962 int arg = 1; 982 unsigned long arg = 1;
963 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
964#else 984#else
965 fcntl (fd, F_SETFD, FD_CLOEXEC); 985 fcntl (fd, F_SETFD, FD_CLOEXEC);
966 fcntl (fd, F_SETFL, O_NONBLOCK); 986 fcntl (fd, F_SETFL, O_NONBLOCK);
967#endif 987#endif
981 } 1001 }
982 else 1002 else
983#endif 1003#endif
984 { 1004 {
985 while (pipe (evpipe)) 1005 while (pipe (evpipe))
986 syserr ("(libev) error creating signal/async pipe"); 1006 ev_syserr ("(libev) error creating signal/async pipe");
987 1007
988 fd_intern (evpipe [0]); 1008 fd_intern (evpipe [0]);
989 fd_intern (evpipe [1]); 1009 fd_intern (evpipe [1]);
990 ev_io_set (&pipeev, evpipe [0], EV_READ); 1010 ev_io_set (&pipeev, evpipe [0], EV_READ);
991 } 1011 }
1451 1471
1452 postfork = 0; 1472 postfork = 0;
1453} 1473}
1454 1474
1455#if EV_MULTIPLICITY 1475#if EV_MULTIPLICITY
1476
1456struct ev_loop * 1477struct ev_loop *
1457ev_loop_new (unsigned int flags) 1478ev_loop_new (unsigned int flags)
1458{ 1479{
1459 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));
1460 1481
1478void 1499void
1479ev_loop_fork (EV_P) 1500ev_loop_fork (EV_P)
1480{ 1501{
1481 postfork = 1; /* must be in line with ev_default_fork */ 1502 postfork = 1; /* must be in line with ev_default_fork */
1482} 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)
1483#endif 1600# endif
1601#endif
1602}
1603
1604#endif /* multiplicity */
1484 1605
1485#if EV_MULTIPLICITY 1606#if EV_MULTIPLICITY
1486struct ev_loop * 1607struct ev_loop *
1487ev_default_loop_init (unsigned int flags) 1608ev_default_loop_init (unsigned int flags)
1488#else 1609#else
1521{ 1642{
1522#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1523 struct ev_loop *loop = ev_default_loop_ptr; 1644 struct ev_loop *loop = ev_default_loop_ptr;
1524#endif 1645#endif
1525 1646
1647 ev_default_loop_ptr = 0;
1648
1526#ifndef _WIN32 1649#ifndef _WIN32
1527 ev_ref (EV_A); /* child watcher */ 1650 ev_ref (EV_A); /* child watcher */
1528 ev_signal_stop (EV_A_ &childev); 1651 ev_signal_stop (EV_A_ &childev);
1529#endif 1652#endif
1530 1653
1536{ 1659{
1537#if EV_MULTIPLICITY 1660#if EV_MULTIPLICITY
1538 struct ev_loop *loop = ev_default_loop_ptr; 1661 struct ev_loop *loop = ev_default_loop_ptr;
1539#endif 1662#endif
1540 1663
1541 if (backend)
1542 postfork = 1; /* must be in line with ev_loop_fork */ 1664 postfork = 1; /* must be in line with ev_loop_fork */
1543} 1665}
1544 1666
1545/*****************************************************************************/ 1667/*****************************************************************************/
1546 1668
1547void 1669void
1564 { 1686 {
1565 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1687 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1566 1688
1567 p->w->pending = 0; 1689 p->w->pending = 0;
1568 EV_CB_INVOKE (p->w, p->events); 1690 EV_CB_INVOKE (p->w, p->events);
1691 EV_FREQUENT_CHECK;
1569 } 1692 }
1570 } 1693 }
1571} 1694}
1572 1695
1573#if EV_IDLE_ENABLE 1696#if EV_IDLE_ENABLE
1594#endif 1717#endif
1595 1718
1596void inline_size 1719void inline_size
1597timers_reify (EV_P) 1720timers_reify (EV_P)
1598{ 1721{
1722 EV_FREQUENT_CHECK;
1723
1599 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1724 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1600 { 1725 {
1601 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1726 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1602 1727
1603 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1728 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1604 1729
1605 /* first reschedule or stop timer */ 1730 /* first reschedule or stop timer */
1606 if (w->repeat) 1731 if (w->repeat)
1607 { 1732 {
1608 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1609
1610 ev_at (w) += w->repeat; 1733 ev_at (w) += w->repeat;
1611 if (ev_at (w) < mn_now) 1734 if (ev_at (w) < mn_now)
1612 ev_at (w) = mn_now; 1735 ev_at (w) = mn_now;
1613 1736
1737 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1738
1739 ANHE_at_cache (timers [HEAP0]);
1614 downheap (timers, timercnt, HEAP0); 1740 downheap (timers, timercnt, HEAP0);
1615 } 1741 }
1616 else 1742 else
1617 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1743 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1618 1744
1745 EV_FREQUENT_CHECK;
1619 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1746 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1620 } 1747 }
1621} 1748}
1622 1749
1623#if EV_PERIODIC_ENABLE 1750#if EV_PERIODIC_ENABLE
1624void inline_size 1751void inline_size
1625periodics_reify (EV_P) 1752periodics_reify (EV_P)
1626{ 1753{
1754 EV_FREQUENT_CHECK;
1755
1627 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1756 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1628 { 1757 {
1629 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1758 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1630 1759
1631 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1760 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1632 1761
1633 /* first reschedule or stop timer */ 1762 /* first reschedule or stop timer */
1634 if (w->reschedule_cb) 1763 if (w->reschedule_cb)
1635 { 1764 {
1636 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1765 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1766
1637 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]);
1638 downheap (periodics, periodiccnt, 1); 1770 downheap (periodics, periodiccnt, HEAP0);
1639 } 1771 }
1640 else if (w->interval) 1772 else if (w->interval)
1641 { 1773 {
1642 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 */
1643 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval; 1777 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1644 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]);
1645 downheap (periodics, periodiccnt, HEAP0); 1789 downheap (periodics, periodiccnt, HEAP0);
1646 } 1790 }
1647 else 1791 else
1648 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1792 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1649 1793
1794 EV_FREQUENT_CHECK;
1650 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1795 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1651 } 1796 }
1652} 1797}
1653 1798
1654static void noinline 1799static void noinline
1663 1808
1664 if (w->reschedule_cb) 1809 if (w->reschedule_cb)
1665 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1810 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1811 else if (w->interval)
1667 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;
1668 }
1669 1813
1670 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */ 1814 ANHE_at_cache (periodics [i]);
1671 for (i = periodiccnt >> 1; --i; ) 1815 }
1816
1672 downheap (periodics, periodiccnt, i + HEAP0); 1817 reheap (periodics, periodiccnt);
1673} 1818}
1674#endif 1819#endif
1675 1820
1676void inline_speed 1821void inline_speed
1677time_update (EV_P_ ev_tstamp max_block) 1822time_update (EV_P_ ev_tstamp max_block)
1735 /* 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 */
1736 for (i = 0; i < timercnt; ++i) 1881 for (i = 0; i < timercnt; ++i)
1737 { 1882 {
1738 ANHE *he = timers + i + HEAP0; 1883 ANHE *he = timers + i + HEAP0;
1739 ANHE_w (*he)->at += ev_rt_now - mn_now; 1884 ANHE_w (*he)->at += ev_rt_now - mn_now;
1740 ANHE_at_set (*he); 1885 ANHE_at_cache (*he);
1741 } 1886 }
1742 } 1887 }
1743 1888
1744 mn_now = ev_rt_now; 1889 mn_now = ev_rt_now;
1745 } 1890 }
1755ev_unref (EV_P) 1900ev_unref (EV_P)
1756{ 1901{
1757 --activecnt; 1902 --activecnt;
1758} 1903}
1759 1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1760static int loop_done; 1911static int loop_done;
1761 1912
1762void 1913void
1763ev_loop (EV_P_ int flags) 1914ev_loop (EV_P_ int flags)
1764{ 1915{
1766 1917
1767 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 */
1768 1919
1769 do 1920 do
1770 { 1921 {
1922#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A);
1924#endif
1925
1771#ifndef _WIN32 1926#ifndef _WIN32
1772 if (expect_false (curpid)) /* penalise the forking check even more */ 1927 if (expect_false (curpid)) /* penalise the forking check even more */
1773 if (expect_false (getpid () != curpid)) 1928 if (expect_false (getpid () != curpid))
1774 { 1929 {
1775 curpid = getpid (); 1930 curpid = getpid ();
1969 2124
1970 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
1971 return; 2126 return;
1972 2127
1973 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;
1974 2132
1975 ev_start (EV_A_ (W)w, 1); 2133 ev_start (EV_A_ (W)w, 1);
1976 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1977 wlist_add (&anfds[fd].head, (WL)w); 2135 wlist_add (&anfds[fd].head, (WL)w);
1978 2136
1979 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1980 w->events &= ~EV_IOFDSET; 2138 w->events &= ~EV_IOFDSET;
2139
2140 EV_FREQUENT_CHECK;
1981} 2141}
1982 2142
1983void noinline 2143void noinline
1984ev_io_stop (EV_P_ ev_io *w) 2144ev_io_stop (EV_P_ ev_io *w)
1985{ 2145{
1986 clear_pending (EV_A_ (W)w); 2146 clear_pending (EV_A_ (W)w);
1987 if (expect_false (!ev_is_active (w))) 2147 if (expect_false (!ev_is_active (w)))
1988 return; 2148 return;
1989 2149
1990 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;
1991 2153
1992 wlist_del (&anfds[w->fd].head, (WL)w); 2154 wlist_del (&anfds[w->fd].head, (WL)w);
1993 ev_stop (EV_A_ (W)w); 2155 ev_stop (EV_A_ (W)w);
1994 2156
1995 fd_change (EV_A_ w->fd, 1); 2157 fd_change (EV_A_ w->fd, 1);
2158
2159 EV_FREQUENT_CHECK;
1996} 2160}
1997 2161
1998void noinline 2162void noinline
1999ev_timer_start (EV_P_ ev_timer *w) 2163ev_timer_start (EV_P_ ev_timer *w)
2000{ 2164{
2003 2167
2004 ev_at (w) += mn_now; 2168 ev_at (w) += mn_now;
2005 2169
2006 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.));
2007 2171
2172 EV_FREQUENT_CHECK;
2173
2174 ++timercnt;
2008 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2175 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2009 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2176 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2010 ANHE_w (timers [ev_active (w)]) = (WT)w; 2177 ANHE_w (timers [ev_active (w)]) = (WT)w;
2011 ANHE_at_set (timers [ev_active (w)]); 2178 ANHE_at_cache (timers [ev_active (w)]);
2012 upheap (timers, ev_active (w)); 2179 upheap (timers, ev_active (w));
2013 2180
2181 EV_FREQUENT_CHECK;
2182
2014 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/ 2183 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2015} 2184}
2016 2185
2017void noinline 2186void noinline
2018ev_timer_stop (EV_P_ ev_timer *w) 2187ev_timer_stop (EV_P_ ev_timer *w)
2019{ 2188{
2020 clear_pending (EV_A_ (W)w); 2189 clear_pending (EV_A_ (W)w);
2021 if (expect_false (!ev_is_active (w))) 2190 if (expect_false (!ev_is_active (w)))
2022 return; 2191 return;
2023 2192
2193 EV_FREQUENT_CHECK;
2194
2024 { 2195 {
2025 int active = ev_active (w); 2196 int active = ev_active (w);
2026 2197
2027 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2198 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2028 2199
2200 --timercnt;
2201
2029 if (expect_true (active < timercnt + HEAP0 - 1)) 2202 if (expect_true (active < timercnt + HEAP0))
2030 { 2203 {
2031 timers [active] = timers [timercnt + HEAP0 - 1]; 2204 timers [active] = timers [timercnt + HEAP0];
2032 adjustheap (timers, timercnt, active); 2205 adjustheap (timers, timercnt, active);
2033 } 2206 }
2034
2035 --timercnt;
2036 } 2207 }
2208
2209 EV_FREQUENT_CHECK;
2037 2210
2038 ev_at (w) -= mn_now; 2211 ev_at (w) -= mn_now;
2039 2212
2040 ev_stop (EV_A_ (W)w); 2213 ev_stop (EV_A_ (W)w);
2041} 2214}
2042 2215
2043void noinline 2216void noinline
2044ev_timer_again (EV_P_ ev_timer *w) 2217ev_timer_again (EV_P_ ev_timer *w)
2045{ 2218{
2219 EV_FREQUENT_CHECK;
2220
2046 if (ev_is_active (w)) 2221 if (ev_is_active (w))
2047 { 2222 {
2048 if (w->repeat) 2223 if (w->repeat)
2049 { 2224 {
2050 ev_at (w) = mn_now + w->repeat; 2225 ev_at (w) = mn_now + w->repeat;
2051 ANHE_at_set (timers [ev_active (w)]); 2226 ANHE_at_cache (timers [ev_active (w)]);
2052 adjustheap (timers, timercnt, ev_active (w)); 2227 adjustheap (timers, timercnt, ev_active (w));
2053 } 2228 }
2054 else 2229 else
2055 ev_timer_stop (EV_A_ w); 2230 ev_timer_stop (EV_A_ w);
2056 } 2231 }
2057 else if (w->repeat) 2232 else if (w->repeat)
2058 { 2233 {
2059 ev_at (w) = w->repeat; 2234 ev_at (w) = w->repeat;
2060 ev_timer_start (EV_A_ w); 2235 ev_timer_start (EV_A_ w);
2061 } 2236 }
2237
2238 EV_FREQUENT_CHECK;
2062} 2239}
2063 2240
2064#if EV_PERIODIC_ENABLE 2241#if EV_PERIODIC_ENABLE
2065void noinline 2242void noinline
2066ev_periodic_start (EV_P_ ev_periodic *w) 2243ev_periodic_start (EV_P_ ev_periodic *w)
2077 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;
2078 } 2255 }
2079 else 2256 else
2080 ev_at (w) = w->offset; 2257 ev_at (w) = w->offset;
2081 2258
2259 EV_FREQUENT_CHECK;
2260
2261 ++periodiccnt;
2082 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2262 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2083 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2263 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2084 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2264 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2265 ANHE_at_cache (periodics [ev_active (w)]);
2085 upheap (periodics, ev_active (w)); 2266 upheap (periodics, ev_active (w));
2267
2268 EV_FREQUENT_CHECK;
2086 2269
2087 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2270 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2088} 2271}
2089 2272
2090void noinline 2273void noinline
2092{ 2275{
2093 clear_pending (EV_A_ (W)w); 2276 clear_pending (EV_A_ (W)w);
2094 if (expect_false (!ev_is_active (w))) 2277 if (expect_false (!ev_is_active (w)))
2095 return; 2278 return;
2096 2279
2280 EV_FREQUENT_CHECK;
2281
2097 { 2282 {
2098 int active = ev_active (w); 2283 int active = ev_active (w);
2099 2284
2100 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2285 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2101 2286
2287 --periodiccnt;
2288
2102 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2289 if (expect_true (active < periodiccnt + HEAP0))
2103 { 2290 {
2104 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2291 periodics [active] = periodics [periodiccnt + HEAP0];
2105 adjustheap (periodics, periodiccnt, active); 2292 adjustheap (periodics, periodiccnt, active);
2106 } 2293 }
2107
2108 --periodiccnt;
2109 } 2294 }
2295
2296 EV_FREQUENT_CHECK;
2110 2297
2111 ev_stop (EV_A_ (W)w); 2298 ev_stop (EV_A_ (W)w);
2112} 2299}
2113 2300
2114void noinline 2301void noinline
2134 return; 2321 return;
2135 2322
2136 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));
2137 2324
2138 evpipe_init (EV_A); 2325 evpipe_init (EV_A);
2326
2327 EV_FREQUENT_CHECK;
2139 2328
2140 { 2329 {
2141#ifndef _WIN32 2330#ifndef _WIN32
2142 sigset_t full, prev; 2331 sigset_t full, prev;
2143 sigfillset (&full); 2332 sigfillset (&full);
2144 sigprocmask (SIG_SETMASK, &full, &prev); 2333 sigprocmask (SIG_SETMASK, &full, &prev);
2145#endif 2334#endif
2146 2335
2147 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2148 2337
2149#ifndef _WIN32 2338#ifndef _WIN32
2150 sigprocmask (SIG_SETMASK, &prev, 0); 2339 sigprocmask (SIG_SETMASK, &prev, 0);
2151#endif 2340#endif
2152 } 2341 }
2164 sigfillset (&sa.sa_mask); 2353 sigfillset (&sa.sa_mask);
2165 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 */
2166 sigaction (w->signum, &sa, 0); 2355 sigaction (w->signum, &sa, 0);
2167#endif 2356#endif
2168 } 2357 }
2358
2359 EV_FREQUENT_CHECK;
2169} 2360}
2170 2361
2171void noinline 2362void noinline
2172ev_signal_stop (EV_P_ ev_signal *w) 2363ev_signal_stop (EV_P_ ev_signal *w)
2173{ 2364{
2174 clear_pending (EV_A_ (W)w); 2365 clear_pending (EV_A_ (W)w);
2175 if (expect_false (!ev_is_active (w))) 2366 if (expect_false (!ev_is_active (w)))
2176 return; 2367 return;
2177 2368
2369 EV_FREQUENT_CHECK;
2370
2178 wlist_del (&signals [w->signum - 1].head, (WL)w); 2371 wlist_del (&signals [w->signum - 1].head, (WL)w);
2179 ev_stop (EV_A_ (W)w); 2372 ev_stop (EV_A_ (W)w);
2180 2373
2181 if (!signals [w->signum - 1].head) 2374 if (!signals [w->signum - 1].head)
2182 signal (w->signum, SIG_DFL); 2375 signal (w->signum, SIG_DFL);
2376
2377 EV_FREQUENT_CHECK;
2183} 2378}
2184 2379
2185void 2380void
2186ev_child_start (EV_P_ ev_child *w) 2381ev_child_start (EV_P_ ev_child *w)
2187{ 2382{
2189 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));
2190#endif 2385#endif
2191 if (expect_false (ev_is_active (w))) 2386 if (expect_false (ev_is_active (w)))
2192 return; 2387 return;
2193 2388
2389 EV_FREQUENT_CHECK;
2390
2194 ev_start (EV_A_ (W)w, 1); 2391 ev_start (EV_A_ (W)w, 1);
2195 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;
2196} 2395}
2197 2396
2198void 2397void
2199ev_child_stop (EV_P_ ev_child *w) 2398ev_child_stop (EV_P_ ev_child *w)
2200{ 2399{
2201 clear_pending (EV_A_ (W)w); 2400 clear_pending (EV_A_ (W)w);
2202 if (expect_false (!ev_is_active (w))) 2401 if (expect_false (!ev_is_active (w)))
2203 return; 2402 return;
2204 2403
2404 EV_FREQUENT_CHECK;
2405
2205 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2406 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2206 ev_stop (EV_A_ (W)w); 2407 ev_stop (EV_A_ (W)w);
2408
2409 EV_FREQUENT_CHECK;
2207} 2410}
2208 2411
2209#if EV_STAT_ENABLE 2412#if EV_STAT_ENABLE
2210 2413
2211# ifdef _WIN32 2414# ifdef _WIN32
2229 if (w->wd < 0) 2432 if (w->wd < 0)
2230 { 2433 {
2231 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2434 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2232 2435
2233 /* monitor some parent directory for speedup hints */ 2436 /* monitor some parent directory for speedup hints */
2234 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2437 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2235 /* but an efficiency issue only */ 2438 /* but an efficiency issue only */
2236 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2237 { 2440 {
2238 char path [4096]; 2441 char path [4096];
2239 strcpy (path, w->path); 2442 strcpy (path, w->path);
2280 2483
2281static void noinline 2484static void noinline
2282infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2485infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2283{ 2486{
2284 if (slot < 0) 2487 if (slot < 0)
2285 /* overflow, need to check for all hahs slots */ 2488 /* overflow, need to check for all hash slots */
2286 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2489 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2287 infy_wd (EV_A_ slot, wd, ev); 2490 infy_wd (EV_A_ slot, wd, ev);
2288 else 2491 else
2289 { 2492 {
2290 WL w_; 2493 WL w_;
2324infy_init (EV_P) 2527infy_init (EV_P)
2325{ 2528{
2326 if (fs_fd != -2) 2529 if (fs_fd != -2)
2327 return; 2530 return;
2328 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
2329 fs_fd = inotify_init (); 2553 fs_fd = inotify_init ();
2330 2554
2331 if (fs_fd >= 0) 2555 if (fs_fd >= 0)
2332 { 2556 {
2333 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2362 if (fs_fd >= 0) 2586 if (fs_fd >= 0)
2363 infy_add (EV_A_ w); /* re-add, no matter what */ 2587 infy_add (EV_A_ w); /* re-add, no matter what */
2364 else 2588 else
2365 ev_timer_start (EV_A_ &w->timer); 2589 ev_timer_start (EV_A_ &w->timer);
2366 } 2590 }
2367
2368 } 2591 }
2369} 2592}
2370 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)
2371#endif 2600#endif
2372 2601
2373void 2602void
2374ev_stat_stat (EV_P_ ev_stat *w) 2603ev_stat_stat (EV_P_ ev_stat *w)
2375{ 2604{
2402 || w->prev.st_atime != w->attr.st_atime 2631 || w->prev.st_atime != w->attr.st_atime
2403 || w->prev.st_mtime != w->attr.st_mtime 2632 || w->prev.st_mtime != w->attr.st_mtime
2404 || w->prev.st_ctime != w->attr.st_ctime 2633 || w->prev.st_ctime != w->attr.st_ctime
2405 ) { 2634 ) {
2406 #if EV_USE_INOTIFY 2635 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0)
2637 {
2407 infy_del (EV_A_ w); 2638 infy_del (EV_A_ w);
2408 infy_add (EV_A_ w); 2639 infy_add (EV_A_ w);
2409 ev_stat_stat (EV_A_ w); /* avoid race... */ 2640 ev_stat_stat (EV_A_ w); /* avoid race... */
2641 }
2410 #endif 2642 #endif
2411 2643
2412 ev_feed_event (EV_A_ w, EV_STAT); 2644 ev_feed_event (EV_A_ w, EV_STAT);
2413 } 2645 }
2414} 2646}
2439 else 2671 else
2440#endif 2672#endif
2441 ev_timer_start (EV_A_ &w->timer); 2673 ev_timer_start (EV_A_ &w->timer);
2442 2674
2443 ev_start (EV_A_ (W)w, 1); 2675 ev_start (EV_A_ (W)w, 1);
2676
2677 EV_FREQUENT_CHECK;
2444} 2678}
2445 2679
2446void 2680void
2447ev_stat_stop (EV_P_ ev_stat *w) 2681ev_stat_stop (EV_P_ ev_stat *w)
2448{ 2682{
2449 clear_pending (EV_A_ (W)w); 2683 clear_pending (EV_A_ (W)w);
2450 if (expect_false (!ev_is_active (w))) 2684 if (expect_false (!ev_is_active (w)))
2451 return; 2685 return;
2452 2686
2687 EV_FREQUENT_CHECK;
2688
2453#if EV_USE_INOTIFY 2689#if EV_USE_INOTIFY
2454 infy_del (EV_A_ w); 2690 infy_del (EV_A_ w);
2455#endif 2691#endif
2456 ev_timer_stop (EV_A_ &w->timer); 2692 ev_timer_stop (EV_A_ &w->timer);
2457 2693
2458 ev_stop (EV_A_ (W)w); 2694 ev_stop (EV_A_ (W)w);
2695
2696 EV_FREQUENT_CHECK;
2459} 2697}
2460#endif 2698#endif
2461 2699
2462#if EV_IDLE_ENABLE 2700#if EV_IDLE_ENABLE
2463void 2701void
2465{ 2703{
2466 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2467 return; 2705 return;
2468 2706
2469 pri_adjust (EV_A_ (W)w); 2707 pri_adjust (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2470 2710
2471 { 2711 {
2472 int active = ++idlecnt [ABSPRI (w)]; 2712 int active = ++idlecnt [ABSPRI (w)];
2473 2713
2474 ++idleall; 2714 ++idleall;
2475 ev_start (EV_A_ (W)w, active); 2715 ev_start (EV_A_ (W)w, active);
2476 2716
2477 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);
2478 idles [ABSPRI (w)][active - 1] = w; 2718 idles [ABSPRI (w)][active - 1] = w;
2479 } 2719 }
2720
2721 EV_FREQUENT_CHECK;
2480} 2722}
2481 2723
2482void 2724void
2483ev_idle_stop (EV_P_ ev_idle *w) 2725ev_idle_stop (EV_P_ ev_idle *w)
2484{ 2726{
2485 clear_pending (EV_A_ (W)w); 2727 clear_pending (EV_A_ (W)w);
2486 if (expect_false (!ev_is_active (w))) 2728 if (expect_false (!ev_is_active (w)))
2487 return; 2729 return;
2488 2730
2731 EV_FREQUENT_CHECK;
2732
2489 { 2733 {
2490 int active = ev_active (w); 2734 int active = ev_active (w);
2491 2735
2492 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2736 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2493 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2737 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2494 2738
2495 ev_stop (EV_A_ (W)w); 2739 ev_stop (EV_A_ (W)w);
2496 --idleall; 2740 --idleall;
2497 } 2741 }
2742
2743 EV_FREQUENT_CHECK;
2498} 2744}
2499#endif 2745#endif
2500 2746
2501void 2747void
2502ev_prepare_start (EV_P_ ev_prepare *w) 2748ev_prepare_start (EV_P_ ev_prepare *w)
2503{ 2749{
2504 if (expect_false (ev_is_active (w))) 2750 if (expect_false (ev_is_active (w)))
2505 return; 2751 return;
2752
2753 EV_FREQUENT_CHECK;
2506 2754
2507 ev_start (EV_A_ (W)w, ++preparecnt); 2755 ev_start (EV_A_ (W)w, ++preparecnt);
2508 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2756 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2509 prepares [preparecnt - 1] = w; 2757 prepares [preparecnt - 1] = w;
2758
2759 EV_FREQUENT_CHECK;
2510} 2760}
2511 2761
2512void 2762void
2513ev_prepare_stop (EV_P_ ev_prepare *w) 2763ev_prepare_stop (EV_P_ ev_prepare *w)
2514{ 2764{
2515 clear_pending (EV_A_ (W)w); 2765 clear_pending (EV_A_ (W)w);
2516 if (expect_false (!ev_is_active (w))) 2766 if (expect_false (!ev_is_active (w)))
2517 return; 2767 return;
2518 2768
2769 EV_FREQUENT_CHECK;
2770
2519 { 2771 {
2520 int active = ev_active (w); 2772 int active = ev_active (w);
2521 2773
2522 prepares [active - 1] = prepares [--preparecnt]; 2774 prepares [active - 1] = prepares [--preparecnt];
2523 ev_active (prepares [active - 1]) = active; 2775 ev_active (prepares [active - 1]) = active;
2524 } 2776 }
2525 2777
2526 ev_stop (EV_A_ (W)w); 2778 ev_stop (EV_A_ (W)w);
2779
2780 EV_FREQUENT_CHECK;
2527} 2781}
2528 2782
2529void 2783void
2530ev_check_start (EV_P_ ev_check *w) 2784ev_check_start (EV_P_ ev_check *w)
2531{ 2785{
2532 if (expect_false (ev_is_active (w))) 2786 if (expect_false (ev_is_active (w)))
2533 return; 2787 return;
2788
2789 EV_FREQUENT_CHECK;
2534 2790
2535 ev_start (EV_A_ (W)w, ++checkcnt); 2791 ev_start (EV_A_ (W)w, ++checkcnt);
2536 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2792 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2537 checks [checkcnt - 1] = w; 2793 checks [checkcnt - 1] = w;
2794
2795 EV_FREQUENT_CHECK;
2538} 2796}
2539 2797
2540void 2798void
2541ev_check_stop (EV_P_ ev_check *w) 2799ev_check_stop (EV_P_ ev_check *w)
2542{ 2800{
2543 clear_pending (EV_A_ (W)w); 2801 clear_pending (EV_A_ (W)w);
2544 if (expect_false (!ev_is_active (w))) 2802 if (expect_false (!ev_is_active (w)))
2545 return; 2803 return;
2546 2804
2805 EV_FREQUENT_CHECK;
2806
2547 { 2807 {
2548 int active = ev_active (w); 2808 int active = ev_active (w);
2549 2809
2550 checks [active - 1] = checks [--checkcnt]; 2810 checks [active - 1] = checks [--checkcnt];
2551 ev_active (checks [active - 1]) = active; 2811 ev_active (checks [active - 1]) = active;
2552 } 2812 }
2553 2813
2554 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2815
2816 EV_FREQUENT_CHECK;
2555} 2817}
2556 2818
2557#if EV_EMBED_ENABLE 2819#if EV_EMBED_ENABLE
2558void noinline 2820void noinline
2559ev_embed_sweep (EV_P_ ev_embed *w) 2821ev_embed_sweep (EV_P_ ev_embed *w)
2586 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2848 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2587 } 2849 }
2588 } 2850 }
2589} 2851}
2590 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
2591#if 0 2865#if 0
2592static void 2866static void
2593embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2867embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2594{ 2868{
2595 ev_idle_stop (EV_A_ idle); 2869 ev_idle_stop (EV_A_ idle);
2606 struct ev_loop *loop = w->other; 2880 struct ev_loop *loop = w->other;
2607 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 ()));
2608 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);
2609 } 2883 }
2610 2884
2885 EV_FREQUENT_CHECK;
2886
2611 ev_set_priority (&w->io, ev_priority (w)); 2887 ev_set_priority (&w->io, ev_priority (w));
2612 ev_io_start (EV_A_ &w->io); 2888 ev_io_start (EV_A_ &w->io);
2613 2889
2614 ev_prepare_init (&w->prepare, embed_prepare_cb); 2890 ev_prepare_init (&w->prepare, embed_prepare_cb);
2615 ev_set_priority (&w->prepare, EV_MINPRI); 2891 ev_set_priority (&w->prepare, EV_MINPRI);
2616 ev_prepare_start (EV_A_ &w->prepare); 2892 ev_prepare_start (EV_A_ &w->prepare);
2617 2893
2894 ev_fork_init (&w->fork, embed_fork_cb);
2895 ev_fork_start (EV_A_ &w->fork);
2896
2618 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2897 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2619 2898
2620 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2900
2901 EV_FREQUENT_CHECK;
2621} 2902}
2622 2903
2623void 2904void
2624ev_embed_stop (EV_P_ ev_embed *w) 2905ev_embed_stop (EV_P_ ev_embed *w)
2625{ 2906{
2626 clear_pending (EV_A_ (W)w); 2907 clear_pending (EV_A_ (W)w);
2627 if (expect_false (!ev_is_active (w))) 2908 if (expect_false (!ev_is_active (w)))
2628 return; 2909 return;
2629 2910
2911 EV_FREQUENT_CHECK;
2912
2630 ev_io_stop (EV_A_ &w->io); 2913 ev_io_stop (EV_A_ &w->io);
2631 ev_prepare_stop (EV_A_ &w->prepare); 2914 ev_prepare_stop (EV_A_ &w->prepare);
2915 ev_fork_stop (EV_A_ &w->fork);
2632 2916
2633 ev_stop (EV_A_ (W)w); 2917 EV_FREQUENT_CHECK;
2634} 2918}
2635#endif 2919#endif
2636 2920
2637#if EV_FORK_ENABLE 2921#if EV_FORK_ENABLE
2638void 2922void
2639ev_fork_start (EV_P_ ev_fork *w) 2923ev_fork_start (EV_P_ ev_fork *w)
2640{ 2924{
2641 if (expect_false (ev_is_active (w))) 2925 if (expect_false (ev_is_active (w)))
2642 return; 2926 return;
2927
2928 EV_FREQUENT_CHECK;
2643 2929
2644 ev_start (EV_A_ (W)w, ++forkcnt); 2930 ev_start (EV_A_ (W)w, ++forkcnt);
2645 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2931 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2646 forks [forkcnt - 1] = w; 2932 forks [forkcnt - 1] = w;
2933
2934 EV_FREQUENT_CHECK;
2647} 2935}
2648 2936
2649void 2937void
2650ev_fork_stop (EV_P_ ev_fork *w) 2938ev_fork_stop (EV_P_ ev_fork *w)
2651{ 2939{
2652 clear_pending (EV_A_ (W)w); 2940 clear_pending (EV_A_ (W)w);
2653 if (expect_false (!ev_is_active (w))) 2941 if (expect_false (!ev_is_active (w)))
2654 return; 2942 return;
2655 2943
2944 EV_FREQUENT_CHECK;
2945
2656 { 2946 {
2657 int active = ev_active (w); 2947 int active = ev_active (w);
2658 2948
2659 forks [active - 1] = forks [--forkcnt]; 2949 forks [active - 1] = forks [--forkcnt];
2660 ev_active (forks [active - 1]) = active; 2950 ev_active (forks [active - 1]) = active;
2661 } 2951 }
2662 2952
2663 ev_stop (EV_A_ (W)w); 2953 ev_stop (EV_A_ (W)w);
2954
2955 EV_FREQUENT_CHECK;
2664} 2956}
2665#endif 2957#endif
2666 2958
2667#if EV_ASYNC_ENABLE 2959#if EV_ASYNC_ENABLE
2668void 2960void
2670{ 2962{
2671 if (expect_false (ev_is_active (w))) 2963 if (expect_false (ev_is_active (w)))
2672 return; 2964 return;
2673 2965
2674 evpipe_init (EV_A); 2966 evpipe_init (EV_A);
2967
2968 EV_FREQUENT_CHECK;
2675 2969
2676 ev_start (EV_A_ (W)w, ++asynccnt); 2970 ev_start (EV_A_ (W)w, ++asynccnt);
2677 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 2971 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2678 asyncs [asynccnt - 1] = w; 2972 asyncs [asynccnt - 1] = w;
2973
2974 EV_FREQUENT_CHECK;
2679} 2975}
2680 2976
2681void 2977void
2682ev_async_stop (EV_P_ ev_async *w) 2978ev_async_stop (EV_P_ ev_async *w)
2683{ 2979{
2684 clear_pending (EV_A_ (W)w); 2980 clear_pending (EV_A_ (W)w);
2685 if (expect_false (!ev_is_active (w))) 2981 if (expect_false (!ev_is_active (w)))
2686 return; 2982 return;
2687 2983
2984 EV_FREQUENT_CHECK;
2985
2688 { 2986 {
2689 int active = ev_active (w); 2987 int active = ev_active (w);
2690 2988
2691 asyncs [active - 1] = asyncs [--asynccnt]; 2989 asyncs [active - 1] = asyncs [--asynccnt];
2692 ev_active (asyncs [active - 1]) = active; 2990 ev_active (asyncs [active - 1]) = active;
2693 } 2991 }
2694 2992
2695 ev_stop (EV_A_ (W)w); 2993 ev_stop (EV_A_ (W)w);
2994
2995 EV_FREQUENT_CHECK;
2696} 2996}
2697 2997
2698void 2998void
2699ev_async_send (EV_P_ ev_async *w) 2999ev_async_send (EV_P_ ev_async *w)
2700{ 3000{
2717once_cb (EV_P_ struct ev_once *once, int revents) 3017once_cb (EV_P_ struct ev_once *once, int revents)
2718{ 3018{
2719 void (*cb)(int revents, void *arg) = once->cb; 3019 void (*cb)(int revents, void *arg) = once->cb;
2720 void *arg = once->arg; 3020 void *arg = once->arg;
2721 3021
2722 ev_io_stop (EV_A_ &once->io); 3022 ev_io_stop (EV_A_ &once->io);
2723 ev_timer_stop (EV_A_ &once->to); 3023 ev_timer_stop (EV_A_ &once->to);
2724 ev_free (once); 3024 ev_free (once);
2725 3025
2726 cb (revents, arg); 3026 cb (revents, arg);
2727} 3027}
2728 3028
2729static void 3029static void
2730once_cb_io (EV_P_ ev_io *w, int revents) 3030once_cb_io (EV_P_ ev_io *w, int revents)
2731{ 3031{
2732 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));
2733} 3035}
2734 3036
2735static void 3037static void
2736once_cb_to (EV_P_ ev_timer *w, int revents) 3038once_cb_to (EV_P_ ev_timer *w, int revents)
2737{ 3039{
2738 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));
2739} 3043}
2740 3044
2741void 3045void
2742ev_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)
2743{ 3047{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines