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

Comparing libev/ev.c (file contents):
Revision 1.86 by root, Sat Nov 10 03:19:21 2007 UTC vs.
Revision 1.119 by root, Fri Nov 16 01:43:52 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif
63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
53# endif 66# endif
54 67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
66#include <sys/types.h> 79#include <sys/types.h>
67#include <time.h> 80#include <time.h>
68 81
69#include <signal.h> 82#include <signal.h>
70 83
71#ifndef WIN32 84#ifndef _WIN32
72# include <unistd.h> 85# include <unistd.h>
73# include <sys/time.h> 86# include <sys/time.h>
74# 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
75#endif 93# endif
94#endif
95
76/**/ 96/**/
77 97
78#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 1
80#endif 100#endif
81 101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1
104#endif
105
82#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
84#endif 109#endif
85 110
86#ifndef EV_USE_POLL 111#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 112# ifdef _WIN32
113# define EV_USE_POLL 0
114# else
115# define EV_USE_POLL 1
116# endif
88#endif 117#endif
89 118
90#ifndef EV_USE_EPOLL 119#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 120# define EV_USE_EPOLL 0
92#endif 121#endif
93 122
94#ifndef EV_USE_KQUEUE 123#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 124# define EV_USE_KQUEUE 0
96#endif 125#endif
97 126
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 127#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 128# define EV_USE_PORT 0
110#endif 129#endif
111 130
112/**/ 131/**/
132
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
113 138
114#ifndef CLOCK_MONOTONIC 139#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 140# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 141# define EV_USE_MONOTONIC 0
117#endif 142#endif
118 143
119#ifndef CLOCK_REALTIME 144#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 145# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 146# define EV_USE_REALTIME 0
147#endif
148
149#if EV_SELECT_IS_WINSOCKET
150# include <winsock.h>
122#endif 151#endif
123 152
124/**/ 153/**/
125 154
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 155#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
146#define expect_true(expr) expect ((expr) != 0, 1) 175#define expect_true(expr) expect ((expr) != 0, 1)
147 176
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 177#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 178#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 179
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */
182
151typedef struct ev_watcher *W; 183typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 184typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 185typedef struct ev_watcher_time *WT;
154 186
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 188
189#ifdef _WIN32
157#include "ev_win32.c" 190# include "ev_win32.c"
191#endif
158 192
159/*****************************************************************************/ 193/*****************************************************************************/
160 194
161static void (*syserr_cb)(const char *msg); 195static void (*syserr_cb)(const char *msg);
162 196
209typedef struct 243typedef struct
210{ 244{
211 WL head; 245 WL head;
212 unsigned char events; 246 unsigned char events;
213 unsigned char reify; 247 unsigned char reify;
248#if EV_SELECT_IS_WINSOCKET
249 SOCKET handle;
250#endif
214} ANFD; 251} ANFD;
215 252
216typedef struct 253typedef struct
217{ 254{
218 W w; 255 W w;
222#if EV_MULTIPLICITY 259#if EV_MULTIPLICITY
223 260
224 struct ev_loop 261 struct ev_loop
225 { 262 {
226 ev_tstamp ev_rt_now; 263 ev_tstamp ev_rt_now;
264 #define ev_rt_now ((loop)->ev_rt_now)
227 #define VAR(name,decl) decl; 265 #define VAR(name,decl) decl;
228 #include "ev_vars.h" 266 #include "ev_vars.h"
229 #undef VAR 267 #undef VAR
230 }; 268 };
231 #include "ev_wrap.h" 269 #include "ev_wrap.h"
232 270
233 struct ev_loop default_loop_struct; 271 static struct ev_loop default_loop_struct;
234 static struct ev_loop *default_loop; 272 struct ev_loop *ev_default_loop_ptr;
235 273
236#else 274#else
237 275
238 ev_tstamp ev_rt_now; 276 ev_tstamp ev_rt_now;
239 #define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
240 #include "ev_vars.h" 278 #include "ev_vars.h"
241 #undef VAR 279 #undef VAR
242 280
243 static int default_loop; 281 static int ev_default_loop_ptr;
244 282
245#endif 283#endif
246 284
247/*****************************************************************************/ 285/*****************************************************************************/
248 286
249inline ev_tstamp 287ev_tstamp
250ev_time (void) 288ev_time (void)
251{ 289{
252#if EV_USE_REALTIME 290#if EV_USE_REALTIME
253 struct timespec ts; 291 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 292 clock_gettime (CLOCK_REALTIME, &ts);
281{ 319{
282 return ev_rt_now; 320 return ev_rt_now;
283} 321}
284#endif 322#endif
285 323
286#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
287 325
288#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
289 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
290 { \ 328 { \
291 int newcnt = cur; \ 329 int newcnt = cur; \
306 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
307 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
308 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
309 } 347 }
310 348
311/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
312/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
313#define array_free_microshit(stem) \
314 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
315
316#define array_free(stem, idx) \ 349#define array_free(stem, idx) \
317 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 350 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
318 351
319/*****************************************************************************/ 352/*****************************************************************************/
320 353
341 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
342 return; 375 return;
343 } 376 }
344 377
345 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
346 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 379 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
347 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
348 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
349} 382}
350 383
351static void 384static void
394 int events = 0; 427 int events = 0;
395 428
396 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 429 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
397 events |= w->events; 430 events |= w->events;
398 431
432#if EV_SELECT_IS_WINSOCKET
433 if (events)
434 {
435 unsigned long argp;
436 anfd->handle = _get_osfhandle (fd);
437 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
438 }
439#endif
440
399 anfd->reify = 0; 441 anfd->reify = 0;
400 442
401 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
402 anfd->events = events; 444 anfd->events = events;
403 } 445 }
412 return; 454 return;
413 455
414 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
415 457
416 ++fdchangecnt; 458 ++fdchangecnt;
417 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
418 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
419} 461}
420 462
421static void 463static void
422fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
431} 473}
432 474
433static int 475static int
434fd_valid (int fd) 476fd_valid (int fd)
435{ 477{
436#ifdef WIN32 478#ifdef _WIN32
437 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
438#else 480#else
439 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
440#endif 482#endif
441} 483}
442 484
523 heap [k] = w; 565 heap [k] = w;
524 ((W)heap [k])->active = k + 1; 566 ((W)heap [k])->active = k + 1;
525} 567}
526 568
527inline void 569inline void
528adjustheap (WT *heap, int N, int k, ev_tstamp at) 570adjustheap (WT *heap, int N, int k)
529{ 571{
530 ev_tstamp old_at = heap [k]->at; 572 upheap (heap, k);
531 heap [k]->at = at;
532
533 if (old_at < at)
534 downheap (heap, N, k); 573 downheap (heap, N, k);
535 else
536 upheap (heap, k);
537} 574}
538 575
539/*****************************************************************************/ 576/*****************************************************************************/
540 577
541typedef struct 578typedef struct
564} 601}
565 602
566static void 603static void
567sighandler (int signum) 604sighandler (int signum)
568{ 605{
569#if WIN32 606#if _WIN32
570 signal (signum, sighandler); 607 signal (signum, sighandler);
571#endif 608#endif
572 609
573 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
574 611
575 if (!gotsig) 612 if (!gotsig)
576 { 613 {
577 int old_errno = errno; 614 int old_errno = errno;
578 gotsig = 1; 615 gotsig = 1;
579#ifdef WIN32
580 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
581#else
582 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
583#endif
584 errno = old_errno; 617 errno = old_errno;
585 } 618 }
586} 619}
587 620
588void 621void
589ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
590{ 623{
591 WL w; 624 WL w;
592 625
593#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
594 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 627 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
595#endif 628#endif
596 629
597 --signum; 630 --signum;
598 631
599 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
608static void 641static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 643{
611 int signum; 644 int signum;
612 645
613#ifdef WIN32
614 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
615#else
616 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
617#endif
618 gotsig = 0; 647 gotsig = 0;
619 648
620 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
621 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
622 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
623} 652}
624 653
654inline void
655fd_intern (int fd)
656{
657#ifdef _WIN32
658 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
660#else
661 fcntl (fd, F_SETFD, FD_CLOEXEC);
662 fcntl (fd, F_SETFL, O_NONBLOCK);
663#endif
664}
665
625static void 666static void
626siginit (EV_P) 667siginit (EV_P)
627{ 668{
628#ifndef WIN32 669 fd_intern (sigpipe [0]);
629 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 fd_intern (sigpipe [1]);
630 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
631
632 /* rather than sort out wether we really need nb, set it */
633 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
634 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
635#endif
636 671
637 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
638 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
639 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
640} 675}
641 676
642/*****************************************************************************/ 677/*****************************************************************************/
643 678
644static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
645 680
646#ifndef WIN32 681#ifndef _WIN32
647 682
648static struct ev_signal childev; 683static struct ev_signal childev;
649 684
650#ifndef WCONTINUED 685#ifndef WCONTINUED
651# define WCONTINUED 0 686# define WCONTINUED 0
683 718
684#endif 719#endif
685 720
686/*****************************************************************************/ 721/*****************************************************************************/
687 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
688#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
689# include "ev_kqueue.c" 727# include "ev_kqueue.c"
690#endif 728#endif
691#if EV_USE_EPOLL 729#if EV_USE_EPOLL
692# include "ev_epoll.c" 730# include "ev_epoll.c"
712 750
713/* return true if we are running with elevated privileges and should ignore env variables */ 751/* return true if we are running with elevated privileges and should ignore env variables */
714static int 752static int
715enable_secure (void) 753enable_secure (void)
716{ 754{
717#ifdef WIN32 755#ifdef _WIN32
718 return 0; 756 return 0;
719#else 757#else
720 return getuid () != geteuid () 758 return getuid () != geteuid ()
721 || getgid () != getegid (); 759 || getgid () != getegid ();
722#endif 760#endif
723} 761}
724 762
725int 763unsigned int
726ev_method (EV_P) 764ev_method (EV_P)
727{ 765{
728 return method; 766 return method;
729} 767}
730 768
731static void 769static void
732loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
733{ 771{
734 if (!method) 772 if (!method)
735 { 773 {
736#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
737 { 775 {
744 ev_rt_now = ev_time (); 782 ev_rt_now = ev_time ();
745 mn_now = get_clock (); 783 mn_now = get_clock ();
746 now_floor = mn_now; 784 now_floor = mn_now;
747 rtmn_diff = ev_rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
748 786
749 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
750 if (!enable_secure () && getenv ("LIBEV_METHODS"))
751 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
752 else 789
753 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
754 792
755 method = 0; 793 method = 0;
756#if EV_USE_WIN32 794#if EV_USE_PORT
757 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
758#endif 796#endif
759#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
760 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
761#endif 799#endif
762#if EV_USE_EPOLL 800#if EV_USE_EPOLL
763 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
764#endif 802#endif
765#if EV_USE_POLL 803#if EV_USE_POLL
766 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
767#endif 805#endif
768#if EV_USE_SELECT 806#if EV_USE_SELECT
769 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
770#endif 808#endif
771 809
772 ev_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
773 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
774 } 812 }
777void 815void
778loop_destroy (EV_P) 816loop_destroy (EV_P)
779{ 817{
780 int i; 818 int i;
781 819
782#if EV_USE_WIN32 820#if EV_USE_PORT
783 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
784#endif 822#endif
785#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
786 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
787#endif 825#endif
788#if EV_USE_EPOLL 826#if EV_USE_EPOLL
797 835
798 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
799 array_free (pending, [i]); 837 array_free (pending, [i]);
800 838
801 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
803 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
804 array_free_microshit (periodic); 842#if EV_PERIODICS
805 array_free_microshit (idle); 843 array_free (periodic, EMPTY0);
806 array_free_microshit (prepare); 844#endif
807 array_free_microshit (check); 845 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0);
808 848
809 method = 0; 849 method = 0;
810} 850}
811 851
812static void 852static void
813loop_fork (EV_P) 853loop_fork (EV_P)
814{ 854{
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A);
857#endif
858#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
860#endif
815#if EV_USE_EPOLL 861#if EV_USE_EPOLL
816 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
817#endif
818#if EV_USE_KQUEUE
819 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
820#endif 863#endif
821 864
822 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
823 { 866 {
824 /* default loop */ 867 /* default loop */
837 postfork = 0; 880 postfork = 0;
838} 881}
839 882
840#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
841struct ev_loop * 884struct ev_loop *
842ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
843{ 886{
844 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 887 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
845 888
846 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
847 890
848 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
849 892
850 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
851 return loop; 894 return loop;
852 895
853 return 0; 896 return 0;
868 911
869#endif 912#endif
870 913
871#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
872struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
873#else 917#else
874int 918int
919ev_default_loop (unsigned int flags)
875#endif 920#endif
876ev_default_loop (int methods)
877{ 921{
878 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
879 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
880 return 0; 924 return 0;
881 925
882 if (!default_loop) 926 if (!ev_default_loop_ptr)
883 { 927 {
884#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
886#else 930#else
887 default_loop = 1; 931 ev_default_loop_ptr = 1;
888#endif 932#endif
889 933
890 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
891 935
892 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
893 { 937 {
894 siginit (EV_A); 938 siginit (EV_A);
895 939
896#ifndef WIN32 940#ifndef _WIN32
897 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
898 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
899 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
901#endif 945#endif
902 } 946 }
903 else 947 else
904 default_loop = 0; 948 ev_default_loop_ptr = 0;
905 } 949 }
906 950
907 return default_loop; 951 return ev_default_loop_ptr;
908} 952}
909 953
910void 954void
911ev_default_destroy (void) 955ev_default_destroy (void)
912{ 956{
913#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
914 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
915#endif 959#endif
916 960
917#ifndef WIN32 961#ifndef _WIN32
918 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
919 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
920#endif 964#endif
921 965
922 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
930 974
931void 975void
932ev_default_fork (void) 976ev_default_fork (void)
933{ 977{
934#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
935 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
936#endif 980#endif
937 981
938 if (method) 982 if (method)
939 postfork = 1; 983 postfork = 1;
940} 984}
982 1026
983 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
984 if (w->repeat) 1028 if (w->repeat)
985 { 1029 {
986 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1030 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1031
987 ((WT)w)->at = mn_now + w->repeat; 1032 ((WT)w)->at += w->repeat;
1033 if (((WT)w)->at < mn_now)
1034 ((WT)w)->at = mn_now;
1035
988 downheap ((WT *)timers, timercnt, 0); 1036 downheap ((WT *)timers, timercnt, 0);
989 } 1037 }
990 else 1038 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1040
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1042 }
995} 1043}
996 1044
1045#if EV_PERIODICS
997static void 1046static void
998periodics_reify (EV_P) 1047periodics_reify (EV_P)
999{ 1048{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1050 {
1004 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1005 1054
1006 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
1007 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
1008 { 1057 {
1009 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1058 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1010
1011 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1059 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1012 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
1013 } 1061 }
1014 else if (w->interval) 1062 else if (w->interval)
1015 { 1063 {
1042 1090
1043 /* now rebuild the heap */ 1091 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1092 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1093 downheap ((WT *)periodics, periodiccnt, i);
1046} 1094}
1095#endif
1047 1096
1048inline int 1097inline int
1049time_update_monotonic (EV_P) 1098time_update_monotonic (EV_P)
1050{ 1099{
1051 mn_now = get_clock (); 1100 mn_now = get_clock ();
1085 ev_rt_now = ev_time (); 1134 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1135 mn_now = get_clock ();
1087 now_floor = mn_now; 1136 now_floor = mn_now;
1088 } 1137 }
1089 1138
1139# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1140 periodics_reschedule (EV_A);
1141# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1142 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1143 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1144 }
1094 } 1145 }
1095 else 1146 else
1097 { 1148 {
1098 ev_rt_now = ev_time (); 1149 ev_rt_now = ev_time ();
1099 1150
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1151 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1152 {
1153#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1154 periodics_reschedule (EV_A);
1155#endif
1103 1156
1104 /* adjust timers. this is easy, as the offset is the same for all */ 1157 /* adjust timers. this is easy, as the offset is the same for all */
1105 for (i = 0; i < timercnt; ++i) 1158 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1159 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1160 }
1128ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1129{ 1182{
1130 double block; 1183 double block;
1131 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1132 1185
1133 do 1186 while (activecnt)
1134 { 1187 {
1135 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1136 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1137 { 1190 {
1138 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1170 { 1223 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1225 if (block > to) block = to;
1173 } 1226 }
1174 1227
1228#if EV_PERIODICS
1175 if (periodiccnt) 1229 if (periodiccnt)
1176 { 1230 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1232 if (block > to) block = to;
1179 } 1233 }
1234#endif
1180 1235
1181 if (block < 0.) block = 0.; 1236 if (block < 0.) block = 0.;
1182 } 1237 }
1183 1238
1184 method_poll (EV_A_ block); 1239 method_poll (EV_A_ block);
1186 /* update ev_rt_now, do magic */ 1241 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1242 time_update (EV_A);
1188 1243
1189 /* queue pending timers and reschedule them */ 1244 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1245 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1247 periodics_reify (EV_A); /* absolute timers called first */
1248#endif
1192 1249
1193 /* queue idle watchers unless io or timers are pending */ 1250 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1251 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1253
1197 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1198 if (checkcnt) 1255 if (checkcnt)
1199 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1200 1257
1201 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1202 } 1262 }
1203 while (activecnt && !loop_done);
1204 1263
1205 if (loop_done != 2) 1264 if (loop_done != 2)
1206 loop_done = 0; 1265 loop_done = 0;
1207} 1266}
1208 1267
1287{ 1346{
1288 ev_clear_pending (EV_A_ (W)w); 1347 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1348 if (!ev_is_active (w))
1290 return; 1349 return;
1291 1350
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1354 ev_stop (EV_A_ (W)w);
1294 1355
1295 fd_change (EV_A_ w->fd); 1356 fd_change (EV_A_ w->fd);
1296} 1357}
1304 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1305 1366
1306 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1307 1368
1308 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1309 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1310 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1311 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1312 1373
1313 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1314} 1375}
1323 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1324 1385
1325 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1326 { 1387 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1390 }
1330 1391
1331 ((WT)w)->at = w->repeat; 1392 ((WT)w)->at -= mn_now;
1332 1393
1333 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
1334} 1395}
1335 1396
1336void 1397void
1337ev_timer_again (EV_P_ struct ev_timer *w) 1398ev_timer_again (EV_P_ struct ev_timer *w)
1338{ 1399{
1339 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1340 { 1401 {
1341 if (w->repeat) 1402 if (w->repeat)
1403 {
1404 ((WT)w)->at = mn_now + w->repeat;
1342 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1406 }
1343 else 1407 else
1344 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1345 } 1409 }
1346 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1347 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1348} 1415}
1349 1416
1417#if EV_PERIODICS
1350void 1418void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1420{
1353 if (ev_is_active (w)) 1421 if (ev_is_active (w))
1354 return; 1422 return;
1361 /* this formula differs from the one in periodic_reify because we do not always round up */ 1429 /* this formula differs from the one in periodic_reify because we do not always round up */
1362 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1363 } 1431 }
1364 1432
1365 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1366 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1367 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1368 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1369 1437
1370 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1371} 1439}
1380 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1381 1449
1382 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1383 { 1451 {
1384 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1385 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1386 } 1454 }
1387 1455
1388 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1389} 1457}
1390 1458
1393{ 1461{
1394 /* TODO: use adjustheap and recalculation */ 1462 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1463 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1464 ev_periodic_start (EV_A_ w);
1397} 1465}
1466#endif
1398 1467
1399void 1468void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1469ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1470{
1402 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1403 return; 1472 return;
1404 1473
1405 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1406 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1407 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1408} 1477}
1409 1478
1410void 1479void
1411ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1412{ 1481{
1413 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1414 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1415 return; 1484 return;
1416 1485
1417 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1418 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1419} 1488}
1423{ 1492{
1424 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1425 return; 1494 return;
1426 1495
1427 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1428 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1429 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1430} 1499}
1431 1500
1432void 1501void
1433ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1434{ 1503{
1435 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1436 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1437 return; 1506 return;
1438 1507
1439 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1440 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1441} 1510}
1445{ 1514{
1446 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1447 return; 1516 return;
1448 1517
1449 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1450 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1451 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1452} 1521}
1453 1522
1454void 1523void
1455ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1525{
1457 ev_clear_pending (EV_A_ (W)w); 1526 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1527 if (!ev_is_active (w))
1459 return; 1528 return;
1460 1529
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1530 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1531 ev_stop (EV_A_ (W)w);
1463} 1532}
1468 1537
1469void 1538void
1470ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1471{ 1540{
1472#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1473 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1474#endif 1543#endif
1475 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1476 return; 1545 return;
1477 1546
1478 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1481 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1482 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1483 1552
1484 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1485 { 1554 {
1486#if WIN32 1555#if _WIN32
1487 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1488#else 1557#else
1489 struct sigaction sa; 1558 struct sigaction sa;
1490 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1491 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
1511 1580
1512void 1581void
1513ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1514{ 1583{
1515#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1516 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1586#endif
1518 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1519 return; 1588 return;
1520 1589
1521 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);
1524 1593
1525void 1594void
1526ev_child_stop (EV_P_ struct ev_child *w) 1595ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1596{
1528 ev_clear_pending (EV_A_ (W)w); 1597 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1598 if (!ev_is_active (w))
1530 return; 1599 return;
1531 1600
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1602 ev_stop (EV_A_ (W)w);
1534} 1603}
1594 ev_timer_start (EV_A_ &once->to); 1663 ev_timer_start (EV_A_ &once->to);
1595 } 1664 }
1596 } 1665 }
1597} 1666}
1598 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines