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.116 by root, Thu Nov 15 09:19:42 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
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# include <sys/wait.h> 83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 104# ifdef _WIN32
105# define EV_USE_POLL 0
106# else
107# define EV_USE_POLL 1
108# endif
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif 117#endif
97 118
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 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
111 122
112/**/ 123/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
113 130
114#ifndef CLOCK_MONOTONIC 131#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 132# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 133# define EV_USE_MONOTONIC 0
117#endif 134#endif
118 135
119#ifndef CLOCK_REALTIME 136#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 137# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 138# define EV_USE_REALTIME 0
139#endif
140
141#if EV_SELECT_IS_WINSOCKET
142# include <winsock.h>
122#endif 143#endif
123 144
124/**/ 145/**/
125 146
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
147 168
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 171
172#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
173#define EMPTY2(a,b) /* used to suppress some warnings */
174
151typedef struct ev_watcher *W; 175typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 176typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 177typedef struct ev_watcher_time *WT;
154 178
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 179static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 180
181#ifdef _WIN32
157#include "ev_win32.c" 182# include "ev_win32.c"
183#endif
158 184
159/*****************************************************************************/ 185/*****************************************************************************/
160 186
161static void (*syserr_cb)(const char *msg); 187static void (*syserr_cb)(const char *msg);
162 188
… …
209typedef struct 235typedef struct
210{ 236{
211 WL head; 237 WL head;
212 unsigned char events; 238 unsigned char events;
213 unsigned char reify; 239 unsigned char reify;
240#if EV_SELECT_IS_WINSOCKET
241 SOCKET handle;
242#endif
214} ANFD; 243} ANFD;
215 244
216typedef struct 245typedef struct
217{ 246{
218 W w; 247 W w;
… …
222#if EV_MULTIPLICITY 251#if EV_MULTIPLICITY
223 252
224 struct ev_loop 253 struct ev_loop
225 { 254 {
226 ev_tstamp ev_rt_now; 255 ev_tstamp ev_rt_now;
256 #define ev_rt_now ((loop)->ev_rt_now)
227 #define VAR(name,decl) decl; 257 #define VAR(name,decl) decl;
228 #include "ev_vars.h" 258 #include "ev_vars.h"
229 #undef VAR 259 #undef VAR
230 }; 260 };
231 #include "ev_wrap.h" 261 #include "ev_wrap.h"
232 262
233 struct ev_loop default_loop_struct; 263 static struct ev_loop default_loop_struct;
234 static struct ev_loop *default_loop; 264 struct ev_loop *ev_default_loop_ptr;
235 265
236#else 266#else
237 267
238 ev_tstamp ev_rt_now; 268 ev_tstamp ev_rt_now;
239 #define VAR(name,decl) static decl; 269 #define VAR(name,decl) static decl;
240 #include "ev_vars.h" 270 #include "ev_vars.h"
241 #undef VAR 271 #undef VAR
242 272
243 static int default_loop; 273 static int ev_default_loop_ptr;
244 274
245#endif 275#endif
246 276
247/*****************************************************************************/ 277/*****************************************************************************/
248 278
249inline ev_tstamp 279ev_tstamp
250ev_time (void) 280ev_time (void)
251{ 281{
252#if EV_USE_REALTIME 282#if EV_USE_REALTIME
253 struct timespec ts; 283 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 284 clock_gettime (CLOCK_REALTIME, &ts);
… …
281{ 311{
282 return ev_rt_now; 312 return ev_rt_now;
283} 313}
284#endif 314#endif
285 315
286#define array_roundsize(type,n) ((n) | 4 & ~3) 316#define array_roundsize(type,n) (((n) | 4) & ~3)
287 317
288#define array_needsize(type,base,cur,cnt,init) \ 318#define array_needsize(type,base,cur,cnt,init) \
289 if (expect_false ((cnt) > cur)) \ 319 if (expect_false ((cnt) > cur)) \
290 { \ 320 { \
291 int newcnt = cur; \ 321 int newcnt = cur; \
… …
306 stem ## max = array_roundsize (stem ## cnt >> 1); \ 336 stem ## max = array_roundsize (stem ## cnt >> 1); \
307 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 337 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
308 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 338 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
309 } 339 }
310 340
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) \ 341#define array_free(stem, idx) \
317 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 342 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
318 343
319/*****************************************************************************/ 344/*****************************************************************************/
320 345
… …
341 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
342 return; 367 return;
343 } 368 }
344 369
345 w_->pending = ++pendingcnt [ABSPRI (w_)]; 370 w_->pending = ++pendingcnt [ABSPRI (w_)];
346 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 371 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
347 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 372 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
348 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
349} 374}
350 375
351static void 376static void
… …
394 int events = 0; 419 int events = 0;
395 420
396 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 421 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
397 events |= w->events; 422 events |= w->events;
398 423
424#if EV_SELECT_IS_WINSOCKET
425 if (events)
426 {
427 unsigned long argp;
428 anfd->handle = _get_osfhandle (fd);
429 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
430 }
431#endif
432
399 anfd->reify = 0; 433 anfd->reify = 0;
400 434
401 method_modify (EV_A_ fd, anfd->events, events); 435 method_modify (EV_A_ fd, anfd->events, events);
402 anfd->events = events; 436 anfd->events = events;
403 } 437 }
… …
412 return; 446 return;
413 447
414 anfds [fd].reify = 1; 448 anfds [fd].reify = 1;
415 449
416 ++fdchangecnt; 450 ++fdchangecnt;
417 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 451 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
418 fdchanges [fdchangecnt - 1] = fd; 452 fdchanges [fdchangecnt - 1] = fd;
419} 453}
420 454
421static void 455static void
422fd_kill (EV_P_ int fd) 456fd_kill (EV_P_ int fd)
… …
431} 465}
432 466
433static int 467static int
434fd_valid (int fd) 468fd_valid (int fd)
435{ 469{
436#ifdef WIN32 470#ifdef _WIN32
437 return !!win32_get_osfhandle (fd); 471 return _get_osfhandle (fd) != -1;
438#else 472#else
439 return fcntl (fd, F_GETFD) != -1; 473 return fcntl (fd, F_GETFD) != -1;
440#endif 474#endif
441} 475}
442 476
… …
523 heap [k] = w; 557 heap [k] = w;
524 ((W)heap [k])->active = k + 1; 558 ((W)heap [k])->active = k + 1;
525} 559}
526 560
527inline void 561inline void
528adjustheap (WT *heap, int N, int k, ev_tstamp at) 562adjustheap (WT *heap, int N, int k)
529{ 563{
530 ev_tstamp old_at = heap [k]->at; 564 upheap (heap, k);
531 heap [k]->at = at;
532
533 if (old_at < at)
534 downheap (heap, N, k); 565 downheap (heap, N, k);
535 else
536 upheap (heap, k);
537} 566}
538 567
539/*****************************************************************************/ 568/*****************************************************************************/
540 569
541typedef struct 570typedef struct
… …
564} 593}
565 594
566static void 595static void
567sighandler (int signum) 596sighandler (int signum)
568{ 597{
569#if WIN32 598#if _WIN32
570 signal (signum, sighandler); 599 signal (signum, sighandler);
571#endif 600#endif
572 601
573 signals [signum - 1].gotsig = 1; 602 signals [signum - 1].gotsig = 1;
574 603
575 if (!gotsig) 604 if (!gotsig)
576 { 605 {
577 int old_errno = errno; 606 int old_errno = errno;
578 gotsig = 1; 607 gotsig = 1;
579#ifdef WIN32
580 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
581#else
582 write (sigpipe [1], &signum, 1); 608 write (sigpipe [1], &signum, 1);
583#endif
584 errno = old_errno; 609 errno = old_errno;
585 } 610 }
586} 611}
587 612
588void 613void
589ev_feed_signal_event (EV_P_ int signum) 614ev_feed_signal_event (EV_P_ int signum)
590{ 615{
591 WL w; 616 WL w;
592 617
593#if EV_MULTIPLICITY 618#if EV_MULTIPLICITY
594 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 619 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
595#endif 620#endif
596 621
597 --signum; 622 --signum;
598 623
599 if (signum < 0 || signum >= signalmax) 624 if (signum < 0 || signum >= signalmax)
… …
608static void 633static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 634sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 635{
611 int signum; 636 int signum;
612 637
613#ifdef WIN32
614 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
615#else
616 read (sigpipe [0], &revents, 1); 638 read (sigpipe [0], &revents, 1);
617#endif
618 gotsig = 0; 639 gotsig = 0;
619 640
620 for (signum = signalmax; signum--; ) 641 for (signum = signalmax; signum--; )
621 if (signals [signum].gotsig) 642 if (signals [signum].gotsig)
622 ev_feed_signal_event (EV_A_ signum + 1); 643 ev_feed_signal_event (EV_A_ signum + 1);
623} 644}
624 645
646inline void
647fd_intern (int fd)
648{
649#ifdef _WIN32
650 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
652#else
653 fcntl (fd, F_SETFD, FD_CLOEXEC);
654 fcntl (fd, F_SETFL, O_NONBLOCK);
655#endif
656}
657
625static void 658static void
626siginit (EV_P) 659siginit (EV_P)
627{ 660{
628#ifndef WIN32 661 fd_intern (sigpipe [0]);
629 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 662 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 663
637 ev_io_set (&sigev, sigpipe [0], EV_READ); 664 ev_io_set (&sigev, sigpipe [0], EV_READ);
638 ev_io_start (EV_A_ &sigev); 665 ev_io_start (EV_A_ &sigev);
639 ev_unref (EV_A); /* child watcher should not keep loop alive */ 666 ev_unref (EV_A); /* child watcher should not keep loop alive */
640} 667}
641 668
642/*****************************************************************************/ 669/*****************************************************************************/
643 670
644static struct ev_child *childs [PID_HASHSIZE]; 671static struct ev_child *childs [PID_HASHSIZE];
645 672
646#ifndef WIN32 673#ifndef _WIN32
647 674
648static struct ev_signal childev; 675static struct ev_signal childev;
649 676
650#ifndef WCONTINUED 677#ifndef WCONTINUED
651# define WCONTINUED 0 678# define WCONTINUED 0
… …
712 739
713/* return true if we are running with elevated privileges and should ignore env variables */ 740/* return true if we are running with elevated privileges and should ignore env variables */
714static int 741static int
715enable_secure (void) 742enable_secure (void)
716{ 743{
717#ifdef WIN32 744#ifdef _WIN32
718 return 0; 745 return 0;
719#else 746#else
720 return getuid () != geteuid () 747 return getuid () != geteuid ()
721 || getgid () != getegid (); 748 || getgid () != getegid ();
722#endif 749#endif
723} 750}
724 751
725int 752unsigned int
726ev_method (EV_P) 753ev_method (EV_P)
727{ 754{
728 return method; 755 return method;
729} 756}
730 757
731static void 758static void
732loop_init (EV_P_ int methods) 759loop_init (EV_P_ unsigned int flags)
733{ 760{
734 if (!method) 761 if (!method)
735 { 762 {
736#if EV_USE_MONOTONIC 763#if EV_USE_MONOTONIC
737 { 764 {
… …
744 ev_rt_now = ev_time (); 771 ev_rt_now = ev_time ();
745 mn_now = get_clock (); 772 mn_now = get_clock ();
746 now_floor = mn_now; 773 now_floor = mn_now;
747 rtmn_diff = ev_rt_now - mn_now; 774 rtmn_diff = ev_rt_now - mn_now;
748 775
749 if (methods == EVMETHOD_AUTO) 776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
750 if (!enable_secure () && getenv ("LIBEV_METHODS"))
751 methods = atoi (getenv ("LIBEV_METHODS")); 777 flags = atoi (getenv ("LIBEV_FLAGS"));
752 else 778
753 methods = EVMETHOD_ANY; 779 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff;
754 781
755 method = 0; 782 method = 0;
756#if EV_USE_WIN32
757 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
758#endif
759#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
760 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
761#endif 785#endif
762#if EV_USE_EPOLL 786#if EV_USE_EPOLL
763 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
764#endif 788#endif
765#if EV_USE_POLL 789#if EV_USE_POLL
766 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
767#endif 791#endif
768#if EV_USE_SELECT 792#if EV_USE_SELECT
769 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
770#endif 794#endif
771 795
772 ev_init (&sigev, sigcb); 796 ev_init (&sigev, sigcb);
773 ev_set_priority (&sigev, EV_MAXPRI); 797 ev_set_priority (&sigev, EV_MAXPRI);
774 } 798 }
… …
777void 801void
778loop_destroy (EV_P) 802loop_destroy (EV_P)
779{ 803{
780 int i; 804 int i;
781 805
782#if EV_USE_WIN32
783 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
784#endif
785#if EV_USE_KQUEUE 806#if EV_USE_KQUEUE
786 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
787#endif 808#endif
788#if EV_USE_EPOLL 809#if EV_USE_EPOLL
789 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
797 818
798 for (i = NUMPRI; i--; ) 819 for (i = NUMPRI; i--; )
799 array_free (pending, [i]); 820 array_free (pending, [i]);
800 821
801 /* have to use the microsoft-never-gets-it-right macro */ 822 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 823 array_free (fdchange, EMPTY0);
803 array_free_microshit (timer); 824 array_free (timer, EMPTY0);
804 array_free_microshit (periodic); 825#if EV_PERIODICS
805 array_free_microshit (idle); 826 array_free (periodic, EMPTY0);
806 array_free_microshit (prepare); 827#endif
807 array_free_microshit (check); 828 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0);
808 831
809 method = 0; 832 method = 0;
810} 833}
811 834
812static void 835static void
… …
837 postfork = 0; 860 postfork = 0;
838} 861}
839 862
840#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
841struct ev_loop * 864struct ev_loop *
842ev_loop_new (int methods) 865ev_loop_new (unsigned int flags)
843{ 866{
844 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 867 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
845 868
846 memset (loop, 0, sizeof (struct ev_loop)); 869 memset (loop, 0, sizeof (struct ev_loop));
847 870
848 loop_init (EV_A_ methods); 871 loop_init (EV_A_ flags);
849 872
850 if (ev_method (EV_A)) 873 if (ev_method (EV_A))
851 return loop; 874 return loop;
852 875
853 return 0; 876 return 0;
… …
868 891
869#endif 892#endif
870 893
871#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
872struct ev_loop * 895struct ev_loop *
896ev_default_loop_ (unsigned int flags)
873#else 897#else
874int 898int
899ev_default_loop (unsigned int flags)
875#endif 900#endif
876ev_default_loop (int methods)
877{ 901{
878 if (sigpipe [0] == sigpipe [1]) 902 if (sigpipe [0] == sigpipe [1])
879 if (pipe (sigpipe)) 903 if (pipe (sigpipe))
880 return 0; 904 return 0;
881 905
882 if (!default_loop) 906 if (!ev_default_loop_ptr)
883 { 907 {
884#if EV_MULTIPLICITY 908#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop = &default_loop_struct; 909 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
886#else 910#else
887 default_loop = 1; 911 ev_default_default_loop_ptr = 1;
888#endif 912#endif
889 913
890 loop_init (EV_A_ methods); 914 loop_init (EV_A_ flags);
891 915
892 if (ev_method (EV_A)) 916 if (ev_method (EV_A))
893 { 917 {
894 siginit (EV_A); 918 siginit (EV_A);
895 919
896#ifndef WIN32 920#ifndef _WIN32
897 ev_signal_init (&childev, childcb, SIGCHLD); 921 ev_signal_init (&childev, childcb, SIGCHLD);
898 ev_set_priority (&childev, EV_MAXPRI); 922 ev_set_priority (&childev, EV_MAXPRI);
899 ev_signal_start (EV_A_ &childev); 923 ev_signal_start (EV_A_ &childev);
900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 924 ev_unref (EV_A); /* child watcher should not keep loop alive */
901#endif 925#endif
902 } 926 }
903 else 927 else
904 default_loop = 0; 928 ev_default_loop_ptr = 0;
905 } 929 }
906 930
907 return default_loop; 931 return ev_default_loop_ptr;
908} 932}
909 933
910void 934void
911ev_default_destroy (void) 935ev_default_destroy (void)
912{ 936{
913#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
914 struct ev_loop *loop = default_loop; 938 struct ev_loop *loop = ev_default_loop_ptr;
915#endif 939#endif
916 940
917#ifndef WIN32 941#ifndef _WIN32
918 ev_ref (EV_A); /* child watcher */ 942 ev_ref (EV_A); /* child watcher */
919 ev_signal_stop (EV_A_ &childev); 943 ev_signal_stop (EV_A_ &childev);
920#endif 944#endif
921 945
922 ev_ref (EV_A); /* signal watcher */ 946 ev_ref (EV_A); /* signal watcher */
… …
930 954
931void 955void
932ev_default_fork (void) 956ev_default_fork (void)
933{ 957{
934#if EV_MULTIPLICITY 958#if EV_MULTIPLICITY
935 struct ev_loop *loop = default_loop; 959 struct ev_loop *loop = ev_default_loop_ptr;
936#endif 960#endif
937 961
938 if (method) 962 if (method)
939 postfork = 1; 963 postfork = 1;
940} 964}
… …
982 1006
983 /* first reschedule or stop timer */ 1007 /* first reschedule or stop timer */
984 if (w->repeat) 1008 if (w->repeat)
985 { 1009 {
986 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1010 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1011
987 ((WT)w)->at = mn_now + w->repeat; 1012 ((WT)w)->at += w->repeat;
1013 if (((WT)w)->at < mn_now)
1014 ((WT)w)->at = mn_now;
1015
988 downheap ((WT *)timers, timercnt, 0); 1016 downheap ((WT *)timers, timercnt, 0);
989 } 1017 }
990 else 1018 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1019 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1020
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1021 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1022 }
995} 1023}
996 1024
1025#if EV_PERIODICS
997static void 1026static void
998periodics_reify (EV_P) 1027periodics_reify (EV_P)
999{ 1028{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1029 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1030 {
… …
1004 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1033 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1005 1034
1006 /* first reschedule or stop timer */ 1035 /* first reschedule or stop timer */
1007 if (w->reschedule_cb) 1036 if (w->reschedule_cb)
1008 { 1037 {
1009 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1038 ((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)); 1039 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1012 downheap ((WT *)periodics, periodiccnt, 0); 1040 downheap ((WT *)periodics, periodiccnt, 0);
1013 } 1041 }
1014 else if (w->interval) 1042 else if (w->interval)
1015 { 1043 {
… …
1042 1070
1043 /* now rebuild the heap */ 1071 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1072 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1073 downheap ((WT *)periodics, periodiccnt, i);
1046} 1074}
1075#endif
1047 1076
1048inline int 1077inline int
1049time_update_monotonic (EV_P) 1078time_update_monotonic (EV_P)
1050{ 1079{
1051 mn_now = get_clock (); 1080 mn_now = get_clock ();
… …
1085 ev_rt_now = ev_time (); 1114 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1115 mn_now = get_clock ();
1087 now_floor = mn_now; 1116 now_floor = mn_now;
1088 } 1117 }
1089 1118
1119# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1120 periodics_reschedule (EV_A);
1121# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1122 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1123 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1124 }
1094 } 1125 }
1095 else 1126 else
… …
1097 { 1128 {
1098 ev_rt_now = ev_time (); 1129 ev_rt_now = ev_time ();
1099 1130
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1131 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1132 {
1133#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1134 periodics_reschedule (EV_A);
1135#endif
1103 1136
1104 /* adjust timers. this is easy, as the offset is the same for all */ 1137 /* adjust timers. this is easy, as the offset is the same for all */
1105 for (i = 0; i < timercnt; ++i) 1138 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1139 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1140 }
… …
1128ev_loop (EV_P_ int flags) 1161ev_loop (EV_P_ int flags)
1129{ 1162{
1130 double block; 1163 double block;
1131 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1164 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1132 1165
1133 do 1166 while (activecnt)
1134 { 1167 {
1135 /* queue check watchers (and execute them) */ 1168 /* queue check watchers (and execute them) */
1136 if (expect_false (preparecnt)) 1169 if (expect_false (preparecnt))
1137 { 1170 {
1138 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1171 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1170 { 1203 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1204 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1205 if (block > to) block = to;
1173 } 1206 }
1174 1207
1208#if EV_PERIODICS
1175 if (periodiccnt) 1209 if (periodiccnt)
1176 { 1210 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1211 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1212 if (block > to) block = to;
1179 } 1213 }
1214#endif
1180 1215
1181 if (block < 0.) block = 0.; 1216 if (block < 0.) block = 0.;
1182 } 1217 }
1183 1218
1184 method_poll (EV_A_ block); 1219 method_poll (EV_A_ block);
… …
1186 /* update ev_rt_now, do magic */ 1221 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1222 time_update (EV_A);
1188 1223
1189 /* queue pending timers and reschedule them */ 1224 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1225 timers_reify (EV_A); /* relative timers called last */
1226#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1227 periodics_reify (EV_A); /* absolute timers called first */
1228#endif
1192 1229
1193 /* queue idle watchers unless io or timers are pending */ 1230 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1231 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1232 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1233
1197 /* queue check watchers, to be executed first */ 1234 /* queue check watchers, to be executed first */
1198 if (checkcnt) 1235 if (checkcnt)
1199 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1236 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1200 1237
1201 call_pending (EV_A); 1238 call_pending (EV_A);
1239
1240 if (loop_done)
1241 break;
1202 } 1242 }
1203 while (activecnt && !loop_done);
1204 1243
1205 if (loop_done != 2) 1244 if (loop_done != 2)
1206 loop_done = 0; 1245 loop_done = 0;
1207} 1246}
1208 1247
… …
1287{ 1326{
1288 ev_clear_pending (EV_A_ (W)w); 1327 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1328 if (!ev_is_active (w))
1290 return; 1329 return;
1291 1330
1331 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1332
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1333 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1334 ev_stop (EV_A_ (W)w);
1294 1335
1295 fd_change (EV_A_ w->fd); 1336 fd_change (EV_A_ w->fd);
1296} 1337}
… …
1304 ((WT)w)->at += mn_now; 1345 ((WT)w)->at += mn_now;
1305 1346
1306 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1347 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1307 1348
1308 ev_start (EV_A_ (W)w, ++timercnt); 1349 ev_start (EV_A_ (W)w, ++timercnt);
1309 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1350 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1310 timers [timercnt - 1] = w; 1351 timers [timercnt - 1] = w;
1311 upheap ((WT *)timers, timercnt - 1); 1352 upheap ((WT *)timers, timercnt - 1);
1312 1353
1313 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1354 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1314} 1355}
… …
1323 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1364 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1324 1365
1325 if (((W)w)->active < timercnt--) 1366 if (((W)w)->active < timercnt--)
1326 { 1367 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1368 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1370 }
1330 1371
1331 ((WT)w)->at = w->repeat; 1372 ((WT)w)->at -= mn_now;
1332 1373
1333 ev_stop (EV_A_ (W)w); 1374 ev_stop (EV_A_ (W)w);
1334} 1375}
1335 1376
1336void 1377void
1337ev_timer_again (EV_P_ struct ev_timer *w) 1378ev_timer_again (EV_P_ struct ev_timer *w)
1338{ 1379{
1339 if (ev_is_active (w)) 1380 if (ev_is_active (w))
1340 { 1381 {
1341 if (w->repeat) 1382 if (w->repeat)
1383 {
1384 ((WT)w)->at = mn_now + w->repeat;
1342 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1385 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1386 }
1343 else 1387 else
1344 ev_timer_stop (EV_A_ w); 1388 ev_timer_stop (EV_A_ w);
1345 } 1389 }
1346 else if (w->repeat) 1390 else if (w->repeat)
1391 {
1392 w->at = w->repeat;
1347 ev_timer_start (EV_A_ w); 1393 ev_timer_start (EV_A_ w);
1394 }
1348} 1395}
1349 1396
1397#if EV_PERIODICS
1350void 1398void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1399ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1400{
1353 if (ev_is_active (w)) 1401 if (ev_is_active (w))
1354 return; 1402 return;
… …
1361 /* this formula differs from the one in periodic_reify because we do not always round up */ 1409 /* 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; 1410 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1363 } 1411 }
1364 1412
1365 ev_start (EV_A_ (W)w, ++periodiccnt); 1413 ev_start (EV_A_ (W)w, ++periodiccnt);
1366 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1414 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1367 periodics [periodiccnt - 1] = w; 1415 periodics [periodiccnt - 1] = w;
1368 upheap ((WT *)periodics, periodiccnt - 1); 1416 upheap ((WT *)periodics, periodiccnt - 1);
1369 1417
1370 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1418 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1371} 1419}
… …
1380 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1428 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1381 1429
1382 if (((W)w)->active < periodiccnt--) 1430 if (((W)w)->active < periodiccnt--)
1383 { 1431 {
1384 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1432 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1385 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1433 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1386 } 1434 }
1387 1435
1388 ev_stop (EV_A_ (W)w); 1436 ev_stop (EV_A_ (W)w);
1389} 1437}
1390 1438
… …
1393{ 1441{
1394 /* TODO: use adjustheap and recalculation */ 1442 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1443 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1444 ev_periodic_start (EV_A_ w);
1397} 1445}
1446#endif
1398 1447
1399void 1448void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1449ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1450{
1402 if (ev_is_active (w)) 1451 if (ev_is_active (w))
1403 return; 1452 return;
1404 1453
1405 ev_start (EV_A_ (W)w, ++idlecnt); 1454 ev_start (EV_A_ (W)w, ++idlecnt);
1406 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1455 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1407 idles [idlecnt - 1] = w; 1456 idles [idlecnt - 1] = w;
1408} 1457}
1409 1458
1410void 1459void
1411ev_idle_stop (EV_P_ struct ev_idle *w) 1460ev_idle_stop (EV_P_ struct ev_idle *w)
1412{ 1461{
1413 ev_clear_pending (EV_A_ (W)w); 1462 ev_clear_pending (EV_A_ (W)w);
1414 if (ev_is_active (w)) 1463 if (!ev_is_active (w))
1415 return; 1464 return;
1416 1465
1417 idles [((W)w)->active - 1] = idles [--idlecnt]; 1466 idles [((W)w)->active - 1] = idles [--idlecnt];
1418 ev_stop (EV_A_ (W)w); 1467 ev_stop (EV_A_ (W)w);
1419} 1468}
… …
1423{ 1472{
1424 if (ev_is_active (w)) 1473 if (ev_is_active (w))
1425 return; 1474 return;
1426 1475
1427 ev_start (EV_A_ (W)w, ++preparecnt); 1476 ev_start (EV_A_ (W)w, ++preparecnt);
1428 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1477 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1429 prepares [preparecnt - 1] = w; 1478 prepares [preparecnt - 1] = w;
1430} 1479}
1431 1480
1432void 1481void
1433ev_prepare_stop (EV_P_ struct ev_prepare *w) 1482ev_prepare_stop (EV_P_ struct ev_prepare *w)
1434{ 1483{
1435 ev_clear_pending (EV_A_ (W)w); 1484 ev_clear_pending (EV_A_ (W)w);
1436 if (ev_is_active (w)) 1485 if (!ev_is_active (w))
1437 return; 1486 return;
1438 1487
1439 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1488 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1440 ev_stop (EV_A_ (W)w); 1489 ev_stop (EV_A_ (W)w);
1441} 1490}
… …
1445{ 1494{
1446 if (ev_is_active (w)) 1495 if (ev_is_active (w))
1447 return; 1496 return;
1448 1497
1449 ev_start (EV_A_ (W)w, ++checkcnt); 1498 ev_start (EV_A_ (W)w, ++checkcnt);
1450 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1499 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1451 checks [checkcnt - 1] = w; 1500 checks [checkcnt - 1] = w;
1452} 1501}
1453 1502
1454void 1503void
1455ev_check_stop (EV_P_ struct ev_check *w) 1504ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1505{
1457 ev_clear_pending (EV_A_ (W)w); 1506 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1507 if (!ev_is_active (w))
1459 return; 1508 return;
1460 1509
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1510 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1511 ev_stop (EV_A_ (W)w);
1463} 1512}
… …
1468 1517
1469void 1518void
1470ev_signal_start (EV_P_ struct ev_signal *w) 1519ev_signal_start (EV_P_ struct ev_signal *w)
1471{ 1520{
1472#if EV_MULTIPLICITY 1521#if EV_MULTIPLICITY
1473 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1522 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1474#endif 1523#endif
1475 if (ev_is_active (w)) 1524 if (ev_is_active (w))
1476 return; 1525 return;
1477 1526
1478 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1527 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
… …
1481 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1530 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1482 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1531 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1483 1532
1484 if (!((WL)w)->next) 1533 if (!((WL)w)->next)
1485 { 1534 {
1486#if WIN32 1535#if _WIN32
1487 signal (w->signum, sighandler); 1536 signal (w->signum, sighandler);
1488#else 1537#else
1489 struct sigaction sa; 1538 struct sigaction sa;
1490 sa.sa_handler = sighandler; 1539 sa.sa_handler = sighandler;
1491 sigfillset (&sa.sa_mask); 1540 sigfillset (&sa.sa_mask);
… …
1511 1560
1512void 1561void
1513ev_child_start (EV_P_ struct ev_child *w) 1562ev_child_start (EV_P_ struct ev_child *w)
1514{ 1563{
1515#if EV_MULTIPLICITY 1564#if EV_MULTIPLICITY
1516 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1565 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1566#endif
1518 if (ev_is_active (w)) 1567 if (ev_is_active (w))
1519 return; 1568 return;
1520 1569
1521 ev_start (EV_A_ (W)w, 1); 1570 ev_start (EV_A_ (W)w, 1);
… …
1524 1573
1525void 1574void
1526ev_child_stop (EV_P_ struct ev_child *w) 1575ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1576{
1528 ev_clear_pending (EV_A_ (W)w); 1577 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1578 if (!ev_is_active (w))
1530 return; 1579 return;
1531 1580
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1581 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1582 ev_stop (EV_A_ (W)w);
1534} 1583}
… …
1594 ev_timer_start (EV_A_ &once->to); 1643 ev_timer_start (EV_A_ &once->to);
1595 } 1644 }
1596 } 1645 }
1597} 1646}
1598 1647
1648#ifdef __cplusplus
1649}
1650#endif
1651

Diff Legend

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