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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 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;
215 int events; 248 int events;
216} ANPENDING; 249} ANPENDING;
217 250
218#if EV_MULTIPLICITY 251#if EV_MULTIPLICITY
219 252
220struct 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};
225# undef VAR 259 #undef VAR
260 };
226# include "ev_wrap.h" 261 #include "ev_wrap.h"
262
263 struct ev_loop default_loop_struct;
264 static struct ev_loop *default_loop;
227 265
228#else 266#else
229 267
268 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 269 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 270 #include "ev_vars.h"
232# undef VAR 271 #undef VAR
272
273 static int default_loop;
233 274
234#endif 275#endif
235 276
236/*****************************************************************************/ 277/*****************************************************************************/
237 278
238inline ev_tstamp 279ev_tstamp
239ev_time (void) 280ev_time (void)
240{ 281{
241#if EV_USE_REALTIME 282#if EV_USE_REALTIME
242 struct timespec ts; 283 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 284 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 303#endif
263 304
264 return ev_time (); 305 return ev_time ();
265} 306}
266 307
308#if EV_MULTIPLICITY
267ev_tstamp 309ev_tstamp
268ev_now (EV_P) 310ev_now (EV_P)
269{ 311{
270 return rt_now; 312 return ev_rt_now;
271} 313}
314#endif
272 315
273#define array_roundsize(type,n) ((n) | 4 & ~3) 316#define array_roundsize(type,n) (((n) | 4) & ~3)
274 317
275#define array_needsize(type,base,cur,cnt,init) \ 318#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 319 if (expect_false ((cnt) > cur)) \
277 { \ 320 { \
278 int newcnt = cur; \ 321 int newcnt = cur; \
… …
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 336 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 337 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 338 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 339 }
297 340
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \ 341#define array_free(stem, idx) \
304 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;
305 343
306/*****************************************************************************/ 344/*****************************************************************************/
307 345
… …
328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
329 return; 367 return;
330 } 368 }
331 369
332 w_->pending = ++pendingcnt [ABSPRI (w_)]; 370 w_->pending = ++pendingcnt [ABSPRI (w_)];
333 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);
334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 372 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
336} 374}
337 375
338static void 376static void
… …
342 380
343 for (i = 0; i < eventcnt; ++i) 381 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 382 ev_feed_event (EV_A_ events [i], type);
345} 383}
346 384
347static void 385inline void
348fd_event (EV_P_ int fd, int events) 386fd_event (EV_P_ int fd, int revents)
349{ 387{
350 ANFD *anfd = anfds + fd; 388 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 389 struct ev_io *w;
352 390
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 391 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 392 {
355 int ev = w->events & events; 393 int ev = w->events & revents;
356 394
357 if (ev) 395 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 396 ev_feed_event (EV_A_ (W)w, ev);
359 } 397 }
398}
399
400void
401ev_feed_fd_event (EV_P_ int fd, int revents)
402{
403 fd_event (EV_A_ fd, revents);
360} 404}
361 405
362/*****************************************************************************/ 406/*****************************************************************************/
363 407
364static void 408static void
… …
375 int events = 0; 419 int events = 0;
376 420
377 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)
378 events |= w->events; 422 events |= w->events;
379 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
380 anfd->reify = 0; 433 anfd->reify = 0;
381 434
382 method_modify (EV_A_ fd, anfd->events, events); 435 method_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 436 anfd->events = events;
384 } 437 }
… …
393 return; 446 return;
394 447
395 anfds [fd].reify = 1; 448 anfds [fd].reify = 1;
396 449
397 ++fdchangecnt; 450 ++fdchangecnt;
398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 451 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
399 fdchanges [fdchangecnt - 1] = fd; 452 fdchanges [fdchangecnt - 1] = fd;
400} 453}
401 454
402static void 455static void
403fd_kill (EV_P_ int fd) 456fd_kill (EV_P_ int fd)
… …
412} 465}
413 466
414static int 467static int
415fd_valid (int fd) 468fd_valid (int fd)
416{ 469{
417#ifdef WIN32 470#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 471 return _get_osfhandle (fd) != -1;
419#else 472#else
420 return fcntl (fd, F_GETFD) != -1; 473 return fcntl (fd, F_GETFD) != -1;
421#endif 474#endif
422} 475}
423 476
… …
503 556
504 heap [k] = w; 557 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 558 ((W)heap [k])->active = k + 1;
506} 559}
507 560
561inline void
562adjustheap (WT *heap, int N, int k)
563{
564 upheap (heap, k);
565 downheap (heap, N, k);
566}
567
508/*****************************************************************************/ 568/*****************************************************************************/
509 569
510typedef struct 570typedef struct
511{ 571{
512 WL head; 572 WL head;
… …
533} 593}
534 594
535static void 595static void
536sighandler (int signum) 596sighandler (int signum)
537{ 597{
538#if WIN32 598#if _WIN32
539 signal (signum, sighandler); 599 signal (signum, sighandler);
540#endif 600#endif
541 601
542 signals [signum - 1].gotsig = 1; 602 signals [signum - 1].gotsig = 1;
543 603
544 if (!gotsig) 604 if (!gotsig)
545 { 605 {
546 int old_errno = errno; 606 int old_errno = errno;
547 gotsig = 1; 607 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 608 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 609 errno = old_errno;
554 } 610 }
555} 611}
556 612
613void
614ev_feed_signal_event (EV_P_ int signum)
615{
616 WL w;
617
618#if EV_MULTIPLICITY
619 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
620#endif
621
622 --signum;
623
624 if (signum < 0 || signum >= signalmax)
625 return;
626
627 signals [signum].gotsig = 0;
628
629 for (w = signals [signum].head; w; w = w->next)
630 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
631}
632
557static void 633static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 634sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 635{
560 WL w;
561 int signum; 636 int signum;
562 637
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 638 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 639 gotsig = 0;
569 640
570 for (signum = signalmax; signum--; ) 641 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 642 if (signals [signum].gotsig)
572 { 643 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 644}
574 645
575 for (w = signals [signum].head; w; w = w->next) 646inline void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 647fd_intern (int fd)
577 } 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
578} 656}
579 657
580static void 658static void
581siginit (EV_P) 659siginit (EV_P)
582{ 660{
583#ifndef WIN32 661 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 662 fd_intern (sigpipe [1]);
585 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
586
587 /* rather than sort out wether we really need nb, set it */
588 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
589 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
590#endif
591 663
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 664 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 665 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 666 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 667}
596 668
597/*****************************************************************************/ 669/*****************************************************************************/
598 670
599static struct ev_child *childs [PID_HASHSIZE]; 671static struct ev_child *childs [PID_HASHSIZE];
600 672
601#ifndef WIN32 673#ifndef _WIN32
602 674
603static struct ev_signal childev; 675static struct ev_signal childev;
604 676
605#ifndef WCONTINUED 677#ifndef WCONTINUED
606# define WCONTINUED 0 678# define WCONTINUED 0
… …
667 739
668/* 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 */
669static int 741static int
670enable_secure (void) 742enable_secure (void)
671{ 743{
672#ifdef WIN32 744#ifdef _WIN32
673 return 0; 745 return 0;
674#else 746#else
675 return getuid () != geteuid () 747 return getuid () != geteuid ()
676 || getgid () != getegid (); 748 || getgid () != getegid ();
677#endif 749#endif
678} 750}
679 751
680int 752unsigned int
681ev_method (EV_P) 753ev_method (EV_P)
682{ 754{
683 return method; 755 return method;
684} 756}
685 757
686static void 758static void
687loop_init (EV_P_ int methods) 759loop_init (EV_P_ unsigned int flags)
688{ 760{
689 if (!method) 761 if (!method)
690 { 762 {
691#if EV_USE_MONOTONIC 763#if EV_USE_MONOTONIC
692 { 764 {
… …
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 766 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 767 have_monotonic = 1;
696 } 768 }
697#endif 769#endif
698 770
699 rt_now = ev_time (); 771 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 772 mn_now = get_clock ();
701 now_floor = mn_now; 773 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 774 rtmn_diff = ev_rt_now - mn_now;
703 775
704 if (methods == EVMETHOD_AUTO) 776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
705 if (!enable_secure () && getenv ("LIBEV_METHODS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 777 flags = atoi (getenv ("LIBEV_FLAGS"));
707 else 778
708 methods = EVMETHOD_ANY; 779 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff;
709 781
710 method = 0; 782 method = 0;
711#if EV_USE_WIN32
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
713#endif
714#if EV_USE_KQUEUE 783#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
716#endif 785#endif
717#if EV_USE_EPOLL 786#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
719#endif 788#endif
720#if EV_USE_POLL 789#if EV_USE_POLL
721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
722#endif 791#endif
723#if EV_USE_SELECT 792#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
725#endif 794#endif
726 795
727 ev_watcher_init (&sigev, sigcb); 796 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 797 ev_set_priority (&sigev, EV_MAXPRI);
729 } 798 }
730} 799}
731 800
732void 801void
733loop_destroy (EV_P) 802loop_destroy (EV_P)
734{ 803{
735 int i; 804 int i;
736 805
737#if EV_USE_WIN32
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
739#endif
740#if EV_USE_KQUEUE 806#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
742#endif 808#endif
743#if EV_USE_EPOLL 809#if EV_USE_EPOLL
744 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
752 818
753 for (i = NUMPRI; i--; ) 819 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 820 array_free (pending, [i]);
755 821
756 /* have to use the microsoft-never-gets-it-right macro */ 822 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 823 array_free (fdchange, EMPTY0);
758 array_free_microshit (timer); 824 array_free (timer, EMPTY0);
759 array_free_microshit (periodic); 825#if EV_PERIODICS
760 array_free_microshit (idle); 826 array_free (periodic, EMPTY0);
761 array_free_microshit (prepare); 827#endif
762 array_free_microshit (check); 828 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0);
763 831
764 method = 0; 832 method = 0;
765} 833}
766 834
767static void 835static void
… …
792 postfork = 0; 860 postfork = 0;
793} 861}
794 862
795#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
796struct ev_loop * 864struct ev_loop *
797ev_loop_new (int methods) 865ev_loop_new (unsigned int flags)
798{ 866{
799 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));
800 868
801 memset (loop, 0, sizeof (struct ev_loop)); 869 memset (loop, 0, sizeof (struct ev_loop));
802 870
803 loop_init (EV_A_ methods); 871 loop_init (EV_A_ flags);
804 872
805 if (ev_method (EV_A)) 873 if (ev_method (EV_A))
806 return loop; 874 return loop;
807 875
808 return 0; 876 return 0;
… …
822} 890}
823 891
824#endif 892#endif
825 893
826#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 895struct ev_loop *
831#else 896#else
832static int default_loop;
833
834int 897int
835#endif 898#endif
836ev_default_loop (int methods) 899ev_default_loop (unsigned int flags)
837{ 900{
838 if (sigpipe [0] == sigpipe [1]) 901 if (sigpipe [0] == sigpipe [1])
839 if (pipe (sigpipe)) 902 if (pipe (sigpipe))
840 return 0; 903 return 0;
841 904
… …
845 struct ev_loop *loop = default_loop = &default_loop_struct; 908 struct ev_loop *loop = default_loop = &default_loop_struct;
846#else 909#else
847 default_loop = 1; 910 default_loop = 1;
848#endif 911#endif
849 912
850 loop_init (EV_A_ methods); 913 loop_init (EV_A_ flags);
851 914
852 if (ev_method (EV_A)) 915 if (ev_method (EV_A))
853 { 916 {
854 siginit (EV_A); 917 siginit (EV_A);
855 918
856#ifndef WIN32 919#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 920 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 921 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 922 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 923 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 924#endif
… …
872{ 935{
873#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 937 struct ev_loop *loop = default_loop;
875#endif 938#endif
876 939
877#ifndef WIN32 940#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 941 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 942 ev_signal_stop (EV_A_ &childev);
880#endif 943#endif
881 944
882 ev_ref (EV_A); /* signal watcher */ 945 ev_ref (EV_A); /* signal watcher */
… …
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 987 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 988
926 if (p->w) 989 if (p->w)
927 { 990 {
928 p->w->pending = 0; 991 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 992 EV_CB_INVOKE (p->w, p->events);
930 } 993 }
931 } 994 }
932} 995}
933 996
934static void 997static void
… …
942 1005
943 /* first reschedule or stop timer */ 1006 /* first reschedule or stop timer */
944 if (w->repeat) 1007 if (w->repeat)
945 { 1008 {
946 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
947 ((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
948 downheap ((WT *)timers, timercnt, 0); 1015 downheap ((WT *)timers, timercnt, 0);
949 } 1016 }
950 else 1017 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1018 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1019
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1021 }
955} 1022}
956 1023
1024#if EV_PERIODICS
957static void 1025static void
958periodics_reify (EV_P) 1026periodics_reify (EV_P)
959{ 1027{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1029 {
962 struct ev_periodic *w = periodics [0]; 1030 struct ev_periodic *w = periodics [0];
963 1031
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1032 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1033
966 /* first reschedule or stop timer */ 1034 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1035 if (w->reschedule_cb)
968 { 1036 {
969 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);
970
971 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));
972 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1040 }
974 else if (w->interval) 1041 else if (w->interval)
975 { 1042 {
976 ((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;
977 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));
978 downheap ((WT *)periodics, periodiccnt, 0); 1045 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1046 }
980 else 1047 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1049
… …
993 for (i = 0; i < periodiccnt; ++i) 1060 for (i = 0; i < periodiccnt; ++i)
994 { 1061 {
995 struct ev_periodic *w = periodics [i]; 1062 struct ev_periodic *w = periodics [i];
996 1063
997 if (w->reschedule_cb) 1064 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1066 else if (w->interval)
1000 ((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;
1001 } 1068 }
1002 1069
1003 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1006} 1073}
1074#endif
1007 1075
1008inline int 1076inline int
1009time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1010{ 1078{
1011 mn_now = get_clock (); 1079 mn_now = get_clock ();
1012 1080
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1081 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1082 {
1015 rt_now = rtmn_diff + mn_now; 1083 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1084 return 0;
1017 } 1085 }
1018 else 1086 else
1019 { 1087 {
1020 now_floor = mn_now; 1088 now_floor = mn_now;
1021 rt_now = ev_time (); 1089 ev_rt_now = ev_time ();
1022 return 1; 1090 return 1;
1023 } 1091 }
1024} 1092}
1025 1093
1026static void 1094static void
… …
1035 { 1103 {
1036 ev_tstamp odiff = rtmn_diff; 1104 ev_tstamp odiff = rtmn_diff;
1037 1105
1038 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 */
1039 { 1107 {
1040 rtmn_diff = rt_now - mn_now; 1108 rtmn_diff = ev_rt_now - mn_now;
1041 1109
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1110 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1111 return; /* all is well */
1044 1112
1045 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1114 mn_now = get_clock ();
1047 now_floor = mn_now; 1115 now_floor = mn_now;
1048 } 1116 }
1049 1117
1118# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1123 }
1054 } 1124 }
1055 else 1125 else
1056#endif 1126#endif
1057 { 1127 {
1058 rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1059 1129
1060 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))
1061 { 1131 {
1132#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1063 1135
1064 /* 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 */
1065 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1139 }
1068 1140
1069 mn_now = rt_now; 1141 mn_now = ev_rt_now;
1070 } 1142 }
1071} 1143}
1072 1144
1073void 1145void
1074ev_ref (EV_P) 1146ev_ref (EV_P)
… …
1088ev_loop (EV_P_ int flags) 1160ev_loop (EV_P_ int flags)
1089{ 1161{
1090 double block; 1162 double block;
1091 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1092 1164
1093 do 1165 while (activecnt)
1094 { 1166 {
1095 /* queue check watchers (and execute them) */ 1167 /* queue check watchers (and execute them) */
1096 if (expect_false (preparecnt)) 1168 if (expect_false (preparecnt))
1097 { 1169 {
1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1114 if (expect_true (have_monotonic)) 1186 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1187 time_update_monotonic (EV_A);
1116 else 1188 else
1117#endif 1189#endif
1118 { 1190 {
1119 rt_now = ev_time (); 1191 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1192 mn_now = ev_rt_now;
1121 } 1193 }
1122 1194
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1196 block = 0.;
1125 else 1197 else
… …
1130 { 1202 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1204 if (block > to) block = to;
1133 } 1205 }
1134 1206
1207#if EV_PERIODICS
1135 if (periodiccnt) 1208 if (periodiccnt)
1136 { 1209 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1211 if (block > to) block = to;
1139 } 1212 }
1213#endif
1140 1214
1141 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1142 } 1216 }
1143 1217
1144 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
1145 1219
1146 /* update rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1221 time_update (EV_A);
1148 1222
1149 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1152 1228
1153 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1232
1157 /* queue check watchers, to be executed first */ 1233 /* queue check watchers, to be executed first */
1158 if (checkcnt) 1234 if (checkcnt)
1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1160 1236
1161 call_pending (EV_A); 1237 call_pending (EV_A);
1238
1239 if (loop_done)
1240 break;
1162 } 1241 }
1163 while (activecnt && !loop_done);
1164 1242
1165 if (loop_done != 2) 1243 if (loop_done != 2)
1166 loop_done = 0; 1244 loop_done = 0;
1167} 1245}
1168 1246
… …
1247{ 1325{
1248 ev_clear_pending (EV_A_ (W)w); 1326 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1327 if (!ev_is_active (w))
1250 return; 1328 return;
1251 1329
1330 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1331
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1333 ev_stop (EV_A_ (W)w);
1254 1334
1255 fd_change (EV_A_ w->fd); 1335 fd_change (EV_A_ w->fd);
1256} 1336}
… …
1264 ((WT)w)->at += mn_now; 1344 ((WT)w)->at += mn_now;
1265 1345
1266 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.));
1267 1347
1268 ev_start (EV_A_ (W)w, ++timercnt); 1348 ev_start (EV_A_ (W)w, ++timercnt);
1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1349 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1270 timers [timercnt - 1] = w; 1350 timers [timercnt - 1] = w;
1271 upheap ((WT *)timers, timercnt - 1); 1351 upheap ((WT *)timers, timercnt - 1);
1272 1352
1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1353 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1274} 1354}
… …
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1364
1285 if (((W)w)->active < timercnt--) 1365 if (((W)w)->active < timercnt--)
1286 { 1366 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1367 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1369 }
1290 1370
1291 ((WT)w)->at = w->repeat; 1371 ((WT)w)->at -= mn_now;
1292 1372
1293 ev_stop (EV_A_ (W)w); 1373 ev_stop (EV_A_ (W)w);
1294} 1374}
1295 1375
1296void 1376void
… …
1299 if (ev_is_active (w)) 1379 if (ev_is_active (w))
1300 { 1380 {
1301 if (w->repeat) 1381 if (w->repeat)
1302 { 1382 {
1303 ((WT)w)->at = mn_now + w->repeat; 1383 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1384 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1385 }
1306 else 1386 else
1307 ev_timer_stop (EV_A_ w); 1387 ev_timer_stop (EV_A_ w);
1308 } 1388 }
1309 else if (w->repeat) 1389 else if (w->repeat)
1390 {
1391 w->at = w->repeat;
1310 ev_timer_start (EV_A_ w); 1392 ev_timer_start (EV_A_ w);
1393 }
1311} 1394}
1312 1395
1396#if EV_PERIODICS
1313void 1397void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1398ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1399{
1316 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1317 return; 1401 return;
1318 1402
1319 if (w->reschedule_cb) 1403 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1405 else if (w->interval)
1322 { 1406 {
1323 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.));
1324 /* 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 */
1325 ((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;
1326 } 1410 }
1327 1411
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1412 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1413 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1330 periodics [periodiccnt - 1] = w; 1414 periodics [periodiccnt - 1] = w;
1331 upheap ((WT *)periodics, periodiccnt - 1); 1415 upheap ((WT *)periodics, periodiccnt - 1);
1332 1416
1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1417 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1334} 1418}
… …
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1428
1345 if (((W)w)->active < periodiccnt--) 1429 if (((W)w)->active < periodiccnt--)
1346 { 1430 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1431 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1433 }
1350 1434
1351 ev_stop (EV_A_ (W)w); 1435 ev_stop (EV_A_ (W)w);
1352} 1436}
1353 1437
1354void 1438void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1439ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1440{
1441 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1442 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1443 ev_periodic_start (EV_A_ w);
1359} 1444}
1445#endif
1360 1446
1361void 1447void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1448ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1449{
1364 if (ev_is_active (w)) 1450 if (ev_is_active (w))
1365 return; 1451 return;
1366 1452
1367 ev_start (EV_A_ (W)w, ++idlecnt); 1453 ev_start (EV_A_ (W)w, ++idlecnt);
1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1369 idles [idlecnt - 1] = w; 1455 idles [idlecnt - 1] = w;
1370} 1456}
1371 1457
1372void 1458void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1459ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1460{
1375 ev_clear_pending (EV_A_ (W)w); 1461 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1462 if (!ev_is_active (w))
1377 return; 1463 return;
1378 1464
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1465 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1466 ev_stop (EV_A_ (W)w);
1381} 1467}
… …
1385{ 1471{
1386 if (ev_is_active (w)) 1472 if (ev_is_active (w))
1387 return; 1473 return;
1388 1474
1389 ev_start (EV_A_ (W)w, ++preparecnt); 1475 ev_start (EV_A_ (W)w, ++preparecnt);
1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1391 prepares [preparecnt - 1] = w; 1477 prepares [preparecnt - 1] = w;
1392} 1478}
1393 1479
1394void 1480void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1481ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1482{
1397 ev_clear_pending (EV_A_ (W)w); 1483 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1484 if (!ev_is_active (w))
1399 return; 1485 return;
1400 1486
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1487 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1488 ev_stop (EV_A_ (W)w);
1403} 1489}
… …
1407{ 1493{
1408 if (ev_is_active (w)) 1494 if (ev_is_active (w))
1409 return; 1495 return;
1410 1496
1411 ev_start (EV_A_ (W)w, ++checkcnt); 1497 ev_start (EV_A_ (W)w, ++checkcnt);
1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1413 checks [checkcnt - 1] = w; 1499 checks [checkcnt - 1] = w;
1414} 1500}
1415 1501
1416void 1502void
1417ev_check_stop (EV_P_ struct ev_check *w) 1503ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1504{
1419 ev_clear_pending (EV_A_ (W)w); 1505 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1506 if (!ev_is_active (w))
1421 return; 1507 return;
1422 1508
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1509 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1510 ev_stop (EV_A_ (W)w);
1425} 1511}
… …
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1529 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1530 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1531
1446 if (!((WL)w)->next) 1532 if (!((WL)w)->next)
1447 { 1533 {
1448#if WIN32 1534#if _WIN32
1449 signal (w->signum, sighandler); 1535 signal (w->signum, sighandler);
1450#else 1536#else
1451 struct sigaction sa; 1537 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1538 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1539 sigfillset (&sa.sa_mask);
… …
1486 1572
1487void 1573void
1488ev_child_stop (EV_P_ struct ev_child *w) 1574ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1575{
1490 ev_clear_pending (EV_A_ (W)w); 1576 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1577 if (!ev_is_active (w))
1492 return; 1578 return;
1493 1579
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1581 ev_stop (EV_A_ (W)w);
1496} 1582}
… …
1540 else 1626 else
1541 { 1627 {
1542 once->cb = cb; 1628 once->cb = cb;
1543 once->arg = arg; 1629 once->arg = arg;
1544 1630
1545 ev_watcher_init (&once->io, once_cb_io); 1631 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1632 if (fd >= 0)
1547 { 1633 {
1548 ev_io_set (&once->io, fd, events); 1634 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1635 ev_io_start (EV_A_ &once->io);
1550 } 1636 }
1551 1637
1552 ev_watcher_init (&once->to, once_cb_to); 1638 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1639 if (timeout >= 0.)
1554 { 1640 {
1555 ev_timer_set (&once->to, timeout, 0.); 1641 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1642 ev_timer_start (EV_A_ &once->to);
1557 } 1643 }
1558 } 1644 }
1559} 1645}
1560 1646
1647#ifdef __cplusplus
1648}
1649#endif
1650

Diff Legend

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