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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC vs.
Revision 1.114 by root, Mon Nov 12 20:03:39 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;
… …
221 250
222#if EV_MULTIPLICITY 251#if EV_MULTIPLICITY
223 252
224 struct ev_loop 253 struct ev_loop
225 { 254 {
255 ev_tstamp ev_rt_now;
256 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 257 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 258 #include "ev_vars.h"
228 #undef VAR 259 #undef VAR
229 }; 260 };
230 #include "ev_wrap.h" 261 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 263 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 264 static struct ev_loop *default_loop;
234 265
235#else 266#else
236 267
268 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 269 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 270 #include "ev_vars.h"
239 #undef VAR 271 #undef VAR
240 272
241 static int default_loop; 273 static int default_loop;
242 274
243#endif 275#endif
244 276
245/*****************************************************************************/ 277/*****************************************************************************/
246 278
247inline ev_tstamp 279ev_tstamp
248ev_time (void) 280ev_time (void)
249{ 281{
250#if EV_USE_REALTIME 282#if EV_USE_REALTIME
251 struct timespec ts; 283 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 284 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 303#endif
272 304
273 return ev_time (); 305 return ev_time ();
274} 306}
275 307
308#if EV_MULTIPLICITY
276ev_tstamp 309ev_tstamp
277ev_now (EV_P) 310ev_now (EV_P)
278{ 311{
279 return rt_now; 312 return ev_rt_now;
280} 313}
314#endif
281 315
282#define array_roundsize(type,n) ((n) | 4 & ~3) 316#define array_roundsize(type,n) (((n) | 4) & ~3)
283 317
284#define array_needsize(type,base,cur,cnt,init) \ 318#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 319 if (expect_false ((cnt) > cur)) \
286 { \ 320 { \
287 int newcnt = cur; \ 321 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 336 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 337 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 338 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 339 }
306 340
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
311
312#define array_free(stem, idx) \ 341#define array_free(stem, idx) \
313 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;
314 343
315/*****************************************************************************/ 344/*****************************************************************************/
316 345
… …
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 367 return;
339 } 368 }
340 369
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 370 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 372 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 374}
346 375
347static void 376static void
… …
390 int events = 0; 419 int events = 0;
391 420
392 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)
393 events |= w->events; 422 events |= w->events;
394 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
395 anfd->reify = 0; 433 anfd->reify = 0;
396 434
397 method_modify (EV_A_ fd, anfd->events, events); 435 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 436 anfd->events = events;
399 } 437 }
… …
408 return; 446 return;
409 447
410 anfds [fd].reify = 1; 448 anfds [fd].reify = 1;
411 449
412 ++fdchangecnt; 450 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 451 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 452 fdchanges [fdchangecnt - 1] = fd;
415} 453}
416 454
417static void 455static void
418fd_kill (EV_P_ int fd) 456fd_kill (EV_P_ int fd)
… …
427} 465}
428 466
429static int 467static int
430fd_valid (int fd) 468fd_valid (int fd)
431{ 469{
432#ifdef WIN32 470#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 471 return _get_osfhandle (fd) != -1;
434#else 472#else
435 return fcntl (fd, F_GETFD) != -1; 473 return fcntl (fd, F_GETFD) != -1;
436#endif 474#endif
437} 475}
438 476
… …
519 heap [k] = w; 557 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 558 ((W)heap [k])->active = k + 1;
521} 559}
522 560
523inline void 561inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 562adjustheap (WT *heap, int N, int k)
525{ 563{
526 ev_tstamp old_at = heap [k]->at; 564 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 565 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 566}
534 567
535/*****************************************************************************/ 568/*****************************************************************************/
536 569
537typedef struct 570typedef struct
… …
560} 593}
561 594
562static void 595static void
563sighandler (int signum) 596sighandler (int signum)
564{ 597{
565#if WIN32 598#if _WIN32
566 signal (signum, sighandler); 599 signal (signum, sighandler);
567#endif 600#endif
568 601
569 signals [signum - 1].gotsig = 1; 602 signals [signum - 1].gotsig = 1;
570 603
571 if (!gotsig) 604 if (!gotsig)
572 { 605 {
573 int old_errno = errno; 606 int old_errno = errno;
574 gotsig = 1; 607 gotsig = 1;
575#ifdef WIN32
576 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
577#else
578 write (sigpipe [1], &signum, 1); 608 write (sigpipe [1], &signum, 1);
579#endif
580 errno = old_errno; 609 errno = old_errno;
581 } 610 }
582} 611}
583 612
584void 613void
… …
604static void 633static void
605sigcb (EV_P_ struct ev_io *iow, int revents) 634sigcb (EV_P_ struct ev_io *iow, int revents)
606{ 635{
607 int signum; 636 int signum;
608 637
609#ifdef WIN32
610 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
611#else
612 read (sigpipe [0], &revents, 1); 638 read (sigpipe [0], &revents, 1);
613#endif
614 gotsig = 0; 639 gotsig = 0;
615 640
616 for (signum = signalmax; signum--; ) 641 for (signum = signalmax; signum--; )
617 if (signals [signum].gotsig) 642 if (signals [signum].gotsig)
618 ev_feed_signal_event (EV_A_ signum + 1); 643 ev_feed_signal_event (EV_A_ signum + 1);
619} 644}
620 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
621static void 658static void
622siginit (EV_P) 659siginit (EV_P)
623{ 660{
624#ifndef WIN32 661 fd_intern (sigpipe [0]);
625 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 662 fd_intern (sigpipe [1]);
626 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
627
628 /* rather than sort out wether we really need nb, set it */
629 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
630 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
631#endif
632 663
633 ev_io_set (&sigev, sigpipe [0], EV_READ); 664 ev_io_set (&sigev, sigpipe [0], EV_READ);
634 ev_io_start (EV_A_ &sigev); 665 ev_io_start (EV_A_ &sigev);
635 ev_unref (EV_A); /* child watcher should not keep loop alive */ 666 ev_unref (EV_A); /* child watcher should not keep loop alive */
636} 667}
637 668
638/*****************************************************************************/ 669/*****************************************************************************/
639 670
640static struct ev_child *childs [PID_HASHSIZE]; 671static struct ev_child *childs [PID_HASHSIZE];
641 672
642#ifndef WIN32 673#ifndef _WIN32
643 674
644static struct ev_signal childev; 675static struct ev_signal childev;
645 676
646#ifndef WCONTINUED 677#ifndef WCONTINUED
647# define WCONTINUED 0 678# define WCONTINUED 0
… …
708 739
709/* 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 */
710static int 741static int
711enable_secure (void) 742enable_secure (void)
712{ 743{
713#ifdef WIN32 744#ifdef _WIN32
714 return 0; 745 return 0;
715#else 746#else
716 return getuid () != geteuid () 747 return getuid () != geteuid ()
717 || getgid () != getegid (); 748 || getgid () != getegid ();
718#endif 749#endif
719} 750}
720 751
721int 752unsigned int
722ev_method (EV_P) 753ev_method (EV_P)
723{ 754{
724 return method; 755 return method;
725} 756}
726 757
727static void 758static void
728loop_init (EV_P_ int methods) 759loop_init (EV_P_ unsigned int flags)
729{ 760{
730 if (!method) 761 if (!method)
731 { 762 {
732#if EV_USE_MONOTONIC 763#if EV_USE_MONOTONIC
733 { 764 {
… …
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 766 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 767 have_monotonic = 1;
737 } 768 }
738#endif 769#endif
739 770
740 rt_now = ev_time (); 771 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 772 mn_now = get_clock ();
742 now_floor = mn_now; 773 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 774 rtmn_diff = ev_rt_now - mn_now;
744 775
745 if (methods == EVMETHOD_AUTO) 776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
746 if (!enable_secure () && getenv ("LIBEV_METHODS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 777 flags = atoi (getenv ("LIBEV_FLAGS"));
748 else 778
749 methods = EVMETHOD_ANY; 779 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff;
750 781
751 method = 0; 782 method = 0;
752#if EV_USE_WIN32
753 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
754#endif
755#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
756 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
757#endif 785#endif
758#if EV_USE_EPOLL 786#if EV_USE_EPOLL
759 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
760#endif 788#endif
761#if EV_USE_POLL 789#if EV_USE_POLL
762 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
763#endif 791#endif
764#if EV_USE_SELECT 792#if EV_USE_SELECT
765 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
766#endif 794#endif
767 795
768 ev_init (&sigev, sigcb); 796 ev_init (&sigev, sigcb);
769 ev_set_priority (&sigev, EV_MAXPRI); 797 ev_set_priority (&sigev, EV_MAXPRI);
770 } 798 }
… …
773void 801void
774loop_destroy (EV_P) 802loop_destroy (EV_P)
775{ 803{
776 int i; 804 int i;
777 805
778#if EV_USE_WIN32
779 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
780#endif
781#if EV_USE_KQUEUE 806#if EV_USE_KQUEUE
782 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
783#endif 808#endif
784#if EV_USE_EPOLL 809#if EV_USE_EPOLL
785 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
793 818
794 for (i = NUMPRI; i--; ) 819 for (i = NUMPRI; i--; )
795 array_free (pending, [i]); 820 array_free (pending, [i]);
796 821
797 /* have to use the microsoft-never-gets-it-right macro */ 822 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 823 array_free (fdchange, EMPTY0);
799 array_free_microshit (timer); 824 array_free (timer, EMPTY0);
800 array_free_microshit (periodic); 825#if EV_PERIODICS
801 array_free_microshit (idle); 826 array_free (periodic, EMPTY0);
802 array_free_microshit (prepare); 827#endif
803 array_free_microshit (check); 828 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0);
804 831
805 method = 0; 832 method = 0;
806} 833}
807 834
808static void 835static void
… …
833 postfork = 0; 860 postfork = 0;
834} 861}
835 862
836#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
837struct ev_loop * 864struct ev_loop *
838ev_loop_new (int methods) 865ev_loop_new (unsigned int flags)
839{ 866{
840 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));
841 868
842 memset (loop, 0, sizeof (struct ev_loop)); 869 memset (loop, 0, sizeof (struct ev_loop));
843 870
844 loop_init (EV_A_ methods); 871 loop_init (EV_A_ flags);
845 872
846 if (ev_method (EV_A)) 873 if (ev_method (EV_A))
847 return loop; 874 return loop;
848 875
849 return 0; 876 return 0;
… …
867#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
868struct ev_loop * 895struct ev_loop *
869#else 896#else
870int 897int
871#endif 898#endif
872ev_default_loop (int methods) 899ev_default_loop (unsigned int flags)
873{ 900{
874 if (sigpipe [0] == sigpipe [1]) 901 if (sigpipe [0] == sigpipe [1])
875 if (pipe (sigpipe)) 902 if (pipe (sigpipe))
876 return 0; 903 return 0;
877 904
… …
881 struct ev_loop *loop = default_loop = &default_loop_struct; 908 struct ev_loop *loop = default_loop = &default_loop_struct;
882#else 909#else
883 default_loop = 1; 910 default_loop = 1;
884#endif 911#endif
885 912
886 loop_init (EV_A_ methods); 913 loop_init (EV_A_ flags);
887 914
888 if (ev_method (EV_A)) 915 if (ev_method (EV_A))
889 { 916 {
890 siginit (EV_A); 917 siginit (EV_A);
891 918
892#ifndef WIN32 919#ifndef _WIN32
893 ev_signal_init (&childev, childcb, SIGCHLD); 920 ev_signal_init (&childev, childcb, SIGCHLD);
894 ev_set_priority (&childev, EV_MAXPRI); 921 ev_set_priority (&childev, EV_MAXPRI);
895 ev_signal_start (EV_A_ &childev); 922 ev_signal_start (EV_A_ &childev);
896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 923 ev_unref (EV_A); /* child watcher should not keep loop alive */
897#endif 924#endif
… …
908{ 935{
909#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
910 struct ev_loop *loop = default_loop; 937 struct ev_loop *loop = default_loop;
911#endif 938#endif
912 939
913#ifndef WIN32 940#ifndef _WIN32
914 ev_ref (EV_A); /* child watcher */ 941 ev_ref (EV_A); /* child watcher */
915 ev_signal_stop (EV_A_ &childev); 942 ev_signal_stop (EV_A_ &childev);
916#endif 943#endif
917 944
918 ev_ref (EV_A); /* signal watcher */ 945 ev_ref (EV_A); /* signal watcher */
… …
978 1005
979 /* first reschedule or stop timer */ 1006 /* first reschedule or stop timer */
980 if (w->repeat) 1007 if (w->repeat)
981 { 1008 {
982 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1009 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1010
983 ((WT)w)->at = mn_now + w->repeat; 1011 ((WT)w)->at += w->repeat;
1012 if (((WT)w)->at < mn_now)
1013 ((WT)w)->at = mn_now;
1014
984 downheap ((WT *)timers, timercnt, 0); 1015 downheap ((WT *)timers, timercnt, 0);
985 } 1016 }
986 else 1017 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1018 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1019
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1021 }
991} 1022}
992 1023
1024#if EV_PERIODICS
993static void 1025static void
994periodics_reify (EV_P) 1026periodics_reify (EV_P)
995{ 1027{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1029 {
998 struct ev_periodic *w = periodics [0]; 1030 struct ev_periodic *w = periodics [0];
999 1031
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1032 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1033
1002 /* first reschedule or stop timer */ 1034 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1035 if (w->reschedule_cb)
1004 { 1036 {
1005 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1037 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1006
1007 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1038 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1040 }
1010 else if (w->interval) 1041 else if (w->interval)
1011 { 1042 {
1012 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1043 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1013 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1044 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1045 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1046 }
1016 else 1047 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1049
… …
1029 for (i = 0; i < periodiccnt; ++i) 1060 for (i = 0; i < periodiccnt; ++i)
1030 { 1061 {
1031 struct ev_periodic *w = periodics [i]; 1062 struct ev_periodic *w = periodics [i];
1032 1063
1033 if (w->reschedule_cb) 1064 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1066 else if (w->interval)
1036 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1067 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1037 } 1068 }
1038 1069
1039 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1042} 1073}
1074#endif
1043 1075
1044inline int 1076inline int
1045time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1046{ 1078{
1047 mn_now = get_clock (); 1079 mn_now = get_clock ();
1048 1080
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1081 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1082 {
1051 rt_now = rtmn_diff + mn_now; 1083 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1084 return 0;
1053 } 1085 }
1054 else 1086 else
1055 { 1087 {
1056 now_floor = mn_now; 1088 now_floor = mn_now;
1057 rt_now = ev_time (); 1089 ev_rt_now = ev_time ();
1058 return 1; 1090 return 1;
1059 } 1091 }
1060} 1092}
1061 1093
1062static void 1094static void
… …
1071 { 1103 {
1072 ev_tstamp odiff = rtmn_diff; 1104 ev_tstamp odiff = rtmn_diff;
1073 1105
1074 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1106 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1075 { 1107 {
1076 rtmn_diff = rt_now - mn_now; 1108 rtmn_diff = ev_rt_now - mn_now;
1077 1109
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1110 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1111 return; /* all is well */
1080 1112
1081 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1114 mn_now = get_clock ();
1083 now_floor = mn_now; 1115 now_floor = mn_now;
1084 } 1116 }
1085 1117
1118# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1123 }
1090 } 1124 }
1091 else 1125 else
1092#endif 1126#endif
1093 { 1127 {
1094 rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1095 1129
1096 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1130 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1097 { 1131 {
1132#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1099 1135
1100 /* adjust timers. this is easy, as the offset is the same for all */ 1136 /* adjust timers. this is easy, as the offset is the same for all */
1101 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1139 }
1104 1140
1105 mn_now = rt_now; 1141 mn_now = ev_rt_now;
1106 } 1142 }
1107} 1143}
1108 1144
1109void 1145void
1110ev_ref (EV_P) 1146ev_ref (EV_P)
… …
1150 if (expect_true (have_monotonic)) 1186 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1187 time_update_monotonic (EV_A);
1152 else 1188 else
1153#endif 1189#endif
1154 { 1190 {
1155 rt_now = ev_time (); 1191 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1192 mn_now = ev_rt_now;
1157 } 1193 }
1158 1194
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1196 block = 0.;
1161 else 1197 else
… …
1166 { 1202 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1204 if (block > to) block = to;
1169 } 1205 }
1170 1206
1207#if EV_PERIODICS
1171 if (periodiccnt) 1208 if (periodiccnt)
1172 { 1209 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1211 if (block > to) block = to;
1175 } 1212 }
1213#endif
1176 1214
1177 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1178 } 1216 }
1179 1217
1180 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
1181 1219
1182 /* update rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1221 time_update (EV_A);
1184 1222
1185 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1188 1228
1189 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1232
… …
1283{ 1323{
1284 ev_clear_pending (EV_A_ (W)w); 1324 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1325 if (!ev_is_active (w))
1286 return; 1326 return;
1287 1327
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1290 1332
1291 fd_change (EV_A_ w->fd); 1333 fd_change (EV_A_ w->fd);
1292} 1334}
… …
1300 ((WT)w)->at += mn_now; 1342 ((WT)w)->at += mn_now;
1301 1343
1302 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1303 1345
1304 ev_start (EV_A_ (W)w, ++timercnt); 1346 ev_start (EV_A_ (W)w, ++timercnt);
1305 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1306 timers [timercnt - 1] = w; 1348 timers [timercnt - 1] = w;
1307 upheap ((WT *)timers, timercnt - 1); 1349 upheap ((WT *)timers, timercnt - 1);
1308 1350
1309 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1310} 1352}
… …
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1362
1321 if (((W)w)->active < timercnt--) 1363 if (((W)w)->active < timercnt--)
1322 { 1364 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1365 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1367 }
1326 1368
1327 ((WT)w)->at = w->repeat; 1369 ((WT)w)->at -= mn_now;
1328 1370
1329 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1330} 1372}
1331 1373
1332void 1374void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1375ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1376{
1335 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1336 { 1378 {
1337 if (w->repeat) 1379 if (w->repeat)
1380 {
1381 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1382 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1383 }
1339 else 1384 else
1340 ev_timer_stop (EV_A_ w); 1385 ev_timer_stop (EV_A_ w);
1341 } 1386 }
1342 else if (w->repeat) 1387 else if (w->repeat)
1388 {
1389 w->at = w->repeat;
1343 ev_timer_start (EV_A_ w); 1390 ev_timer_start (EV_A_ w);
1391 }
1344} 1392}
1345 1393
1394#if EV_PERIODICS
1346void 1395void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1396ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1397{
1349 if (ev_is_active (w)) 1398 if (ev_is_active (w))
1350 return; 1399 return;
1351 1400
1352 if (w->reschedule_cb) 1401 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1402 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1403 else if (w->interval)
1355 { 1404 {
1356 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1405 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1357 /* this formula differs from the one in periodic_reify because we do not always round up */ 1406 /* this formula differs from the one in periodic_reify because we do not always round up */
1358 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1407 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1359 } 1408 }
1360 1409
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1410 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1411 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1363 periodics [periodiccnt - 1] = w; 1412 periodics [periodiccnt - 1] = w;
1364 upheap ((WT *)periodics, periodiccnt - 1); 1413 upheap ((WT *)periodics, periodiccnt - 1);
1365 1414
1366 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1415 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1367} 1416}
… …
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1425 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1426
1378 if (((W)w)->active < periodiccnt--) 1427 if (((W)w)->active < periodiccnt--)
1379 { 1428 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1429 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1430 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1431 }
1383 1432
1384 ev_stop (EV_A_ (W)w); 1433 ev_stop (EV_A_ (W)w);
1385} 1434}
1386 1435
… …
1389{ 1438{
1390 /* TODO: use adjustheap and recalculation */ 1439 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1440 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1441 ev_periodic_start (EV_A_ w);
1393} 1442}
1443#endif
1394 1444
1395void 1445void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1446ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1447{
1398 if (ev_is_active (w)) 1448 if (ev_is_active (w))
1399 return; 1449 return;
1400 1450
1401 ev_start (EV_A_ (W)w, ++idlecnt); 1451 ev_start (EV_A_ (W)w, ++idlecnt);
1402 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1452 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1403 idles [idlecnt - 1] = w; 1453 idles [idlecnt - 1] = w;
1404} 1454}
1405 1455
1406void 1456void
1407ev_idle_stop (EV_P_ struct ev_idle *w) 1457ev_idle_stop (EV_P_ struct ev_idle *w)
1408{ 1458{
1409 ev_clear_pending (EV_A_ (W)w); 1459 ev_clear_pending (EV_A_ (W)w);
1410 if (ev_is_active (w)) 1460 if (!ev_is_active (w))
1411 return; 1461 return;
1412 1462
1413 idles [((W)w)->active - 1] = idles [--idlecnt]; 1463 idles [((W)w)->active - 1] = idles [--idlecnt];
1414 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1415} 1465}
… …
1419{ 1469{
1420 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1421 return; 1471 return;
1422 1472
1423 ev_start (EV_A_ (W)w, ++preparecnt); 1473 ev_start (EV_A_ (W)w, ++preparecnt);
1424 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1474 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1425 prepares [preparecnt - 1] = w; 1475 prepares [preparecnt - 1] = w;
1426} 1476}
1427 1477
1428void 1478void
1429ev_prepare_stop (EV_P_ struct ev_prepare *w) 1479ev_prepare_stop (EV_P_ struct ev_prepare *w)
1430{ 1480{
1431 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1432 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1433 return; 1483 return;
1434 1484
1435 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1485 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1436 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1437} 1487}
… …
1441{ 1491{
1442 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1443 return; 1493 return;
1444 1494
1445 ev_start (EV_A_ (W)w, ++checkcnt); 1495 ev_start (EV_A_ (W)w, ++checkcnt);
1446 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1496 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1447 checks [checkcnt - 1] = w; 1497 checks [checkcnt - 1] = w;
1448} 1498}
1449 1499
1450void 1500void
1451ev_check_stop (EV_P_ struct ev_check *w) 1501ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1502{
1453 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1455 return; 1505 return;
1456 1506
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1507 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1459} 1509}
… …
1477 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1527 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1478 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1528 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1479 1529
1480 if (!((WL)w)->next) 1530 if (!((WL)w)->next)
1481 { 1531 {
1482#if WIN32 1532#if _WIN32
1483 signal (w->signum, sighandler); 1533 signal (w->signum, sighandler);
1484#else 1534#else
1485 struct sigaction sa; 1535 struct sigaction sa;
1486 sa.sa_handler = sighandler; 1536 sa.sa_handler = sighandler;
1487 sigfillset (&sa.sa_mask); 1537 sigfillset (&sa.sa_mask);
… …
1520 1570
1521void 1571void
1522ev_child_stop (EV_P_ struct ev_child *w) 1572ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1573{
1524 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1575 if (!ev_is_active (w))
1526 return; 1576 return;
1527 1577
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1578 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1530} 1580}
… …
1590 ev_timer_start (EV_A_ &once->to); 1640 ev_timer_start (EV_A_ &once->to);
1591 } 1641 }
1592 } 1642 }
1593} 1643}
1594 1644
1645#ifdef __cplusplus
1646}
1647#endif
1648

Diff Legend

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