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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.112 by root, Mon Nov 12 07:20:24 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# include <sys/wait.h> 83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 104# ifdef _WIN32
105# define EV_USE_POLL 0
106# else
107# define EV_USE_POLL 1
108# endif
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif 117#endif
97 118
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
111 122
112/**/ 123/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
113 130
114#ifndef CLOCK_MONOTONIC 131#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 132# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 133# define EV_USE_MONOTONIC 0
117#endif 134#endif
118 135
119#ifndef CLOCK_REALTIME 136#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 137# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 138# define EV_USE_REALTIME 0
139#endif
140
141#if EV_SELECT_IS_WINSOCKET
142# include <winsock.h>
122#endif 143#endif
123 144
124/**/ 145/**/
125 146
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 151
152#ifdef EV_H
153# include EV_H
154#else
131#include "ev.h" 155# include "ev.h"
156#endif
132 157
133#if __GNUC__ >= 3 158#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 159# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 160# define inline inline
136#else 161#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
143 168
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 171
172#define EMPTY /* required for microsofts broken pseudo-c compiler */
173
147typedef struct ev_watcher *W; 174typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 175typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 176typedef struct ev_watcher_time *WT;
150 177
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 179
180#ifdef _WIN32
153#include "ev_win32.c" 181# include "ev_win32.c"
182#endif
154 183
155/*****************************************************************************/ 184/*****************************************************************************/
156 185
157static void (*syserr_cb)(const char *msg); 186static void (*syserr_cb)(const char *msg);
158 187
… …
205typedef struct 234typedef struct
206{ 235{
207 WL head; 236 WL head;
208 unsigned char events; 237 unsigned char events;
209 unsigned char reify; 238 unsigned char reify;
239#if EV_SELECT_IS_WINSOCKET
240 SOCKET handle;
241#endif
210} ANFD; 242} ANFD;
211 243
212typedef struct 244typedef struct
213{ 245{
214 W w; 246 W w;
… …
217 249
218#if EV_MULTIPLICITY 250#if EV_MULTIPLICITY
219 251
220 struct ev_loop 252 struct ev_loop
221 { 253 {
254 ev_tstamp ev_rt_now;
255 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 256 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 257 #include "ev_vars.h"
224 #undef VAR 258 #undef VAR
225 }; 259 };
226 #include "ev_wrap.h" 260 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 262 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 263 static struct ev_loop *default_loop;
230 264
231#else 265#else
232 266
267 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 268 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 269 #include "ev_vars.h"
235 #undef VAR 270 #undef VAR
236 271
237 static int default_loop; 272 static int default_loop;
238 273
239#endif 274#endif
240 275
241/*****************************************************************************/ 276/*****************************************************************************/
242 277
243inline ev_tstamp 278ev_tstamp
244ev_time (void) 279ev_time (void)
245{ 280{
246#if EV_USE_REALTIME 281#if EV_USE_REALTIME
247 struct timespec ts; 282 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 283 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 302#endif
268 303
269 return ev_time (); 304 return ev_time ();
270} 305}
271 306
307#if EV_MULTIPLICITY
272ev_tstamp 308ev_tstamp
273ev_now (EV_P) 309ev_now (EV_P)
274{ 310{
275 return rt_now; 311 return ev_rt_now;
276} 312}
313#endif
277 314
278#define array_roundsize(type,n) ((n) | 4 & ~3) 315#define array_roundsize(type,n) (((n) | 4) & ~3)
279 316
280#define array_needsize(type,base,cur,cnt,init) \ 317#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 318 if (expect_false ((cnt) > cur)) \
282 { \ 319 { \
283 int newcnt = cur; \ 320 int newcnt = cur; \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 335 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 336 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 337 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 338 }
302 339
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 340#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 341 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
310 342
311/*****************************************************************************/ 343/*****************************************************************************/
312 344
… …
386 int events = 0; 418 int events = 0;
387 419
388 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
389 events |= w->events; 421 events |= w->events;
390 422
423#if EV_SELECT_IS_WINSOCKET
424 if (events)
425 {
426 unsigned long argp;
427 anfd->handle = _get_osfhandle (fd);
428 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
429 }
430#endif
431
391 anfd->reify = 0; 432 anfd->reify = 0;
392 433
393 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 435 anfd->events = events;
395 } 436 }
… …
423} 464}
424 465
425static int 466static int
426fd_valid (int fd) 467fd_valid (int fd)
427{ 468{
428#ifdef WIN32 469#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 470 return _get_osfhandle (fd) != -1;
430#else 471#else
431 return fcntl (fd, F_GETFD) != -1; 472 return fcntl (fd, F_GETFD) != -1;
432#endif 473#endif
433} 474}
434 475
… …
514 555
515 heap [k] = w; 556 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
517} 558}
518 559
560inline void
561adjustheap (WT *heap, int N, int k)
562{
563 upheap (heap, k);
564 downheap (heap, N, k);
565}
566
519/*****************************************************************************/ 567/*****************************************************************************/
520 568
521typedef struct 569typedef struct
522{ 570{
523 WL head; 571 WL head;
… …
544} 592}
545 593
546static void 594static void
547sighandler (int signum) 595sighandler (int signum)
548{ 596{
549#if WIN32 597#if _WIN32
550 signal (signum, sighandler); 598 signal (signum, sighandler);
551#endif 599#endif
552 600
553 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
554 602
555 if (!gotsig) 603 if (!gotsig)
556 { 604 {
557 int old_errno = errno; 605 int old_errno = errno;
558 gotsig = 1; 606 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 608 errno = old_errno;
565 } 609 }
566} 610}
567 611
568void 612void
… …
588static void 632static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 634{
591 int signum; 635 int signum;
592 636
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 638 gotsig = 0;
599 639
600 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 642 ev_feed_signal_event (EV_A_ signum + 1);
603} 643}
604 644
645inline void
646fd_intern (int fd)
647{
648#ifdef _WIN32
649 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
651#else
652 fcntl (fd, F_SETFD, FD_CLOEXEC);
653 fcntl (fd, F_SETFL, O_NONBLOCK);
654#endif
655}
656
605static void 657static void
606siginit (EV_P) 658siginit (EV_P)
607{ 659{
608#ifndef WIN32 660 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 662
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 666}
621 667
622/*****************************************************************************/ 668/*****************************************************************************/
623 669
624static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
625 671
626#ifndef WIN32 672#ifndef _WIN32
627 673
628static struct ev_signal childev; 674static struct ev_signal childev;
629 675
630#ifndef WCONTINUED 676#ifndef WCONTINUED
631# define WCONTINUED 0 677# define WCONTINUED 0
… …
692 738
693/* return true if we are running with elevated privileges and should ignore env variables */ 739/* return true if we are running with elevated privileges and should ignore env variables */
694static int 740static int
695enable_secure (void) 741enable_secure (void)
696{ 742{
697#ifdef WIN32 743#ifdef _WIN32
698 return 0; 744 return 0;
699#else 745#else
700 return getuid () != geteuid () 746 return getuid () != geteuid ()
701 || getgid () != getegid (); 747 || getgid () != getegid ();
702#endif 748#endif
703} 749}
704 750
705int 751unsigned int
706ev_method (EV_P) 752ev_method (EV_P)
707{ 753{
708 return method; 754 return method;
709} 755}
710 756
711static void 757static void
712loop_init (EV_P_ int methods) 758loop_init (EV_P_ unsigned int flags)
713{ 759{
714 if (!method) 760 if (!method)
715 { 761 {
716#if EV_USE_MONOTONIC 762#if EV_USE_MONOTONIC
717 { 763 {
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 766 have_monotonic = 1;
721 } 767 }
722#endif 768#endif
723 769
724 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 771 mn_now = get_clock ();
726 now_floor = mn_now; 772 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
728 774
729 if (methods == EVMETHOD_AUTO) 775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
730 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 776 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 777
733 methods = EVMETHOD_ANY; 778 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff;
734 780
735 method = 0; 781 method = 0;
736#if EV_USE_WIN32
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
738#endif
739#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 784#endif
742#if EV_USE_EPOLL 785#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 787#endif
745#if EV_USE_POLL 788#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 790#endif
748#if EV_USE_SELECT 791#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 793#endif
751 794
752 ev_watcher_init (&sigev, sigcb); 795 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 796 ev_set_priority (&sigev, EV_MAXPRI);
754 } 797 }
755} 798}
756 799
757void 800void
758loop_destroy (EV_P) 801loop_destroy (EV_P)
759{ 802{
760 int i; 803 int i;
761 804
762#if EV_USE_WIN32
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
764#endif
765#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 807#endif
768#if EV_USE_EPOLL 808#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
777 817
778 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 819 array_free (pending, [i]);
780 820
781 /* have to use the microsoft-never-gets-it-right macro */ 821 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 822 array_free (fdchange, EMPTY);
783 array_free_microshit (timer); 823 array_free (timer, EMPTY);
784 array_free_microshit (periodic); 824#if EV_PERIODICS
785 array_free_microshit (idle); 825 array_free (periodic, EMPTY);
786 array_free_microshit (prepare); 826#endif
787 array_free_microshit (check); 827 array_free (idle, EMPTY);
828 array_free (prepare, EMPTY);
829 array_free (check, EMPTY);
788 830
789 method = 0; 831 method = 0;
790} 832}
791 833
792static void 834static void
… …
817 postfork = 0; 859 postfork = 0;
818} 860}
819 861
820#if EV_MULTIPLICITY 862#if EV_MULTIPLICITY
821struct ev_loop * 863struct ev_loop *
822ev_loop_new (int methods) 864ev_loop_new (unsigned int flags)
823{ 865{
824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825 867
826 memset (loop, 0, sizeof (struct ev_loop)); 868 memset (loop, 0, sizeof (struct ev_loop));
827 869
828 loop_init (EV_A_ methods); 870 loop_init (EV_A_ flags);
829 871
830 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
831 return loop; 873 return loop;
832 874
833 return 0; 875 return 0;
… …
851#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
852struct ev_loop * 894struct ev_loop *
853#else 895#else
854int 896int
855#endif 897#endif
856ev_default_loop (int methods) 898ev_default_loop (unsigned int flags)
857{ 899{
858 if (sigpipe [0] == sigpipe [1]) 900 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 901 if (pipe (sigpipe))
860 return 0; 902 return 0;
861 903
… …
865 struct ev_loop *loop = default_loop = &default_loop_struct; 907 struct ev_loop *loop = default_loop = &default_loop_struct;
866#else 908#else
867 default_loop = 1; 909 default_loop = 1;
868#endif 910#endif
869 911
870 loop_init (EV_A_ methods); 912 loop_init (EV_A_ flags);
871 913
872 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
873 { 915 {
874 siginit (EV_A); 916 siginit (EV_A);
875 917
876#ifndef WIN32 918#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 923#endif
… …
892{ 934{
893#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
895#endif 937#endif
896 938
897#ifndef WIN32 939#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
900#endif 942#endif
901 943
902 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 986 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 987
946 if (p->w) 988 if (p->w)
947 { 989 {
948 p->w->pending = 0; 990 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 991 EV_CB_INVOKE (p->w, p->events);
950 } 992 }
951 } 993 }
952} 994}
953 995
954static void 996static void
… …
962 1004
963 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
964 if (w->repeat) 1006 if (w->repeat)
965 { 1007 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1008 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1009
967 ((WT)w)->at = mn_now + w->repeat; 1010 ((WT)w)->at += w->repeat;
1011 if (((WT)w)->at < mn_now)
1012 ((WT)w)->at = mn_now;
1013
968 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
969 } 1015 }
970 else 1016 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1018
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1020 }
975} 1021}
976 1022
1023#if EV_PERIODICS
977static void 1024static void
978periodics_reify (EV_P) 1025periodics_reify (EV_P)
979{ 1026{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1028 {
982 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
983 1030
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1032
986 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1034 if (w->reschedule_cb)
988 { 1035 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1037 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1038 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1039 }
994 else if (w->interval) 1040 else if (w->interval)
995 { 1041 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1042 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1043 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1044 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1045 }
1000 else 1046 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1047 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1048
… …
1013 for (i = 0; i < periodiccnt; ++i) 1059 for (i = 0; i < periodiccnt; ++i)
1014 { 1060 {
1015 struct ev_periodic *w = periodics [i]; 1061 struct ev_periodic *w = periodics [i];
1016 1062
1017 if (w->reschedule_cb) 1063 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1064 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1065 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1066 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1067 }
1022 1068
1023 /* now rebuild the heap */ 1069 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1070 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1071 downheap ((WT *)periodics, periodiccnt, i);
1026} 1072}
1073#endif
1027 1074
1028inline int 1075inline int
1029time_update_monotonic (EV_P) 1076time_update_monotonic (EV_P)
1030{ 1077{
1031 mn_now = get_clock (); 1078 mn_now = get_clock ();
1032 1079
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1080 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1081 {
1035 rt_now = rtmn_diff + mn_now; 1082 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1083 return 0;
1037 } 1084 }
1038 else 1085 else
1039 { 1086 {
1040 now_floor = mn_now; 1087 now_floor = mn_now;
1041 rt_now = ev_time (); 1088 ev_rt_now = ev_time ();
1042 return 1; 1089 return 1;
1043 } 1090 }
1044} 1091}
1045 1092
1046static void 1093static void
… …
1055 { 1102 {
1056 ev_tstamp odiff = rtmn_diff; 1103 ev_tstamp odiff = rtmn_diff;
1057 1104
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1105 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1106 {
1060 rtmn_diff = rt_now - mn_now; 1107 rtmn_diff = ev_rt_now - mn_now;
1061 1108
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1109 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1110 return; /* all is well */
1064 1111
1065 rt_now = ev_time (); 1112 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1113 mn_now = get_clock ();
1067 now_floor = mn_now; 1114 now_floor = mn_now;
1068 } 1115 }
1069 1116
1117# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1120 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1121 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1122 }
1074 } 1123 }
1075 else 1124 else
1076#endif 1125#endif
1077 { 1126 {
1078 rt_now = ev_time (); 1127 ev_rt_now = ev_time ();
1079 1128
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1129 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1130 {
1131#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1132 periodics_reschedule (EV_A);
1133#endif
1083 1134
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1135 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1136 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1137 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1138 }
1088 1139
1089 mn_now = rt_now; 1140 mn_now = ev_rt_now;
1090 } 1141 }
1091} 1142}
1092 1143
1093void 1144void
1094ev_ref (EV_P) 1145ev_ref (EV_P)
… …
1134 if (expect_true (have_monotonic)) 1185 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1186 time_update_monotonic (EV_A);
1136 else 1187 else
1137#endif 1188#endif
1138 { 1189 {
1139 rt_now = ev_time (); 1190 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1191 mn_now = ev_rt_now;
1141 } 1192 }
1142 1193
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1194 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1195 block = 0.;
1145 else 1196 else
… …
1150 { 1201 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1203 if (block > to) block = to;
1153 } 1204 }
1154 1205
1206#if EV_PERIODICS
1155 if (periodiccnt) 1207 if (periodiccnt)
1156 { 1208 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1210 if (block > to) block = to;
1159 } 1211 }
1212#endif
1160 1213
1161 if (block < 0.) block = 0.; 1214 if (block < 0.) block = 0.;
1162 } 1215 }
1163 1216
1164 method_poll (EV_A_ block); 1217 method_poll (EV_A_ block);
1165 1218
1166 /* update rt_now, do magic */ 1219 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1220 time_update (EV_A);
1168 1221
1169 /* queue pending timers and reschedule them */ 1222 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1223 timers_reify (EV_A); /* relative timers called last */
1224#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1225 periodics_reify (EV_A); /* absolute timers called first */
1226#endif
1172 1227
1173 /* queue idle watchers unless io or timers are pending */ 1228 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1229 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1231
… …
1267{ 1322{
1268 ev_clear_pending (EV_A_ (W)w); 1323 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1324 if (!ev_is_active (w))
1270 return; 1325 return;
1271 1326
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1330 ev_stop (EV_A_ (W)w);
1274 1331
1275 fd_change (EV_A_ w->fd); 1332 fd_change (EV_A_ w->fd);
1276} 1333}
… …
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1361
1305 if (((W)w)->active < timercnt--) 1362 if (((W)w)->active < timercnt--)
1306 { 1363 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1364 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1366 }
1310 1367
1311 ((WT)w)->at = w->repeat; 1368 ((WT)w)->at -= mn_now;
1312 1369
1313 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1314} 1371}
1315 1372
1316void 1373void
… …
1319 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1320 { 1377 {
1321 if (w->repeat) 1378 if (w->repeat)
1322 { 1379 {
1323 ((WT)w)->at = mn_now + w->repeat; 1380 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1381 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1382 }
1326 else 1383 else
1327 ev_timer_stop (EV_A_ w); 1384 ev_timer_stop (EV_A_ w);
1328 } 1385 }
1329 else if (w->repeat) 1386 else if (w->repeat)
1387 {
1388 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1389 ev_timer_start (EV_A_ w);
1390 }
1331} 1391}
1332 1392
1393#if EV_PERIODICS
1333void 1394void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1395ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1396{
1336 if (ev_is_active (w)) 1397 if (ev_is_active (w))
1337 return; 1398 return;
1338 1399
1339 if (w->reschedule_cb) 1400 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1401 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1402 else if (w->interval)
1342 { 1403 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1404 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1405 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1406 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1407 }
1347 1408
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1409 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1410 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1350 periodics [periodiccnt - 1] = w; 1411 periodics [periodiccnt - 1] = w;
… …
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1424 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1425
1365 if (((W)w)->active < periodiccnt--) 1426 if (((W)w)->active < periodiccnt--)
1366 { 1427 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1428 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1429 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1430 }
1370 1431
1371 ev_stop (EV_A_ (W)w); 1432 ev_stop (EV_A_ (W)w);
1372} 1433}
1373 1434
1374void 1435void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1436ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1437{
1438 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1439 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1440 ev_periodic_start (EV_A_ w);
1379} 1441}
1442#endif
1380 1443
1381void 1444void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1445ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1446{
1384 if (ev_is_active (w)) 1447 if (ev_is_active (w))
… …
1391 1454
1392void 1455void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1456ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1457{
1395 ev_clear_pending (EV_A_ (W)w); 1458 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1459 if (!ev_is_active (w))
1397 return; 1460 return;
1398 1461
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1462 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1463 ev_stop (EV_A_ (W)w);
1401} 1464}
… …
1413 1476
1414void 1477void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1478ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1479{
1417 ev_clear_pending (EV_A_ (W)w); 1480 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1481 if (!ev_is_active (w))
1419 return; 1482 return;
1420 1483
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1484 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1485 ev_stop (EV_A_ (W)w);
1423} 1486}
… …
1435 1498
1436void 1499void
1437ev_check_stop (EV_P_ struct ev_check *w) 1500ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1501{
1439 ev_clear_pending (EV_A_ (W)w); 1502 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1503 if (!ev_is_active (w))
1441 return; 1504 return;
1442 1505
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1506 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1507 ev_stop (EV_A_ (W)w);
1445} 1508}
… …
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1526 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1527 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1528
1466 if (!((WL)w)->next) 1529 if (!((WL)w)->next)
1467 { 1530 {
1468#if WIN32 1531#if _WIN32
1469 signal (w->signum, sighandler); 1532 signal (w->signum, sighandler);
1470#else 1533#else
1471 struct sigaction sa; 1534 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1535 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1536 sigfillset (&sa.sa_mask);
… …
1506 1569
1507void 1570void
1508ev_child_stop (EV_P_ struct ev_child *w) 1571ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1572{
1510 ev_clear_pending (EV_A_ (W)w); 1573 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1574 if (!ev_is_active (w))
1512 return; 1575 return;
1513 1576
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1577 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1578 ev_stop (EV_A_ (W)w);
1516} 1579}
… …
1560 else 1623 else
1561 { 1624 {
1562 once->cb = cb; 1625 once->cb = cb;
1563 once->arg = arg; 1626 once->arg = arg;
1564 1627
1565 ev_watcher_init (&once->io, once_cb_io); 1628 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1629 if (fd >= 0)
1567 { 1630 {
1568 ev_io_set (&once->io, fd, events); 1631 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1632 ev_io_start (EV_A_ &once->io);
1570 } 1633 }
1571 1634
1572 ev_watcher_init (&once->to, once_cb_to); 1635 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1636 if (timeout >= 0.)
1574 { 1637 {
1575 ev_timer_set (&once->to, timeout, 0.); 1638 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1639 ev_timer_start (EV_A_ &once->to);
1577 } 1640 }
1578 } 1641 }
1579} 1642}
1580 1643
1644#ifdef __cplusplus
1645}
1646#endif
1647

Diff Legend

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