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

Comparing libev/ev.c (file contents):
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC vs.
Revision 1.131 by root, Fri Nov 23 05:43:45 2007 UTC

41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
62# endif 93# endif
63 94
64#endif 95#endif
65 96
66#include <math.h> 97#include <math.h>
75#include <sys/types.h> 106#include <sys/types.h>
76#include <time.h> 107#include <time.h>
77 108
78#include <signal.h> 109#include <signal.h>
79 110
80#ifndef WIN32 111#ifndef _WIN32
81# include <unistd.h> 112# include <unistd.h>
82# include <sys/time.h> 113# include <sys/time.h>
83# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
84#endif 120# endif
121#endif
122
85/**/ 123/**/
86 124
87#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
88# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
89#endif 131#endif
90 132
91#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
92# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
93#endif 135#endif
94 136
95#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
96# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
97#endif 143#endif
98 144
99#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
100# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
101#endif 147#endif
102 148
103#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
104# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
105#endif 151#endif
106 152
107#ifndef EV_USE_WIN32
108# ifdef WIN32
109# define EV_USE_WIN32 0 /* it does not exist, use select */
110# undef EV_USE_SELECT
111# define EV_USE_SELECT 1
112# else
113# define EV_USE_WIN32 0
114# endif
115#endif
116
117#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
118# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
119#endif 155#endif
120 156
121/**/ 157/**/
122 158
123#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
128#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
129# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
130# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
131#endif 167#endif
132 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
133/**/ 173/**/
134 174
135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
136#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
137#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
139 179
140#ifdef EV_H 180#ifdef EV_H
141# include EV_H 181# include EV_H
142#else 182#else
143# include "ev.h" 183# include "ev.h"
144#endif 184#endif
145 185
146#if __GNUC__ >= 3 186#if __GNUC__ >= 3
147# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
148# define inline inline 188# define inline static inline
149#else 189#else
150# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
151# define inline static 191# define inline static
152#endif 192#endif
153 193
155#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
156 196
157#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
158#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
159 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
160typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
161typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
162typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
163 206
164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
165 208
209#ifdef _WIN32
166#include "ev_win32.c" 210# include "ev_win32.c"
211#endif
167 212
168/*****************************************************************************/ 213/*****************************************************************************/
169 214
170static void (*syserr_cb)(const char *msg); 215static void (*syserr_cb)(const char *msg);
171 216
218typedef struct 263typedef struct
219{ 264{
220 WL head; 265 WL head;
221 unsigned char events; 266 unsigned char events;
222 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
223} ANFD; 271} ANFD;
224 272
225typedef struct 273typedef struct
226{ 274{
227 W w; 275 W w;
231#if EV_MULTIPLICITY 279#if EV_MULTIPLICITY
232 280
233 struct ev_loop 281 struct ev_loop
234 { 282 {
235 ev_tstamp ev_rt_now; 283 ev_tstamp ev_rt_now;
284 #define ev_rt_now ((loop)->ev_rt_now)
236 #define VAR(name,decl) decl; 285 #define VAR(name,decl) decl;
237 #include "ev_vars.h" 286 #include "ev_vars.h"
238 #undef VAR 287 #undef VAR
239 }; 288 };
240 #include "ev_wrap.h" 289 #include "ev_wrap.h"
241 290
242 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
243 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
244 293
245#else 294#else
246 295
247 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
248 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
249 #include "ev_vars.h" 298 #include "ev_vars.h"
250 #undef VAR 299 #undef VAR
251 300
252 static int default_loop; 301 static int ev_default_loop_ptr;
253 302
254#endif 303#endif
255 304
256/*****************************************************************************/ 305/*****************************************************************************/
257 306
290{ 339{
291 return ev_rt_now; 340 return ev_rt_now;
292} 341}
293#endif 342#endif
294 343
295#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
296 345
297#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
298 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
299 { \ 348 { \
300 int newcnt = cur; \ 349 int newcnt = cur; \
315 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
316 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
317 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
318 } 367 }
319 368
320/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
321/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
322#define array_free_microshit(stem) \
323 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
324
325#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
326 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 370 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
327 371
328/*****************************************************************************/ 372/*****************************************************************************/
329 373
343void 387void
344ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
345{ 389{
346 W w_ = (W)w; 390 W w_ = (W)w;
347 391
348 if (w_->pending) 392 if (expect_false (w_->pending))
349 { 393 {
350 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
351 return; 395 return;
352 } 396 }
353 397
354 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
355 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
356 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
357 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
358} 402}
359 403
360static void 404static void
387 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
388} 432}
389 433
390/*****************************************************************************/ 434/*****************************************************************************/
391 435
392static void 436inline void
393fd_reify (EV_P) 437fd_reify (EV_P)
394{ 438{
395 int i; 439 int i;
396 440
397 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
403 int events = 0; 447 int events = 0;
404 448
405 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 449 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
406 events |= w->events; 450 events |= w->events;
407 451
452#if EV_SELECT_IS_WINSOCKET
453 if (events)
454 {
455 unsigned long argp;
456 anfd->handle = _get_osfhandle (fd);
457 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
458 }
459#endif
460
408 anfd->reify = 0; 461 anfd->reify = 0;
409 462
410 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
411 anfd->events = events; 464 anfd->events = events;
412 } 465 }
413 466
414 fdchangecnt = 0; 467 fdchangecnt = 0;
415} 468}
416 469
417static void 470static void
418fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
419{ 472{
420 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
421 return; 474 return;
422 475
423 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
424 477
425 ++fdchangecnt; 478 ++fdchangecnt;
426 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
427 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
428} 481}
429 482
430static void 483static void
431fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
437 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
438 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
439 } 492 }
440} 493}
441 494
442static int 495inline int
443fd_valid (int fd) 496fd_valid (int fd)
444{ 497{
445#ifdef WIN32 498#ifdef _WIN32
446 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
447#else 500#else
448 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
449#endif 502#endif
450} 503}
451 504
473 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
474 return; 527 return;
475 } 528 }
476} 529}
477 530
478/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
479static void 532static void
480fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
481{ 534{
482 int fd; 535 int fd;
483 536
532 heap [k] = w; 585 heap [k] = w;
533 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
534} 587}
535 588
536inline void 589inline void
537adjustheap (WT *heap, int N, int k, ev_tstamp at) 590adjustheap (WT *heap, int N, int k)
538{ 591{
539 ev_tstamp old_at = heap [k]->at; 592 upheap (heap, k);
540 heap [k]->at = at;
541
542 if (old_at < at)
543 downheap (heap, N, k); 593 downheap (heap, N, k);
544 else
545 upheap (heap, k);
546} 594}
547 595
548/*****************************************************************************/ 596/*****************************************************************************/
549 597
550typedef struct 598typedef struct
573} 621}
574 622
575static void 623static void
576sighandler (int signum) 624sighandler (int signum)
577{ 625{
578#if WIN32 626#if _WIN32
579 signal (signum, sighandler); 627 signal (signum, sighandler);
580#endif 628#endif
581 629
582 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
583 631
584 if (!gotsig) 632 if (!gotsig)
585 { 633 {
586 int old_errno = errno; 634 int old_errno = errno;
587 gotsig = 1; 635 gotsig = 1;
588#ifdef WIN32
589 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
590#else
591 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
592#endif
593 errno = old_errno; 637 errno = old_errno;
594 } 638 }
595} 639}
596 640
597void 641void
598ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
599{ 643{
600 WL w; 644 WL w;
601 645
602#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
603 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
604#endif 648#endif
605 649
606 --signum; 650 --signum;
607 651
608 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
617static void 661static void
618sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
619{ 663{
620 int signum; 664 int signum;
621 665
622#ifdef WIN32
623 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
624#else
625 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
626#endif
627 gotsig = 0; 667 gotsig = 0;
628 668
629 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
632} 672}
633 673
634static void 674static void
675fd_intern (int fd)
676{
677#ifdef _WIN32
678 int arg = 1;
679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
680#else
681 fcntl (fd, F_SETFD, FD_CLOEXEC);
682 fcntl (fd, F_SETFL, O_NONBLOCK);
683#endif
684}
685
686static void
635siginit (EV_P) 687siginit (EV_P)
636{ 688{
637#ifndef WIN32 689 fd_intern (sigpipe [0]);
638 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
639 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
640
641 /* rather than sort out wether we really need nb, set it */
642 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
643 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
644#endif
645 691
646 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
647 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
648 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
649} 695}
650 696
651/*****************************************************************************/ 697/*****************************************************************************/
652 698
653static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
654 700
655#ifndef WIN32 701#ifndef _WIN32
656 702
657static struct ev_signal childev; 703static struct ev_signal childev;
658 704
659#ifndef WCONTINUED 705#ifndef WCONTINUED
660# define WCONTINUED 0 706# define WCONTINUED 0
692 738
693#endif 739#endif
694 740
695/*****************************************************************************/ 741/*****************************************************************************/
696 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
697#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
698# include "ev_kqueue.c" 747# include "ev_kqueue.c"
699#endif 748#endif
700#if EV_USE_EPOLL 749#if EV_USE_EPOLL
701# include "ev_epoll.c" 750# include "ev_epoll.c"
721 770
722/* return true if we are running with elevated privileges and should ignore env variables */ 771/* return true if we are running with elevated privileges and should ignore env variables */
723static int 772static int
724enable_secure (void) 773enable_secure (void)
725{ 774{
726#ifdef WIN32 775#ifdef _WIN32
727 return 0; 776 return 0;
728#else 777#else
729 return getuid () != geteuid () 778 return getuid () != geteuid ()
730 || getgid () != getegid (); 779 || getgid () != getegid ();
731#endif 780#endif
732} 781}
733 782
734int 783unsigned int
735ev_method (EV_P) 784ev_supported_backends (void)
736{ 785{
737 return method; 786 unsigned int flags = 0;
738}
739 787
740static void 788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
741loop_init (EV_P_ int methods) 789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
742{ 799{
743 if (!method) 800 unsigned int flags = ev_supported_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
819}
820
821static void
822loop_init (EV_P_ unsigned int flags)
823{
824 if (!backend)
744 { 825 {
745#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
746 { 827 {
747 struct timespec ts; 828 struct timespec ts;
748 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
753 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
754 mn_now = get_clock (); 835 mn_now = get_clock ();
755 now_floor = mn_now; 836 now_floor = mn_now;
756 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
757 838
758 if (methods == EVMETHOD_AUTO) 839 if (!(flags & EVFLAG_NOENV)
759 if (!enable_secure () && getenv ("LIBEV_METHODS")) 840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
760 methods = atoi (getenv ("LIBEV_METHODS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
761 else
762 methods = EVMETHOD_ANY;
763 843
764 method = 0; 844 if (!(flags & 0x0000ffffUL))
765#if EV_USE_WIN32 845 flags |= ev_recommended_backends ();
766 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 846
847 backend = 0;
848#if EV_USE_PORT
849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
767#endif 850#endif
768#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
769 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
770#endif 853#endif
771#if EV_USE_EPOLL 854#if EV_USE_EPOLL
772 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
773#endif 856#endif
774#if EV_USE_POLL 857#if EV_USE_POLL
775 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
776#endif 859#endif
777#if EV_USE_SELECT 860#if EV_USE_SELECT
778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
779#endif 862#endif
780 863
781 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
782 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
783 } 866 }
784} 867}
785 868
786void 869static void
787loop_destroy (EV_P) 870loop_destroy (EV_P)
788{ 871{
789 int i; 872 int i;
790 873
791#if EV_USE_WIN32 874#if EV_USE_PORT
792 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
793#endif 876#endif
794#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 879#endif
797#if EV_USE_EPOLL 880#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 882#endif
800#if EV_USE_POLL 883#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 885#endif
803#if EV_USE_SELECT 886#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 888#endif
806 889
807 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 891 array_free (pending, [i]);
809 892
810 /* have to use the microsoft-never-gets-it-right macro */ 893 /* have to use the microsoft-never-gets-it-right macro */
811 array_free_microshit (fdchange); 894 array_free (fdchange, EMPTY0);
812 array_free_microshit (timer); 895 array_free (timer, EMPTY0);
813#if EV_PERIODICS 896#if EV_PERIODICS
814 array_free_microshit (periodic); 897 array_free (periodic, EMPTY0);
815#endif 898#endif
816 array_free_microshit (idle); 899 array_free (idle, EMPTY0);
817 array_free_microshit (prepare); 900 array_free (prepare, EMPTY0);
818 array_free_microshit (check); 901 array_free (check, EMPTY0);
819 902
820 method = 0; 903 backend = 0;
821} 904}
822 905
823static void 906static void
824loop_fork (EV_P) 907loop_fork (EV_P)
825{ 908{
909#if EV_USE_PORT
910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
911#endif
912#if EV_USE_KQUEUE
913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
914#endif
826#if EV_USE_EPOLL 915#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif 917#endif
832 918
833 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
834 { 920 {
835 /* default loop */ 921 /* default loop */
848 postfork = 0; 934 postfork = 0;
849} 935}
850 936
851#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
852struct ev_loop * 938struct ev_loop *
853ev_loop_new (int methods) 939ev_loop_new (unsigned int flags)
854{ 940{
855 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 941 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
856 942
857 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
858 944
859 loop_init (EV_A_ methods); 945 loop_init (EV_A_ flags);
860 946
861 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
862 return loop; 948 return loop;
863 949
864 return 0; 950 return 0;
865} 951}
866 952
879 965
880#endif 966#endif
881 967
882#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
883struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
884#else 971#else
885int 972int
973ev_default_loop (unsigned int flags)
886#endif 974#endif
887ev_default_loop (int methods)
888{ 975{
889 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
891 return 0; 978 return 0;
892 979
893 if (!default_loop) 980 if (!ev_default_loop_ptr)
894 { 981 {
895#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 984#else
898 default_loop = 1; 985 ev_default_loop_ptr = 1;
899#endif 986#endif
900 987
901 loop_init (EV_A_ methods); 988 loop_init (EV_A_ flags);
902 989
903 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
904 { 991 {
905 siginit (EV_A); 992 siginit (EV_A);
906 993
907#ifndef WIN32 994#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
909 ev_set_priority (&childev, EV_MAXPRI); 996 ev_set_priority (&childev, EV_MAXPRI);
910 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 999#endif
913 } 1000 }
914 else 1001 else
915 default_loop = 0; 1002 ev_default_loop_ptr = 0;
916 } 1003 }
917 1004
918 return default_loop; 1005 return ev_default_loop_ptr;
919} 1006}
920 1007
921void 1008void
922ev_default_destroy (void) 1009ev_default_destroy (void)
923{ 1010{
924#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1013#endif
927 1014
928#ifndef WIN32 1015#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
931#endif 1018#endif
932 1019
933 ev_ref (EV_A); /* signal watcher */ 1020 ev_ref (EV_A); /* signal watcher */
941 1028
942void 1029void
943ev_default_fork (void) 1030ev_default_fork (void)
944{ 1031{
945#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1034#endif
948 1035
949 if (method) 1036 if (backend)
950 postfork = 1; 1037 postfork = 1;
951} 1038}
952 1039
953/*****************************************************************************/ 1040/*****************************************************************************/
954 1041
962 return 1; 1049 return 1;
963 1050
964 return 0; 1051 return 0;
965} 1052}
966 1053
967static void 1054inline void
968call_pending (EV_P) 1055call_pending (EV_P)
969{ 1056{
970 int pri; 1057 int pri;
971 1058
972 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
974 { 1061 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1063
977 if (p->w) 1064 if (expect_true (p->w))
978 { 1065 {
979 p->w->pending = 0; 1066 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
981 } 1068 }
982 } 1069 }
983} 1070}
984 1071
985static void 1072inline void
986timers_reify (EV_P) 1073timers_reify (EV_P)
987{ 1074{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1076 {
990 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1096 }
1010} 1097}
1011 1098
1012#if EV_PERIODICS 1099#if EV_PERIODICS
1013static void 1100inline void
1014periodics_reify (EV_P) 1101periodics_reify (EV_P)
1015{ 1102{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1104 {
1018 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1107 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1108
1022 /* first reschedule or stop timer */ 1109 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1110 if (w->reschedule_cb)
1024 { 1111 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1026
1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1113 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1114 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1115 }
1030 else if (w->interval) 1116 else if (w->interval)
1031 { 1117 {
1078 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1079 return 1; 1165 return 1;
1080 } 1166 }
1081} 1167}
1082 1168
1083static void 1169inline void
1084time_update (EV_P) 1170time_update (EV_P)
1085{ 1171{
1086 int i; 1172 int i;
1087 1173
1088#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
1149ev_loop (EV_P_ int flags) 1235ev_loop (EV_P_ int flags)
1150{ 1236{
1151 double block; 1237 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1238 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1239
1154 do 1240 while (activecnt)
1155 { 1241 {
1156 /* queue check watchers (and execute them) */ 1242 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1243 if (expect_false (preparecnt))
1158 { 1244 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1245 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1187 { 1273 {
1188 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1189 1275
1190 if (timercnt) 1276 if (timercnt)
1191 { 1277 {
1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1193 if (block > to) block = to; 1279 if (block > to) block = to;
1194 } 1280 }
1195 1281
1196#if EV_PERIODICS 1282#if EV_PERIODICS
1197 if (periodiccnt) 1283 if (periodiccnt)
1198 { 1284 {
1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1200 if (block > to) block = to; 1286 if (block > to) block = to;
1201 } 1287 }
1202#endif 1288#endif
1203 1289
1204 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1205 } 1291 }
1206 1292
1207 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1208 1294
1209 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1210 time_update (EV_A); 1296 time_update (EV_A);
1211 1297
1212 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
1218 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1307
1222 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1309 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1311
1226 call_pending (EV_A); 1312 call_pending (EV_A);
1313
1314 if (expect_false (loop_done))
1315 break;
1227 } 1316 }
1228 while (activecnt && !loop_done);
1229 1317
1230 if (loop_done != 2) 1318 if (loop_done != 2)
1231 loop_done = 0; 1319 loop_done = 0;
1232} 1320}
1233 1321
1293void 1381void
1294ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1295{ 1383{
1296 int fd = w->fd; 1384 int fd = w->fd;
1297 1385
1298 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1299 return; 1387 return;
1300 1388
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1390
1303 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
1309 1397
1310void 1398void
1311ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1400{
1313 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1315 return; 1403 return;
1316 1404
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1405 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318 1406
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1323} 1411}
1324 1412
1325void 1413void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1415{
1328 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1329 return; 1417 return;
1330 1418
1331 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1332 1420
1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1421 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1334 1422
1335 ev_start (EV_A_ (W)w, ++timercnt); 1423 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1424 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1425 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1426 upheap ((WT *)timers, timercnt - 1);
1339 1427
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1428 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1429}
1342 1430
1343void 1431void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1433{
1346 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1348 return; 1436 return;
1349 1437
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1439
1352 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1353 { 1441 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1444 }
1357 1445
1358 ((WT)w)->at -= mn_now; 1446 ((WT)w)->at -= mn_now;
1359 1447
1360 ev_stop (EV_A_ (W)w); 1448 ev_stop (EV_A_ (W)w);
1364ev_timer_again (EV_P_ struct ev_timer *w) 1452ev_timer_again (EV_P_ struct ev_timer *w)
1365{ 1453{
1366 if (ev_is_active (w)) 1454 if (ev_is_active (w))
1367 { 1455 {
1368 if (w->repeat) 1456 if (w->repeat)
1457 {
1458 ((WT)w)->at = mn_now + w->repeat;
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1460 }
1370 else 1461 else
1371 ev_timer_stop (EV_A_ w); 1462 ev_timer_stop (EV_A_ w);
1372 } 1463 }
1373 else if (w->repeat) 1464 else if (w->repeat)
1465 {
1466 w->at = w->repeat;
1374 ev_timer_start (EV_A_ w); 1467 ev_timer_start (EV_A_ w);
1468 }
1375} 1469}
1376 1470
1377#if EV_PERIODICS 1471#if EV_PERIODICS
1378void 1472void
1379ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1380{ 1474{
1381 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1382 return; 1476 return;
1383 1477
1384 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1386 else if (w->interval) 1480 else if (w->interval)
1389 /* this formula differs from the one in periodic_reify because we do not always round up */ 1483 /* this formula differs from the one in periodic_reify because we do not always round up */
1390 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1484 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1391 } 1485 }
1392 1486
1393 ev_start (EV_A_ (W)w, ++periodiccnt); 1487 ev_start (EV_A_ (W)w, ++periodiccnt);
1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1488 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1395 periodics [periodiccnt - 1] = w; 1489 periodics [periodiccnt - 1] = w;
1396 upheap ((WT *)periodics, periodiccnt - 1); 1490 upheap ((WT *)periodics, periodiccnt - 1);
1397 1491
1398 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1492 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1399} 1493}
1400 1494
1401void 1495void
1402ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1403{ 1497{
1404 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1405 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1406 return; 1500 return;
1407 1501
1408 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1409 1503
1410 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1411 { 1505 {
1412 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1413 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1414 } 1508 }
1415 1509
1416 ev_stop (EV_A_ (W)w); 1510 ev_stop (EV_A_ (W)w);
1417} 1511}
1418 1512
1426#endif 1520#endif
1427 1521
1428void 1522void
1429ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1430{ 1524{
1431 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1432 return; 1526 return;
1433 1527
1434 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1435 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1436 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
1437} 1531}
1438 1532
1439void 1533void
1440ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1441{ 1535{
1442 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1443 if (ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1444 return; 1538 return;
1445 1539
1446 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1447 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1448} 1542}
1449 1543
1450void 1544void
1451ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1452{ 1546{
1453 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1454 return; 1548 return;
1455 1549
1456 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1457 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1458 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
1459} 1553}
1460 1554
1461void 1555void
1462ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1463{ 1557{
1464 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1465 if (ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1466 return; 1560 return;
1467 1561
1468 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1469 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1470} 1564}
1471 1565
1472void 1566void
1473ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1474{ 1568{
1475 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1476 return; 1570 return;
1477 1571
1478 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1479 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1480 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
1481} 1575}
1482 1576
1483void 1577void
1484ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1485{ 1579{
1486 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1487 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1488 return; 1582 return;
1489 1583
1490 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1491 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1492} 1586}
1497 1591
1498void 1592void
1499ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1500{ 1594{
1501#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1502 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1503#endif 1597#endif
1504 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1505 return; 1599 return;
1506 1600
1507 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1601 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1508 1602
1509 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
1510 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1604 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1511 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1605 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1512 1606
1513 if (!((WL)w)->next) 1607 if (!((WL)w)->next)
1514 { 1608 {
1515#if WIN32 1609#if _WIN32
1516 signal (w->signum, sighandler); 1610 signal (w->signum, sighandler);
1517#else 1611#else
1518 struct sigaction sa; 1612 struct sigaction sa;
1519 sa.sa_handler = sighandler; 1613 sa.sa_handler = sighandler;
1520 sigfillset (&sa.sa_mask); 1614 sigfillset (&sa.sa_mask);
1526 1620
1527void 1621void
1528ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1529{ 1623{
1530 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1531 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1532 return; 1626 return;
1533 1627
1534 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1535 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1536 1630
1540 1634
1541void 1635void
1542ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1543{ 1637{
1544#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1545 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1546#endif 1640#endif
1547 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1548 return; 1642 return;
1549 1643
1550 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1551 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1552} 1646}
1553 1647
1554void 1648void
1555ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1556{ 1650{
1557 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1558 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1559 return; 1653 return;
1560 1654
1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1562 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1563} 1657}
1600void 1694void
1601ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1695ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1602{ 1696{
1603 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1697 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1604 1698
1605 if (!once) 1699 if (expect_false (!once))
1700 {
1606 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1607 else 1702 return;
1608 { 1703 }
1704
1609 once->cb = cb; 1705 once->cb = cb;
1610 once->arg = arg; 1706 once->arg = arg;
1611 1707
1612 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1613 if (fd >= 0) 1709 if (fd >= 0)
1614 { 1710 {
1615 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1616 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1617 } 1713 }
1618 1714
1619 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1620 if (timeout >= 0.) 1716 if (timeout >= 0.)
1621 { 1717 {
1622 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1623 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1624 }
1625 } 1720 }
1626} 1721}
1627 1722
1628#ifdef __cplusplus 1723#ifdef __cplusplus
1629} 1724}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines