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

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