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

Comparing libev/ev.c (file contents):
Revision 1.102 by root, Sun Nov 11 17:56:11 2007 UTC vs.
Revision 1.119 by root, Fri Nov 16 01:43:52 2007 UTC

… …
59 59
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif 62# endif
63 63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
64#endif 68#endif
65 69
66#include <math.h> 70#include <math.h>
67#include <stdlib.h> 71#include <stdlib.h>
68#include <fcntl.h> 72#include <fcntl.h>
… …
75#include <sys/types.h> 79#include <sys/types.h>
76#include <time.h> 80#include <time.h>
77 81
78#include <signal.h> 82#include <signal.h>
79 83
80#ifndef WIN32 84#ifndef _WIN32
81# include <unistd.h> 85# include <unistd.h>
82# include <sys/time.h> 86# include <sys/time.h>
83# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
84#endif 93# endif
94#endif
95
85/**/ 96/**/
86 97
87#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
88# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 1
89#endif 100#endif
90 101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1
104#endif
105
91#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
92# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
93#endif 109#endif
94 110
95#ifndef EV_USE_POLL 111#ifndef EV_USE_POLL
96# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 112# ifdef _WIN32
113# define EV_USE_POLL 0
114# else
115# define EV_USE_POLL 1
116# endif
97#endif 117#endif
98 118
99#ifndef EV_USE_EPOLL 119#ifndef EV_USE_EPOLL
100# define EV_USE_EPOLL 0 120# define EV_USE_EPOLL 0
101#endif 121#endif
102 122
103#ifndef EV_USE_KQUEUE 123#ifndef EV_USE_KQUEUE
104# define EV_USE_KQUEUE 0 124# define EV_USE_KQUEUE 0
105#endif 125#endif
106 126
107#ifndef EV_USE_WIN32
108# ifdef WIN32
109# define EV_USE_WIN32 0 /* it does not exist, use select */
110# undef EV_USE_SELECT
111# define EV_USE_SELECT 1
112# else
113# define EV_USE_WIN32 0
114# endif
115#endif
116
117#ifndef EV_USE_REALTIME 127#ifndef EV_USE_PORT
118# define EV_USE_REALTIME 1 128# define EV_USE_PORT 0
119#endif 129#endif
120 130
121/**/ 131/**/
132
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
122 138
123#ifndef CLOCK_MONOTONIC 139#ifndef CLOCK_MONOTONIC
124# undef EV_USE_MONOTONIC 140# undef EV_USE_MONOTONIC
125# define EV_USE_MONOTONIC 0 141# define EV_USE_MONOTONIC 0
126#endif 142#endif
127 143
128#ifndef CLOCK_REALTIME 144#ifndef CLOCK_REALTIME
129# undef EV_USE_REALTIME 145# undef EV_USE_REALTIME
130# define EV_USE_REALTIME 0 146# define EV_USE_REALTIME 0
147#endif
148
149#if EV_SELECT_IS_WINSOCKET
150# include <winsock.h>
131#endif 151#endif
132 152
133/**/ 153/**/
134 154
135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 155#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
155#define expect_true(expr) expect ((expr) != 0, 1) 175#define expect_true(expr) expect ((expr) != 0, 1)
156 176
157#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 177#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
158#define ABSPRI(w) ((w)->priority - EV_MINPRI) 178#define ABSPRI(w) ((w)->priority - EV_MINPRI)
159 179
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */
182
160typedef struct ev_watcher *W; 183typedef struct ev_watcher *W;
161typedef struct ev_watcher_list *WL; 184typedef struct ev_watcher_list *WL;
162typedef struct ev_watcher_time *WT; 185typedef struct ev_watcher_time *WT;
163 186
164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
165 188
166#ifdef WIN32 189#ifdef _WIN32
167# include "ev_win32.c" 190# include "ev_win32.c"
168#endif 191#endif
169 192
170/*****************************************************************************/ 193/*****************************************************************************/
171 194
… …
220typedef struct 243typedef struct
221{ 244{
222 WL head; 245 WL head;
223 unsigned char events; 246 unsigned char events;
224 unsigned char reify; 247 unsigned char reify;
248#if EV_SELECT_IS_WINSOCKET
249 SOCKET handle;
250#endif
225} ANFD; 251} ANFD;
226 252
227typedef struct 253typedef struct
228{ 254{
229 W w; 255 W w;
… …
240 #include "ev_vars.h" 266 #include "ev_vars.h"
241 #undef VAR 267 #undef VAR
242 }; 268 };
243 #include "ev_wrap.h" 269 #include "ev_wrap.h"
244 270
245 struct ev_loop default_loop_struct; 271 static struct ev_loop default_loop_struct;
246 static struct ev_loop *default_loop; 272 struct ev_loop *ev_default_loop_ptr;
247 273
248#else 274#else
249 275
250 ev_tstamp ev_rt_now; 276 ev_tstamp ev_rt_now;
251 #define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
252 #include "ev_vars.h" 278 #include "ev_vars.h"
253 #undef VAR 279 #undef VAR
254 280
255 static int default_loop; 281 static int ev_default_loop_ptr;
256 282
257#endif 283#endif
258 284
259/*****************************************************************************/ 285/*****************************************************************************/
260 286
… …
293{ 319{
294 return ev_rt_now; 320 return ev_rt_now;
295} 321}
296#endif 322#endif
297 323
298#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
299 325
300#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
301 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
302 { \ 328 { \
303 int newcnt = cur; \ 329 int newcnt = cur; \
… …
318 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
319 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
320 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
321 } 347 }
322 348
323/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
324/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
325#define array_free_microshit(stem) \
326 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
327
328#define array_free(stem, idx) \ 349#define array_free(stem, idx) \
329 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 350 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
330 351
331/*****************************************************************************/ 352/*****************************************************************************/
332 353
… …
353 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
354 return; 375 return;
355 } 376 }
356 377
357 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
358 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 379 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
359 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
360 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
361} 382}
362 383
363static void 384static void
… …
406 int events = 0; 427 int events = 0;
407 428
408 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 429 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
409 events |= w->events; 430 events |= w->events;
410 431
432#if EV_SELECT_IS_WINSOCKET
433 if (events)
434 {
435 unsigned long argp;
436 anfd->handle = _get_osfhandle (fd);
437 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
438 }
439#endif
440
411 anfd->reify = 0; 441 anfd->reify = 0;
412 442
413 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
414 anfd->events = events; 444 anfd->events = events;
415 } 445 }
… …
424 return; 454 return;
425 455
426 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
427 457
428 ++fdchangecnt; 458 ++fdchangecnt;
429 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
430 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
431} 461}
432 462
433static void 463static void
434fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
… …
443} 473}
444 474
445static int 475static int
446fd_valid (int fd) 476fd_valid (int fd)
447{ 477{
448#ifdef WIN32 478#ifdef _WIN32
449 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
450#else 480#else
451 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
452#endif 482#endif
453} 483}
454 484
… …
571} 601}
572 602
573static void 603static void
574sighandler (int signum) 604sighandler (int signum)
575{ 605{
576#if WIN32 606#if _WIN32
577 signal (signum, sighandler); 607 signal (signum, sighandler);
578#endif 608#endif
579 609
580 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
581 611
582 if (!gotsig) 612 if (!gotsig)
583 { 613 {
584 int old_errno = errno; 614 int old_errno = errno;
585 gotsig = 1; 615 gotsig = 1;
586#ifdef WIN32
587 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
588#else
589 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
590#endif
591 errno = old_errno; 617 errno = old_errno;
592 } 618 }
593} 619}
594 620
595void 621void
596ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
597{ 623{
598 WL w; 624 WL w;
599 625
600#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
601 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 627 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
602#endif 628#endif
603 629
604 --signum; 630 --signum;
605 631
606 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
… …
615static void 641static void
616sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
617{ 643{
618 int signum; 644 int signum;
619 645
620#ifdef WIN32
621 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
622#else
623 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
624#endif
625 gotsig = 0; 647 gotsig = 0;
626 648
627 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
628 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
629 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
630} 652}
631 653
654inline void
655fd_intern (int fd)
656{
657#ifdef _WIN32
658 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
660#else
661 fcntl (fd, F_SETFD, FD_CLOEXEC);
662 fcntl (fd, F_SETFL, O_NONBLOCK);
663#endif
664}
665
632static void 666static void
633siginit (EV_P) 667siginit (EV_P)
634{ 668{
635#ifndef WIN32 669 fd_intern (sigpipe [0]);
636 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 fd_intern (sigpipe [1]);
637 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
638
639 /* rather than sort out wether we really need nb, set it */
640 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
641 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
642#endif
643 671
644 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
645 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
646 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
647} 675}
648 676
649/*****************************************************************************/ 677/*****************************************************************************/
650 678
651static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
652 680
653#ifndef WIN32 681#ifndef _WIN32
654 682
655static struct ev_signal childev; 683static struct ev_signal childev;
656 684
657#ifndef WCONTINUED 685#ifndef WCONTINUED
658# define WCONTINUED 0 686# define WCONTINUED 0
… …
690 718
691#endif 719#endif
692 720
693/*****************************************************************************/ 721/*****************************************************************************/
694 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
695#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
696# include "ev_kqueue.c" 727# include "ev_kqueue.c"
697#endif 728#endif
698#if EV_USE_EPOLL 729#if EV_USE_EPOLL
699# include "ev_epoll.c" 730# include "ev_epoll.c"
… …
719 750
720/* return true if we are running with elevated privileges and should ignore env variables */ 751/* return true if we are running with elevated privileges and should ignore env variables */
721static int 752static int
722enable_secure (void) 753enable_secure (void)
723{ 754{
724#ifdef WIN32 755#ifdef _WIN32
725 return 0; 756 return 0;
726#else 757#else
727 return getuid () != geteuid () 758 return getuid () != geteuid ()
728 || getgid () != getegid (); 759 || getgid () != getegid ();
729#endif 760#endif
730} 761}
731 762
732int 763unsigned int
733ev_method (EV_P) 764ev_method (EV_P)
734{ 765{
735 return method; 766 return method;
736} 767}
737 768
738static void 769static void
739loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
740{ 771{
741 if (!method) 772 if (!method)
742 { 773 {
743#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
744 { 775 {
… …
751 ev_rt_now = ev_time (); 782 ev_rt_now = ev_time ();
752 mn_now = get_clock (); 783 mn_now = get_clock ();
753 now_floor = mn_now; 784 now_floor = mn_now;
754 rtmn_diff = ev_rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
755 786
756 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
757 if (!enable_secure () && getenv ("LIBEV_METHODS"))
758 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
759 else 789
760 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
761 792
762 method = 0; 793 method = 0;
763#if EV_USE_WIN32 794#if EV_USE_PORT
764 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
765#endif 796#endif
766#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
767 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
768#endif 799#endif
769#if EV_USE_EPOLL 800#if EV_USE_EPOLL
770 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
771#endif 802#endif
772#if EV_USE_POLL 803#if EV_USE_POLL
773 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
774#endif 805#endif
775#if EV_USE_SELECT 806#if EV_USE_SELECT
776 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
777#endif 808#endif
778 809
779 ev_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
780 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
781 } 812 }
… …
784void 815void
785loop_destroy (EV_P) 816loop_destroy (EV_P)
786{ 817{
787 int i; 818 int i;
788 819
789#if EV_USE_WIN32 820#if EV_USE_PORT
790 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
791#endif 822#endif
792#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
793 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
794#endif 825#endif
795#if EV_USE_EPOLL 826#if EV_USE_EPOLL
… …
804 835
805 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
806 array_free (pending, [i]); 837 array_free (pending, [i]);
807 838
808 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
809 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
810 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
811#if EV_PERIODICS 842#if EV_PERIODICS
812 array_free_microshit (periodic); 843 array_free (periodic, EMPTY0);
813#endif 844#endif
814 array_free_microshit (idle); 845 array_free (idle, EMPTY0);
815 array_free_microshit (prepare); 846 array_free (prepare, EMPTY0);
816 array_free_microshit (check); 847 array_free (check, EMPTY0);
817 848
818 method = 0; 849 method = 0;
819} 850}
820 851
821static void 852static void
822loop_fork (EV_P) 853loop_fork (EV_P)
823{ 854{
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A);
857#endif
858#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
860#endif
824#if EV_USE_EPOLL 861#if EV_USE_EPOLL
825 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
826#endif
827#if EV_USE_KQUEUE
828 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
829#endif 863#endif
830 864
831 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
832 { 866 {
833 /* default loop */ 867 /* default loop */
… …
846 postfork = 0; 880 postfork = 0;
847} 881}
848 882
849#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
850struct ev_loop * 884struct ev_loop *
851ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
852{ 886{
853 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 887 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
854 888
855 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
856 890
857 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
858 892
859 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
860 return loop; 894 return loop;
861 895
862 return 0; 896 return 0;
… …
877 911
878#endif 912#endif
879 913
880#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
881struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
882#else 917#else
883int 918int
919ev_default_loop (unsigned int flags)
884#endif 920#endif
885ev_default_loop (int methods)
886{ 921{
887 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
888 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
889 return 0; 924 return 0;
890 925
891 if (!default_loop) 926 if (!ev_default_loop_ptr)
892 { 927 {
893#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
895#else 930#else
896 default_loop = 1; 931 ev_default_loop_ptr = 1;
897#endif 932#endif
898 933
899 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
900 935
901 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
902 { 937 {
903 siginit (EV_A); 938 siginit (EV_A);
904 939
905#ifndef WIN32 940#ifndef _WIN32
906 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
907 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
908 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
909 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
910#endif 945#endif
911 } 946 }
912 else 947 else
913 default_loop = 0; 948 ev_default_loop_ptr = 0;
914 } 949 }
915 950
916 return default_loop; 951 return ev_default_loop_ptr;
917} 952}
918 953
919void 954void
920ev_default_destroy (void) 955ev_default_destroy (void)
921{ 956{
922#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
923 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
924#endif 959#endif
925 960
926#ifndef WIN32 961#ifndef _WIN32
927 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
928 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
929#endif 964#endif
930 965
931 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
… …
939 974
940void 975void
941ev_default_fork (void) 976ev_default_fork (void)
942{ 977{
943#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
944 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
945#endif 980#endif
946 981
947 if (method) 982 if (method)
948 postfork = 1; 983 postfork = 1;
949} 984}
… …
1018 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1019 1054
1020 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
1021 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
1022 { 1057 {
1023 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1058 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1024
1025 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1059 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1026 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
1027 } 1061 }
1028 else if (w->interval) 1062 else if (w->interval)
1029 { 1063 {
… …
1147ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1148{ 1182{
1149 double block; 1183 double block;
1150 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1151 1185
1152 do 1186 while (activecnt)
1153 { 1187 {
1154 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1155 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1156 { 1190 {
1157 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1220 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1221 if (checkcnt) 1255 if (checkcnt)
1222 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1223 1257
1224 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1225 } 1262 }
1226 while (activecnt && !loop_done);
1227 1263
1228 if (loop_done != 2) 1264 if (loop_done != 2)
1229 loop_done = 0; 1265 loop_done = 0;
1230} 1266}
1231 1267
… …
1329 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1330 1366
1331 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1332 1368
1333 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1334 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1335 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1336 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1337 1373
1338 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1339} 1375}
… …
1370 } 1406 }
1371 else 1407 else
1372 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1373 } 1409 }
1374 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1375 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1376} 1415}
1377 1416
1378#if EV_PERIODICS 1417#if EV_PERIODICS
1379void 1418void
1380ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
… …
1390 /* this formula differs from the one in periodic_reify because we do not always round up */ 1429 /* this formula differs from the one in periodic_reify because we do not always round up */
1391 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1392 } 1431 }
1393 1432
1394 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1395 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1396 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1397 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1398 1437
1399 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1400} 1439}
… …
1431{ 1470{
1432 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1433 return; 1472 return;
1434 1473
1435 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1436 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1437 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1438} 1477}
1439 1478
1440void 1479void
1441ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1453{ 1492{
1454 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1455 return; 1494 return;
1456 1495
1457 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1458 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1459 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1460} 1499}
1461 1500
1462void 1501void
1463ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1475{ 1514{
1476 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1477 return; 1516 return;
1478 1517
1479 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1480 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1481 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1482} 1521}
1483 1522
1484void 1523void
1485ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
… …
1498 1537
1499void 1538void
1500ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1501{ 1540{
1502#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1503 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1504#endif 1543#endif
1505 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1506 return; 1545 return;
1507 1546
1508 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
… …
1511 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1512 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1513 1552
1514 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1515 { 1554 {
1516#if WIN32 1555#if _WIN32
1517 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1518#else 1557#else
1519 struct sigaction sa; 1558 struct sigaction sa;
1520 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1521 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
… …
1541 1580
1542void 1581void
1543ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1544{ 1583{
1545#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1546 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1547#endif 1586#endif
1548 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1549 return; 1588 return;
1550 1589
1551 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);

Diff Legend

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