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

Comparing libev/ev.c (file contents):
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC vs.
Revision 1.288 by root, Sat Apr 25 14:12:48 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
64# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
67# endif 67# endif
68# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
69# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
70# endif 70# endif
71# else 71# else
72# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
73# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
74# endif 74# endif
… …
193# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif 194# endif
195#endif 195#endif
196 196
197#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
198# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 199#endif
200 200
201#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
397typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
398 398
399#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
401 401
402#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif 410#endif
407 411
408#ifdef _WIN32 412#ifdef _WIN32
409# include "ev_win32.c" 413# include "ev_win32.c"
… …
474#define ev_malloc(size) ev_realloc (0, (size)) 478#define ev_malloc(size) ev_realloc (0, (size))
475#define ev_free(ptr) ev_realloc ((ptr), 0) 479#define ev_free(ptr) ev_realloc ((ptr), 0)
476 480
477/*****************************************************************************/ 481/*****************************************************************************/
478 482
483/* file descriptor info structure */
479typedef struct 484typedef struct
480{ 485{
481 WL head; 486 WL head;
482 unsigned char events; 487 unsigned char events; /* the events watched for */
483 unsigned char reify; 488 unsigned char reify; /* flag set when this ANFD needs reification */
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused; 490 unsigned char unused;
486#if EV_USE_EPOLL 491#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */ 492 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif 493#endif
489#if EV_SELECT_IS_WINSOCKET 494#if EV_SELECT_IS_WINSOCKET
490 SOCKET handle; 495 SOCKET handle;
491#endif 496#endif
492} ANFD; 497} ANFD;
493 498
499/* stores the pending event set for a given watcher */
494typedef struct 500typedef struct
495{ 501{
496 W w; 502 W w;
497 int events; 503 int events; /* the pending event set for the given watcher */
498} ANPENDING; 504} ANPENDING;
499 505
500#if EV_USE_INOTIFY 506#if EV_USE_INOTIFY
501/* hash table entry per inotify-id */ 507/* hash table entry per inotify-id */
502typedef struct 508typedef struct
… …
505} ANFS; 511} ANFS;
506#endif 512#endif
507 513
508/* Heap Entry */ 514/* Heap Entry */
509#if EV_HEAP_CACHE_AT 515#if EV_HEAP_CACHE_AT
516 /* a heap element */
510 typedef struct { 517 typedef struct {
511 ev_tstamp at; 518 ev_tstamp at;
512 WT w; 519 WT w;
513 } ANHE; 520 } ANHE;
514 521
515 #define ANHE_w(he) (he).w /* access watcher, read-write */ 522 #define ANHE_w(he) (he).w /* access watcher, read-write */
516 #define ANHE_at(he) (he).at /* access cached at, read-only */ 523 #define ANHE_at(he) (he).at /* access cached at, read-only */
517 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 524 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
518#else 525#else
526 /* a heap element */
519 typedef WT ANHE; 527 typedef WT ANHE;
520 528
521 #define ANHE_w(he) (he) 529 #define ANHE_w(he) (he)
522 #define ANHE_at(he) (he)->at 530 #define ANHE_at(he) (he)->at
523 #define ANHE_at_cache(he) 531 #define ANHE_at_cache(he)
… …
553 561
554ev_tstamp 562ev_tstamp
555ev_time (void) 563ev_time (void)
556{ 564{
557#if EV_USE_REALTIME 565#if EV_USE_REALTIME
566 if (expect_true (have_realtime))
567 {
558 struct timespec ts; 568 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 569 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 570 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 571 }
572#endif
573
562 struct timeval tv; 574 struct timeval tv;
563 gettimeofday (&tv, 0); 575 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 576 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 577}
567 578
568ev_tstamp inline_size 579inline_size ev_tstamp
569get_clock (void) 580get_clock (void)
570{ 581{
571#if EV_USE_MONOTONIC 582#if EV_USE_MONOTONIC
572 if (expect_true (have_monotonic)) 583 if (expect_true (have_monotonic))
573 { 584 {
… …
618 629
619/*****************************************************************************/ 630/*****************************************************************************/
620 631
621#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 632#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
622 633
623int inline_size 634/* find a suitable new size for the given array, */
635/* hopefully by rounding to a ncie-to-malloc size */
636inline_size int
624array_nextsize (int elem, int cur, int cnt) 637array_nextsize (int elem, int cur, int cnt)
625{ 638{
626 int ncur = cur + 1; 639 int ncur = cur + 1;
627 640
628 do 641 do
… …
669 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 682 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
670 } 683 }
671#endif 684#endif
672 685
673#define array_free(stem, idx) \ 686#define array_free(stem, idx) \
674 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 687 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
675 688
676/*****************************************************************************/ 689/*****************************************************************************/
690
691/* dummy callback for pending events */
692static void noinline
693pendingcb (EV_P_ ev_prepare *w, int revents)
694{
695}
677 696
678void noinline 697void noinline
679ev_feed_event (EV_P_ void *w, int revents) 698ev_feed_event (EV_P_ void *w, int revents)
680{ 699{
681 W w_ = (W)w; 700 W w_ = (W)w;
… …
690 pendings [pri][w_->pending - 1].w = w_; 709 pendings [pri][w_->pending - 1].w = w_;
691 pendings [pri][w_->pending - 1].events = revents; 710 pendings [pri][w_->pending - 1].events = revents;
692 } 711 }
693} 712}
694 713
695void inline_speed 714inline_speed void
715feed_reverse (EV_P_ W w)
716{
717 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
718 rfeeds [rfeedcnt++] = w;
719}
720
721inline_size void
722feed_reverse_done (EV_P_ int revents)
723{
724 do
725 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
726 while (rfeedcnt);
727}
728
729inline_speed void
696queue_events (EV_P_ W *events, int eventcnt, int type) 730queue_events (EV_P_ W *events, int eventcnt, int type)
697{ 731{
698 int i; 732 int i;
699 733
700 for (i = 0; i < eventcnt; ++i) 734 for (i = 0; i < eventcnt; ++i)
701 ev_feed_event (EV_A_ events [i], type); 735 ev_feed_event (EV_A_ events [i], type);
702} 736}
703 737
704/*****************************************************************************/ 738/*****************************************************************************/
705 739
706void inline_speed 740inline_speed void
707fd_event (EV_P_ int fd, int revents) 741fd_event (EV_P_ int fd, int revents)
708{ 742{
709 ANFD *anfd = anfds + fd; 743 ANFD *anfd = anfds + fd;
710 ev_io *w; 744 ev_io *w;
711 745
… …
723{ 757{
724 if (fd >= 0 && fd < anfdmax) 758 if (fd >= 0 && fd < anfdmax)
725 fd_event (EV_A_ fd, revents); 759 fd_event (EV_A_ fd, revents);
726} 760}
727 761
728void inline_size 762/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */
764inline_size void
729fd_reify (EV_P) 765fd_reify (EV_P)
730{ 766{
731 int i; 767 int i;
732 768
733 for (i = 0; i < fdchangecnt; ++i) 769 for (i = 0; i < fdchangecnt; ++i)
… …
748 #ifdef EV_FD_TO_WIN32_HANDLE 784 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else 786 #else
751 anfd->handle = _get_osfhandle (fd); 787 anfd->handle = _get_osfhandle (fd);
752 #endif 788 #endif
753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
754 } 790 }
755#endif 791#endif
756 792
757 { 793 {
758 unsigned char o_events = anfd->events; 794 unsigned char o_events = anfd->events;
759 unsigned char o_reify = anfd->reify; 795 unsigned char o_reify = anfd->reify;
760 796
761 anfd->reify = 0; 797 anfd->reify = 0;
762 anfd->events = events; 798 anfd->events = events;
763 799
764 if (o_events != events || o_reify & EV_IOFDSET) 800 if (o_events != events || o_reify & EV__IOFDSET)
765 backend_modify (EV_A_ fd, o_events, events); 801 backend_modify (EV_A_ fd, o_events, events);
766 } 802 }
767 } 803 }
768 804
769 fdchangecnt = 0; 805 fdchangecnt = 0;
770} 806}
771 807
772void inline_size 808/* something about the given fd changed */
809inline_size void
773fd_change (EV_P_ int fd, int flags) 810fd_change (EV_P_ int fd, int flags)
774{ 811{
775 unsigned char reify = anfds [fd].reify; 812 unsigned char reify = anfds [fd].reify;
776 anfds [fd].reify |= flags; 813 anfds [fd].reify |= flags;
777 814
… …
781 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 818 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
782 fdchanges [fdchangecnt - 1] = fd; 819 fdchanges [fdchangecnt - 1] = fd;
783 } 820 }
784} 821}
785 822
786void inline_speed 823/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
824inline_speed void
787fd_kill (EV_P_ int fd) 825fd_kill (EV_P_ int fd)
788{ 826{
789 ev_io *w; 827 ev_io *w;
790 828
791 while ((w = (ev_io *)anfds [fd].head)) 829 while ((w = (ev_io *)anfds [fd].head))
… …
793 ev_io_stop (EV_A_ w); 831 ev_io_stop (EV_A_ w);
794 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 832 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
795 } 833 }
796} 834}
797 835
798int inline_size 836/* check whether the given fd is atcually valid, for error recovery */
837inline_size int
799fd_valid (int fd) 838fd_valid (int fd)
800{ 839{
801#ifdef _WIN32 840#ifdef _WIN32
802 return _get_osfhandle (fd) != -1; 841 return _get_osfhandle (fd) != -1;
803#else 842#else
… …
840 for (fd = 0; fd < anfdmax; ++fd) 879 for (fd = 0; fd < anfdmax; ++fd)
841 if (anfds [fd].events) 880 if (anfds [fd].events)
842 { 881 {
843 anfds [fd].events = 0; 882 anfds [fd].events = 0;
844 anfds [fd].emask = 0; 883 anfds [fd].emask = 0;
845 fd_change (EV_A_ fd, EV_IOFDSET | 1); 884 fd_change (EV_A_ fd, EV__IOFDSET | 1);
846 } 885 }
847} 886}
848 887
849/*****************************************************************************/ 888/*****************************************************************************/
850 889
… …
866#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 905#define HEAP0 (DHEAP - 1) /* index of first element in heap */
867#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 906#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
868#define UPHEAP_DONE(p,k) ((p) == (k)) 907#define UPHEAP_DONE(p,k) ((p) == (k))
869 908
870/* away from the root */ 909/* away from the root */
871void inline_speed 910inline_speed void
872downheap (ANHE *heap, int N, int k) 911downheap (ANHE *heap, int N, int k)
873{ 912{
874 ANHE he = heap [k]; 913 ANHE he = heap [k];
875 ANHE *E = heap + N + HEAP0; 914 ANHE *E = heap + N + HEAP0;
876 915
… …
916#define HEAP0 1 955#define HEAP0 1
917#define HPARENT(k) ((k) >> 1) 956#define HPARENT(k) ((k) >> 1)
918#define UPHEAP_DONE(p,k) (!(p)) 957#define UPHEAP_DONE(p,k) (!(p))
919 958
920/* away from the root */ 959/* away from the root */
921void inline_speed 960inline_speed void
922downheap (ANHE *heap, int N, int k) 961downheap (ANHE *heap, int N, int k)
923{ 962{
924 ANHE he = heap [k]; 963 ANHE he = heap [k];
925 964
926 for (;;) 965 for (;;)
… …
946 ev_active (ANHE_w (he)) = k; 985 ev_active (ANHE_w (he)) = k;
947} 986}
948#endif 987#endif
949 988
950/* towards the root */ 989/* towards the root */
951void inline_speed 990inline_speed void
952upheap (ANHE *heap, int k) 991upheap (ANHE *heap, int k)
953{ 992{
954 ANHE he = heap [k]; 993 ANHE he = heap [k];
955 994
956 for (;;) 995 for (;;)
… …
967 1006
968 heap [k] = he; 1007 heap [k] = he;
969 ev_active (ANHE_w (he)) = k; 1008 ev_active (ANHE_w (he)) = k;
970} 1009}
971 1010
972void inline_size 1011/* move an element suitably so it is in a correct place */
1012inline_size void
973adjustheap (ANHE *heap, int N, int k) 1013adjustheap (ANHE *heap, int N, int k)
974{ 1014{
975 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
976 upheap (heap, k); 1016 upheap (heap, k);
977 else 1017 else
978 downheap (heap, N, k); 1018 downheap (heap, N, k);
979} 1019}
980 1020
981/* rebuild the heap: this function is used only once and executed rarely */ 1021/* rebuild the heap: this function is used only once and executed rarely */
982void inline_size 1022inline_size void
983reheap (ANHE *heap, int N) 1023reheap (ANHE *heap, int N)
984{ 1024{
985 int i; 1025 int i;
986 1026
987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1027 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
990 upheap (heap, i + HEAP0); 1030 upheap (heap, i + HEAP0);
991} 1031}
992 1032
993/*****************************************************************************/ 1033/*****************************************************************************/
994 1034
1035/* associate signal watchers to a signal signal */
995typedef struct 1036typedef struct
996{ 1037{
997 WL head; 1038 WL head;
998 EV_ATOMIC_T gotsig; 1039 EV_ATOMIC_T gotsig;
999} ANSIG; 1040} ANSIG;
… …
1003 1044
1004static EV_ATOMIC_T gotsig; 1045static EV_ATOMIC_T gotsig;
1005 1046
1006/*****************************************************************************/ 1047/*****************************************************************************/
1007 1048
1008void inline_speed 1049/* used to prepare libev internal fd's */
1050/* this is not fork-safe */
1051inline_speed void
1009fd_intern (int fd) 1052fd_intern (int fd)
1010{ 1053{
1011#ifdef _WIN32 1054#ifdef _WIN32
1012 unsigned long arg = 1; 1055 unsigned long arg = 1;
1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1018} 1061}
1019 1062
1020static void noinline 1063static void noinline
1021evpipe_init (EV_P) 1064evpipe_init (EV_P)
1022{ 1065{
1023 if (!ev_is_active (&pipeev)) 1066 if (!ev_is_active (&pipe_w))
1024 { 1067 {
1025#if EV_USE_EVENTFD 1068#if EV_USE_EVENTFD
1026 if ((evfd = eventfd (0, 0)) >= 0) 1069 if ((evfd = eventfd (0, 0)) >= 0)
1027 { 1070 {
1028 evpipe [0] = -1; 1071 evpipe [0] = -1;
1029 fd_intern (evfd); 1072 fd_intern (evfd);
1030 ev_io_set (&pipeev, evfd, EV_READ); 1073 ev_io_set (&pipe_w, evfd, EV_READ);
1031 } 1074 }
1032 else 1075 else
1033#endif 1076#endif
1034 { 1077 {
1035 while (pipe (evpipe)) 1078 while (pipe (evpipe))
1036 ev_syserr ("(libev) error creating signal/async pipe"); 1079 ev_syserr ("(libev) error creating signal/async pipe");
1037 1080
1038 fd_intern (evpipe [0]); 1081 fd_intern (evpipe [0]);
1039 fd_intern (evpipe [1]); 1082 fd_intern (evpipe [1]);
1040 ev_io_set (&pipeev, evpipe [0], EV_READ); 1083 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1041 } 1084 }
1042 1085
1043 ev_io_start (EV_A_ &pipeev); 1086 ev_io_start (EV_A_ &pipe_w);
1044 ev_unref (EV_A); /* watcher should not keep loop alive */ 1087 ev_unref (EV_A); /* watcher should not keep loop alive */
1045 } 1088 }
1046} 1089}
1047 1090
1048void inline_size 1091inline_size void
1049evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1092evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1050{ 1093{
1051 if (!*flag) 1094 if (!*flag)
1052 { 1095 {
1053 int old_errno = errno; /* save errno because write might clobber it */ 1096 int old_errno = errno; /* save errno because write might clobber it */
… …
1066 1109
1067 errno = old_errno; 1110 errno = old_errno;
1068 } 1111 }
1069} 1112}
1070 1113
1114/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */
1071static void 1116static void
1072pipecb (EV_P_ ev_io *iow, int revents) 1117pipecb (EV_P_ ev_io *iow, int revents)
1073{ 1118{
1074#if EV_USE_EVENTFD 1119#if EV_USE_EVENTFD
1075 if (evfd >= 0) 1120 if (evfd >= 0)
… …
1131ev_feed_signal_event (EV_P_ int signum) 1176ev_feed_signal_event (EV_P_ int signum)
1132{ 1177{
1133 WL w; 1178 WL w;
1134 1179
1135#if EV_MULTIPLICITY 1180#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1137#endif 1182#endif
1138 1183
1139 --signum; 1184 --signum;
1140 1185
1141 if (signum < 0 || signum >= signalmax) 1186 if (signum < 0 || signum >= signalmax)
… …
1157 1202
1158#ifndef WIFCONTINUED 1203#ifndef WIFCONTINUED
1159# define WIFCONTINUED(status) 0 1204# define WIFCONTINUED(status) 0
1160#endif 1205#endif
1161 1206
1162void inline_speed 1207/* handle a single child status event */
1208inline_speed void
1163child_reap (EV_P_ int chain, int pid, int status) 1209child_reap (EV_P_ int chain, int pid, int status)
1164{ 1210{
1165 ev_child *w; 1211 ev_child *w;
1166 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1212 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1167 1213
… …
1180 1226
1181#ifndef WCONTINUED 1227#ifndef WCONTINUED
1182# define WCONTINUED 0 1228# define WCONTINUED 0
1183#endif 1229#endif
1184 1230
1231/* called on sigchld etc., calls waitpid */
1185static void 1232static void
1186childcb (EV_P_ ev_signal *sw, int revents) 1233childcb (EV_P_ ev_signal *sw, int revents)
1187{ 1234{
1188 int pid, status; 1235 int pid, status;
1189 1236
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1317 /* kqueue is borked on everything but netbsd apparently */
1271 /* it usually doesn't work correctly on anything but sockets and pipes */ 1318 /* it usually doesn't work correctly on anything but sockets and pipes */
1272 flags &= ~EVBACKEND_KQUEUE; 1319 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1320#endif
1274#ifdef __APPLE__ 1321#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation 1322 /* only select works correctly on that "unix-certified" platform */
1276 flags &= ~EVBACKEND_SELECT; 1323 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1324 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1277#endif 1325#endif
1278 1326
1279 return flags; 1327 return flags;
1280} 1328}
1281 1329
… …
1313ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1314{ 1362{
1315 timeout_blocktime = interval; 1363 timeout_blocktime = interval;
1316} 1364}
1317 1365
1366/* initialise a loop structure, must be zero-initialised */
1318static void noinline 1367static void noinline
1319loop_init (EV_P_ unsigned int flags) 1368loop_init (EV_P_ unsigned int flags)
1320{ 1369{
1321 if (!backend) 1370 if (!backend)
1322 { 1371 {
1372#if EV_USE_REALTIME
1373 if (!have_realtime)
1374 {
1375 struct timespec ts;
1376
1377 if (!clock_gettime (CLOCK_REALTIME, &ts))
1378 have_realtime = 1;
1379 }
1380#endif
1381
1323#if EV_USE_MONOTONIC 1382#if EV_USE_MONOTONIC
1383 if (!have_monotonic)
1324 { 1384 {
1325 struct timespec ts; 1385 struct timespec ts;
1386
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1388 have_monotonic = 1;
1328 } 1389 }
1329#endif 1390#endif
1330 1391
1331 ev_rt_now = ev_time (); 1392 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1393 mn_now = get_clock ();
1333 now_floor = mn_now; 1394 now_floor = mn_now;
… …
1370#endif 1431#endif
1371#if EV_USE_SELECT 1432#if EV_USE_SELECT
1372 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1433 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1373#endif 1434#endif
1374 1435
1436 ev_prepare_init (&pending_w, pendingcb);
1437
1375 ev_init (&pipeev, pipecb); 1438 ev_init (&pipe_w, pipecb);
1376 ev_set_priority (&pipeev, EV_MAXPRI); 1439 ev_set_priority (&pipe_w, EV_MAXPRI);
1377 } 1440 }
1378} 1441}
1379 1442
1443/* free up a loop structure */
1380static void noinline 1444static void noinline
1381loop_destroy (EV_P) 1445loop_destroy (EV_P)
1382{ 1446{
1383 int i; 1447 int i;
1384 1448
1385 if (ev_is_active (&pipeev)) 1449 if (ev_is_active (&pipe_w))
1386 { 1450 {
1387 ev_ref (EV_A); /* signal watcher */ 1451 ev_ref (EV_A); /* signal watcher */
1388 ev_io_stop (EV_A_ &pipeev); 1452 ev_io_stop (EV_A_ &pipe_w);
1389 1453
1390#if EV_USE_EVENTFD 1454#if EV_USE_EVENTFD
1391 if (evfd >= 0) 1455 if (evfd >= 0)
1392 close (evfd); 1456 close (evfd);
1393#endif 1457#endif
… …
1432 } 1496 }
1433 1497
1434 ev_free (anfds); anfdmax = 0; 1498 ev_free (anfds); anfdmax = 0;
1435 1499
1436 /* have to use the microsoft-never-gets-it-right macro */ 1500 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY);
1437 array_free (fdchange, EMPTY); 1502 array_free (fdchange, EMPTY);
1438 array_free (timer, EMPTY); 1503 array_free (timer, EMPTY);
1439#if EV_PERIODIC_ENABLE 1504#if EV_PERIODIC_ENABLE
1440 array_free (periodic, EMPTY); 1505 array_free (periodic, EMPTY);
1441#endif 1506#endif
… …
1450 1515
1451 backend = 0; 1516 backend = 0;
1452} 1517}
1453 1518
1454#if EV_USE_INOTIFY 1519#if EV_USE_INOTIFY
1455void inline_size infy_fork (EV_P); 1520inline_size void infy_fork (EV_P);
1456#endif 1521#endif
1457 1522
1458void inline_size 1523inline_size void
1459loop_fork (EV_P) 1524loop_fork (EV_P)
1460{ 1525{
1461#if EV_USE_PORT 1526#if EV_USE_PORT
1462 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1527 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1463#endif 1528#endif
… …
1469#endif 1534#endif
1470#if EV_USE_INOTIFY 1535#if EV_USE_INOTIFY
1471 infy_fork (EV_A); 1536 infy_fork (EV_A);
1472#endif 1537#endif
1473 1538
1474 if (ev_is_active (&pipeev)) 1539 if (ev_is_active (&pipe_w))
1475 { 1540 {
1476 /* this "locks" the handlers against writing to the pipe */ 1541 /* this "locks" the handlers against writing to the pipe */
1477 /* while we modify the fd vars */ 1542 /* while we modify the fd vars */
1478 gotsig = 1; 1543 gotsig = 1;
1479#if EV_ASYNC_ENABLE 1544#if EV_ASYNC_ENABLE
1480 gotasync = 1; 1545 gotasync = 1;
1481#endif 1546#endif
1482 1547
1483 ev_ref (EV_A); 1548 ev_ref (EV_A);
1484 ev_io_stop (EV_A_ &pipeev); 1549 ev_io_stop (EV_A_ &pipe_w);
1485 1550
1486#if EV_USE_EVENTFD 1551#if EV_USE_EVENTFD
1487 if (evfd >= 0) 1552 if (evfd >= 0)
1488 close (evfd); 1553 close (evfd);
1489#endif 1554#endif
… …
1494 close (evpipe [1]); 1559 close (evpipe [1]);
1495 } 1560 }
1496 1561
1497 evpipe_init (EV_A); 1562 evpipe_init (EV_A);
1498 /* now iterate over everything, in case we missed something */ 1563 /* now iterate over everything, in case we missed something */
1499 pipecb (EV_A_ &pipeev, EV_READ); 1564 pipecb (EV_A_ &pipe_w, EV_READ);
1500 } 1565 }
1501 1566
1502 postfork = 0; 1567 postfork = 0;
1503} 1568}
1504 1569
… …
1534 1599
1535#if EV_VERIFY 1600#if EV_VERIFY
1536static void noinline 1601static void noinline
1537verify_watcher (EV_P_ W w) 1602verify_watcher (EV_P_ W w)
1538{ 1603{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1604 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1605
1541 if (w->pending) 1606 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1607 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543} 1608}
1544 1609
1545static void noinline 1610static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1611verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1612{
1548 int i; 1613 int i;
1549 1614
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1615 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1616 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1617 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1618 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1619 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555 1620
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1621 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1622 }
1558} 1623}
1559 1624
1560static void noinline 1625static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1626array_verify (EV_P_ W *ws, int cnt)
1562{ 1627{
1563 while (cnt--) 1628 while (cnt--)
1564 { 1629 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1630 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1631 verify_watcher (EV_A_ ws [cnt]);
1567 } 1632 }
1568} 1633}
1569#endif 1634#endif
1570 1635
… …
1577 1642
1578 assert (activecnt >= -1); 1643 assert (activecnt >= -1);
1579 1644
1580 assert (fdchangemax >= fdchangecnt); 1645 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1646 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1647 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1648
1584 assert (anfdmax >= 0); 1649 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1650 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1651 for (w = anfds [i].head; w; w = w->next)
1587 { 1652 {
1588 verify_watcher (EV_A_ (W)w); 1653 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1654 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1655 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 } 1656 }
1592 1657
1593 assert (timermax >= timercnt); 1658 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1659 verify_heap (EV_A_ timers, timercnt);
1595 1660
… …
1700ev_invoke (EV_P_ void *w, int revents) 1765ev_invoke (EV_P_ void *w, int revents)
1701{ 1766{
1702 EV_CB_INVOKE ((W)w, revents); 1767 EV_CB_INVOKE ((W)w, revents);
1703} 1768}
1704 1769
1705void inline_speed 1770inline_speed void
1706call_pending (EV_P) 1771call_pending (EV_P)
1707{ 1772{
1708 int pri; 1773 int pri;
1709 1774
1710 for (pri = NUMPRI; pri--; ) 1775 for (pri = NUMPRI; pri--; )
1711 while (pendingcnt [pri]) 1776 while (pendingcnt [pri])
1712 { 1777 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1778 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1779
1715 if (expect_true (p->w))
1716 {
1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1780 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1781 /* ^ this is no longer true, as pending_w could be here */
1718 1782
1719 p->w->pending = 0; 1783 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 1784 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 1785 EV_FREQUENT_CHECK;
1722 }
1723 } 1786 }
1724} 1787}
1725 1788
1726#if EV_IDLE_ENABLE 1789#if EV_IDLE_ENABLE
1727void inline_size 1790/* make idle watchers pending. this handles the "call-idle */
1791/* only when higher priorities are idle" logic */
1792inline_size void
1728idle_reify (EV_P) 1793idle_reify (EV_P)
1729{ 1794{
1730 if (expect_false (idleall)) 1795 if (expect_false (idleall))
1731 { 1796 {
1732 int pri; 1797 int pri;
… …
1744 } 1809 }
1745 } 1810 }
1746} 1811}
1747#endif 1812#endif
1748 1813
1749void inline_size 1814/* make timers pending */
1815inline_size void
1750timers_reify (EV_P) 1816timers_reify (EV_P)
1751{ 1817{
1752 EV_FREQUENT_CHECK; 1818 EV_FREQUENT_CHECK;
1753 1819
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1820 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 1821 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1822 do
1757
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1759
1760 /* first reschedule or stop timer */
1761 if (w->repeat)
1762 { 1823 {
1824 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1825
1826 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1827
1828 /* first reschedule or stop timer */
1829 if (w->repeat)
1830 {
1763 ev_at (w) += w->repeat; 1831 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 1832 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 1833 ev_at (w) = mn_now;
1766 1834
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1835 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768 1836
1769 ANHE_at_cache (timers [HEAP0]); 1837 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0); 1838 downheap (timers, timercnt, HEAP0);
1839 }
1840 else
1841 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1842
1843 EV_FREQUENT_CHECK;
1844 feed_reverse (EV_A_ (W)w);
1771 } 1845 }
1772 else 1846 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1773 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1774 1847
1775 EV_FREQUENT_CHECK;
1776 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1848 feed_reverse_done (EV_A_ EV_TIMEOUT);
1777 } 1849 }
1778} 1850}
1779 1851
1780#if EV_PERIODIC_ENABLE 1852#if EV_PERIODIC_ENABLE
1781void inline_size 1853/* make periodics pending */
1854inline_size void
1782periodics_reify (EV_P) 1855periodics_reify (EV_P)
1783{ 1856{
1784 EV_FREQUENT_CHECK; 1857 EV_FREQUENT_CHECK;
1785 1858
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1859 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 1860 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1861 int feed_count = 0;
1789 1862
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1863 do
1791
1792 /* first reschedule or stop timer */
1793 if (w->reschedule_cb)
1794 { 1864 {
1865 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1866
1867 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1868
1869 /* first reschedule or stop timer */
1870 if (w->reschedule_cb)
1871 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1872 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 1873
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1874 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798 1875
1799 ANHE_at_cache (periodics [HEAP0]); 1876 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0); 1877 downheap (periodics, periodiccnt, HEAP0);
1878 }
1879 else if (w->interval)
1880 {
1881 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1882 /* if next trigger time is not sufficiently in the future, put it there */
1883 /* this might happen because of floating point inexactness */
1884 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1885 {
1886 ev_at (w) += w->interval;
1887
1888 /* if interval is unreasonably low we might still have a time in the past */
1889 /* so correct this. this will make the periodic very inexact, but the user */
1890 /* has effectively asked to get triggered more often than possible */
1891 if (ev_at (w) < ev_rt_now)
1892 ev_at (w) = ev_rt_now;
1893 }
1894
1895 ANHE_at_cache (periodics [HEAP0]);
1896 downheap (periodics, periodiccnt, HEAP0);
1897 }
1898 else
1899 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1900
1901 EV_FREQUENT_CHECK;
1902 feed_reverse (EV_A_ (W)w);
1801 } 1903 }
1802 else if (w->interval) 1904 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1803 {
1804 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1805 /* if next trigger time is not sufficiently in the future, put it there */
1806 /* this might happen because of floating point inexactness */
1807 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1808 {
1809 ev_at (w) += w->interval;
1810 1905
1811 /* if interval is unreasonably low we might still have a time in the past */
1812 /* so correct this. this will make the periodic very inexact, but the user */
1813 /* has effectively asked to get triggered more often than possible */
1814 if (ev_at (w) < ev_rt_now)
1815 ev_at (w) = ev_rt_now;
1816 }
1817
1818 ANHE_at_cache (periodics [HEAP0]);
1819 downheap (periodics, periodiccnt, HEAP0);
1820 }
1821 else
1822 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1823
1824 EV_FREQUENT_CHECK;
1825 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1906 feed_reverse_done (EV_A_ EV_PERIODIC);
1826 } 1907 }
1827} 1908}
1828 1909
1910/* simply recalculate all periodics */
1911/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1829static void noinline 1912static void noinline
1830periodics_reschedule (EV_P) 1913periodics_reschedule (EV_P)
1831{ 1914{
1832 int i; 1915 int i;
1833 1916
… …
1846 1929
1847 reheap (periodics, periodiccnt); 1930 reheap (periodics, periodiccnt);
1848} 1931}
1849#endif 1932#endif
1850 1933
1851void inline_speed 1934/* adjust all timers by a given offset */
1935static void noinline
1936timers_reschedule (EV_P_ ev_tstamp adjust)
1937{
1938 int i;
1939
1940 for (i = 0; i < timercnt; ++i)
1941 {
1942 ANHE *he = timers + i + HEAP0;
1943 ANHE_w (*he)->at += adjust;
1944 ANHE_at_cache (*he);
1945 }
1946}
1947
1948/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void
1852time_update (EV_P_ ev_tstamp max_block) 1951time_update (EV_P_ ev_tstamp max_block)
1853{ 1952{
1854 int i; 1953 int i;
1855 1954
1856#if EV_USE_MONOTONIC 1955#if EV_USE_MONOTONIC
… …
1889 ev_rt_now = ev_time (); 1988 ev_rt_now = ev_time ();
1890 mn_now = get_clock (); 1989 mn_now = get_clock ();
1891 now_floor = mn_now; 1990 now_floor = mn_now;
1892 } 1991 }
1893 1992
1993 /* no timer adjustment, as the monotonic clock doesn't jump */
1994 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1894# if EV_PERIODIC_ENABLE 1995# if EV_PERIODIC_ENABLE
1895 periodics_reschedule (EV_A); 1996 periodics_reschedule (EV_A);
1896# endif 1997# endif
1897 /* no timer adjustment, as the monotonic clock doesn't jump */
1898 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1899 } 1998 }
1900 else 1999 else
1901#endif 2000#endif
1902 { 2001 {
1903 ev_rt_now = ev_time (); 2002 ev_rt_now = ev_time ();
1904 2003
1905 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2004 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1906 { 2005 {
2006 /* adjust timers. this is easy, as the offset is the same for all of them */
2007 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1907#if EV_PERIODIC_ENABLE 2008#if EV_PERIODIC_ENABLE
1908 periodics_reschedule (EV_A); 2009 periodics_reschedule (EV_A);
1909#endif 2010#endif
1910 /* adjust timers. this is easy, as the offset is the same for all of them */
1911 for (i = 0; i < timercnt; ++i)
1912 {
1913 ANHE *he = timers + i + HEAP0;
1914 ANHE_w (*he)->at += ev_rt_now - mn_now;
1915 ANHE_at_cache (*he);
1916 }
1917 } 2011 }
1918 2012
1919 mn_now = ev_rt_now; 2013 mn_now = ev_rt_now;
1920 } 2014 }
1921}
1922
1923void
1924ev_ref (EV_P)
1925{
1926 ++activecnt;
1927}
1928
1929void
1930ev_unref (EV_P)
1931{
1932 --activecnt;
1933}
1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939} 2015}
1940 2016
1941static int loop_done; 2017static int loop_done;
1942 2018
1943void 2019void
… …
1977 { 2053 {
1978 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1979 call_pending (EV_A); 2055 call_pending (EV_A);
1980 } 2056 }
1981 2057
1982 if (expect_false (!activecnt))
1983 break;
1984
1985 /* we might have forked, so reify kernel state if necessary */ 2058 /* we might have forked, so reify kernel state if necessary */
1986 if (expect_false (postfork)) 2059 if (expect_false (postfork))
1987 loop_fork (EV_A); 2060 loop_fork (EV_A);
1988 2061
1989 /* update fd-related kernel structures */ 2062 /* update fd-related kernel structures */
… …
2068ev_unloop (EV_P_ int how) 2141ev_unloop (EV_P_ int how)
2069{ 2142{
2070 loop_done = how; 2143 loop_done = how;
2071} 2144}
2072 2145
2146void
2147ev_ref (EV_P)
2148{
2149 ++activecnt;
2150}
2151
2152void
2153ev_unref (EV_P)
2154{
2155 --activecnt;
2156}
2157
2158void
2159ev_now_update (EV_P)
2160{
2161 time_update (EV_A_ 1e100);
2162}
2163
2164void
2165ev_suspend (EV_P)
2166{
2167 ev_now_update (EV_A);
2168}
2169
2170void
2171ev_resume (EV_P)
2172{
2173 ev_tstamp mn_prev = mn_now;
2174
2175 ev_now_update (EV_A);
2176 timers_reschedule (EV_A_ mn_now - mn_prev);
2177#if EV_PERIODIC_ENABLE
2178 /* TODO: really do this? */
2179 periodics_reschedule (EV_A);
2180#endif
2181}
2182
2073/*****************************************************************************/ 2183/*****************************************************************************/
2184/* singly-linked list management, used when the expected list length is short */
2074 2185
2075void inline_size 2186inline_size void
2076wlist_add (WL *head, WL elem) 2187wlist_add (WL *head, WL elem)
2077{ 2188{
2078 elem->next = *head; 2189 elem->next = *head;
2079 *head = elem; 2190 *head = elem;
2080} 2191}
2081 2192
2082void inline_size 2193inline_size void
2083wlist_del (WL *head, WL elem) 2194wlist_del (WL *head, WL elem)
2084{ 2195{
2085 while (*head) 2196 while (*head)
2086 { 2197 {
2087 if (*head == elem) 2198 if (*head == elem)
… …
2092 2203
2093 head = &(*head)->next; 2204 head = &(*head)->next;
2094 } 2205 }
2095} 2206}
2096 2207
2097void inline_speed 2208/* internal, faster, version of ev_clear_pending */
2209inline_speed void
2098clear_pending (EV_P_ W w) 2210clear_pending (EV_P_ W w)
2099{ 2211{
2100 if (w->pending) 2212 if (w->pending)
2101 { 2213 {
2102 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2214 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2103 w->pending = 0; 2215 w->pending = 0;
2104 } 2216 }
2105} 2217}
2106 2218
2107int 2219int
… …
2111 int pending = w_->pending; 2223 int pending = w_->pending;
2112 2224
2113 if (expect_true (pending)) 2225 if (expect_true (pending))
2114 { 2226 {
2115 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2227 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2228 p->w = (W)&pending_w;
2116 w_->pending = 0; 2229 w_->pending = 0;
2117 p->w = 0;
2118 return p->events; 2230 return p->events;
2119 } 2231 }
2120 else 2232 else
2121 return 0; 2233 return 0;
2122} 2234}
2123 2235
2124void inline_size 2236inline_size void
2125pri_adjust (EV_P_ W w) 2237pri_adjust (EV_P_ W w)
2126{ 2238{
2127 int pri = w->priority; 2239 int pri = w->priority;
2128 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2129 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2130 w->priority = pri; 2242 w->priority = pri;
2131} 2243}
2132 2244
2133void inline_speed 2245inline_speed void
2134ev_start (EV_P_ W w, int active) 2246ev_start (EV_P_ W w, int active)
2135{ 2247{
2136 pri_adjust (EV_A_ w); 2248 pri_adjust (EV_A_ w);
2137 w->active = active; 2249 w->active = active;
2138 ev_ref (EV_A); 2250 ev_ref (EV_A);
2139} 2251}
2140 2252
2141void inline_size 2253inline_size void
2142ev_stop (EV_P_ W w) 2254ev_stop (EV_P_ W w)
2143{ 2255{
2144 ev_unref (EV_A); 2256 ev_unref (EV_A);
2145 w->active = 0; 2257 w->active = 0;
2146} 2258}
… …
2153 int fd = w->fd; 2265 int fd = w->fd;
2154 2266
2155 if (expect_false (ev_is_active (w))) 2267 if (expect_false (ev_is_active (w)))
2156 return; 2268 return;
2157 2269
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2270 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2271 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2160 2272
2161 EV_FREQUENT_CHECK; 2273 EV_FREQUENT_CHECK;
2162 2274
2163 ev_start (EV_A_ (W)w, 1); 2275 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2165 wlist_add (&anfds[fd].head, (WL)w); 2277 wlist_add (&anfds[fd].head, (WL)w);
2166 2278
2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2168 w->events &= ~EV_IOFDSET; 2280 w->events &= ~EV__IOFDSET;
2169 2281
2170 EV_FREQUENT_CHECK; 2282 EV_FREQUENT_CHECK;
2171} 2283}
2172 2284
2173void noinline 2285void noinline
… …
2175{ 2287{
2176 clear_pending (EV_A_ (W)w); 2288 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2289 if (expect_false (!ev_is_active (w)))
2178 return; 2290 return;
2179 2291
2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2292 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181 2293
2182 EV_FREQUENT_CHECK; 2294 EV_FREQUENT_CHECK;
2183 2295
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2296 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2297 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2196 return; 2308 return;
2197 2309
2198 ev_at (w) += mn_now; 2310 ev_at (w) += mn_now;
2199 2311
2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2312 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2201 2313
2202 EV_FREQUENT_CHECK; 2314 EV_FREQUENT_CHECK;
2203 2315
2204 ++timercnt; 2316 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2317 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2320 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2321 upheap (timers, ev_active (w));
2210 2322
2211 EV_FREQUENT_CHECK; 2323 EV_FREQUENT_CHECK;
2212 2324
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2325 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2326}
2215 2327
2216void noinline 2328void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2329ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2330{
… …
2223 EV_FREQUENT_CHECK; 2335 EV_FREQUENT_CHECK;
2224 2336
2225 { 2337 {
2226 int active = ev_active (w); 2338 int active = ev_active (w);
2227 2339
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2340 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2341
2230 --timercnt; 2342 --timercnt;
2231 2343
2232 if (expect_true (active < timercnt + HEAP0)) 2344 if (expect_true (active < timercnt + HEAP0))
2233 { 2345 {
… …
2277 2389
2278 if (w->reschedule_cb) 2390 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2391 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2392 else if (w->interval)
2281 { 2393 {
2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2394 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2283 /* this formula differs from the one in periodic_reify because we do not always round up */ 2395 /* this formula differs from the one in periodic_reify because we do not always round up */
2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2396 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2285 } 2397 }
2286 else 2398 else
2287 ev_at (w) = w->offset; 2399 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2407 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2408 upheap (periodics, ev_active (w));
2297 2409
2298 EV_FREQUENT_CHECK; 2410 EV_FREQUENT_CHECK;
2299 2411
2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2412 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2301} 2413}
2302 2414
2303void noinline 2415void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2416ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2417{
… …
2310 EV_FREQUENT_CHECK; 2422 EV_FREQUENT_CHECK;
2311 2423
2312 { 2424 {
2313 int active = ev_active (w); 2425 int active = ev_active (w);
2314 2426
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2427 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2428
2317 --periodiccnt; 2429 --periodiccnt;
2318 2430
2319 if (expect_true (active < periodiccnt + HEAP0)) 2431 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2432 {
… …
2343 2455
2344void noinline 2456void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2457ev_signal_start (EV_P_ ev_signal *w)
2346{ 2458{
2347#if EV_MULTIPLICITY 2459#if EV_MULTIPLICITY
2348 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2460 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2349#endif 2461#endif
2350 if (expect_false (ev_is_active (w))) 2462 if (expect_false (ev_is_active (w)))
2351 return; 2463 return;
2352 2464
2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2354 2466
2355 evpipe_init (EV_A); 2467 evpipe_init (EV_A);
2356 2468
2357 EV_FREQUENT_CHECK; 2469 EV_FREQUENT_CHECK;
2358 2470
… …
2409 2521
2410void 2522void
2411ev_child_start (EV_P_ ev_child *w) 2523ev_child_start (EV_P_ ev_child *w)
2412{ 2524{
2413#if EV_MULTIPLICITY 2525#if EV_MULTIPLICITY
2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2526 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2415#endif 2527#endif
2416 if (expect_false (ev_is_active (w))) 2528 if (expect_false (ev_is_active (w)))
2417 return; 2529 return;
2418 2530
2419 EV_FREQUENT_CHECK; 2531 EV_FREQUENT_CHECK;
… …
2571 2683
2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2684 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2573 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2685 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2574} 2686}
2575 2687
2576void inline_size 2688inline_size void
2577check_2625 (EV_P) 2689check_2625 (EV_P)
2578{ 2690{
2579 /* kernels < 2.6.25 are borked 2691 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2692 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */ 2693 */
… …
2594 return; 2706 return;
2595 2707
2596 fs_2625 = 1; 2708 fs_2625 = 1;
2597} 2709}
2598 2710
2599void inline_size 2711inline_size void
2600infy_init (EV_P) 2712infy_init (EV_P)
2601{ 2713{
2602 if (fs_fd != -2) 2714 if (fs_fd != -2)
2603 return; 2715 return;
2604 2716
… …
2614 ev_set_priority (&fs_w, EV_MAXPRI); 2726 ev_set_priority (&fs_w, EV_MAXPRI);
2615 ev_io_start (EV_A_ &fs_w); 2727 ev_io_start (EV_A_ &fs_w);
2616 } 2728 }
2617} 2729}
2618 2730
2619void inline_size 2731inline_size void
2620infy_fork (EV_P) 2732infy_fork (EV_P)
2621{ 2733{
2622 int slot; 2734 int slot;
2623 2735
2624 if (fs_fd < 0) 2736 if (fs_fd < 0)
… …
2933 if (expect_false (ev_is_active (w))) 3045 if (expect_false (ev_is_active (w)))
2934 return; 3046 return;
2935 3047
2936 { 3048 {
2937 struct ev_loop *loop = w->other; 3049 struct ev_loop *loop = w->other;
2938 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2939 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3051 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2940 } 3052 }
2941 3053
2942 EV_FREQUENT_CHECK; 3054 EV_FREQUENT_CHECK;
2943 3055
… …
3126 ev_timer_set (&once->to, timeout, 0.); 3238 ev_timer_set (&once->to, timeout, 0.);
3127 ev_timer_start (EV_A_ &once->to); 3239 ev_timer_start (EV_A_ &once->to);
3128 } 3240 }
3129} 3241}
3130 3242
3243/*****************************************************************************/
3244
3245#if EV_WALK_ENABLE
3246void
3247ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3248{
3249 int i, j;
3250 ev_watcher_list *wl, *wn;
3251
3252 if (types & (EV_IO | EV_EMBED))
3253 for (i = 0; i < anfdmax; ++i)
3254 for (wl = anfds [i].head; wl; )
3255 {
3256 wn = wl->next;
3257
3258#if EV_EMBED_ENABLE
3259 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3260 {
3261 if (types & EV_EMBED)
3262 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3263 }
3264 else
3265#endif
3266#if EV_USE_INOTIFY
3267 if (ev_cb ((ev_io *)wl) == infy_cb)
3268 ;
3269 else
3270#endif
3271 if ((ev_io *)wl != &pipe_w)
3272 if (types & EV_IO)
3273 cb (EV_A_ EV_IO, wl);
3274
3275 wl = wn;
3276 }
3277
3278 if (types & (EV_TIMER | EV_STAT))
3279 for (i = timercnt + HEAP0; i-- > HEAP0; )
3280#if EV_STAT_ENABLE
3281 /*TODO: timer is not always active*/
3282 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3283 {
3284 if (types & EV_STAT)
3285 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3286 }
3287 else
3288#endif
3289 if (types & EV_TIMER)
3290 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3291
3292#if EV_PERIODIC_ENABLE
3293 if (types & EV_PERIODIC)
3294 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3295 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3296#endif
3297
3298#if EV_IDLE_ENABLE
3299 if (types & EV_IDLE)
3300 for (j = NUMPRI; i--; )
3301 for (i = idlecnt [j]; i--; )
3302 cb (EV_A_ EV_IDLE, idles [j][i]);
3303#endif
3304
3305#if EV_FORK_ENABLE
3306 if (types & EV_FORK)
3307 for (i = forkcnt; i--; )
3308 if (ev_cb (forks [i]) != embed_fork_cb)
3309 cb (EV_A_ EV_FORK, forks [i]);
3310#endif
3311
3312#if EV_ASYNC_ENABLE
3313 if (types & EV_ASYNC)
3314 for (i = asynccnt; i--; )
3315 cb (EV_A_ EV_ASYNC, asyncs [i]);
3316#endif
3317
3318 if (types & EV_PREPARE)
3319 for (i = preparecnt; i--; )
3320#if EV_EMBED_ENABLE
3321 if (ev_cb (prepares [i]) != embed_prepare_cb)
3322#endif
3323 cb (EV_A_ EV_PREPARE, prepares [i]);
3324
3325 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]);
3328
3329 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i)
3331 for (wl = signals [i].head; wl; )
3332 {
3333 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn;
3336 }
3337
3338 if (types & EV_CHILD)
3339 for (i = EV_PID_HASHSIZE; i--; )
3340 for (wl = childs [i]; wl; )
3341 {
3342 wn = wl->next;
3343 cb (EV_A_ EV_CHILD, wl);
3344 wl = wn;
3345 }
3346/* EV_STAT 0x00001000 /* stat data changed */
3347/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3348}
3349#endif
3350
3131#if EV_MULTIPLICITY 3351#if EV_MULTIPLICITY
3132 #include "ev_wrap.h" 3352 #include "ev_wrap.h"
3133#endif 3353#endif
3134 3354
3135#ifdef __cplusplus 3355#ifdef __cplusplus

Diff Legend

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