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

Comparing libev/ev.c (file contents):
Revision 1.99 by root, Sun Nov 11 02:26:47 2007 UTC vs.
Revision 1.132 by root, Fri Nov 23 10:36:30 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
166#ifdef WIN32 209#ifdef _WIN32
167# include "ev_win32.c" 210# include "ev_win32.c"
168#endif 211#endif
169 212
170/*****************************************************************************/ 213/*****************************************************************************/
171 214
220typedef struct 263typedef struct
221{ 264{
222 WL head; 265 WL head;
223 unsigned char events; 266 unsigned char events;
224 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
225} ANFD; 271} ANFD;
226 272
227typedef struct 273typedef struct
228{ 274{
229 W w; 275 W w;
240 #include "ev_vars.h" 286 #include "ev_vars.h"
241 #undef VAR 287 #undef VAR
242 }; 288 };
243 #include "ev_wrap.h" 289 #include "ev_wrap.h"
244 290
245 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
246 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
247 293
248#else 294#else
249 295
250 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
251 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
252 #include "ev_vars.h" 298 #include "ev_vars.h"
253 #undef VAR 299 #undef VAR
254 300
255 static int default_loop; 301 static int ev_default_loop_ptr;
256 302
257#endif 303#endif
258 304
259/*****************************************************************************/ 305/*****************************************************************************/
260 306
293{ 339{
294 return ev_rt_now; 340 return ev_rt_now;
295} 341}
296#endif 342#endif
297 343
298#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
299 345
300#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
301 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
302 { \ 348 { \
303 int newcnt = cur; \ 349 int newcnt = cur; \
318 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
319 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
320 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
321 } 367 }
322 368
323/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
324/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
325#define array_free_microshit(stem) \
326 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
327
328#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
329 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;
330 371
331/*****************************************************************************/ 372/*****************************************************************************/
332 373
346void 387void
347ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
348{ 389{
349 W w_ = (W)w; 390 W w_ = (W)w;
350 391
351 if (w_->pending) 392 if (expect_false (w_->pending))
352 { 393 {
353 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
354 return; 395 return;
355 } 396 }
356 397
357 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
358 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);
359 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
360 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
361} 402}
362 403
363static void 404static void
390 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
391} 432}
392 433
393/*****************************************************************************/ 434/*****************************************************************************/
394 435
395static void 436inline void
396fd_reify (EV_P) 437fd_reify (EV_P)
397{ 438{
398 int i; 439 int i;
399 440
400 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
406 int events = 0; 447 int events = 0;
407 448
408 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)
409 events |= w->events; 450 events |= w->events;
410 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
411 anfd->reify = 0; 461 anfd->reify = 0;
412 462
413 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
414 anfd->events = events; 464 anfd->events = events;
415 } 465 }
416 466
417 fdchangecnt = 0; 467 fdchangecnt = 0;
418} 468}
419 469
420static void 470static void
421fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
422{ 472{
423 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
424 return; 474 return;
425 475
426 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
427 477
428 ++fdchangecnt; 478 ++fdchangecnt;
429 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
430 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
431} 481}
432 482
433static void 483static void
434fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
440 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
441 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);
442 } 492 }
443} 493}
444 494
445static int 495inline int
446fd_valid (int fd) 496fd_valid (int fd)
447{ 497{
448#ifdef WIN32 498#ifdef _WIN32
449 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
450#else 500#else
451 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
452#endif 502#endif
453} 503}
454 504
476 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
477 return; 527 return;
478 } 528 }
479} 529}
480 530
481/* 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 */
482static void 532static void
483fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
484{ 534{
485 int fd; 535 int fd;
486 536
571} 621}
572 622
573static void 623static void
574sighandler (int signum) 624sighandler (int signum)
575{ 625{
576#if WIN32 626#if _WIN32
577 signal (signum, sighandler); 627 signal (signum, sighandler);
578#endif 628#endif
579 629
580 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
581 631
582 if (!gotsig) 632 if (!gotsig)
583 { 633 {
584 int old_errno = errno; 634 int old_errno = errno;
585 gotsig = 1; 635 gotsig = 1;
586#ifdef WIN32
587 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
588#else
589 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
590#endif
591 errno = old_errno; 637 errno = old_errno;
592 } 638 }
593} 639}
594 640
595void 641void
596ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
597{ 643{
598 WL w; 644 WL w;
599 645
600#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
601 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));
602#endif 648#endif
603 649
604 --signum; 650 --signum;
605 651
606 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
615static void 661static void
616sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
617{ 663{
618 int signum; 664 int signum;
619 665
620#ifdef WIN32
621 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
622#else
623 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
624#endif
625 gotsig = 0; 667 gotsig = 0;
626 668
627 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
628 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
629 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
630} 672}
631 673
632static 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
633siginit (EV_P) 687siginit (EV_P)
634{ 688{
635#ifndef WIN32 689 fd_intern (sigpipe [0]);
636 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
637 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
638
639 /* rather than sort out wether we really need nb, set it */
640 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
641 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
642#endif
643 691
644 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
645 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
646 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
647} 695}
648 696
649/*****************************************************************************/ 697/*****************************************************************************/
650 698
651static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
652 700
653#ifndef WIN32 701#ifndef _WIN32
654 702
655static struct ev_signal childev; 703static struct ev_signal childev;
656 704
657#ifndef WCONTINUED 705#ifndef WCONTINUED
658# define WCONTINUED 0 706# define WCONTINUED 0
679 int pid, status; 727 int pid, status;
680 728
681 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
682 { 730 {
683 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* we need to do it this way so that the callback gets called before we continue */
684 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
685 734
686 child_reap (EV_A_ sw, pid, pid, status); 735 child_reap (EV_A_ sw, pid, pid, status);
687 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
688 } 737 }
689} 738}
690 739
691#endif 740#endif
692 741
693/*****************************************************************************/ 742/*****************************************************************************/
694 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
695#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
696# include "ev_kqueue.c" 748# include "ev_kqueue.c"
697#endif 749#endif
698#if EV_USE_EPOLL 750#if EV_USE_EPOLL
699# include "ev_epoll.c" 751# include "ev_epoll.c"
719 771
720/* return true if we are running with elevated privileges and should ignore env variables */ 772/* return true if we are running with elevated privileges and should ignore env variables */
721static int 773static int
722enable_secure (void) 774enable_secure (void)
723{ 775{
724#ifdef WIN32 776#ifdef _WIN32
725 return 0; 777 return 0;
726#else 778#else
727 return getuid () != geteuid () 779 return getuid () != geteuid ()
728 || getgid () != getegid (); 780 || getgid () != getegid ();
729#endif 781#endif
730} 782}
731 783
732int 784unsigned int
733ev_method (EV_P) 785ev_supported_backends (void)
734{ 786{
735 return method; 787 unsigned int flags = 0;
736}
737 788
738static void 789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
739loop_init (EV_P_ int methods) 790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
740{ 800{
741 if (!method) 801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
820}
821
822static void
823loop_init (EV_P_ unsigned int flags)
824{
825 if (!backend)
742 { 826 {
743#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
744 { 828 {
745 struct timespec ts; 829 struct timespec ts;
746 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
751 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
752 mn_now = get_clock (); 836 mn_now = get_clock ();
753 now_floor = mn_now; 837 now_floor = mn_now;
754 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
755 839
756 if (methods == EVMETHOD_AUTO) 840 if (!(flags & EVFLAG_NOENV)
757 if (!enable_secure () && getenv ("LIBEV_METHODS")) 841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
758 methods = atoi (getenv ("LIBEV_METHODS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
759 else
760 methods = EVMETHOD_ANY;
761 844
762 method = 0; 845 if (!(flags & 0x0000ffffUL))
763#if EV_USE_WIN32 846 flags |= ev_recommended_backends ();
764 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 847
848 backend = 0;
849#if EV_USE_PORT
850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
765#endif 851#endif
766#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
767 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
768#endif 854#endif
769#if EV_USE_EPOLL 855#if EV_USE_EPOLL
770 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
771#endif 857#endif
772#if EV_USE_POLL 858#if EV_USE_POLL
773 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
774#endif 860#endif
775#if EV_USE_SELECT 861#if EV_USE_SELECT
776 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
777#endif 863#endif
778 864
779 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
780 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
781 } 867 }
782} 868}
783 869
784void 870static void
785loop_destroy (EV_P) 871loop_destroy (EV_P)
786{ 872{
787 int i; 873 int i;
788 874
789#if EV_USE_WIN32 875#if EV_USE_PORT
790 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
791#endif 877#endif
792#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
793 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
794#endif 880#endif
795#if EV_USE_EPOLL 881#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
797#endif 883#endif
798#if EV_USE_POLL 884#if EV_USE_POLL
799 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
800#endif 886#endif
801#if EV_USE_SELECT 887#if EV_USE_SELECT
802 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
803#endif 889#endif
804 890
805 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
806 array_free (pending, [i]); 892 array_free (pending, [i]);
807 893
808 /* have to use the microsoft-never-gets-it-right macro */ 894 /* have to use the microsoft-never-gets-it-right macro */
809 array_free_microshit (fdchange); 895 array_free (fdchange, EMPTY0);
810 array_free_microshit (timer); 896 array_free (timer, EMPTY0);
811#if EV_PERIODICS 897#if EV_PERIODICS
812 array_free_microshit (periodic); 898 array_free (periodic, EMPTY0);
813#endif 899#endif
814 array_free_microshit (idle); 900 array_free (idle, EMPTY0);
815 array_free_microshit (prepare); 901 array_free (prepare, EMPTY0);
816 array_free_microshit (check); 902 array_free (check, EMPTY0);
817 903
818 method = 0; 904 backend = 0;
819} 905}
820 906
821static void 907static void
822loop_fork (EV_P) 908loop_fork (EV_P)
823{ 909{
910#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
912#endif
913#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
915#endif
824#if EV_USE_EPOLL 916#if EV_USE_EPOLL
825 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
826#endif
827#if EV_USE_KQUEUE
828 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
829#endif 918#endif
830 919
831 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
832 { 921 {
833 /* default loop */ 922 /* default loop */
846 postfork = 0; 935 postfork = 0;
847} 936}
848 937
849#if EV_MULTIPLICITY 938#if EV_MULTIPLICITY
850struct ev_loop * 939struct ev_loop *
851ev_loop_new (int methods) 940ev_loop_new (unsigned int flags)
852{ 941{
853 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 942 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
854 943
855 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
856 945
857 loop_init (EV_A_ methods); 946 loop_init (EV_A_ flags);
858 947
859 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
860 return loop; 949 return loop;
861 950
862 return 0; 951 return 0;
863} 952}
864 953
877 966
878#endif 967#endif
879 968
880#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
881struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
882#else 972#else
883int 973int
974ev_default_loop (unsigned int flags)
884#endif 975#endif
885ev_default_loop (int methods)
886{ 976{
887 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
888 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
889 return 0; 979 return 0;
890 980
891 if (!default_loop) 981 if (!ev_default_loop_ptr)
892 { 982 {
893#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
895#else 985#else
896 default_loop = 1; 986 ev_default_loop_ptr = 1;
897#endif 987#endif
898 988
899 loop_init (EV_A_ methods); 989 loop_init (EV_A_ flags);
900 990
901 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
902 { 992 {
903 siginit (EV_A); 993 siginit (EV_A);
904 994
905#ifndef WIN32 995#ifndef _WIN32
906 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
907 ev_set_priority (&childev, EV_MAXPRI); 997 ev_set_priority (&childev, EV_MAXPRI);
908 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
909 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
910#endif 1000#endif
911 } 1001 }
912 else 1002 else
913 default_loop = 0; 1003 ev_default_loop_ptr = 0;
914 } 1004 }
915 1005
916 return default_loop; 1006 return ev_default_loop_ptr;
917} 1007}
918 1008
919void 1009void
920ev_default_destroy (void) 1010ev_default_destroy (void)
921{ 1011{
922#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
923 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
924#endif 1014#endif
925 1015
926#ifndef WIN32 1016#ifndef _WIN32
927 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
928 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
929#endif 1019#endif
930 1020
931 ev_ref (EV_A); /* signal watcher */ 1021 ev_ref (EV_A); /* signal watcher */
939 1029
940void 1030void
941ev_default_fork (void) 1031ev_default_fork (void)
942{ 1032{
943#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
944 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
945#endif 1035#endif
946 1036
947 if (method) 1037 if (backend)
948 postfork = 1; 1038 postfork = 1;
949} 1039}
950 1040
951/*****************************************************************************/ 1041/*****************************************************************************/
952 1042
960 return 1; 1050 return 1;
961 1051
962 return 0; 1052 return 0;
963} 1053}
964 1054
965static void 1055inline void
966call_pending (EV_P) 1056call_pending (EV_P)
967{ 1057{
968 int pri; 1058 int pri;
969 1059
970 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
971 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
972 { 1062 {
973 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
974 1064
975 if (p->w) 1065 if (expect_true (p->w))
976 { 1066 {
977 p->w->pending = 0; 1067 p->w->pending = 0;
978 EV_CB_INVOKE (p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
979 } 1069 }
980 } 1070 }
981} 1071}
982 1072
983static void 1073inline void
984timers_reify (EV_P) 1074timers_reify (EV_P)
985{ 1075{
986 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
987 { 1077 {
988 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1007 } 1097 }
1008} 1098}
1009 1099
1010#if EV_PERIODICS 1100#if EV_PERIODICS
1011static void 1101inline void
1012periodics_reify (EV_P) 1102periodics_reify (EV_P)
1013{ 1103{
1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1015 { 1105 {
1016 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
1018 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1108 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1019 1109
1020 /* first reschedule or stop timer */ 1110 /* first reschedule or stop timer */
1021 if (w->reschedule_cb) 1111 if (w->reschedule_cb)
1022 { 1112 {
1023 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1113 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1024
1025 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1114 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1026 downheap ((WT *)periodics, periodiccnt, 0); 1115 downheap ((WT *)periodics, periodiccnt, 0);
1027 } 1116 }
1028 else if (w->interval) 1117 else if (w->interval)
1029 { 1118 {
1076 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1077 return 1; 1166 return 1;
1078 } 1167 }
1079} 1168}
1080 1169
1081static void 1170inline void
1082time_update (EV_P) 1171time_update (EV_P)
1083{ 1172{
1084 int i; 1173 int i;
1085 1174
1086#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
1147ev_loop (EV_P_ int flags) 1236ev_loop (EV_P_ int flags)
1148{ 1237{
1149 double block; 1238 double block;
1150 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1239 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1151 1240
1152 do 1241 while (activecnt)
1153 { 1242 {
1154 /* queue check watchers (and execute them) */ 1243 /* queue check watchers (and execute them) */
1155 if (expect_false (preparecnt)) 1244 if (expect_false (preparecnt))
1156 { 1245 {
1157 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1246 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1185 { 1274 {
1186 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1187 1276
1188 if (timercnt) 1277 if (timercnt)
1189 { 1278 {
1190 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1191 if (block > to) block = to; 1280 if (block > to) block = to;
1192 } 1281 }
1193 1282
1194#if EV_PERIODICS 1283#if EV_PERIODICS
1195 if (periodiccnt) 1284 if (periodiccnt)
1196 { 1285 {
1197 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1198 if (block > to) block = to; 1287 if (block > to) block = to;
1199 } 1288 }
1200#endif 1289#endif
1201 1290
1202 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1203 } 1292 }
1204 1293
1205 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1206 1295
1207 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1208 time_update (EV_A); 1297 time_update (EV_A);
1209 1298
1210 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
1216 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1217 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1219 1308
1220 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1221 if (checkcnt) 1310 if (expect_false (checkcnt))
1222 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1223 1312
1224 call_pending (EV_A); 1313 call_pending (EV_A);
1314
1315 if (expect_false (loop_done))
1316 break;
1225 } 1317 }
1226 while (activecnt && !loop_done);
1227 1318
1228 if (loop_done != 2) 1319 if (loop_done != 2)
1229 loop_done = 0; 1320 loop_done = 0;
1230} 1321}
1231 1322
1291void 1382void
1292ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1293{ 1384{
1294 int fd = w->fd; 1385 int fd = w->fd;
1295 1386
1296 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1297 return; 1388 return;
1298 1389
1299 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1300 1391
1301 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
1307 1398
1308void 1399void
1309ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1310{ 1401{
1311 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1313 return; 1404 return;
1314 1405
1315 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1316 1407
1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1321} 1412}
1322 1413
1323void 1414void
1324ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1325{ 1416{
1326 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1327 return; 1418 return;
1328 1419
1329 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1330 1421
1331 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1332 1423
1333 ev_start (EV_A_ (W)w, ++timercnt); 1424 ev_start (EV_A_ (W)w, ++timercnt);
1334 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1425 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1335 timers [timercnt - 1] = w; 1426 timers [timercnt - 1] = w;
1336 upheap ((WT *)timers, timercnt - 1); 1427 upheap ((WT *)timers, timercnt - 1);
1337 1428
1338 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1429 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1339} 1430}
1340 1431
1341void 1432void
1342ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1343{ 1434{
1344 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1345 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1346 return; 1437 return;
1347 1438
1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1349 1440
1350 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1351 { 1442 {
1352 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1354 } 1445 }
1355 1446
1370 } 1461 }
1371 else 1462 else
1372 ev_timer_stop (EV_A_ w); 1463 ev_timer_stop (EV_A_ w);
1373 } 1464 }
1374 else if (w->repeat) 1465 else if (w->repeat)
1466 {
1467 w->at = w->repeat;
1375 ev_timer_start (EV_A_ w); 1468 ev_timer_start (EV_A_ w);
1469 }
1376} 1470}
1377 1471
1378#if EV_PERIODICS 1472#if EV_PERIODICS
1379void 1473void
1380ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1381{ 1475{
1382 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1383 return; 1477 return;
1384 1478
1385 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1386 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1387 else if (w->interval) 1481 else if (w->interval)
1390 /* this formula differs from the one in periodic_reify because we do not always round up */ 1484 /* this formula differs from the one in periodic_reify because we do not always round up */
1391 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1485 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1392 } 1486 }
1393 1487
1394 ev_start (EV_A_ (W)w, ++periodiccnt); 1488 ev_start (EV_A_ (W)w, ++periodiccnt);
1395 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1489 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1396 periodics [periodiccnt - 1] = w; 1490 periodics [periodiccnt - 1] = w;
1397 upheap ((WT *)periodics, periodiccnt - 1); 1491 upheap ((WT *)periodics, periodiccnt - 1);
1398 1492
1399 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1493 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1400} 1494}
1401 1495
1402void 1496void
1403ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1404{ 1498{
1405 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1406 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1407 return; 1501 return;
1408 1502
1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1410 1504
1411 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1412 { 1506 {
1413 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1415 } 1509 }
1416 1510
1427#endif 1521#endif
1428 1522
1429void 1523void
1430ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1431{ 1525{
1432 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1433 return; 1527 return;
1434 1528
1435 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1436 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1437 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
1438} 1532}
1439 1533
1440void 1534void
1441ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1442{ 1536{
1443 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1445 return; 1539 return;
1446 1540
1447 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1448 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1449} 1543}
1450 1544
1451void 1545void
1452ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1453{ 1547{
1454 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1455 return; 1549 return;
1456 1550
1457 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1458 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1459 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
1460} 1554}
1461 1555
1462void 1556void
1463ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1464{ 1558{
1465 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1466 if (ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1467 return; 1561 return;
1468 1562
1469 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1470 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1471} 1565}
1472 1566
1473void 1567void
1474ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1475{ 1569{
1476 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1477 return; 1571 return;
1478 1572
1479 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1480 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1481 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
1482} 1576}
1483 1577
1484void 1578void
1485ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1486{ 1580{
1487 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1488 if (!ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1489 return; 1583 return;
1490 1584
1491 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1492 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1493} 1587}
1498 1592
1499void 1593void
1500ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1501{ 1595{
1502#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1503 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1504#endif 1598#endif
1505 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1506 return; 1600 return;
1507 1601
1508 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1509 1603
1510 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
1511 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1605 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1512 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1606 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1513 1607
1514 if (!((WL)w)->next) 1608 if (!((WL)w)->next)
1515 { 1609 {
1516#if WIN32 1610#if _WIN32
1517 signal (w->signum, sighandler); 1611 signal (w->signum, sighandler);
1518#else 1612#else
1519 struct sigaction sa; 1613 struct sigaction sa;
1520 sa.sa_handler = sighandler; 1614 sa.sa_handler = sighandler;
1521 sigfillset (&sa.sa_mask); 1615 sigfillset (&sa.sa_mask);
1527 1621
1528void 1622void
1529ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1530{ 1624{
1531 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1532 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1533 return; 1627 return;
1534 1628
1535 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1536 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1537 1631
1541 1635
1542void 1636void
1543ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1544{ 1638{
1545#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1546 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1547#endif 1641#endif
1548 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1549 return; 1643 return;
1550 1644
1551 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1552 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1553} 1647}
1554 1648
1555void 1649void
1556ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1557{ 1651{
1558 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1559 if (!ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1560 return; 1654 return;
1561 1655
1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1563 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1564} 1658}
1601void 1695void
1602ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1603{ 1697{
1604 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1605 1699
1606 if (!once) 1700 if (expect_false (!once))
1701 {
1607 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1608 else 1703 return;
1609 { 1704 }
1705
1610 once->cb = cb; 1706 once->cb = cb;
1611 once->arg = arg; 1707 once->arg = arg;
1612 1708
1613 ev_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1614 if (fd >= 0) 1710 if (fd >= 0)
1615 { 1711 {
1616 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1617 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1618 } 1714 }
1619 1715
1620 ev_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1621 if (timeout >= 0.) 1717 if (timeout >= 0.)
1622 { 1718 {
1623 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1624 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1625 }
1626 } 1721 }
1627} 1722}
1628 1723
1629#ifdef __cplusplus 1724#ifdef __cplusplus
1630} 1725}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines