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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.129 by root, Fri Nov 23 05:00:44 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
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
37# endif 53# endif
38 54
55# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
41# endif 61# endif
42 62
63# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
45# endif 69# endif
46 70
71# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
49# endif 77# endif
50 78
79# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# 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
53# endif 93# endif
54 94
55#endif 95#endif
56 96
57#include <math.h> 97#include <math.h>
66#include <sys/types.h> 106#include <sys/types.h>
67#include <time.h> 107#include <time.h>
68 108
69#include <signal.h> 109#include <signal.h>
70 110
71#ifndef WIN32 111#ifndef _WIN32
72# include <unistd.h> 112# include <unistd.h>
73# include <sys/time.h> 113# include <sys/time.h>
74# 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
75#endif 120# endif
121#endif
122
76/**/ 123/**/
77 124
78#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
79# 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
80#endif 131#endif
81 132
82#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
84#endif 135#endif
85 136
86#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
87# 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
88#endif 143#endif
89 144
90#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
92#endif 147#endif
93 148
94#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
96#endif 151#endif
97 152
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
110#endif 155#endif
111 156
112/**/ 157/**/
113 158
114#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 164#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 165# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 166# define EV_USE_REALTIME 0
122#endif 167#endif
123 168
169#if EV_SELECT_IS_WINSOCKET
170# include <winsock.h>
171#endif
172
124/**/ 173/**/
125 174
126#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) */
127#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) */
128#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 */
129/*#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 */
130 179
180#ifdef EV_H
181# include EV_H
182#else
131#include "ev.h" 183# include "ev.h"
184#endif
132 185
133#if __GNUC__ >= 3 186#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 188# define inline static inline
136#else 189#else
137# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
138# define inline static 191# define inline static
139#endif 192#endif
140 193
142#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
143 196
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 199
200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
202
147typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
150 206
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 207static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 208
209#ifdef _WIN32
153#include "ev_win32.c" 210# include "ev_win32.c"
211#endif
154 212
155/*****************************************************************************/ 213/*****************************************************************************/
156 214
157static void (*syserr_cb)(const char *msg); 215static void (*syserr_cb)(const char *msg);
158 216
205typedef struct 263typedef struct
206{ 264{
207 WL head; 265 WL head;
208 unsigned char events; 266 unsigned char events;
209 unsigned char reify; 267 unsigned char reify;
268#if EV_SELECT_IS_WINSOCKET
269 SOCKET handle;
270#endif
210} ANFD; 271} ANFD;
211 272
212typedef struct 273typedef struct
213{ 274{
214 W w; 275 W w;
217 278
218#if EV_MULTIPLICITY 279#if EV_MULTIPLICITY
219 280
220 struct ev_loop 281 struct ev_loop
221 { 282 {
283 ev_tstamp ev_rt_now;
284 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 285 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 286 #include "ev_vars.h"
224 #undef VAR 287 #undef VAR
225 }; 288 };
226 #include "ev_wrap.h" 289 #include "ev_wrap.h"
227 290
228 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
230 293
231#else 294#else
232 295
296 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 298 #include "ev_vars.h"
235 #undef VAR 299 #undef VAR
236 300
237 static int default_loop; 301 static int ev_default_loop_ptr;
238 302
239#endif 303#endif
240 304
241/*****************************************************************************/ 305/*****************************************************************************/
242 306
243inline ev_tstamp 307ev_tstamp
244ev_time (void) 308ev_time (void)
245{ 309{
246#if EV_USE_REALTIME 310#if EV_USE_REALTIME
247 struct timespec ts; 311 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 312 clock_gettime (CLOCK_REALTIME, &ts);
267#endif 331#endif
268 332
269 return ev_time (); 333 return ev_time ();
270} 334}
271 335
336#if EV_MULTIPLICITY
272ev_tstamp 337ev_tstamp
273ev_now (EV_P) 338ev_now (EV_P)
274{ 339{
275 return rt_now; 340 return ev_rt_now;
276} 341}
342#endif
277 343
278#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
279 345
280#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
282 { \ 348 { \
283 int newcnt = cur; \ 349 int newcnt = cur; \
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 364 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 365 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 366 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 367 }
302 368
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 369#define array_free(stem, idx) \
309 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;
310 371
311/*****************************************************************************/ 372/*****************************************************************************/
312 373
326void 387void
327ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
328{ 389{
329 W w_ = (W)w; 390 W w_ = (W)w;
330 391
331 if (w_->pending) 392 if (expect_false (w_->pending))
332 { 393 {
333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
334 return; 395 return;
335 } 396 }
336 397
337 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
338 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);
339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
341} 402}
342 403
343static void 404static void
370 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
371} 432}
372 433
373/*****************************************************************************/ 434/*****************************************************************************/
374 435
375static void 436inline void
376fd_reify (EV_P) 437fd_reify (EV_P)
377{ 438{
378 int i; 439 int i;
379 440
380 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
386 int events = 0; 447 int events = 0;
387 448
388 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)
389 events |= w->events; 450 events |= w->events;
390 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
391 anfd->reify = 0; 461 anfd->reify = 0;
392 462
393 method_modify (EV_A_ fd, anfd->events, events); 463 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 464 anfd->events = events;
395 } 465 }
398} 468}
399 469
400static void 470static void
401fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
402{ 472{
403 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
404 return; 474 return;
405 475
406 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
407 477
408 ++fdchangecnt; 478 ++fdchangecnt;
409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
410 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
411} 481}
412 482
413static void 483static void
414fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
420 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
421 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);
422 } 492 }
423} 493}
424 494
425static int 495inline int
426fd_valid (int fd) 496fd_valid (int fd)
427{ 497{
428#ifdef WIN32 498#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 499 return _get_osfhandle (fd) != -1;
430#else 500#else
431 return fcntl (fd, F_GETFD) != -1; 501 return fcntl (fd, F_GETFD) != -1;
432#endif 502#endif
433} 503}
434 504
514 584
515 heap [k] = w; 585 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 586 ((W)heap [k])->active = k + 1;
517} 587}
518 588
589inline void
590adjustheap (WT *heap, int N, int k)
591{
592 upheap (heap, k);
593 downheap (heap, N, k);
594}
595
519/*****************************************************************************/ 596/*****************************************************************************/
520 597
521typedef struct 598typedef struct
522{ 599{
523 WL head; 600 WL head;
544} 621}
545 622
546static void 623static void
547sighandler (int signum) 624sighandler (int signum)
548{ 625{
549#if WIN32 626#if _WIN32
550 signal (signum, sighandler); 627 signal (signum, sighandler);
551#endif 628#endif
552 629
553 signals [signum - 1].gotsig = 1; 630 signals [signum - 1].gotsig = 1;
554 631
555 if (!gotsig) 632 if (!gotsig)
556 { 633 {
557 int old_errno = errno; 634 int old_errno = errno;
558 gotsig = 1; 635 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 636 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 637 errno = old_errno;
565 } 638 }
566} 639}
567 640
568void 641void
569ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
570{ 643{
571 WL w; 644 WL w;
572 645
573#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
574 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));
575#endif 648#endif
576 649
577 --signum; 650 --signum;
578 651
579 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
588static void 661static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 662sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 663{
591 int signum; 664 int signum;
592 665
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 666 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 667 gotsig = 0;
599 668
600 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
603} 672}
604 673
605static 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
606siginit (EV_P) 687siginit (EV_P)
607{ 688{
608#ifndef WIN32 689 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 690 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 691
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 692 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 693 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 694 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 695}
621 696
622/*****************************************************************************/ 697/*****************************************************************************/
623 698
624static struct ev_child *childs [PID_HASHSIZE]; 699static struct ev_child *childs [PID_HASHSIZE];
625 700
626#ifndef WIN32 701#ifndef _WIN32
627 702
628static struct ev_signal childev; 703static struct ev_signal childev;
629 704
630#ifndef WCONTINUED 705#ifndef WCONTINUED
631# define WCONTINUED 0 706# define WCONTINUED 0
663 738
664#endif 739#endif
665 740
666/*****************************************************************************/ 741/*****************************************************************************/
667 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
668#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
669# include "ev_kqueue.c" 747# include "ev_kqueue.c"
670#endif 748#endif
671#if EV_USE_EPOLL 749#if EV_USE_EPOLL
672# include "ev_epoll.c" 750# include "ev_epoll.c"
692 770
693/* 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 */
694static int 772static int
695enable_secure (void) 773enable_secure (void)
696{ 774{
697#ifdef WIN32 775#ifdef _WIN32
698 return 0; 776 return 0;
699#else 777#else
700 return getuid () != geteuid () 778 return getuid () != geteuid ()
701 || getgid () != getegid (); 779 || getgid () != getegid ();
702#endif 780#endif
703} 781}
704 782
705int 783unsigned int
706ev_method (EV_P) 784ev_supported_backends (void)
707{ 785{
708 return method;
709} 786}
710 787
788unsigned int
789ev_recommended_backends (void)
790{
791 unsigned int flags;
792
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_backend (EV_P)
804{
805 unsigned int flags = ev_recommended_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
711static void 820static void
712loop_init (EV_P_ int methods) 821loop_init (EV_P_ unsigned int flags)
713{ 822{
714 if (!method) 823 if (!method)
715 { 824 {
716#if EV_USE_MONOTONIC 825#if EV_USE_MONOTONIC
717 { 826 {
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 828 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 829 have_monotonic = 1;
721 } 830 }
722#endif 831#endif
723 832
724 rt_now = ev_time (); 833 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 834 mn_now = get_clock ();
726 now_floor = mn_now; 835 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
728 837
729 if (methods == EVMETHOD_AUTO) 838 if (!(flags & EVFLAG_NOENV)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
732 else 842
733 methods = EVMETHOD_ANY; 843 if (!(flags & 0x0000ffffUL))
844 flags |= ev_recommended_backends ();
734 845
735 method = 0; 846 method = 0;
736#if EV_USE_WIN32 847#if EV_USE_PORT
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
738#endif 849#endif
739#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
741#endif 852#endif
742#if EV_USE_EPOLL 853#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
744#endif 855#endif
745#if EV_USE_POLL 856#if EV_USE_POLL
746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
747#endif 858#endif
748#if EV_USE_SELECT 859#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
750#endif 861#endif
751 862
752 ev_watcher_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
754 } 865 }
755} 866}
756 867
757void 868static void
758loop_destroy (EV_P) 869loop_destroy (EV_P)
759{ 870{
760 int i; 871 int i;
761 872
762#if EV_USE_WIN32 873#if EV_USE_PORT
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
764#endif 875#endif
765#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
767#endif 878#endif
768#if EV_USE_EPOLL 879#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
770#endif 881#endif
771#if EV_USE_POLL 882#if EV_USE_POLL
772 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
773#endif 884#endif
774#if EV_USE_SELECT 885#if EV_USE_SELECT
775 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
776#endif 887#endif
777 888
778 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 890 array_free (pending, [i]);
780 891
781 /* have to use the microsoft-never-gets-it-right macro */ 892 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 893 array_free (fdchange, EMPTY0);
783 array_free_microshit (timer); 894 array_free (timer, EMPTY0);
784 array_free_microshit (periodic); 895#if EV_PERIODICS
785 array_free_microshit (idle); 896 array_free (periodic, EMPTY0);
786 array_free_microshit (prepare); 897#endif
787 array_free_microshit (check); 898 array_free (idle, EMPTY0);
899 array_free (prepare, EMPTY0);
900 array_free (check, EMPTY0);
788 901
789 method = 0; 902 method = 0;
790} 903}
791 904
792static void 905static void
793loop_fork (EV_P) 906loop_fork (EV_P)
794{ 907{
908#if EV_USE_PORT
909 if (method == EVBACKEND_PORT ) port_fork (EV_A);
910#endif
911#if EV_USE_KQUEUE
912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
913#endif
795#if EV_USE_EPOLL 914#if EV_USE_EPOLL
796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
797#endif
798#if EV_USE_KQUEUE
799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
800#endif 916#endif
801 917
802 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
803 { 919 {
804 /* default loop */ 920 /* default loop */
817 postfork = 0; 933 postfork = 0;
818} 934}
819 935
820#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
821struct ev_loop * 937struct ev_loop *
822ev_loop_new (int methods) 938ev_loop_new (unsigned int flags)
823{ 939{
824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 940 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825 941
826 memset (loop, 0, sizeof (struct ev_loop)); 942 memset (loop, 0, sizeof (struct ev_loop));
827 943
828 loop_init (EV_A_ methods); 944 loop_init (EV_A_ flags);
829 945
830 if (ev_method (EV_A)) 946 if (ev_method (EV_A))
831 return loop; 947 return loop;
832 948
833 return 0; 949 return 0;
848 964
849#endif 965#endif
850 966
851#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
852struct ev_loop * 968struct ev_loop *
969ev_default_loop_init (unsigned int flags)
853#else 970#else
854int 971int
972ev_default_loop (unsigned int flags)
855#endif 973#endif
856ev_default_loop (int methods)
857{ 974{
858 if (sigpipe [0] == sigpipe [1]) 975 if (sigpipe [0] == sigpipe [1])
859 if (pipe (sigpipe)) 976 if (pipe (sigpipe))
860 return 0; 977 return 0;
861 978
862 if (!default_loop) 979 if (!ev_default_loop_ptr)
863 { 980 {
864#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
865 struct ev_loop *loop = default_loop = &default_loop_struct; 982 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
866#else 983#else
867 default_loop = 1; 984 ev_default_loop_ptr = 1;
868#endif 985#endif
869 986
870 loop_init (EV_A_ methods); 987 loop_init (EV_A_ flags);
871 988
872 if (ev_method (EV_A)) 989 if (ev_method (EV_A))
873 { 990 {
874 siginit (EV_A); 991 siginit (EV_A);
875 992
876#ifndef WIN32 993#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 994 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 995 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 996 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 997 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 998#endif
882 } 999 }
883 else 1000 else
884 default_loop = 0; 1001 ev_default_loop_ptr = 0;
885 } 1002 }
886 1003
887 return default_loop; 1004 return ev_default_loop_ptr;
888} 1005}
889 1006
890void 1007void
891ev_default_destroy (void) 1008ev_default_destroy (void)
892{ 1009{
893#if EV_MULTIPLICITY 1010#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 1011 struct ev_loop *loop = ev_default_loop_ptr;
895#endif 1012#endif
896 1013
897#ifndef WIN32 1014#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 1015 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 1016 ev_signal_stop (EV_A_ &childev);
900#endif 1017#endif
901 1018
902 ev_ref (EV_A); /* signal watcher */ 1019 ev_ref (EV_A); /* signal watcher */
910 1027
911void 1028void
912ev_default_fork (void) 1029ev_default_fork (void)
913{ 1030{
914#if EV_MULTIPLICITY 1031#if EV_MULTIPLICITY
915 struct ev_loop *loop = default_loop; 1032 struct ev_loop *loop = ev_default_loop_ptr;
916#endif 1033#endif
917 1034
918 if (method) 1035 if (method)
919 postfork = 1; 1036 postfork = 1;
920} 1037}
931 return 1; 1048 return 1;
932 1049
933 return 0; 1050 return 0;
934} 1051}
935 1052
936static void 1053inline void
937call_pending (EV_P) 1054call_pending (EV_P)
938{ 1055{
939 int pri; 1056 int pri;
940 1057
941 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
942 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
943 { 1060 {
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 1062
946 if (p->w) 1063 if (expect_true (p->w))
947 { 1064 {
948 p->w->pending = 0; 1065 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
950 } 1067 }
951 } 1068 }
952} 1069}
953 1070
954static void 1071inline void
955timers_reify (EV_P) 1072timers_reify (EV_P)
956{ 1073{
957 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
958 { 1075 {
959 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
962 1079
963 /* first reschedule or stop timer */ 1080 /* first reschedule or stop timer */
964 if (w->repeat) 1081 if (w->repeat)
965 { 1082 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1083 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1084
967 ((WT)w)->at = mn_now + w->repeat; 1085 ((WT)w)->at += w->repeat;
1086 if (((WT)w)->at < mn_now)
1087 ((WT)w)->at = mn_now;
1088
968 downheap ((WT *)timers, timercnt, 0); 1089 downheap ((WT *)timers, timercnt, 0);
969 } 1090 }
970 else 1091 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1092 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1093
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1095 }
975} 1096}
976 1097
977static void 1098#if EV_PERIODICS
1099inline void
978periodics_reify (EV_P) 1100periodics_reify (EV_P)
979{ 1101{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1103 {
982 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
983 1105
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1106 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1107
986 /* first reschedule or stop timer */ 1108 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1109 if (w->reschedule_cb)
988 { 1110 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1111 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1112 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1113 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1114 }
994 else if (w->interval) 1115 else if (w->interval)
995 { 1116 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1117 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1118 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1119 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1120 }
1000 else 1121 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1122 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1123
1013 for (i = 0; i < periodiccnt; ++i) 1134 for (i = 0; i < periodiccnt; ++i)
1014 { 1135 {
1015 struct ev_periodic *w = periodics [i]; 1136 struct ev_periodic *w = periodics [i];
1016 1137
1017 if (w->reschedule_cb) 1138 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1139 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1140 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1141 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1142 }
1022 1143
1023 /* now rebuild the heap */ 1144 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1145 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1146 downheap ((WT *)periodics, periodiccnt, i);
1026} 1147}
1148#endif
1027 1149
1028inline int 1150inline int
1029time_update_monotonic (EV_P) 1151time_update_monotonic (EV_P)
1030{ 1152{
1031 mn_now = get_clock (); 1153 mn_now = get_clock ();
1032 1154
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1155 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1156 {
1035 rt_now = rtmn_diff + mn_now; 1157 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1158 return 0;
1037 } 1159 }
1038 else 1160 else
1039 { 1161 {
1040 now_floor = mn_now; 1162 now_floor = mn_now;
1041 rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1042 return 1; 1164 return 1;
1043 } 1165 }
1044} 1166}
1045 1167
1046static void 1168inline void
1047time_update (EV_P) 1169time_update (EV_P)
1048{ 1170{
1049 int i; 1171 int i;
1050 1172
1051#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
1055 { 1177 {
1056 ev_tstamp odiff = rtmn_diff; 1178 ev_tstamp odiff = rtmn_diff;
1057 1179
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1180 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1181 {
1060 rtmn_diff = rt_now - mn_now; 1182 rtmn_diff = ev_rt_now - mn_now;
1061 1183
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1184 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1185 return; /* all is well */
1064 1186
1065 rt_now = ev_time (); 1187 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1188 mn_now = get_clock ();
1067 now_floor = mn_now; 1189 now_floor = mn_now;
1068 } 1190 }
1069 1191
1192# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1193 periodics_reschedule (EV_A);
1194# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1195 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1196 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1197 }
1074 } 1198 }
1075 else 1199 else
1076#endif 1200#endif
1077 { 1201 {
1078 rt_now = ev_time (); 1202 ev_rt_now = ev_time ();
1079 1203
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1204 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1205 {
1206#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1207 periodics_reschedule (EV_A);
1208#endif
1083 1209
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1210 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1211 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1212 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1213 }
1088 1214
1089 mn_now = rt_now; 1215 mn_now = ev_rt_now;
1090 } 1216 }
1091} 1217}
1092 1218
1093void 1219void
1094ev_ref (EV_P) 1220ev_ref (EV_P)
1108ev_loop (EV_P_ int flags) 1234ev_loop (EV_P_ int flags)
1109{ 1235{
1110 double block; 1236 double block;
1111 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1112 1238
1113 do 1239 while (activecnt)
1114 { 1240 {
1115 /* queue check watchers (and execute them) */ 1241 /* queue check watchers (and execute them) */
1116 if (expect_false (preparecnt)) 1242 if (expect_false (preparecnt))
1117 { 1243 {
1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1134 if (expect_true (have_monotonic)) 1260 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1261 time_update_monotonic (EV_A);
1136 else 1262 else
1137#endif 1263#endif
1138 { 1264 {
1139 rt_now = ev_time (); 1265 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1266 mn_now = ev_rt_now;
1141 } 1267 }
1142 1268
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1269 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1270 block = 0.;
1145 else 1271 else
1150 { 1276 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1277 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1278 if (block > to) block = to;
1153 } 1279 }
1154 1280
1281#if EV_PERIODICS
1155 if (periodiccnt) 1282 if (periodiccnt)
1156 { 1283 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1284 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1285 if (block > to) block = to;
1159 } 1286 }
1287#endif
1160 1288
1161 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1162 } 1290 }
1163 1291
1164 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1165 1293
1166 /* update rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1295 time_update (EV_A);
1168 1296
1169 /* queue pending timers and reschedule them */ 1297 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1298 timers_reify (EV_A); /* relative timers called last */
1299#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1300 periodics_reify (EV_A); /* absolute timers called first */
1301#endif
1172 1302
1173 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1306
1177 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1178 if (checkcnt) 1308 if (expect_false (checkcnt))
1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1180 1310
1181 call_pending (EV_A); 1311 call_pending (EV_A);
1312
1313 if (expect_false (loop_done))
1314 break;
1182 } 1315 }
1183 while (activecnt && !loop_done);
1184 1316
1185 if (loop_done != 2) 1317 if (loop_done != 2)
1186 loop_done = 0; 1318 loop_done = 0;
1187} 1319}
1188 1320
1248void 1380void
1249ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1250{ 1382{
1251 int fd = w->fd; 1383 int fd = w->fd;
1252 1384
1253 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1254 return; 1386 return;
1255 1387
1256 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1257 1389
1258 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
1264 1396
1265void 1397void
1266ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1267{ 1399{
1268 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1270 return; 1402 return;
1403
1404 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1271 1405
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1407 ev_stop (EV_A_ (W)w);
1274 1408
1275 fd_change (EV_A_ w->fd); 1409 fd_change (EV_A_ w->fd);
1276} 1410}
1277 1411
1278void 1412void
1279ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1280{ 1414{
1281 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1282 return; 1416 return;
1283 1417
1284 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1285 1419
1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1420 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1287 1421
1288 ev_start (EV_A_ (W)w, ++timercnt); 1422 ev_start (EV_A_ (W)w, ++timercnt);
1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1423 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1290 timers [timercnt - 1] = w; 1424 timers [timercnt - 1] = w;
1291 upheap ((WT *)timers, timercnt - 1); 1425 upheap ((WT *)timers, timercnt - 1);
1292 1426
1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1427 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1294} 1428}
1295 1429
1296void 1430void
1297ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1298{ 1432{
1299 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1300 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1301 return; 1435 return;
1302 1436
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1438
1305 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1306 { 1440 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1443 }
1310 1444
1311 ((WT)w)->at = w->repeat; 1445 ((WT)w)->at -= mn_now;
1312 1446
1313 ev_stop (EV_A_ (W)w); 1447 ev_stop (EV_A_ (W)w);
1314} 1448}
1315 1449
1316void 1450void
1319 if (ev_is_active (w)) 1453 if (ev_is_active (w))
1320 { 1454 {
1321 if (w->repeat) 1455 if (w->repeat)
1322 { 1456 {
1323 ((WT)w)->at = mn_now + w->repeat; 1457 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1458 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1459 }
1326 else 1460 else
1327 ev_timer_stop (EV_A_ w); 1461 ev_timer_stop (EV_A_ w);
1328 } 1462 }
1329 else if (w->repeat) 1463 else if (w->repeat)
1464 {
1465 w->at = w->repeat;
1330 ev_timer_start (EV_A_ w); 1466 ev_timer_start (EV_A_ w);
1467 }
1331} 1468}
1332 1469
1470#if EV_PERIODICS
1333void 1471void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1473{
1336 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1337 return; 1475 return;
1338 1476
1339 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1479 else if (w->interval)
1342 { 1480 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1481 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1482 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1483 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1484 }
1347 1485
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1486 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1487 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1350 periodics [periodiccnt - 1] = w; 1488 periodics [periodiccnt - 1] = w;
1351 upheap ((WT *)periodics, periodiccnt - 1); 1489 upheap ((WT *)periodics, periodiccnt - 1);
1352 1490
1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1491 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1354} 1492}
1355 1493
1356void 1494void
1357ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1358{ 1496{
1359 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1361 return; 1499 return;
1362 1500
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1502
1365 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1366 { 1504 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1507 }
1370 1508
1371 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1372} 1510}
1373 1511
1374void 1512void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1513ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1514{
1515 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1516 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1517 ev_periodic_start (EV_A_ w);
1379} 1518}
1519#endif
1380 1520
1381void 1521void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1523{
1384 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1385 return; 1525 return;
1386 1526
1387 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1389 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
1390} 1530}
1391 1531
1392void 1532void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1534{
1395 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1397 return; 1537 return;
1398 1538
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1401} 1541}
1402 1542
1403void 1543void
1404ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1405{ 1545{
1406 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1407 return; 1547 return;
1408 1548
1409 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1411 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
1412} 1552}
1413 1553
1414void 1554void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1556{
1417 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1419 return; 1559 return;
1420 1560
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1423} 1563}
1424 1564
1425void 1565void
1426ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1427{ 1567{
1428 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1429 return; 1569 return;
1430 1570
1431 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1433 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
1434} 1574}
1435 1575
1436void 1576void
1437ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1578{
1439 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1441 return; 1581 return;
1442 1582
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1445} 1585}
1450 1590
1451void 1591void
1452ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1453{ 1593{
1454#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1455 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1595 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1456#endif 1596#endif
1457 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1458 return; 1598 return;
1459 1599
1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1600 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1461 1601
1462 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1603 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1604 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1605
1466 if (!((WL)w)->next) 1606 if (!((WL)w)->next)
1467 { 1607 {
1468#if WIN32 1608#if _WIN32
1469 signal (w->signum, sighandler); 1609 signal (w->signum, sighandler);
1470#else 1610#else
1471 struct sigaction sa; 1611 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1612 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1613 sigfillset (&sa.sa_mask);
1479 1619
1480void 1620void
1481ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1482{ 1622{
1483 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1485 return; 1625 return;
1486 1626
1487 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1488 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1489 1629
1493 1633
1494void 1634void
1495ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1496{ 1636{
1497#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1498 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1638 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1639#endif
1500 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1501 return; 1641 return;
1502 1642
1503 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1504 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1505} 1645}
1506 1646
1507void 1647void
1508ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1649{
1510 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1512 return; 1652 return;
1513 1653
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1516} 1656}
1553void 1693void
1554ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1694ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1555{ 1695{
1556 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1696 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1557 1697
1558 if (!once) 1698 if (expect_false (!once))
1699 {
1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1560 else 1701 return;
1561 { 1702 }
1703
1562 once->cb = cb; 1704 once->cb = cb;
1563 once->arg = arg; 1705 once->arg = arg;
1564 1706
1565 ev_watcher_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1708 if (fd >= 0)
1567 { 1709 {
1568 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1570 } 1712 }
1571 1713
1572 ev_watcher_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1715 if (timeout >= 0.)
1574 { 1716 {
1575 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1577 }
1578 } 1719 }
1579} 1720}
1580 1721
1722#ifdef __cplusplus
1723}
1724#endif
1725

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines