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

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

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

Diff Legend

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