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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.115 by root, Wed Nov 14 04:53:21 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) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 151
152#ifdef EV_H
153# include EV_H
154#else
131#include "ev.h" 155# include "ev.h"
156#endif
132 157
133#if __GNUC__ >= 3 158#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 159# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 160# define inline inline
136#else 161#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
143 168
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 171
172#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
173#define EMPTY2(a,b) /* used to suppress some warnings */
174
147typedef struct ev_watcher *W; 175typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 176typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 177typedef struct ev_watcher_time *WT;
150 178
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 179static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 180
181#ifdef _WIN32
153#include "ev_win32.c" 182# include "ev_win32.c"
183#endif
154 184
155/*****************************************************************************/ 185/*****************************************************************************/
156 186
157static void (*syserr_cb)(const char *msg); 187static void (*syserr_cb)(const char *msg);
158 188
… …
205typedef struct 235typedef struct
206{ 236{
207 WL head; 237 WL head;
208 unsigned char events; 238 unsigned char events;
209 unsigned char reify; 239 unsigned char reify;
240#if EV_SELECT_IS_WINSOCKET
241 SOCKET handle;
242#endif
210} ANFD; 243} ANFD;
211 244
212typedef struct 245typedef struct
213{ 246{
214 W w; 247 W w;
… …
217 250
218#if EV_MULTIPLICITY 251#if EV_MULTIPLICITY
219 252
220 struct ev_loop 253 struct ev_loop
221 { 254 {
255 ev_tstamp ev_rt_now;
256 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 257 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 258 #include "ev_vars.h"
224 #undef VAR 259 #undef VAR
225 }; 260 };
226 #include "ev_wrap.h" 261 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 263 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 264 static struct ev_loop *default_loop;
230 265
231#else 266#else
232 267
268 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 269 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 270 #include "ev_vars.h"
235 #undef VAR 271 #undef VAR
236 272
237 static int default_loop; 273 static int default_loop;
238 274
239#endif 275#endif
240 276
241/*****************************************************************************/ 277/*****************************************************************************/
242 278
243inline ev_tstamp 279ev_tstamp
244ev_time (void) 280ev_time (void)
245{ 281{
246#if EV_USE_REALTIME 282#if EV_USE_REALTIME
247 struct timespec ts; 283 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 284 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 303#endif
268 304
269 return ev_time (); 305 return ev_time ();
270} 306}
271 307
308#if EV_MULTIPLICITY
272ev_tstamp 309ev_tstamp
273ev_now (EV_P) 310ev_now (EV_P)
274{ 311{
275 return rt_now; 312 return ev_rt_now;
276} 313}
314#endif
277 315
278#define array_roundsize(type,n) ((n) | 4 & ~3) 316#define array_roundsize(type,n) (((n) | 4) & ~3)
279 317
280#define array_needsize(type,base,cur,cnt,init) \ 318#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 319 if (expect_false ((cnt) > cur)) \
282 { \ 320 { \
283 int newcnt = cur; \ 321 int newcnt = cur; \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 336 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 337 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 338 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 339 }
302 340
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 341#define array_free(stem, idx) \
309 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;
310 343
311/*****************************************************************************/ 344/*****************************************************************************/
312 345
… …
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 367 return;
335 } 368 }
336 369
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 370 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 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);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 372 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 374}
342 375
343static void 376static void
… …
386 int events = 0; 419 int events = 0;
387 420
388 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)
389 events |= w->events; 422 events |= w->events;
390 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
391 anfd->reify = 0; 433 anfd->reify = 0;
392 434
393 method_modify (EV_A_ fd, anfd->events, events); 435 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 436 anfd->events = events;
395 } 437 }
… …
404 return; 446 return;
405 447
406 anfds [fd].reify = 1; 448 anfds [fd].reify = 1;
407 449
408 ++fdchangecnt; 450 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 451 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 452 fdchanges [fdchangecnt - 1] = fd;
411} 453}
412 454
413static void 455static void
414fd_kill (EV_P_ int fd) 456fd_kill (EV_P_ int fd)
… …
423} 465}
424 466
425static int 467static int
426fd_valid (int fd) 468fd_valid (int fd)
427{ 469{
428#ifdef WIN32 470#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 471 return _get_osfhandle (fd) != -1;
430#else 472#else
431 return fcntl (fd, F_GETFD) != -1; 473 return fcntl (fd, F_GETFD) != -1;
432#endif 474#endif
433} 475}
434 476
… …
514 556
515 heap [k] = w; 557 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 558 ((W)heap [k])->active = k + 1;
517} 559}
518 560
561inline void
562adjustheap (WT *heap, int N, int k)
563{
564 upheap (heap, k);
565 downheap (heap, N, k);
566}
567
519/*****************************************************************************/ 568/*****************************************************************************/
520 569
521typedef struct 570typedef struct
522{ 571{
523 WL head; 572 WL head;
… …
544} 593}
545 594
546static void 595static void
547sighandler (int signum) 596sighandler (int signum)
548{ 597{
549#if WIN32 598#if _WIN32
550 signal (signum, sighandler); 599 signal (signum, sighandler);
551#endif 600#endif
552 601
553 signals [signum - 1].gotsig = 1; 602 signals [signum - 1].gotsig = 1;
554 603
555 if (!gotsig) 604 if (!gotsig)
556 { 605 {
557 int old_errno = errno; 606 int old_errno = errno;
558 gotsig = 1; 607 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 608 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 609 errno = old_errno;
565 } 610 }
566} 611}
567 612
568void 613void
… …
588static void 633static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 634sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 635{
591 int signum; 636 int signum;
592 637
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 638 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 639 gotsig = 0;
599 640
600 for (signum = signalmax; signum--; ) 641 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 642 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 643 ev_feed_signal_event (EV_A_ signum + 1);
603} 644}
604 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
605static void 658static void
606siginit (EV_P) 659siginit (EV_P)
607{ 660{
608#ifndef WIN32 661 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 662 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 663
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 664 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 665 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 666 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 667}
621 668
622/*****************************************************************************/ 669/*****************************************************************************/
623 670
624static struct ev_child *childs [PID_HASHSIZE]; 671static struct ev_child *childs [PID_HASHSIZE];
625 672
626#ifndef WIN32 673#ifndef _WIN32
627 674
628static struct ev_signal childev; 675static struct ev_signal childev;
629 676
630#ifndef WCONTINUED 677#ifndef WCONTINUED
631# define WCONTINUED 0 678# define WCONTINUED 0
… …
692 739
693/* 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 */
694static int 741static int
695enable_secure (void) 742enable_secure (void)
696{ 743{
697#ifdef WIN32 744#ifdef _WIN32
698 return 0; 745 return 0;
699#else 746#else
700 return getuid () != geteuid () 747 return getuid () != geteuid ()
701 || getgid () != getegid (); 748 || getgid () != getegid ();
702#endif 749#endif
703} 750}
704 751
705int 752unsigned int
706ev_method (EV_P) 753ev_method (EV_P)
707{ 754{
708 return method; 755 return method;
709} 756}
710 757
711static void 758static void
712loop_init (EV_P_ int methods) 759loop_init (EV_P_ unsigned int flags)
713{ 760{
714 if (!method) 761 if (!method)
715 { 762 {
716#if EV_USE_MONOTONIC 763#if EV_USE_MONOTONIC
717 { 764 {
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 766 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 767 have_monotonic = 1;
721 } 768 }
722#endif 769#endif
723 770
724 rt_now = ev_time (); 771 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 772 mn_now = get_clock ();
726 now_floor = mn_now; 773 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 774 rtmn_diff = ev_rt_now - mn_now;
728 775
729 if (methods == EVMETHOD_AUTO) 776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
730 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 777 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 778
733 methods = EVMETHOD_ANY; 779 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff;
734 781
735 method = 0; 782 method = 0;
736#if EV_USE_WIN32
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
738#endif
739#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 785#endif
742#if EV_USE_EPOLL 786#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 788#endif
745#if EV_USE_POLL 789#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
747#endif 791#endif
748#if EV_USE_SELECT 792#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
750#endif 794#endif
751 795
752 ev_watcher_init (&sigev, sigcb); 796 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 797 ev_set_priority (&sigev, EV_MAXPRI);
754 } 798 }
755} 799}
756 800
757void 801void
758loop_destroy (EV_P) 802loop_destroy (EV_P)
759{ 803{
760 int i; 804 int i;
761 805
762#if EV_USE_WIN32
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
764#endif
765#if EV_USE_KQUEUE 806#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 808#endif
768#if EV_USE_EPOLL 809#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
777 818
778 for (i = NUMPRI; i--; ) 819 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 820 array_free (pending, [i]);
780 821
781 /* have to use the microsoft-never-gets-it-right macro */ 822 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 823 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 824 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 825#if EV_PERIODICS
785 array_free_microshit (idle); 826 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 827#endif
787 array_free_microshit (check); 828 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0);
788 831
789 method = 0; 832 method = 0;
790} 833}
791 834
792static void 835static void
… …
817 postfork = 0; 860 postfork = 0;
818} 861}
819 862
820#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
821struct ev_loop * 864struct ev_loop *
822ev_loop_new (int methods) 865ev_loop_new (unsigned int flags)
823{ 866{
824 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));
825 868
826 memset (loop, 0, sizeof (struct ev_loop)); 869 memset (loop, 0, sizeof (struct ev_loop));
827 870
828 loop_init (EV_A_ methods); 871 loop_init (EV_A_ flags);
829 872
830 if (ev_method (EV_A)) 873 if (ev_method (EV_A))
831 return loop; 874 return loop;
832 875
833 return 0; 876 return 0;
… …
851#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
852struct ev_loop * 895struct ev_loop *
853#else 896#else
854int 897int
855#endif 898#endif
856ev_default_loop (int methods) 899ev_default_loop (unsigned int flags)
857{ 900{
858 if (sigpipe [0] == sigpipe [1]) 901 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 902 if (pipe (sigpipe))
860 return 0; 903 return 0;
861 904
… …
865 struct ev_loop *loop = default_loop = &default_loop_struct; 908 struct ev_loop *loop = default_loop = &default_loop_struct;
866#else 909#else
867 default_loop = 1; 910 default_loop = 1;
868#endif 911#endif
869 912
870 loop_init (EV_A_ methods); 913 loop_init (EV_A_ flags);
871 914
872 if (ev_method (EV_A)) 915 if (ev_method (EV_A))
873 { 916 {
874 siginit (EV_A); 917 siginit (EV_A);
875 918
876#ifndef WIN32 919#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 920 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 921 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 922 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 923 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 924#endif
… …
892{ 935{
893#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 937 struct ev_loop *loop = default_loop;
895#endif 938#endif
896 939
897#ifndef WIN32 940#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 941 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 942 ev_signal_stop (EV_A_ &childev);
900#endif 943#endif
901 944
902 ev_ref (EV_A); /* signal watcher */ 945 ev_ref (EV_A); /* signal watcher */
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 987 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 988
946 if (p->w) 989 if (p->w)
947 { 990 {
948 p->w->pending = 0; 991 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 992 EV_CB_INVOKE (p->w, p->events);
950 } 993 }
951 } 994 }
952} 995}
953 996
954static void 997static void
… …
962 1005
963 /* first reschedule or stop timer */ 1006 /* first reschedule or stop timer */
964 if (w->repeat) 1007 if (w->repeat)
965 { 1008 {
966 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
967 ((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
968 downheap ((WT *)timers, timercnt, 0); 1015 downheap ((WT *)timers, timercnt, 0);
969 } 1016 }
970 else 1017 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1018 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1019
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1021 }
975} 1022}
976 1023
1024#if EV_PERIODICS
977static void 1025static void
978periodics_reify (EV_P) 1026periodics_reify (EV_P)
979{ 1027{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1029 {
982 struct ev_periodic *w = periodics [0]; 1030 struct ev_periodic *w = periodics [0];
983 1031
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1032 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1033
986 /* first reschedule or stop timer */ 1034 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1035 if (w->reschedule_cb)
988 { 1036 {
989 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);
990
991 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));
992 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1040 }
994 else if (w->interval) 1041 else if (w->interval)
995 { 1042 {
996 ((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;
997 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));
998 downheap ((WT *)periodics, periodiccnt, 0); 1045 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1046 }
1000 else 1047 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1049
… …
1013 for (i = 0; i < periodiccnt; ++i) 1060 for (i = 0; i < periodiccnt; ++i)
1014 { 1061 {
1015 struct ev_periodic *w = periodics [i]; 1062 struct ev_periodic *w = periodics [i];
1016 1063
1017 if (w->reschedule_cb) 1064 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1066 else if (w->interval)
1020 ((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;
1021 } 1068 }
1022 1069
1023 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1026} 1073}
1074#endif
1027 1075
1028inline int 1076inline int
1029time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1030{ 1078{
1031 mn_now = get_clock (); 1079 mn_now = get_clock ();
1032 1080
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1081 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1082 {
1035 rt_now = rtmn_diff + mn_now; 1083 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1084 return 0;
1037 } 1085 }
1038 else 1086 else
1039 { 1087 {
1040 now_floor = mn_now; 1088 now_floor = mn_now;
1041 rt_now = ev_time (); 1089 ev_rt_now = ev_time ();
1042 return 1; 1090 return 1;
1043 } 1091 }
1044} 1092}
1045 1093
1046static void 1094static void
… …
1055 { 1103 {
1056 ev_tstamp odiff = rtmn_diff; 1104 ev_tstamp odiff = rtmn_diff;
1057 1105
1058 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 */
1059 { 1107 {
1060 rtmn_diff = rt_now - mn_now; 1108 rtmn_diff = ev_rt_now - mn_now;
1061 1109
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1110 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1111 return; /* all is well */
1064 1112
1065 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1114 mn_now = get_clock ();
1067 now_floor = mn_now; 1115 now_floor = mn_now;
1068 } 1116 }
1069 1117
1118# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1123 }
1074 } 1124 }
1075 else 1125 else
1076#endif 1126#endif
1077 { 1127 {
1078 rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1079 1129
1080 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))
1081 { 1131 {
1132#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1083 1135
1084 /* 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 */
1085 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1139 }
1088 1140
1089 mn_now = rt_now; 1141 mn_now = ev_rt_now;
1090 } 1142 }
1091} 1143}
1092 1144
1093void 1145void
1094ev_ref (EV_P) 1146ev_ref (EV_P)
… …
1108ev_loop (EV_P_ int flags) 1160ev_loop (EV_P_ int flags)
1109{ 1161{
1110 double block; 1162 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1164
1113 do 1165 while (activecnt)
1114 { 1166 {
1115 /* queue check watchers (and execute them) */ 1167 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1168 if (expect_false (preparecnt))
1117 { 1169 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1134 if (expect_true (have_monotonic)) 1186 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1187 time_update_monotonic (EV_A);
1136 else 1188 else
1137#endif 1189#endif
1138 { 1190 {
1139 rt_now = ev_time (); 1191 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1192 mn_now = ev_rt_now;
1141 } 1193 }
1142 1194
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1196 block = 0.;
1145 else 1197 else
… …
1150 { 1202 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1204 if (block > to) block = to;
1153 } 1205 }
1154 1206
1207#if EV_PERIODICS
1155 if (periodiccnt) 1208 if (periodiccnt)
1156 { 1209 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1211 if (block > to) block = to;
1159 } 1212 }
1213#endif
1160 1214
1161 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1162 } 1216 }
1163 1217
1164 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
1165 1219
1166 /* update rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1221 time_update (EV_A);
1168 1222
1169 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1172 1228
1173 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1232
1177 /* queue check watchers, to be executed first */ 1233 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1234 if (checkcnt)
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1236
1181 call_pending (EV_A); 1237 call_pending (EV_A);
1238
1239 if (loop_done)
1240 break;
1182 } 1241 }
1183 while (activecnt && !loop_done);
1184 1242
1185 if (loop_done != 2) 1243 if (loop_done != 2)
1186 loop_done = 0; 1244 loop_done = 0;
1187} 1245}
1188 1246
… …
1267{ 1325{
1268 ev_clear_pending (EV_A_ (W)w); 1326 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1327 if (!ev_is_active (w))
1270 return; 1328 return;
1271 1329
1330 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1331
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1333 ev_stop (EV_A_ (W)w);
1274 1334
1275 fd_change (EV_A_ w->fd); 1335 fd_change (EV_A_ w->fd);
1276} 1336}
… …
1284 ((WT)w)->at += mn_now; 1344 ((WT)w)->at += mn_now;
1285 1345
1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1346 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1287 1347
1288 ev_start (EV_A_ (W)w, ++timercnt); 1348 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1349 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1350 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1351 upheap ((WT *)timers, timercnt - 1);
1292 1352
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1353 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1354}
… …
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1364
1305 if (((W)w)->active < timercnt--) 1365 if (((W)w)->active < timercnt--)
1306 { 1366 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1367 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1369 }
1310 1370
1311 ((WT)w)->at = w->repeat; 1371 ((WT)w)->at -= mn_now;
1312 1372
1313 ev_stop (EV_A_ (W)w); 1373 ev_stop (EV_A_ (W)w);
1314} 1374}
1315 1375
1316void 1376void
… …
1319 if (ev_is_active (w)) 1379 if (ev_is_active (w))
1320 { 1380 {
1321 if (w->repeat) 1381 if (w->repeat)
1322 { 1382 {
1323 ((WT)w)->at = mn_now + w->repeat; 1383 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1384 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1385 }
1326 else 1386 else
1327 ev_timer_stop (EV_A_ w); 1387 ev_timer_stop (EV_A_ w);
1328 } 1388 }
1329 else if (w->repeat) 1389 else if (w->repeat)
1390 {
1391 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1392 ev_timer_start (EV_A_ w);
1393 }
1331} 1394}
1332 1395
1396#if EV_PERIODICS
1333void 1397void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1398ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1399{
1336 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1337 return; 1401 return;
1338 1402
1339 if (w->reschedule_cb) 1403 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1405 else if (w->interval)
1342 { 1406 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1407 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1408 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1409 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1410 }
1347 1411
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1412 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1413 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1414 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1415 upheap ((WT *)periodics, periodiccnt - 1);
1352 1416
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1417 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1418}
… …
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1428
1365 if (((W)w)->active < periodiccnt--) 1429 if (((W)w)->active < periodiccnt--)
1366 { 1430 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1431 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1433 }
1370 1434
1371 ev_stop (EV_A_ (W)w); 1435 ev_stop (EV_A_ (W)w);
1372} 1436}
1373 1437
1374void 1438void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1439ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1440{
1441 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1442 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1443 ev_periodic_start (EV_A_ w);
1379} 1444}
1445#endif
1380 1446
1381void 1447void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1448ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1449{
1384 if (ev_is_active (w)) 1450 if (ev_is_active (w))
1385 return; 1451 return;
1386 1452
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1453 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1455 idles [idlecnt - 1] = w;
1390} 1456}
1391 1457
1392void 1458void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1459ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1460{
1395 ev_clear_pending (EV_A_ (W)w); 1461 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1462 if (!ev_is_active (w))
1397 return; 1463 return;
1398 1464
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1465 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1466 ev_stop (EV_A_ (W)w);
1401} 1467}
… …
1405{ 1471{
1406 if (ev_is_active (w)) 1472 if (ev_is_active (w))
1407 return; 1473 return;
1408 1474
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1475 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1477 prepares [preparecnt - 1] = w;
1412} 1478}
1413 1479
1414void 1480void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1481ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1482{
1417 ev_clear_pending (EV_A_ (W)w); 1483 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1484 if (!ev_is_active (w))
1419 return; 1485 return;
1420 1486
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1487 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1488 ev_stop (EV_A_ (W)w);
1423} 1489}
… …
1427{ 1493{
1428 if (ev_is_active (w)) 1494 if (ev_is_active (w))
1429 return; 1495 return;
1430 1496
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1497 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1499 checks [checkcnt - 1] = w;
1434} 1500}
1435 1501
1436void 1502void
1437ev_check_stop (EV_P_ struct ev_check *w) 1503ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1504{
1439 ev_clear_pending (EV_A_ (W)w); 1505 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1506 if (!ev_is_active (w))
1441 return; 1507 return;
1442 1508
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1509 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1510 ev_stop (EV_A_ (W)w);
1445} 1511}
… …
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1529 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1530 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1531
1466 if (!((WL)w)->next) 1532 if (!((WL)w)->next)
1467 { 1533 {
1468#if WIN32 1534#if _WIN32
1469 signal (w->signum, sighandler); 1535 signal (w->signum, sighandler);
1470#else 1536#else
1471 struct sigaction sa; 1537 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1538 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1539 sigfillset (&sa.sa_mask);
… …
1506 1572
1507void 1573void
1508ev_child_stop (EV_P_ struct ev_child *w) 1574ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1575{
1510 ev_clear_pending (EV_A_ (W)w); 1576 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1577 if (!ev_is_active (w))
1512 return; 1578 return;
1513 1579
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1581 ev_stop (EV_A_ (W)w);
1516} 1582}
… …
1560 else 1626 else
1561 { 1627 {
1562 once->cb = cb; 1628 once->cb = cb;
1563 once->arg = arg; 1629 once->arg = arg;
1564 1630
1565 ev_watcher_init (&once->io, once_cb_io); 1631 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1632 if (fd >= 0)
1567 { 1633 {
1568 ev_io_set (&once->io, fd, events); 1634 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1635 ev_io_start (EV_A_ &once->io);
1570 } 1636 }
1571 1637
1572 ev_watcher_init (&once->to, once_cb_to); 1638 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1639 if (timeout >= 0.)
1574 { 1640 {
1575 ev_timer_set (&once->to, timeout, 0.); 1641 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1642 ev_timer_start (EV_A_ &once->to);
1577 } 1643 }
1578 } 1644 }
1579} 1645}
1580 1646
1647#ifdef __cplusplus
1648}
1649#endif
1650

Diff Legend

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