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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines