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

Comparing libev/ev.c (file contents):
Revision 1.280 by root, Sat Mar 14 04:45:39 2009 UTC vs.
Revision 1.296 by root, Thu Jul 9 09:11:20 2009 UTC

… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
282 284
283#ifndef EV_HEAP_CACHE_AT 285#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 286# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 287#endif
286 288
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL
292# include <syscall.h>
293# ifdef SYS_clock_gettime
294# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
295# undef EV_USE_MONOTONIC
296# define EV_USE_MONOTONIC 1
297# else
298# undef EV_USE_CLOCK_SYSCALL
299# define EV_USE_CLOCK_SYSCALL 0
300# endif
301#endif
302
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 303/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 304
289#ifndef CLOCK_MONOTONIC 305#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 306# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 307# define EV_USE_MONOTONIC 0
… …
320 336
321#if EV_SELECT_IS_WINSOCKET 337#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 338# include <winsock.h>
323#endif 339#endif
324 340
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 341#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 343# include <stdint.h>
337# ifdef __cplusplus 344# ifdef __cplusplus
338extern "C" { 345extern "C" {
… …
384# define inline_speed static noinline 391# define inline_speed static noinline
385#else 392#else
386# define inline_speed static inline 393# define inline_speed static inline
387#endif 394#endif
388 395
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397
398#if EV_MINPRI == EV_MAXPRI
399# define ABSPRI(w) (((W)w), 0)
400#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 401# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
402#endif
391 403
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 404#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 405#define EMPTY2(a,b) /* used to suppress some warnings */
394 406
395typedef ev_watcher *W; 407typedef ev_watcher *W;
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 490#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 491#define ev_free(ptr) ev_realloc ((ptr), 0)
480 492
481/*****************************************************************************/ 493/*****************************************************************************/
482 494
495/* file descriptor info structure */
483typedef struct 496typedef struct
484{ 497{
485 WL head; 498 WL head;
486 unsigned char events; 499 unsigned char events; /* the events watched for */
487 unsigned char reify; 500 unsigned char reify; /* flag set when this ANFD needs reification */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 502 unsigned char unused;
490#if EV_USE_EPOLL 503#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 504 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 505#endif
493#if EV_SELECT_IS_WINSOCKET 506#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 507 SOCKET handle;
495#endif 508#endif
496} ANFD; 509} ANFD;
497 510
511/* stores the pending event set for a given watcher */
498typedef struct 512typedef struct
499{ 513{
500 W w; 514 W w;
501 int events; 515 int events; /* the pending event set for the given watcher */
502} ANPENDING; 516} ANPENDING;
503 517
504#if EV_USE_INOTIFY 518#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 519/* hash table entry per inotify-id */
506typedef struct 520typedef struct
… …
509} ANFS; 523} ANFS;
510#endif 524#endif
511 525
512/* Heap Entry */ 526/* Heap Entry */
513#if EV_HEAP_CACHE_AT 527#if EV_HEAP_CACHE_AT
528 /* a heap element */
514 typedef struct { 529 typedef struct {
515 ev_tstamp at; 530 ev_tstamp at;
516 WT w; 531 WT w;
517 } ANHE; 532 } ANHE;
518 533
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 534 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 535 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 536 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 537#else
538 /* a heap element */
523 typedef WT ANHE; 539 typedef WT ANHE;
524 540
525 #define ANHE_w(he) (he) 541 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 542 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 543 #define ANHE_at_cache(he)
… …
553 569
554#endif 570#endif
555 571
556/*****************************************************************************/ 572/*****************************************************************************/
557 573
574#ifndef EV_HAVE_EV_TIME
558ev_tstamp 575ev_tstamp
559ev_time (void) 576ev_time (void)
560{ 577{
561#if EV_USE_REALTIME 578#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 579 if (expect_true (have_realtime))
… …
569 586
570 struct timeval tv; 587 struct timeval tv;
571 gettimeofday (&tv, 0); 588 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 589 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 590}
591#endif
574 592
575ev_tstamp inline_size 593inline_size ev_tstamp
576get_clock (void) 594get_clock (void)
577{ 595{
578#if EV_USE_MONOTONIC 596#if EV_USE_MONOTONIC
579 if (expect_true (have_monotonic)) 597 if (expect_true (have_monotonic))
580 { 598 {
… …
614 632
615 tv.tv_sec = (time_t)delay; 633 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 635
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 637 /* somehting not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 638 /* by older ones */
621 select (0, 0, 0, 0, &tv); 639 select (0, 0, 0, 0, &tv);
622#endif 640#endif
623 } 641 }
624} 642}
625 643
626/*****************************************************************************/ 644/*****************************************************************************/
627 645
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 646#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 647
630int inline_size 648/* find a suitable new size for the given array, */
649/* hopefully by rounding to a ncie-to-malloc size */
650inline_size int
631array_nextsize (int elem, int cur, int cnt) 651array_nextsize (int elem, int cur, int cnt)
632{ 652{
633 int ncur = cur + 1; 653 int ncur = cur + 1;
634 654
635 do 655 do
… …
680#define array_free(stem, idx) \ 700#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 701 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 702
683/*****************************************************************************/ 703/*****************************************************************************/
684 704
705/* dummy callback for pending events */
706static void noinline
707pendingcb (EV_P_ ev_prepare *w, int revents)
708{
709}
710
685void noinline 711void noinline
686ev_feed_event (EV_P_ void *w, int revents) 712ev_feed_event (EV_P_ void *w, int revents)
687{ 713{
688 W w_ = (W)w; 714 W w_ = (W)w;
689 int pri = ABSPRI (w_); 715 int pri = ABSPRI (w_);
… …
697 pendings [pri][w_->pending - 1].w = w_; 723 pendings [pri][w_->pending - 1].w = w_;
698 pendings [pri][w_->pending - 1].events = revents; 724 pendings [pri][w_->pending - 1].events = revents;
699 } 725 }
700} 726}
701 727
702void inline_speed 728inline_speed void
729feed_reverse (EV_P_ W w)
730{
731 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
732 rfeeds [rfeedcnt++] = w;
733}
734
735inline_size void
736feed_reverse_done (EV_P_ int revents)
737{
738 do
739 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
740 while (rfeedcnt);
741}
742
743inline_speed void
703queue_events (EV_P_ W *events, int eventcnt, int type) 744queue_events (EV_P_ W *events, int eventcnt, int type)
704{ 745{
705 int i; 746 int i;
706 747
707 for (i = 0; i < eventcnt; ++i) 748 for (i = 0; i < eventcnt; ++i)
708 ev_feed_event (EV_A_ events [i], type); 749 ev_feed_event (EV_A_ events [i], type);
709} 750}
710 751
711/*****************************************************************************/ 752/*****************************************************************************/
712 753
713void inline_speed 754inline_speed void
714fd_event (EV_P_ int fd, int revents) 755fd_event (EV_P_ int fd, int revents)
715{ 756{
716 ANFD *anfd = anfds + fd; 757 ANFD *anfd = anfds + fd;
717 ev_io *w; 758 ev_io *w;
718 759
… …
730{ 771{
731 if (fd >= 0 && fd < anfdmax) 772 if (fd >= 0 && fd < anfdmax)
732 fd_event (EV_A_ fd, revents); 773 fd_event (EV_A_ fd, revents);
733} 774}
734 775
735void inline_size 776/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */
778inline_size void
736fd_reify (EV_P) 779fd_reify (EV_P)
737{ 780{
738 int i; 781 int i;
739 782
740 for (i = 0; i < fdchangecnt; ++i) 783 for (i = 0; i < fdchangecnt; ++i)
… …
766 unsigned char o_reify = anfd->reify; 809 unsigned char o_reify = anfd->reify;
767 810
768 anfd->reify = 0; 811 anfd->reify = 0;
769 anfd->events = events; 812 anfd->events = events;
770 813
771 if (o_events != events || o_reify & EV_IOFDSET) 814 if (o_events != events || o_reify & EV__IOFDSET)
772 backend_modify (EV_A_ fd, o_events, events); 815 backend_modify (EV_A_ fd, o_events, events);
773 } 816 }
774 } 817 }
775 818
776 fdchangecnt = 0; 819 fdchangecnt = 0;
777} 820}
778 821
779void inline_size 822/* something about the given fd changed */
823inline_size void
780fd_change (EV_P_ int fd, int flags) 824fd_change (EV_P_ int fd, int flags)
781{ 825{
782 unsigned char reify = anfds [fd].reify; 826 unsigned char reify = anfds [fd].reify;
783 anfds [fd].reify |= flags; 827 anfds [fd].reify |= flags;
784 828
… …
788 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 832 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
789 fdchanges [fdchangecnt - 1] = fd; 833 fdchanges [fdchangecnt - 1] = fd;
790 } 834 }
791} 835}
792 836
793void inline_speed 837/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
838inline_speed void
794fd_kill (EV_P_ int fd) 839fd_kill (EV_P_ int fd)
795{ 840{
796 ev_io *w; 841 ev_io *w;
797 842
798 while ((w = (ev_io *)anfds [fd].head)) 843 while ((w = (ev_io *)anfds [fd].head))
… …
800 ev_io_stop (EV_A_ w); 845 ev_io_stop (EV_A_ w);
801 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
802 } 847 }
803} 848}
804 849
805int inline_size 850/* check whether the given fd is atcually valid, for error recovery */
851inline_size int
806fd_valid (int fd) 852fd_valid (int fd)
807{ 853{
808#ifdef _WIN32 854#ifdef _WIN32
809 return _get_osfhandle (fd) != -1; 855 return _get_osfhandle (fd) != -1;
810#else 856#else
… …
847 for (fd = 0; fd < anfdmax; ++fd) 893 for (fd = 0; fd < anfdmax; ++fd)
848 if (anfds [fd].events) 894 if (anfds [fd].events)
849 { 895 {
850 anfds [fd].events = 0; 896 anfds [fd].events = 0;
851 anfds [fd].emask = 0; 897 anfds [fd].emask = 0;
852 fd_change (EV_A_ fd, EV_IOFDSET | 1); 898 fd_change (EV_A_ fd, EV__IOFDSET | 1);
853 } 899 }
854} 900}
855 901
856/*****************************************************************************/ 902/*****************************************************************************/
857 903
… …
873#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 919#define HEAP0 (DHEAP - 1) /* index of first element in heap */
874#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 920#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
875#define UPHEAP_DONE(p,k) ((p) == (k)) 921#define UPHEAP_DONE(p,k) ((p) == (k))
876 922
877/* away from the root */ 923/* away from the root */
878void inline_speed 924inline_speed void
879downheap (ANHE *heap, int N, int k) 925downheap (ANHE *heap, int N, int k)
880{ 926{
881 ANHE he = heap [k]; 927 ANHE he = heap [k];
882 ANHE *E = heap + N + HEAP0; 928 ANHE *E = heap + N + HEAP0;
883 929
… …
923#define HEAP0 1 969#define HEAP0 1
924#define HPARENT(k) ((k) >> 1) 970#define HPARENT(k) ((k) >> 1)
925#define UPHEAP_DONE(p,k) (!(p)) 971#define UPHEAP_DONE(p,k) (!(p))
926 972
927/* away from the root */ 973/* away from the root */
928void inline_speed 974inline_speed void
929downheap (ANHE *heap, int N, int k) 975downheap (ANHE *heap, int N, int k)
930{ 976{
931 ANHE he = heap [k]; 977 ANHE he = heap [k];
932 978
933 for (;;) 979 for (;;)
… …
953 ev_active (ANHE_w (he)) = k; 999 ev_active (ANHE_w (he)) = k;
954} 1000}
955#endif 1001#endif
956 1002
957/* towards the root */ 1003/* towards the root */
958void inline_speed 1004inline_speed void
959upheap (ANHE *heap, int k) 1005upheap (ANHE *heap, int k)
960{ 1006{
961 ANHE he = heap [k]; 1007 ANHE he = heap [k];
962 1008
963 for (;;) 1009 for (;;)
… …
974 1020
975 heap [k] = he; 1021 heap [k] = he;
976 ev_active (ANHE_w (he)) = k; 1022 ev_active (ANHE_w (he)) = k;
977} 1023}
978 1024
979void inline_size 1025/* move an element suitably so it is in a correct place */
1026inline_size void
980adjustheap (ANHE *heap, int N, int k) 1027adjustheap (ANHE *heap, int N, int k)
981{ 1028{
982 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
983 upheap (heap, k); 1030 upheap (heap, k);
984 else 1031 else
985 downheap (heap, N, k); 1032 downheap (heap, N, k);
986} 1033}
987 1034
988/* rebuild the heap: this function is used only once and executed rarely */ 1035/* rebuild the heap: this function is used only once and executed rarely */
989void inline_size 1036inline_size void
990reheap (ANHE *heap, int N) 1037reheap (ANHE *heap, int N)
991{ 1038{
992 int i; 1039 int i;
993 1040
994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1041 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
997 upheap (heap, i + HEAP0); 1044 upheap (heap, i + HEAP0);
998} 1045}
999 1046
1000/*****************************************************************************/ 1047/*****************************************************************************/
1001 1048
1049/* associate signal watchers to a signal signal */
1002typedef struct 1050typedef struct
1003{ 1051{
1004 WL head; 1052 WL head;
1005 EV_ATOMIC_T gotsig; 1053 EV_ATOMIC_T gotsig;
1006} ANSIG; 1054} ANSIG;
… …
1010 1058
1011static EV_ATOMIC_T gotsig; 1059static EV_ATOMIC_T gotsig;
1012 1060
1013/*****************************************************************************/ 1061/*****************************************************************************/
1014 1062
1015void inline_speed 1063/* used to prepare libev internal fd's */
1064/* this is not fork-safe */
1065inline_speed void
1016fd_intern (int fd) 1066fd_intern (int fd)
1017{ 1067{
1018#ifdef _WIN32 1068#ifdef _WIN32
1019 unsigned long arg = 1; 1069 unsigned long arg = 1;
1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1025} 1075}
1026 1076
1027static void noinline 1077static void noinline
1028evpipe_init (EV_P) 1078evpipe_init (EV_P)
1029{ 1079{
1030 if (!ev_is_active (&pipeev)) 1080 if (!ev_is_active (&pipe_w))
1031 { 1081 {
1032#if EV_USE_EVENTFD 1082#if EV_USE_EVENTFD
1033 if ((evfd = eventfd (0, 0)) >= 0) 1083 if ((evfd = eventfd (0, 0)) >= 0)
1034 { 1084 {
1035 evpipe [0] = -1; 1085 evpipe [0] = -1;
1036 fd_intern (evfd); 1086 fd_intern (evfd);
1037 ev_io_set (&pipeev, evfd, EV_READ); 1087 ev_io_set (&pipe_w, evfd, EV_READ);
1038 } 1088 }
1039 else 1089 else
1040#endif 1090#endif
1041 { 1091 {
1042 while (pipe (evpipe)) 1092 while (pipe (evpipe))
1043 ev_syserr ("(libev) error creating signal/async pipe"); 1093 ev_syserr ("(libev) error creating signal/async pipe");
1044 1094
1045 fd_intern (evpipe [0]); 1095 fd_intern (evpipe [0]);
1046 fd_intern (evpipe [1]); 1096 fd_intern (evpipe [1]);
1047 ev_io_set (&pipeev, evpipe [0], EV_READ); 1097 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1048 } 1098 }
1049 1099
1050 ev_io_start (EV_A_ &pipeev); 1100 ev_io_start (EV_A_ &pipe_w);
1051 ev_unref (EV_A); /* watcher should not keep loop alive */ 1101 ev_unref (EV_A); /* watcher should not keep loop alive */
1052 } 1102 }
1053} 1103}
1054 1104
1055void inline_size 1105inline_size void
1056evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1106evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1057{ 1107{
1058 if (!*flag) 1108 if (!*flag)
1059 { 1109 {
1060 int old_errno = errno; /* save errno because write might clobber it */ 1110 int old_errno = errno; /* save errno because write might clobber it */
… …
1073 1123
1074 errno = old_errno; 1124 errno = old_errno;
1075 } 1125 }
1076} 1126}
1077 1127
1128/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */
1078static void 1130static void
1079pipecb (EV_P_ ev_io *iow, int revents) 1131pipecb (EV_P_ ev_io *iow, int revents)
1080{ 1132{
1081#if EV_USE_EVENTFD 1133#if EV_USE_EVENTFD
1082 if (evfd >= 0) 1134 if (evfd >= 0)
… …
1164 1216
1165#ifndef WIFCONTINUED 1217#ifndef WIFCONTINUED
1166# define WIFCONTINUED(status) 0 1218# define WIFCONTINUED(status) 0
1167#endif 1219#endif
1168 1220
1169void inline_speed 1221/* handle a single child status event */
1222inline_speed void
1170child_reap (EV_P_ int chain, int pid, int status) 1223child_reap (EV_P_ int chain, int pid, int status)
1171{ 1224{
1172 ev_child *w; 1225 ev_child *w;
1173 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1174 1227
… …
1187 1240
1188#ifndef WCONTINUED 1241#ifndef WCONTINUED
1189# define WCONTINUED 0 1242# define WCONTINUED 0
1190#endif 1243#endif
1191 1244
1245/* called on sigchld etc., calls waitpid */
1192static void 1246static void
1193childcb (EV_P_ ev_signal *sw, int revents) 1247childcb (EV_P_ ev_signal *sw, int revents)
1194{ 1248{
1195 int pid, status; 1249 int pid, status;
1196 1250
… …
1309ev_loop_count (EV_P) 1363ev_loop_count (EV_P)
1310{ 1364{
1311 return loop_count; 1365 return loop_count;
1312} 1366}
1313 1367
1368unsigned int
1369ev_loop_depth (EV_P)
1370{
1371 return loop_depth;
1372}
1373
1314void 1374void
1315ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1375ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1316{ 1376{
1317 io_blocktime = interval; 1377 io_blocktime = interval;
1318} 1378}
… …
1321ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1322{ 1382{
1323 timeout_blocktime = interval; 1383 timeout_blocktime = interval;
1324} 1384}
1325 1385
1386/* initialise a loop structure, must be zero-initialised */
1326static void noinline 1387static void noinline
1327loop_init (EV_P_ unsigned int flags) 1388loop_init (EV_P_ unsigned int flags)
1328{ 1389{
1329 if (!backend) 1390 if (!backend)
1330 { 1391 {
… …
1350 1411
1351 ev_rt_now = ev_time (); 1412 ev_rt_now = ev_time ();
1352 mn_now = get_clock (); 1413 mn_now = get_clock ();
1353 now_floor = mn_now; 1414 now_floor = mn_now;
1354 rtmn_diff = ev_rt_now - mn_now; 1415 rtmn_diff = ev_rt_now - mn_now;
1416 invoke_cb = ev_invoke_pending;
1355 1417
1356 io_blocktime = 0.; 1418 io_blocktime = 0.;
1357 timeout_blocktime = 0.; 1419 timeout_blocktime = 0.;
1358 backend = 0; 1420 backend = 0;
1359 backend_fd = -1; 1421 backend_fd = -1;
… …
1390#endif 1452#endif
1391#if EV_USE_SELECT 1453#if EV_USE_SELECT
1392 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1454 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1393#endif 1455#endif
1394 1456
1457 ev_prepare_init (&pending_w, pendingcb);
1458
1395 ev_init (&pipeev, pipecb); 1459 ev_init (&pipe_w, pipecb);
1396 ev_set_priority (&pipeev, EV_MAXPRI); 1460 ev_set_priority (&pipe_w, EV_MAXPRI);
1397 } 1461 }
1398} 1462}
1399 1463
1464/* free up a loop structure */
1400static void noinline 1465static void noinline
1401loop_destroy (EV_P) 1466loop_destroy (EV_P)
1402{ 1467{
1403 int i; 1468 int i;
1404 1469
1405 if (ev_is_active (&pipeev)) 1470 if (ev_is_active (&pipe_w))
1406 { 1471 {
1407 ev_ref (EV_A); /* signal watcher */ 1472 ev_ref (EV_A); /* signal watcher */
1408 ev_io_stop (EV_A_ &pipeev); 1473 ev_io_stop (EV_A_ &pipe_w);
1409 1474
1410#if EV_USE_EVENTFD 1475#if EV_USE_EVENTFD
1411 if (evfd >= 0) 1476 if (evfd >= 0)
1412 close (evfd); 1477 close (evfd);
1413#endif 1478#endif
… …
1452 } 1517 }
1453 1518
1454 ev_free (anfds); anfdmax = 0; 1519 ev_free (anfds); anfdmax = 0;
1455 1520
1456 /* have to use the microsoft-never-gets-it-right macro */ 1521 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY);
1457 array_free (fdchange, EMPTY); 1523 array_free (fdchange, EMPTY);
1458 array_free (timer, EMPTY); 1524 array_free (timer, EMPTY);
1459#if EV_PERIODIC_ENABLE 1525#if EV_PERIODIC_ENABLE
1460 array_free (periodic, EMPTY); 1526 array_free (periodic, EMPTY);
1461#endif 1527#endif
… …
1470 1536
1471 backend = 0; 1537 backend = 0;
1472} 1538}
1473 1539
1474#if EV_USE_INOTIFY 1540#if EV_USE_INOTIFY
1475void inline_size infy_fork (EV_P); 1541inline_size void infy_fork (EV_P);
1476#endif 1542#endif
1477 1543
1478void inline_size 1544inline_size void
1479loop_fork (EV_P) 1545loop_fork (EV_P)
1480{ 1546{
1481#if EV_USE_PORT 1547#if EV_USE_PORT
1482 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1548 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1483#endif 1549#endif
… …
1489#endif 1555#endif
1490#if EV_USE_INOTIFY 1556#if EV_USE_INOTIFY
1491 infy_fork (EV_A); 1557 infy_fork (EV_A);
1492#endif 1558#endif
1493 1559
1494 if (ev_is_active (&pipeev)) 1560 if (ev_is_active (&pipe_w))
1495 { 1561 {
1496 /* this "locks" the handlers against writing to the pipe */ 1562 /* this "locks" the handlers against writing to the pipe */
1497 /* while we modify the fd vars */ 1563 /* while we modify the fd vars */
1498 gotsig = 1; 1564 gotsig = 1;
1499#if EV_ASYNC_ENABLE 1565#if EV_ASYNC_ENABLE
1500 gotasync = 1; 1566 gotasync = 1;
1501#endif 1567#endif
1502 1568
1503 ev_ref (EV_A); 1569 ev_ref (EV_A);
1504 ev_io_stop (EV_A_ &pipeev); 1570 ev_io_stop (EV_A_ &pipe_w);
1505 1571
1506#if EV_USE_EVENTFD 1572#if EV_USE_EVENTFD
1507 if (evfd >= 0) 1573 if (evfd >= 0)
1508 close (evfd); 1574 close (evfd);
1509#endif 1575#endif
… …
1514 close (evpipe [1]); 1580 close (evpipe [1]);
1515 } 1581 }
1516 1582
1517 evpipe_init (EV_A); 1583 evpipe_init (EV_A);
1518 /* now iterate over everything, in case we missed something */ 1584 /* now iterate over everything, in case we missed something */
1519 pipecb (EV_A_ &pipeev, EV_READ); 1585 pipecb (EV_A_ &pipe_w, EV_READ);
1520 } 1586 }
1521 1587
1522 postfork = 0; 1588 postfork = 0;
1523} 1589}
1524 1590
… …
1720ev_invoke (EV_P_ void *w, int revents) 1786ev_invoke (EV_P_ void *w, int revents)
1721{ 1787{
1722 EV_CB_INVOKE ((W)w, revents); 1788 EV_CB_INVOKE ((W)w, revents);
1723} 1789}
1724 1790
1725void inline_speed 1791void
1726call_pending (EV_P) 1792ev_invoke_pending (EV_P)
1727{ 1793{
1728 int pri; 1794 int pri;
1729 1795
1730 for (pri = NUMPRI; pri--; ) 1796 for (pri = NUMPRI; pri--; )
1731 while (pendingcnt [pri]) 1797 while (pendingcnt [pri])
1732 { 1798 {
1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1799 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1734 1800
1735 if (expect_true (p->w))
1736 {
1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 1801 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1802 /* ^ this is no longer true, as pending_w could be here */
1738 1803
1739 p->w->pending = 0; 1804 p->w->pending = 0;
1740 EV_CB_INVOKE (p->w, p->events); 1805 EV_CB_INVOKE (p->w, p->events);
1741 EV_FREQUENT_CHECK; 1806 EV_FREQUENT_CHECK;
1742 }
1743 } 1807 }
1744} 1808}
1745 1809
1746#if EV_IDLE_ENABLE 1810#if EV_IDLE_ENABLE
1747void inline_size 1811/* make idle watchers pending. this handles the "call-idle */
1812/* only when higher priorities are idle" logic */
1813inline_size void
1748idle_reify (EV_P) 1814idle_reify (EV_P)
1749{ 1815{
1750 if (expect_false (idleall)) 1816 if (expect_false (idleall))
1751 { 1817 {
1752 int pri; 1818 int pri;
… …
1764 } 1830 }
1765 } 1831 }
1766} 1832}
1767#endif 1833#endif
1768 1834
1769void inline_size 1835/* make timers pending */
1836inline_size void
1770timers_reify (EV_P) 1837timers_reify (EV_P)
1771{ 1838{
1772 EV_FREQUENT_CHECK; 1839 EV_FREQUENT_CHECK;
1773 1840
1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1841 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1775 { 1842 {
1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1843 do
1777
1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1779
1780 /* first reschedule or stop timer */
1781 if (w->repeat)
1782 { 1844 {
1845 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1846
1847 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1848
1849 /* first reschedule or stop timer */
1850 if (w->repeat)
1851 {
1783 ev_at (w) += w->repeat; 1852 ev_at (w) += w->repeat;
1784 if (ev_at (w) < mn_now) 1853 if (ev_at (w) < mn_now)
1785 ev_at (w) = mn_now; 1854 ev_at (w) = mn_now;
1786 1855
1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1856 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1788 1857
1789 ANHE_at_cache (timers [HEAP0]); 1858 ANHE_at_cache (timers [HEAP0]);
1790 downheap (timers, timercnt, HEAP0); 1859 downheap (timers, timercnt, HEAP0);
1860 }
1861 else
1862 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1863
1864 EV_FREQUENT_CHECK;
1865 feed_reverse (EV_A_ (W)w);
1791 } 1866 }
1792 else 1867 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1793 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1794 1868
1795 EV_FREQUENT_CHECK;
1796 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1869 feed_reverse_done (EV_A_ EV_TIMEOUT);
1797 } 1870 }
1798} 1871}
1799 1872
1800#if EV_PERIODIC_ENABLE 1873#if EV_PERIODIC_ENABLE
1801void inline_size 1874/* make periodics pending */
1875inline_size void
1802periodics_reify (EV_P) 1876periodics_reify (EV_P)
1803{ 1877{
1804 EV_FREQUENT_CHECK; 1878 EV_FREQUENT_CHECK;
1805 1879
1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1880 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1807 { 1881 {
1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1882 int feed_count = 0;
1809 1883
1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 1884 do
1811
1812 /* first reschedule or stop timer */
1813 if (w->reschedule_cb)
1814 { 1885 {
1886 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1887
1888 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1889
1890 /* first reschedule or stop timer */
1891 if (w->reschedule_cb)
1892 {
1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1893 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1816 1894
1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1895 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1818 1896
1819 ANHE_at_cache (periodics [HEAP0]); 1897 ANHE_at_cache (periodics [HEAP0]);
1820 downheap (periodics, periodiccnt, HEAP0); 1898 downheap (periodics, periodiccnt, HEAP0);
1899 }
1900 else if (w->interval)
1901 {
1902 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1903 /* if next trigger time is not sufficiently in the future, put it there */
1904 /* this might happen because of floating point inexactness */
1905 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1906 {
1907 ev_at (w) += w->interval;
1908
1909 /* if interval is unreasonably low we might still have a time in the past */
1910 /* so correct this. this will make the periodic very inexact, but the user */
1911 /* has effectively asked to get triggered more often than possible */
1912 if (ev_at (w) < ev_rt_now)
1913 ev_at (w) = ev_rt_now;
1914 }
1915
1916 ANHE_at_cache (periodics [HEAP0]);
1917 downheap (periodics, periodiccnt, HEAP0);
1918 }
1919 else
1920 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1921
1922 EV_FREQUENT_CHECK;
1923 feed_reverse (EV_A_ (W)w);
1821 } 1924 }
1822 else if (w->interval) 1925 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1823 {
1824 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1825 /* if next trigger time is not sufficiently in the future, put it there */
1826 /* this might happen because of floating point inexactness */
1827 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1828 {
1829 ev_at (w) += w->interval;
1830 1926
1831 /* if interval is unreasonably low we might still have a time in the past */
1832 /* so correct this. this will make the periodic very inexact, but the user */
1833 /* has effectively asked to get triggered more often than possible */
1834 if (ev_at (w) < ev_rt_now)
1835 ev_at (w) = ev_rt_now;
1836 }
1837
1838 ANHE_at_cache (periodics [HEAP0]);
1839 downheap (periodics, periodiccnt, HEAP0);
1840 }
1841 else
1842 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1843
1844 EV_FREQUENT_CHECK;
1845 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1927 feed_reverse_done (EV_A_ EV_PERIODIC);
1846 } 1928 }
1847} 1929}
1848 1930
1931/* simply recalculate all periodics */
1932/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1849static void noinline 1933static void noinline
1850periodics_reschedule (EV_P) 1934periodics_reschedule (EV_P)
1851{ 1935{
1852 int i; 1936 int i;
1853 1937
… …
1866 1950
1867 reheap (periodics, periodiccnt); 1951 reheap (periodics, periodiccnt);
1868} 1952}
1869#endif 1953#endif
1870 1954
1871void inline_speed 1955/* adjust all timers by a given offset */
1956static void noinline
1957timers_reschedule (EV_P_ ev_tstamp adjust)
1958{
1959 int i;
1960
1961 for (i = 0; i < timercnt; ++i)
1962 {
1963 ANHE *he = timers + i + HEAP0;
1964 ANHE_w (*he)->at += adjust;
1965 ANHE_at_cache (*he);
1966 }
1967}
1968
1969/* fetch new monotonic and realtime times from the kernel */
1970/* also detetc if there was a timejump, and act accordingly */
1971inline_speed void
1872time_update (EV_P_ ev_tstamp max_block) 1972time_update (EV_P_ ev_tstamp max_block)
1873{ 1973{
1874 int i;
1875
1876#if EV_USE_MONOTONIC 1974#if EV_USE_MONOTONIC
1877 if (expect_true (have_monotonic)) 1975 if (expect_true (have_monotonic))
1878 { 1976 {
1977 int i;
1879 ev_tstamp odiff = rtmn_diff; 1978 ev_tstamp odiff = rtmn_diff;
1880 1979
1881 mn_now = get_clock (); 1980 mn_now = get_clock ();
1882 1981
1883 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1982 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1909 ev_rt_now = ev_time (); 2008 ev_rt_now = ev_time ();
1910 mn_now = get_clock (); 2009 mn_now = get_clock ();
1911 now_floor = mn_now; 2010 now_floor = mn_now;
1912 } 2011 }
1913 2012
2013 /* no timer adjustment, as the monotonic clock doesn't jump */
2014 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1914# if EV_PERIODIC_ENABLE 2015# if EV_PERIODIC_ENABLE
1915 periodics_reschedule (EV_A); 2016 periodics_reschedule (EV_A);
1916# endif 2017# endif
1917 /* no timer adjustment, as the monotonic clock doesn't jump */
1918 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1919 } 2018 }
1920 else 2019 else
1921#endif 2020#endif
1922 { 2021 {
1923 ev_rt_now = ev_time (); 2022 ev_rt_now = ev_time ();
1924 2023
1925 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2024 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1926 { 2025 {
2026 /* adjust timers. this is easy, as the offset is the same for all of them */
2027 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1927#if EV_PERIODIC_ENABLE 2028#if EV_PERIODIC_ENABLE
1928 periodics_reschedule (EV_A); 2029 periodics_reschedule (EV_A);
1929#endif 2030#endif
1930 /* adjust timers. this is easy, as the offset is the same for all of them */
1931 for (i = 0; i < timercnt; ++i)
1932 {
1933 ANHE *he = timers + i + HEAP0;
1934 ANHE_w (*he)->at += ev_rt_now - mn_now;
1935 ANHE_at_cache (*he);
1936 }
1937 } 2031 }
1938 2032
1939 mn_now = ev_rt_now; 2033 mn_now = ev_rt_now;
1940 } 2034 }
1941} 2035}
1942 2036
1943void 2037void
1944ev_ref (EV_P)
1945{
1946 ++activecnt;
1947}
1948
1949void
1950ev_unref (EV_P)
1951{
1952 --activecnt;
1953}
1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1961static int loop_done;
1962
1963void
1964ev_loop (EV_P_ int flags) 2038ev_loop (EV_P_ int flags)
1965{ 2039{
2040 ++loop_depth;
2041
1966 loop_done = EVUNLOOP_CANCEL; 2042 loop_done = EVUNLOOP_CANCEL;
1967 2043
1968 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1969 2045
1970 do 2046 do
1971 { 2047 {
1972#if EV_VERIFY >= 2 2048#if EV_VERIFY >= 2
1973 ev_loop_verify (EV_A); 2049 ev_loop_verify (EV_A);
… …
1986 /* we might have forked, so queue fork handlers */ 2062 /* we might have forked, so queue fork handlers */
1987 if (expect_false (postfork)) 2063 if (expect_false (postfork))
1988 if (forkcnt) 2064 if (forkcnt)
1989 { 2065 {
1990 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1991 call_pending (EV_A); 2067 invoke_cb (EV_A);
1992 } 2068 }
1993#endif 2069#endif
1994 2070
1995 /* queue prepare watchers (and execute them) */ 2071 /* queue prepare watchers (and execute them) */
1996 if (expect_false (preparecnt)) 2072 if (expect_false (preparecnt))
1997 { 2073 {
1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1999 call_pending (EV_A); 2075 invoke_cb (EV_A);
2000 } 2076 }
2001
2002 if (expect_false (!activecnt))
2003 break;
2004 2077
2005 /* we might have forked, so reify kernel state if necessary */ 2078 /* we might have forked, so reify kernel state if necessary */
2006 if (expect_false (postfork)) 2079 if (expect_false (postfork))
2007 loop_fork (EV_A); 2080 loop_fork (EV_A);
2008 2081
… …
2014 ev_tstamp waittime = 0.; 2087 ev_tstamp waittime = 0.;
2015 ev_tstamp sleeptime = 0.; 2088 ev_tstamp sleeptime = 0.;
2016 2089
2017 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2090 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2018 { 2091 {
2092 /* remember old timestamp for io_blocktime calculation */
2093 ev_tstamp prev_mn_now = mn_now;
2094
2019 /* update time to cancel out callback processing overhead */ 2095 /* update time to cancel out callback processing overhead */
2020 time_update (EV_A_ 1e100); 2096 time_update (EV_A_ 1e100);
2021 2097
2022 waittime = MAX_BLOCKTIME; 2098 waittime = MAX_BLOCKTIME;
2023 2099
… …
2033 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2109 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2034 if (waittime > to) waittime = to; 2110 if (waittime > to) waittime = to;
2035 } 2111 }
2036#endif 2112#endif
2037 2113
2114 /* don't let timeouts decrease the waittime below timeout_blocktime */
2038 if (expect_false (waittime < timeout_blocktime)) 2115 if (expect_false (waittime < timeout_blocktime))
2039 waittime = timeout_blocktime; 2116 waittime = timeout_blocktime;
2040 2117
2041 sleeptime = waittime - backend_fudge; 2118 /* extra check because io_blocktime is commonly 0 */
2042
2043 if (expect_true (sleeptime > io_blocktime)) 2119 if (expect_false (io_blocktime))
2044 sleeptime = io_blocktime;
2045
2046 if (sleeptime)
2047 { 2120 {
2121 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2122
2123 if (sleeptime > waittime - backend_fudge)
2124 sleeptime = waittime - backend_fudge;
2125
2126 if (expect_true (sleeptime > 0.))
2127 {
2048 ev_sleep (sleeptime); 2128 ev_sleep (sleeptime);
2049 waittime -= sleeptime; 2129 waittime -= sleeptime;
2130 }
2050 } 2131 }
2051 } 2132 }
2052 2133
2053 ++loop_count; 2134 ++loop_count;
2054 backend_poll (EV_A_ waittime); 2135 backend_poll (EV_A_ waittime);
… …
2070 2151
2071 /* queue check watchers, to be executed first */ 2152 /* queue check watchers, to be executed first */
2072 if (expect_false (checkcnt)) 2153 if (expect_false (checkcnt))
2073 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2074 2155
2075 call_pending (EV_A); 2156 invoke_cb (EV_A);
2076 } 2157 }
2077 while (expect_true ( 2158 while (expect_true (
2078 activecnt 2159 activecnt
2079 && !loop_done 2160 && !loop_done
2080 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2081 )); 2162 ));
2082 2163
2083 if (loop_done == EVUNLOOP_ONE) 2164 if (loop_done == EVUNLOOP_ONE)
2084 loop_done = EVUNLOOP_CANCEL; 2165 loop_done = EVUNLOOP_CANCEL;
2166
2167 --loop_depth;
2085} 2168}
2086 2169
2087void 2170void
2088ev_unloop (EV_P_ int how) 2171ev_unloop (EV_P_ int how)
2089{ 2172{
2090 loop_done = how; 2173 loop_done = how;
2091} 2174}
2092 2175
2176void
2177ev_ref (EV_P)
2178{
2179 ++activecnt;
2180}
2181
2182void
2183ev_unref (EV_P)
2184{
2185 --activecnt;
2186}
2187
2188void
2189ev_now_update (EV_P)
2190{
2191 time_update (EV_A_ 1e100);
2192}
2193
2194void
2195ev_suspend (EV_P)
2196{
2197 ev_now_update (EV_A);
2198}
2199
2200void
2201ev_resume (EV_P)
2202{
2203 ev_tstamp mn_prev = mn_now;
2204
2205 ev_now_update (EV_A);
2206 timers_reschedule (EV_A_ mn_now - mn_prev);
2207#if EV_PERIODIC_ENABLE
2208 /* TODO: really do this? */
2209 periodics_reschedule (EV_A);
2210#endif
2211}
2212
2093/*****************************************************************************/ 2213/*****************************************************************************/
2214/* singly-linked list management, used when the expected list length is short */
2094 2215
2095void inline_size 2216inline_size void
2096wlist_add (WL *head, WL elem) 2217wlist_add (WL *head, WL elem)
2097{ 2218{
2098 elem->next = *head; 2219 elem->next = *head;
2099 *head = elem; 2220 *head = elem;
2100} 2221}
2101 2222
2102void inline_size 2223inline_size void
2103wlist_del (WL *head, WL elem) 2224wlist_del (WL *head, WL elem)
2104{ 2225{
2105 while (*head) 2226 while (*head)
2106 { 2227 {
2107 if (*head == elem) 2228 if (*head == elem)
… …
2112 2233
2113 head = &(*head)->next; 2234 head = &(*head)->next;
2114 } 2235 }
2115} 2236}
2116 2237
2117void inline_speed 2238/* internal, faster, version of ev_clear_pending */
2239inline_speed void
2118clear_pending (EV_P_ W w) 2240clear_pending (EV_P_ W w)
2119{ 2241{
2120 if (w->pending) 2242 if (w->pending)
2121 { 2243 {
2122 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2244 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2123 w->pending = 0; 2245 w->pending = 0;
2124 } 2246 }
2125} 2247}
2126 2248
2127int 2249int
… …
2131 int pending = w_->pending; 2253 int pending = w_->pending;
2132 2254
2133 if (expect_true (pending)) 2255 if (expect_true (pending))
2134 { 2256 {
2135 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2257 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2258 p->w = (W)&pending_w;
2136 w_->pending = 0; 2259 w_->pending = 0;
2137 p->w = 0;
2138 return p->events; 2260 return p->events;
2139 } 2261 }
2140 else 2262 else
2141 return 0; 2263 return 0;
2142} 2264}
2143 2265
2144void inline_size 2266inline_size void
2145pri_adjust (EV_P_ W w) 2267pri_adjust (EV_P_ W w)
2146{ 2268{
2147 int pri = w->priority; 2269 int pri = ev_priority (w);
2148 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2270 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2149 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2271 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2150 w->priority = pri; 2272 ev_set_priority (w, pri);
2151} 2273}
2152 2274
2153void inline_speed 2275inline_speed void
2154ev_start (EV_P_ W w, int active) 2276ev_start (EV_P_ W w, int active)
2155{ 2277{
2156 pri_adjust (EV_A_ w); 2278 pri_adjust (EV_A_ w);
2157 w->active = active; 2279 w->active = active;
2158 ev_ref (EV_A); 2280 ev_ref (EV_A);
2159} 2281}
2160 2282
2161void inline_size 2283inline_size void
2162ev_stop (EV_P_ W w) 2284ev_stop (EV_P_ W w)
2163{ 2285{
2164 ev_unref (EV_A); 2286 ev_unref (EV_A);
2165 w->active = 0; 2287 w->active = 0;
2166} 2288}
… …
2174 2296
2175 if (expect_false (ev_is_active (w))) 2297 if (expect_false (ev_is_active (w)))
2176 return; 2298 return;
2177 2299
2178 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2300 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2301 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2180 2302
2181 EV_FREQUENT_CHECK; 2303 EV_FREQUENT_CHECK;
2182 2304
2183 ev_start (EV_A_ (W)w, 1); 2305 ev_start (EV_A_ (W)w, 1);
2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2185 wlist_add (&anfds[fd].head, (WL)w); 2307 wlist_add (&anfds[fd].head, (WL)w);
2186 2308
2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2188 w->events &= ~EV_IOFDSET; 2310 w->events &= ~EV__IOFDSET;
2189 2311
2190 EV_FREQUENT_CHECK; 2312 EV_FREQUENT_CHECK;
2191} 2313}
2192 2314
2193void noinline 2315void noinline
… …
2591 2713
2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2714 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2593 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2715 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2594} 2716}
2595 2717
2596void inline_size 2718inline_size void
2597check_2625 (EV_P) 2719check_2625 (EV_P)
2598{ 2720{
2599 /* kernels < 2.6.25 are borked 2721 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2722 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */ 2723 */
… …
2614 return; 2736 return;
2615 2737
2616 fs_2625 = 1; 2738 fs_2625 = 1;
2617} 2739}
2618 2740
2619void inline_size 2741inline_size void
2620infy_init (EV_P) 2742infy_init (EV_P)
2621{ 2743{
2622 if (fs_fd != -2) 2744 if (fs_fd != -2)
2623 return; 2745 return;
2624 2746
… …
2634 ev_set_priority (&fs_w, EV_MAXPRI); 2756 ev_set_priority (&fs_w, EV_MAXPRI);
2635 ev_io_start (EV_A_ &fs_w); 2757 ev_io_start (EV_A_ &fs_w);
2636 } 2758 }
2637} 2759}
2638 2760
2639void inline_size 2761inline_size void
2640infy_fork (EV_P) 2762infy_fork (EV_P)
2641{ 2763{
2642 int slot; 2764 int slot;
2643 2765
2644 if (fs_fd < 0) 2766 if (fs_fd < 0)
… …
3146 ev_timer_set (&once->to, timeout, 0.); 3268 ev_timer_set (&once->to, timeout, 0.);
3147 ev_timer_start (EV_A_ &once->to); 3269 ev_timer_start (EV_A_ &once->to);
3148 } 3270 }
3149} 3271}
3150 3272
3273/*****************************************************************************/
3274
3275#if EV_WALK_ENABLE
3276void
3277ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3278{
3279 int i, j;
3280 ev_watcher_list *wl, *wn;
3281
3282 if (types & (EV_IO | EV_EMBED))
3283 for (i = 0; i < anfdmax; ++i)
3284 for (wl = anfds [i].head; wl; )
3285 {
3286 wn = wl->next;
3287
3288#if EV_EMBED_ENABLE
3289 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3290 {
3291 if (types & EV_EMBED)
3292 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3293 }
3294 else
3295#endif
3296#if EV_USE_INOTIFY
3297 if (ev_cb ((ev_io *)wl) == infy_cb)
3298 ;
3299 else
3300#endif
3301 if ((ev_io *)wl != &pipe_w)
3302 if (types & EV_IO)
3303 cb (EV_A_ EV_IO, wl);
3304
3305 wl = wn;
3306 }
3307
3308 if (types & (EV_TIMER | EV_STAT))
3309 for (i = timercnt + HEAP0; i-- > HEAP0; )
3310#if EV_STAT_ENABLE
3311 /*TODO: timer is not always active*/
3312 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3313 {
3314 if (types & EV_STAT)
3315 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3316 }
3317 else
3318#endif
3319 if (types & EV_TIMER)
3320 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3321
3322#if EV_PERIODIC_ENABLE
3323 if (types & EV_PERIODIC)
3324 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3325 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3326#endif
3327
3328#if EV_IDLE_ENABLE
3329 if (types & EV_IDLE)
3330 for (j = NUMPRI; i--; )
3331 for (i = idlecnt [j]; i--; )
3332 cb (EV_A_ EV_IDLE, idles [j][i]);
3333#endif
3334
3335#if EV_FORK_ENABLE
3336 if (types & EV_FORK)
3337 for (i = forkcnt; i--; )
3338 if (ev_cb (forks [i]) != embed_fork_cb)
3339 cb (EV_A_ EV_FORK, forks [i]);
3340#endif
3341
3342#if EV_ASYNC_ENABLE
3343 if (types & EV_ASYNC)
3344 for (i = asynccnt; i--; )
3345 cb (EV_A_ EV_ASYNC, asyncs [i]);
3346#endif
3347
3348 if (types & EV_PREPARE)
3349 for (i = preparecnt; i--; )
3350#if EV_EMBED_ENABLE
3351 if (ev_cb (prepares [i]) != embed_prepare_cb)
3352#endif
3353 cb (EV_A_ EV_PREPARE, prepares [i]);
3354
3355 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]);
3358
3359 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i)
3361 for (wl = signals [i].head; wl; )
3362 {
3363 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn;
3366 }
3367
3368 if (types & EV_CHILD)
3369 for (i = EV_PID_HASHSIZE; i--; )
3370 for (wl = childs [i]; wl; )
3371 {
3372 wn = wl->next;
3373 cb (EV_A_ EV_CHILD, wl);
3374 wl = wn;
3375 }
3376/* EV_STAT 0x00001000 /* stat data changed */
3377/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3378}
3379#endif
3380
3151#if EV_MULTIPLICITY 3381#if EV_MULTIPLICITY
3152 #include "ev_wrap.h" 3382 #include "ev_wrap.h"
3153#endif 3383#endif
3154 3384
3155#ifdef __cplusplus 3385#ifdef __cplusplus

Diff Legend

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