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

Comparing libev/ev.c (file contents):
Revision 1.82 by root, Fri Nov 9 20:55:09 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
… …
518 556
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
561inline void
562adjustheap (WT *heap, int N, int k)
563{
564 upheap (heap, k);
565 downheap (heap, N, k);
566}
567
523/*****************************************************************************/ 568/*****************************************************************************/
524 569
525typedef struct 570typedef struct
526{ 571{
527 WL head; 572 WL head;
… …
548} 593}
549 594
550static void 595static void
551sighandler (int signum) 596sighandler (int signum)
552{ 597{
553#if WIN32 598#if _WIN32
554 signal (signum, sighandler); 599 signal (signum, sighandler);
555#endif 600#endif
556 601
557 signals [signum - 1].gotsig = 1; 602 signals [signum - 1].gotsig = 1;
558 603
559 if (!gotsig) 604 if (!gotsig)
560 { 605 {
561 int old_errno = errno; 606 int old_errno = errno;
562 gotsig = 1; 607 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 608 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 609 errno = old_errno;
569 } 610 }
570} 611}
571 612
572void 613void
… …
592static void 633static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 634sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 635{
595 int signum; 636 int signum;
596 637
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 638 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 639 gotsig = 0;
603 640
604 for (signum = signalmax; signum--; ) 641 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 642 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 643 ev_feed_signal_event (EV_A_ signum + 1);
607} 644}
608 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
609static void 658static void
610siginit (EV_P) 659siginit (EV_P)
611{ 660{
612#ifndef WIN32 661 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 662 fd_intern (sigpipe [1]);
614 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
615
616 /* rather than sort out wether we really need nb, set it */
617 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
618 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
619#endif
620 663
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 664 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 665 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 666 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 667}
625 668
626/*****************************************************************************/ 669/*****************************************************************************/
627 670
628static struct ev_child *childs [PID_HASHSIZE]; 671static struct ev_child *childs [PID_HASHSIZE];
629 672
630#ifndef WIN32 673#ifndef _WIN32
631 674
632static struct ev_signal childev; 675static struct ev_signal childev;
633 676
634#ifndef WCONTINUED 677#ifndef WCONTINUED
635# define WCONTINUED 0 678# define WCONTINUED 0
… …
696 739
697/* 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 */
698static int 741static int
699enable_secure (void) 742enable_secure (void)
700{ 743{
701#ifdef WIN32 744#ifdef _WIN32
702 return 0; 745 return 0;
703#else 746#else
704 return getuid () != geteuid () 747 return getuid () != geteuid ()
705 || getgid () != getegid (); 748 || getgid () != getegid ();
706#endif 749#endif
707} 750}
708 751
709int 752unsigned int
710ev_method (EV_P) 753ev_method (EV_P)
711{ 754{
712 return method; 755 return method;
713} 756}
714 757
715static void 758static void
716loop_init (EV_P_ int methods) 759loop_init (EV_P_ unsigned int flags)
717{ 760{
718 if (!method) 761 if (!method)
719 { 762 {
720#if EV_USE_MONOTONIC 763#if EV_USE_MONOTONIC
721 { 764 {
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 766 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 767 have_monotonic = 1;
725 } 768 }
726#endif 769#endif
727 770
728 rt_now = ev_time (); 771 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 772 mn_now = get_clock ();
730 now_floor = mn_now; 773 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 774 rtmn_diff = ev_rt_now - mn_now;
732 775
733 if (methods == EVMETHOD_AUTO) 776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
734 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 777 flags = atoi (getenv ("LIBEV_FLAGS"));
736 else 778
737 methods = EVMETHOD_ANY; 779 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff;
738 781
739 method = 0; 782 method = 0;
740#if EV_USE_WIN32
741 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
742#endif
743#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
745#endif 785#endif
746#if EV_USE_EPOLL 786#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
748#endif 788#endif
749#if EV_USE_POLL 789#if EV_USE_POLL
750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
751#endif 791#endif
752#if EV_USE_SELECT 792#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
754#endif 794#endif
755 795
756 ev_watcher_init (&sigev, sigcb); 796 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 797 ev_set_priority (&sigev, EV_MAXPRI);
758 } 798 }
759} 799}
760 800
761void 801void
762loop_destroy (EV_P) 802loop_destroy (EV_P)
763{ 803{
764 int i; 804 int i;
765 805
766#if EV_USE_WIN32
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
768#endif
769#if EV_USE_KQUEUE 806#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 808#endif
772#if EV_USE_EPOLL 809#if EV_USE_EPOLL
773 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
781 818
782 for (i = NUMPRI; i--; ) 819 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 820 array_free (pending, [i]);
784 821
785 /* have to use the microsoft-never-gets-it-right macro */ 822 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 823 array_free (fdchange, EMPTY0);
787 array_free_microshit (timer); 824 array_free (timer, EMPTY0);
788 array_free_microshit (periodic); 825#if EV_PERIODICS
789 array_free_microshit (idle); 826 array_free (periodic, EMPTY0);
790 array_free_microshit (prepare); 827#endif
791 array_free_microshit (check); 828 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0);
792 831
793 method = 0; 832 method = 0;
794} 833}
795 834
796static void 835static void
… …
821 postfork = 0; 860 postfork = 0;
822} 861}
823 862
824#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
825struct ev_loop * 864struct ev_loop *
826ev_loop_new (int methods) 865ev_loop_new (unsigned int flags)
827{ 866{
828 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));
829 868
830 memset (loop, 0, sizeof (struct ev_loop)); 869 memset (loop, 0, sizeof (struct ev_loop));
831 870
832 loop_init (EV_A_ methods); 871 loop_init (EV_A_ flags);
833 872
834 if (ev_method (EV_A)) 873 if (ev_method (EV_A))
835 return loop; 874 return loop;
836 875
837 return 0; 876 return 0;
… …
855#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
856struct ev_loop * 895struct ev_loop *
857#else 896#else
858int 897int
859#endif 898#endif
860ev_default_loop (int methods) 899ev_default_loop (unsigned int flags)
861{ 900{
862 if (sigpipe [0] == sigpipe [1]) 901 if (sigpipe [0] == sigpipe [1])
863 if (pipe (sigpipe)) 902 if (pipe (sigpipe))
864 return 0; 903 return 0;
865 904
… …
869 struct ev_loop *loop = default_loop = &default_loop_struct; 908 struct ev_loop *loop = default_loop = &default_loop_struct;
870#else 909#else
871 default_loop = 1; 910 default_loop = 1;
872#endif 911#endif
873 912
874 loop_init (EV_A_ methods); 913 loop_init (EV_A_ flags);
875 914
876 if (ev_method (EV_A)) 915 if (ev_method (EV_A))
877 { 916 {
878 siginit (EV_A); 917 siginit (EV_A);
879 918
880#ifndef WIN32 919#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 920 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 921 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 922 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 923 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 924#endif
… …
896{ 935{
897#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 937 struct ev_loop *loop = default_loop;
899#endif 938#endif
900 939
901#ifndef WIN32 940#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 941 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 942 ev_signal_stop (EV_A_ &childev);
904#endif 943#endif
905 944
906 ev_ref (EV_A); /* signal watcher */ 945 ev_ref (EV_A); /* signal watcher */
… …
966 1005
967 /* first reschedule or stop timer */ 1006 /* first reschedule or stop timer */
968 if (w->repeat) 1007 if (w->repeat)
969 { 1008 {
970 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
971 ((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
972 downheap ((WT *)timers, timercnt, 0); 1015 downheap ((WT *)timers, timercnt, 0);
973 } 1016 }
974 else 1017 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1018 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1019
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1021 }
979} 1022}
980 1023
1024#if EV_PERIODICS
981static void 1025static void
982periodics_reify (EV_P) 1026periodics_reify (EV_P)
983{ 1027{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1029 {
986 struct ev_periodic *w = periodics [0]; 1030 struct ev_periodic *w = periodics [0];
987 1031
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1032 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1033
990 /* first reschedule or stop timer */ 1034 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1035 if (w->reschedule_cb)
992 { 1036 {
993 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);
994
995 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));
996 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1040 }
998 else if (w->interval) 1041 else if (w->interval)
999 { 1042 {
1000 ((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;
1001 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));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1045 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1046 }
1004 else 1047 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1049
… …
1017 for (i = 0; i < periodiccnt; ++i) 1060 for (i = 0; i < periodiccnt; ++i)
1018 { 1061 {
1019 struct ev_periodic *w = periodics [i]; 1062 struct ev_periodic *w = periodics [i];
1020 1063
1021 if (w->reschedule_cb) 1064 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1066 else if (w->interval)
1024 ((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;
1025 } 1068 }
1026 1069
1027 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1030} 1073}
1074#endif
1031 1075
1032inline int 1076inline int
1033time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1034{ 1078{
1035 mn_now = get_clock (); 1079 mn_now = get_clock ();
1036 1080
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1081 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1082 {
1039 rt_now = rtmn_diff + mn_now; 1083 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1084 return 0;
1041 } 1085 }
1042 else 1086 else
1043 { 1087 {
1044 now_floor = mn_now; 1088 now_floor = mn_now;
1045 rt_now = ev_time (); 1089 ev_rt_now = ev_time ();
1046 return 1; 1090 return 1;
1047 } 1091 }
1048} 1092}
1049 1093
1050static void 1094static void
… …
1059 { 1103 {
1060 ev_tstamp odiff = rtmn_diff; 1104 ev_tstamp odiff = rtmn_diff;
1061 1105
1062 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 */
1063 { 1107 {
1064 rtmn_diff = rt_now - mn_now; 1108 rtmn_diff = ev_rt_now - mn_now;
1065 1109
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1110 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1111 return; /* all is well */
1068 1112
1069 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1114 mn_now = get_clock ();
1071 now_floor = mn_now; 1115 now_floor = mn_now;
1072 } 1116 }
1073 1117
1118# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1123 }
1078 } 1124 }
1079 else 1125 else
1080#endif 1126#endif
1081 { 1127 {
1082 rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1083 1129
1084 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))
1085 { 1131 {
1132#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1087 1135
1088 /* 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 */
1089 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1139 }
1092 1140
1093 mn_now = rt_now; 1141 mn_now = ev_rt_now;
1094 } 1142 }
1095} 1143}
1096 1144
1097void 1145void
1098ev_ref (EV_P) 1146ev_ref (EV_P)
… …
1138 if (expect_true (have_monotonic)) 1186 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1187 time_update_monotonic (EV_A);
1140 else 1188 else
1141#endif 1189#endif
1142 { 1190 {
1143 rt_now = ev_time (); 1191 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1192 mn_now = ev_rt_now;
1145 } 1193 }
1146 1194
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1196 block = 0.;
1149 else 1197 else
… …
1154 { 1202 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1204 if (block > to) block = to;
1157 } 1205 }
1158 1206
1207#if EV_PERIODICS
1159 if (periodiccnt) 1208 if (periodiccnt)
1160 { 1209 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1211 if (block > to) block = to;
1163 } 1212 }
1213#endif
1164 1214
1165 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1166 } 1216 }
1167 1217
1168 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
1169 1219
1170 /* update rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1221 time_update (EV_A);
1172 1222
1173 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1176 1228
1177 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1232
… …
1271{ 1323{
1272 ev_clear_pending (EV_A_ (W)w); 1324 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1325 if (!ev_is_active (w))
1274 return; 1326 return;
1275 1327
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1278 1332
1279 fd_change (EV_A_ w->fd); 1333 fd_change (EV_A_ w->fd);
1280} 1334}
… …
1288 ((WT)w)->at += mn_now; 1342 ((WT)w)->at += mn_now;
1289 1343
1290 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.));
1291 1345
1292 ev_start (EV_A_ (W)w, ++timercnt); 1346 ev_start (EV_A_ (W)w, ++timercnt);
1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1294 timers [timercnt - 1] = w; 1348 timers [timercnt - 1] = w;
1295 upheap ((WT *)timers, timercnt - 1); 1349 upheap ((WT *)timers, timercnt - 1);
1296 1350
1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1298} 1352}
… …
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1362
1309 if (((W)w)->active < timercnt--) 1363 if (((W)w)->active < timercnt--)
1310 { 1364 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1365 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1367 }
1314 1368
1315 ((WT)w)->at = w->repeat; 1369 ((WT)w)->at -= mn_now;
1316 1370
1317 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1318} 1372}
1319 1373
1320void 1374void
… …
1323 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1324 { 1378 {
1325 if (w->repeat) 1379 if (w->repeat)
1326 { 1380 {
1327 ((WT)w)->at = mn_now + w->repeat; 1381 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1382 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1383 }
1330 else 1384 else
1331 ev_timer_stop (EV_A_ w); 1385 ev_timer_stop (EV_A_ w);
1332 } 1386 }
1333 else if (w->repeat) 1387 else if (w->repeat)
1388 {
1389 w->at = w->repeat;
1334 ev_timer_start (EV_A_ w); 1390 ev_timer_start (EV_A_ w);
1391 }
1335} 1392}
1336 1393
1394#if EV_PERIODICS
1337void 1395void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1396ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1397{
1340 if (ev_is_active (w)) 1398 if (ev_is_active (w))
1341 return; 1399 return;
1342 1400
1343 if (w->reschedule_cb) 1401 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1402 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1403 else if (w->interval)
1346 { 1404 {
1347 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.));
1348 /* 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 */
1349 ((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;
1350 } 1408 }
1351 1409
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1410 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1411 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1354 periodics [periodiccnt - 1] = w; 1412 periodics [periodiccnt - 1] = w;
1355 upheap ((WT *)periodics, periodiccnt - 1); 1413 upheap ((WT *)periodics, periodiccnt - 1);
1356 1414
1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1415 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1358} 1416}
… …
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1425 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1426
1369 if (((W)w)->active < periodiccnt--) 1427 if (((W)w)->active < periodiccnt--)
1370 { 1428 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1429 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1430 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1431 }
1374 1432
1375 ev_stop (EV_A_ (W)w); 1433 ev_stop (EV_A_ (W)w);
1376} 1434}
1377 1435
1378void 1436void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1437ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1438{
1439 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1440 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1441 ev_periodic_start (EV_A_ w);
1383} 1442}
1443#endif
1384 1444
1385void 1445void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1446ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1447{
1388 if (ev_is_active (w)) 1448 if (ev_is_active (w))
1389 return; 1449 return;
1390 1450
1391 ev_start (EV_A_ (W)w, ++idlecnt); 1451 ev_start (EV_A_ (W)w, ++idlecnt);
1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1452 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1393 idles [idlecnt - 1] = w; 1453 idles [idlecnt - 1] = w;
1394} 1454}
1395 1455
1396void 1456void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1457ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1458{
1399 ev_clear_pending (EV_A_ (W)w); 1459 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1460 if (!ev_is_active (w))
1401 return; 1461 return;
1402 1462
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1463 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1405} 1465}
… …
1409{ 1469{
1410 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1411 return; 1471 return;
1412 1472
1413 ev_start (EV_A_ (W)w, ++preparecnt); 1473 ev_start (EV_A_ (W)w, ++preparecnt);
1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1474 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1415 prepares [preparecnt - 1] = w; 1475 prepares [preparecnt - 1] = w;
1416} 1476}
1417 1477
1418void 1478void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1479ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1480{
1421 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1423 return; 1483 return;
1424 1484
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1485 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1427} 1487}
… …
1431{ 1491{
1432 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1433 return; 1493 return;
1434 1494
1435 ev_start (EV_A_ (W)w, ++checkcnt); 1495 ev_start (EV_A_ (W)w, ++checkcnt);
1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1496 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1437 checks [checkcnt - 1] = w; 1497 checks [checkcnt - 1] = w;
1438} 1498}
1439 1499
1440void 1500void
1441ev_check_stop (EV_P_ struct ev_check *w) 1501ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1502{
1443 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1445 return; 1505 return;
1446 1506
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1507 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1449} 1509}
… …
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1527 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1528 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1529
1470 if (!((WL)w)->next) 1530 if (!((WL)w)->next)
1471 { 1531 {
1472#if WIN32 1532#if _WIN32
1473 signal (w->signum, sighandler); 1533 signal (w->signum, sighandler);
1474#else 1534#else
1475 struct sigaction sa; 1535 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1536 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1537 sigfillset (&sa.sa_mask);
… …
1510 1570
1511void 1571void
1512ev_child_stop (EV_P_ struct ev_child *w) 1572ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1573{
1514 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1575 if (!ev_is_active (w))
1516 return; 1576 return;
1517 1577
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1578 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1520} 1580}
… …
1564 else 1624 else
1565 { 1625 {
1566 once->cb = cb; 1626 once->cb = cb;
1567 once->arg = arg; 1627 once->arg = arg;
1568 1628
1569 ev_watcher_init (&once->io, once_cb_io); 1629 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1630 if (fd >= 0)
1571 { 1631 {
1572 ev_io_set (&once->io, fd, events); 1632 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1633 ev_io_start (EV_A_ &once->io);
1574 } 1634 }
1575 1635
1576 ev_watcher_init (&once->to, once_cb_to); 1636 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1637 if (timeout >= 0.)
1578 { 1638 {
1579 ev_timer_set (&once->to, timeout, 0.); 1639 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1640 ev_timer_start (EV_A_ &once->to);
1581 } 1641 }
1582 } 1642 }
1583} 1643}
1584 1644
1645#ifdef __cplusplus
1646}
1647#endif
1648

Diff Legend

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