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

Comparing libev/ev.c (file contents):
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC vs.
Revision 1.122 by root, Sat Nov 17 02:00:48 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
188#ifdef _WIN32
166#include "ev_win32.c" 189# include "ev_win32.c"
190#endif
167 191
168/*****************************************************************************/ 192/*****************************************************************************/
169 193
170static void (*syserr_cb)(const char *msg); 194static void (*syserr_cb)(const char *msg);
171 195
… …
218typedef struct 242typedef struct
219{ 243{
220 WL head; 244 WL head;
221 unsigned char events; 245 unsigned char events;
222 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
223} ANFD; 250} ANFD;
224 251
225typedef struct 252typedef struct
226{ 253{
227 W w; 254 W w;
… …
231#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
232 259
233 struct ev_loop 260 struct ev_loop
234 { 261 {
235 ev_tstamp ev_rt_now; 262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
236 #define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
237 #include "ev_vars.h" 265 #include "ev_vars.h"
238 #undef VAR 266 #undef VAR
239 }; 267 };
240 #include "ev_wrap.h" 268 #include "ev_wrap.h"
241 269
242 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
243 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
244 272
245#else 273#else
246 274
247 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
248 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
249 #include "ev_vars.h" 277 #include "ev_vars.h"
250 #undef VAR 278 #undef VAR
251 279
252 static int default_loop; 280 static int ev_default_loop_ptr;
253 281
254#endif 282#endif
255 283
256/*****************************************************************************/ 284/*****************************************************************************/
257 285
… …
290{ 318{
291 return ev_rt_now; 319 return ev_rt_now;
292} 320}
293#endif 321#endif
294 322
295#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
296 324
297#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
298 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
299 { \ 327 { \
300 int newcnt = cur; \ 328 int newcnt = cur; \
… …
315 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
316 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
317 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
318 } 346 }
319 347
320/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
321/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
322#define array_free_microshit(stem) \
323 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
324
325#define array_free(stem, idx) \ 348#define array_free(stem, idx) \
326 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;
327 350
328/*****************************************************************************/ 351/*****************************************************************************/
329 352
… …
350 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
351 return; 374 return;
352 } 375 }
353 376
354 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
355 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);
356 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
357 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
358} 381}
359 382
360static void 383static void
… …
403 int events = 0; 426 int events = 0;
404 427
405 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)
406 events |= w->events; 429 events |= w->events;
407 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
408 anfd->reify = 0; 440 anfd->reify = 0;
409 441
410 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
411 anfd->events = events; 443 anfd->events = events;
412 } 444 }
… …
421 return; 453 return;
422 454
423 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
424 456
425 ++fdchangecnt; 457 ++fdchangecnt;
426 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
427 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
428} 460}
429 461
430static void 462static void
431fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
440} 472}
441 473
442static int 474static int
443fd_valid (int fd) 475fd_valid (int fd)
444{ 476{
445#ifdef WIN32 477#ifdef _WIN32
446 return !!win32_get_osfhandle (fd); 478 return _get_osfhandle (fd) != -1;
447#else 479#else
448 return fcntl (fd, F_GETFD) != -1; 480 return fcntl (fd, F_GETFD) != -1;
449#endif 481#endif
450} 482}
451 483
… …
532 heap [k] = w; 564 heap [k] = w;
533 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
534} 566}
535 567
536inline void 568inline void
537adjustheap (WT *heap, int N, int k, ev_tstamp at) 569adjustheap (WT *heap, int N, int k)
538{ 570{
539 ev_tstamp old_at = heap [k]->at; 571 upheap (heap, k);
540 heap [k]->at = at;
541
542 if (old_at < at)
543 downheap (heap, N, k); 572 downheap (heap, N, k);
544 else
545 upheap (heap, k);
546} 573}
547 574
548/*****************************************************************************/ 575/*****************************************************************************/
549 576
550typedef struct 577typedef struct
… …
573} 600}
574 601
575static void 602static void
576sighandler (int signum) 603sighandler (int signum)
577{ 604{
578#if WIN32 605#if _WIN32
579 signal (signum, sighandler); 606 signal (signum, sighandler);
580#endif 607#endif
581 608
582 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
583 610
584 if (!gotsig) 611 if (!gotsig)
585 { 612 {
586 int old_errno = errno; 613 int old_errno = errno;
587 gotsig = 1; 614 gotsig = 1;
588#ifdef WIN32
589 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
590#else
591 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
592#endif
593 errno = old_errno; 616 errno = old_errno;
594 } 617 }
595} 618}
596 619
597void 620void
598ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
599{ 622{
600 WL w; 623 WL w;
601 624
602#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
603 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));
604#endif 627#endif
605 628
606 --signum; 629 --signum;
607 630
608 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
617static void 640static void
618sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
619{ 642{
620 int signum; 643 int signum;
621 644
622#ifdef WIN32
623 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
624#else
625 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
626#endif
627 gotsig = 0; 646 gotsig = 0;
628 647
629 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
632} 651}
633 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
634static void 665static void
635siginit (EV_P) 666siginit (EV_P)
636{ 667{
637#ifndef WIN32 668 fd_intern (sigpipe [0]);
638 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
639 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
640
641 /* rather than sort out wether we really need nb, set it */
642 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
643 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
644#endif
645 670
646 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
647 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
648 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
649} 674}
650 675
651/*****************************************************************************/ 676/*****************************************************************************/
652 677
653static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
654 679
655#ifndef WIN32 680#ifndef _WIN32
656 681
657static struct ev_signal childev; 682static struct ev_signal childev;
658 683
659#ifndef WCONTINUED 684#ifndef WCONTINUED
660# define WCONTINUED 0 685# define WCONTINUED 0
… …
692 717
693#endif 718#endif
694 719
695/*****************************************************************************/ 720/*****************************************************************************/
696 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
697#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
698# include "ev_kqueue.c" 726# include "ev_kqueue.c"
699#endif 727#endif
700#if EV_USE_EPOLL 728#if EV_USE_EPOLL
701# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
721 749
722/* 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 */
723static int 751static int
724enable_secure (void) 752enable_secure (void)
725{ 753{
726#ifdef WIN32 754#ifdef _WIN32
727 return 0; 755 return 0;
728#else 756#else
729 return getuid () != geteuid () 757 return getuid () != geteuid ()
730 || getgid () != getegid (); 758 || getgid () != getegid ();
731#endif 759#endif
732} 760}
733 761
734int 762unsigned int
735ev_method (EV_P) 763ev_method (EV_P)
736{ 764{
737 return method; 765 return method;
738} 766}
739 767
740static void 768static void
741loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
742{ 770{
743 if (!method) 771 if (!method)
744 { 772 {
745#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
746 { 774 {
… …
753 ev_rt_now = ev_time (); 781 ev_rt_now = ev_time ();
754 mn_now = get_clock (); 782 mn_now = get_clock ();
755 now_floor = mn_now; 783 now_floor = mn_now;
756 rtmn_diff = ev_rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
757 785
758 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
759 if (!enable_secure () && getenv ("LIBEV_METHODS"))
760 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
761 else 788
762 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
763 791
764 method = 0; 792 method = 0;
765#if EV_USE_WIN32 793#if EV_USE_PORT
766 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
767#endif 795#endif
768#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
769 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
770#endif 798#endif
771#if EV_USE_EPOLL 799#if EV_USE_EPOLL
772 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
773#endif 801#endif
774#if EV_USE_POLL 802#if EV_USE_POLL
775 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
776#endif 804#endif
777#if EV_USE_SELECT 805#if EV_USE_SELECT
778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
779#endif 807#endif
780 808
781 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
782 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
783 } 811 }
… …
786void 814void
787loop_destroy (EV_P) 815loop_destroy (EV_P)
788{ 816{
789 int i; 817 int i;
790 818
791#if EV_USE_WIN32 819#if EV_USE_PORT
792 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
793#endif 821#endif
794#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
796#endif 824#endif
797#if EV_USE_EPOLL 825#if EV_USE_EPOLL
… …
806 834
807 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 836 array_free (pending, [i]);
809 837
810 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
811 array_free_microshit (fdchange); 839 array_free (fdchange, EMPTY0);
812 array_free_microshit (timer); 840 array_free (timer, EMPTY0);
813#if EV_PERIODICS 841#if EV_PERIODICS
814 array_free_microshit (periodic); 842 array_free (periodic, EMPTY0);
815#endif 843#endif
816 array_free_microshit (idle); 844 array_free (idle, EMPTY0);
817 array_free_microshit (prepare); 845 array_free (prepare, EMPTY0);
818 array_free_microshit (check); 846 array_free (check, EMPTY0);
819 847
820 method = 0; 848 method = 0;
821} 849}
822 850
823static void 851static void
824loop_fork (EV_P) 852loop_fork (EV_P)
825{ 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
826#if EV_USE_EPOLL 860#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif 862#endif
832 863
833 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
834 { 865 {
835 /* default loop */ 866 /* default loop */
… …
848 postfork = 0; 879 postfork = 0;
849} 880}
850 881
851#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
852struct ev_loop * 883struct ev_loop *
853ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
854{ 885{
855 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));
856 887
857 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
858 889
859 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
860 891
861 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
862 return loop; 893 return loop;
863 894
864 return 0; 895 return 0;
… …
879 910
880#endif 911#endif
881 912
882#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
883struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
884#else 916#else
885int 917int
918ev_default_loop (unsigned int flags)
886#endif 919#endif
887ev_default_loop (int methods)
888{ 920{
889 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
891 return 0; 923 return 0;
892 924
893 if (!default_loop) 925 if (!ev_default_loop_ptr)
894 { 926 {
895#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 929#else
898 default_loop = 1; 930 ev_default_loop_ptr = 1;
899#endif 931#endif
900 932
901 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
902 934
903 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
904 { 936 {
905 siginit (EV_A); 937 siginit (EV_A);
906 938
907#ifndef WIN32 939#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
909 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
910 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 944#endif
913 } 945 }
914 else 946 else
915 default_loop = 0; 947 ev_default_loop_ptr = 0;
916 } 948 }
917 949
918 return default_loop; 950 return ev_default_loop_ptr;
919} 951}
920 952
921void 953void
922ev_default_destroy (void) 954ev_default_destroy (void)
923{ 955{
924#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 958#endif
927 959
928#ifndef WIN32 960#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
931#endif 963#endif
932 964
933 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
… …
941 973
942void 974void
943ev_default_fork (void) 975ev_default_fork (void)
944{ 976{
945#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 979#endif
948 980
949 if (method) 981 if (method)
950 postfork = 1; 982 postfork = 1;
951} 983}
… …
962 return 1; 994 return 1;
963 995
964 return 0; 996 return 0;
965} 997}
966 998
967static void 999inline void
968call_pending (EV_P) 1000call_pending (EV_P)
969{ 1001{
970 int pri; 1002 int pri;
971 1003
972 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
974 { 1006 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1008
977 if (p->w) 1009 if (expect_true (p->w))
978 { 1010 {
979 p->w->pending = 0; 1011 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
981 } 1013 }
982 } 1014 }
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1053
1022 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1024 { 1056 {
1025 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);
1026
1027 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));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1060 }
1030 else if (w->interval) 1061 else if (w->interval)
1031 { 1062 {
… …
1149ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1150{ 1181{
1151 double block; 1182 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1184
1154 do 1185 while (activecnt)
1155 { 1186 {
1156 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1158 { 1189 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1222 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1254 if (checkcnt)
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1256
1226 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (loop_done)
1260 break;
1227 } 1261 }
1228 while (activecnt && !loop_done);
1229 1262
1230 if (loop_done != 2) 1263 if (loop_done != 2)
1231 loop_done = 0; 1264 loop_done = 0;
1232} 1265}
1233 1266
… …
1331 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1332 1365
1333 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.));
1334 1367
1335 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1339 1372
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1374}
… …
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1384
1352 if (((W)w)->active < timercnt--) 1385 if (((W)w)->active < timercnt--)
1353 { 1386 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1389 }
1357 1390
1358 ((WT)w)->at -= mn_now; 1391 ((WT)w)->at -= mn_now;
1359 1392
1360 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
… …
1364ev_timer_again (EV_P_ struct ev_timer *w) 1397ev_timer_again (EV_P_ struct ev_timer *w)
1365{ 1398{
1366 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1367 { 1400 {
1368 if (w->repeat) 1401 if (w->repeat)
1402 {
1403 ((WT)w)->at = mn_now + w->repeat;
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1405 }
1370 else 1406 else
1371 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1372 } 1408 }
1373 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1374 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1375} 1414}
1376 1415
1377#if EV_PERIODICS 1416#if EV_PERIODICS
1378void 1417void
1379ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
… …
1389 /* 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 */
1390 ((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;
1391 } 1430 }
1392 1431
1393 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1395 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1396 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1397 1436
1398 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1399} 1438}
… …
1408 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1409 1448
1410 if (((W)w)->active < periodiccnt--) 1449 if (((W)w)->active < periodiccnt--)
1411 { 1450 {
1412 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1413 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1414 } 1453 }
1415 1454
1416 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1417} 1456}
1418 1457
… …
1430{ 1469{
1431 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1432 return; 1471 return;
1433 1472
1434 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1435 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1436 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1437} 1476}
1438 1477
1439void 1478void
1440ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1441{ 1480{
1442 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1443 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1444 return; 1483 return;
1445 1484
1446 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1447 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1448} 1487}
… …
1452{ 1491{
1453 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1454 return; 1493 return;
1455 1494
1456 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1457 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1458 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1459} 1498}
1460 1499
1461void 1500void
1462ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1463{ 1502{
1464 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1465 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1466 return; 1505 return;
1467 1506
1468 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1469 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1470} 1509}
… …
1474{ 1513{
1475 if (ev_is_active (w)) 1514 if (ev_is_active (w))
1476 return; 1515 return;
1477 1516
1478 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1479 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1480 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1481} 1520}
1482 1521
1483void 1522void
1484ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
… …
1497 1536
1498void 1537void
1499ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1500{ 1539{
1501#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1502 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));
1503#endif 1542#endif
1504 if (ev_is_active (w)) 1543 if (ev_is_active (w))
1505 return; 1544 return;
1506 1545
1507 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));
… …
1510 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1511 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1512 1551
1513 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1514 { 1553 {
1515#if WIN32 1554#if _WIN32
1516 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1517#else 1556#else
1518 struct sigaction sa; 1557 struct sigaction sa;
1519 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1520 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
… …
1540 1579
1541void 1580void
1542ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1543{ 1582{
1544#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1545 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));
1546#endif 1585#endif
1547 if (ev_is_active (w)) 1586 if (ev_is_active (w))
1548 return; 1587 return;
1549 1588
1550 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