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

Comparing libev/ev.c (file contents):
Revision 1.101 by root, Sun Nov 11 04:04:23 2007 UTC vs.
Revision 1.121 by root, Fri Nov 16 10:37:28 2007 UTC

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

Diff Legend

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