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

Comparing libev/ev.c (file contents):
Revision 1.107 by root, Mon Nov 12 01:20:25 2007 UTC vs.
Revision 1.137 by root, Sat Nov 24 08:28:10 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
62# endif 97# endif
63 98
64#endif 99#endif
65 100
66#include <math.h> 101#include <math.h>
… …
90#endif 125#endif
91 126
92/**/ 127/**/
93 128
94#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
96#endif 135#endif
97 136
98#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 139#endif
102 140
103#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
104# ifdef _WIN32 142# ifdef _WIN32
105# define EV_USE_POLL 0 143# define EV_USE_POLL 0
… …
114 152
115#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
117#endif 155#endif
118 156
119#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
121#endif 159#endif
122 160
123/**/ 161/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 162
131#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
134#endif 166#endif
… …
143#endif 175#endif
144 176
145/**/ 177/**/
146 178
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 183
152#ifdef EV_H 184#ifdef EV_H
153# include EV_H 185# include EV_H
154#else 186#else
155# include "ev.h" 187# include "ev.h"
156#endif 188#endif
157 189
158#if __GNUC__ >= 3 190#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 192# define inline static inline
161#else 193#else
162# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
163# define inline static 195# define inline static
164#endif 196#endif
165 197
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
168 200
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 203
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
173 206
174typedef struct ev_watcher *W; 207typedef ev_watcher *W;
175typedef struct ev_watcher_list *WL; 208typedef ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 209typedef ev_watcher_time *WT;
177 210
178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
179 212
180#ifdef _WIN32 213#ifdef _WIN32
181# include "ev_win32.c" 214# include "ev_win32.c"
… …
257 #include "ev_vars.h" 290 #include "ev_vars.h"
258 #undef VAR 291 #undef VAR
259 }; 292 };
260 #include "ev_wrap.h" 293 #include "ev_wrap.h"
261 294
262 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
264 297
265#else 298#else
266 299
267 ev_tstamp ev_rt_now; 300 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 302 #include "ev_vars.h"
270 #undef VAR 303 #undef VAR
271 304
272 static int default_loop; 305 static int ev_default_loop_ptr;
273 306
274#endif 307#endif
275 308
276/*****************************************************************************/ 309/*****************************************************************************/
277 310
… …
310{ 343{
311 return ev_rt_now; 344 return ev_rt_now;
312} 345}
313#endif 346#endif
314 347
315#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
316 349
317#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
318 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
319 { \ 352 { \
320 int newcnt = cur; \ 353 int newcnt = cur; \
… …
358void 391void
359ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
360{ 393{
361 W w_ = (W)w; 394 W w_ = (W)w;
362 395
363 if (w_->pending) 396 if (expect_false (w_->pending))
364 { 397 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 399 return;
367 } 400 }
368 401
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 406}
374 407
375static void 408static void
… …
383 416
384inline void 417inline void
385fd_event (EV_P_ int fd, int revents) 418fd_event (EV_P_ int fd, int revents)
386{ 419{
387 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
388 struct ev_io *w; 421 ev_io *w;
389 422
390 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 423 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
391 { 424 {
392 int ev = w->events & revents; 425 int ev = w->events & revents;
393 426
394 if (ev) 427 if (ev)
395 ev_feed_event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
… …
402 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
403} 436}
404 437
405/*****************************************************************************/ 438/*****************************************************************************/
406 439
407static void 440inline void
408fd_reify (EV_P) 441fd_reify (EV_P)
409{ 442{
410 int i; 443 int i;
411 444
412 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
413 { 446 {
414 int fd = fdchanges [i]; 447 int fd = fdchanges [i];
415 ANFD *anfd = anfds + fd; 448 ANFD *anfd = anfds + fd;
416 struct ev_io *w; 449 ev_io *w;
417 450
418 int events = 0; 451 int events = 0;
419 452
420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 453 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
421 events |= w->events; 454 events |= w->events;
422 455
423#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
424 if (events) 457 if (events)
425 { 458 {
… …
429 } 462 }
430#endif 463#endif
431 464
432 anfd->reify = 0; 465 anfd->reify = 0;
433 466
434 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
435 anfd->events = events; 468 anfd->events = events;
436 } 469 }
437 470
438 fdchangecnt = 0; 471 fdchangecnt = 0;
439} 472}
440 473
441static void 474static void
442fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
443{ 476{
444 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
445 return; 478 return;
446 479
447 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
448 481
449 ++fdchangecnt; 482 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
452} 485}
453 486
454static void 487static void
455fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
456{ 489{
457 struct ev_io *w; 490 ev_io *w;
458 491
459 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (ev_io *)anfds [fd].head))
460 { 493 {
461 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
463 } 496 }
464} 497}
465 498
466static int 499inline int
467fd_valid (int fd) 500fd_valid (int fd)
468{ 501{
469#ifdef _WIN32 502#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
471#else 504#else
… …
497 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
498 return; 531 return;
499 } 532 }
500} 533}
501 534
502/* usually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
503static void 536static void
504fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
505{ 538{
506 int fd; 539 int fd;
507 540
… …
575static ANSIG *signals; 608static ANSIG *signals;
576static int signalmax; 609static int signalmax;
577 610
578static int sigpipe [2]; 611static int sigpipe [2];
579static sig_atomic_t volatile gotsig; 612static sig_atomic_t volatile gotsig;
580static struct ev_io sigev; 613static ev_io sigev;
581 614
582static void 615static void
583signals_init (ANSIG *base, int count) 616signals_init (ANSIG *base, int count)
584{ 617{
585 while (count--) 618 while (count--)
… …
613ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
614{ 647{
615 WL w; 648 WL w;
616 649
617#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
619#endif 652#endif
620 653
621 --signum; 654 --signum;
622 655
623 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
628 for (w = signals [signum].head; w; w = w->next) 661 for (w = signals [signum].head; w; w = w->next)
629 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
630} 663}
631 664
632static void 665static void
633sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ ev_io *iow, int revents)
634{ 667{
635 int signum; 668 int signum;
636 669
637 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
638 gotsig = 0; 671 gotsig = 0;
… …
640 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
643} 676}
644 677
645inline void 678static void
646fd_intern (int fd) 679fd_intern (int fd)
647{ 680{
648#ifdef _WIN32 681#ifdef _WIN32
649 int arg = 1; 682 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
665 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
666} 699}
667 700
668/*****************************************************************************/ 701/*****************************************************************************/
669 702
670static struct ev_child *childs [PID_HASHSIZE]; 703static ev_child *childs [PID_HASHSIZE];
671 704
672#ifndef _WIN32 705#ifndef _WIN32
673 706
674static struct ev_signal childev; 707static ev_signal childev;
675 708
676#ifndef WCONTINUED 709#ifndef WCONTINUED
677# define WCONTINUED 0 710# define WCONTINUED 0
678#endif 711#endif
679 712
680static void 713static void
681child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 714child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
682{ 715{
683 struct ev_child *w; 716 ev_child *w;
684 717
685 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 718 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
686 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
687 { 720 {
688 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
689 w->rpid = pid; 722 w->rpid = pid;
690 w->rstatus = status; 723 w->rstatus = status;
691 ev_feed_event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
692 } 725 }
693} 726}
694 727
695static void 728static void
696childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ ev_signal *sw, int revents)
697{ 730{
698 int pid, status; 731 int pid, status;
699 732
700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
701 { 734 {
702 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
703 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
704 738
705 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
706 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
707 } 741 }
708} 742}
709 743
710#endif 744#endif
711 745
712/*****************************************************************************/ 746/*****************************************************************************/
713 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
714#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 752# include "ev_kqueue.c"
716#endif 753#endif
717#if EV_USE_EPOLL 754#if EV_USE_EPOLL
718# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 783 return getuid () != geteuid ()
747 || getgid () != getegid (); 784 || getgid () != getegid ();
748#endif 785#endif
749} 786}
750 787
751int 788unsigned int
752ev_method (EV_P) 789ev_supported_backends (void)
753{ 790{
754 return method; 791 unsigned int flags = 0;
755}
756 792
757static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
758loop_init (EV_P_ int methods) 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_recommended_backends (void)
759{ 804{
760 if (!method) 805 unsigned int flags = ev_supported_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
820unsigned int
821ev_embeddable_backends (void)
822{
823 return EVBACKEND_EPOLL
824 | EVBACKEND_KQUEUE
825 | EVBACKEND_PORT;
826}
827
828unsigned int
829ev_backend (EV_P)
830{
831 return backend;
832}
833
834static void
835loop_init (EV_P_ unsigned int flags)
836{
837 if (!backend)
761 { 838 {
762#if EV_USE_MONOTONIC 839#if EV_USE_MONOTONIC
763 { 840 {
764 struct timespec ts; 841 struct timespec ts;
765 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 842 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
770 ev_rt_now = ev_time (); 847 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 848 mn_now = get_clock ();
772 now_floor = mn_now; 849 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 850 rtmn_diff = ev_rt_now - mn_now;
774 851
775 if (methods == EVMETHOD_AUTO) 852 if (!(flags & EVFLAG_NOENV)
776 if (!enable_secure () && getenv ("LIBEV_METHODS")) 853 && !enable_secure ()
854 && getenv ("LIBEV_FLAGS"))
777 methods = atoi (getenv ("LIBEV_METHODS")); 855 flags = atoi (getenv ("LIBEV_FLAGS"));
778 else
779 methods = EVMETHOD_ANY;
780 856
781 method = 0; 857 if (!(flags & 0x0000ffffUL))
858 flags |= ev_recommended_backends ();
859
860 backend = 0;
861#if EV_USE_PORT
862 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
863#endif
782#if EV_USE_KQUEUE 864#if EV_USE_KQUEUE
783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 865 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
784#endif 866#endif
785#if EV_USE_EPOLL 867#if EV_USE_EPOLL
786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
787#endif 869#endif
788#if EV_USE_POLL 870#if EV_USE_POLL
789 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
790#endif 872#endif
791#if EV_USE_SELECT 873#if EV_USE_SELECT
792 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
793#endif 875#endif
794 876
795 ev_init (&sigev, sigcb); 877 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 878 ev_set_priority (&sigev, EV_MAXPRI);
797 } 879 }
798} 880}
799 881
800void 882static void
801loop_destroy (EV_P) 883loop_destroy (EV_P)
802{ 884{
803 int i; 885 int i;
804 886
887#if EV_USE_PORT
888 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
889#endif
805#if EV_USE_KQUEUE 890#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 891 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
807#endif 892#endif
808#if EV_USE_EPOLL 893#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 894 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
810#endif 895#endif
811#if EV_USE_POLL 896#if EV_USE_POLL
812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 897 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
813#endif 898#endif
814#if EV_USE_SELECT 899#if EV_USE_SELECT
815 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 900 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
816#endif 901#endif
817 902
818 for (i = NUMPRI; i--; ) 903 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 904 array_free (pending, [i]);
820 905
821 /* have to use the microsoft-never-gets-it-right macro */ 906 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 907 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 908 array_free (timer, EMPTY0);
824#if EV_PERIODICS 909#if EV_PERIODICS
825 array_free (periodic, EMPTY); 910 array_free (periodic, EMPTY0);
826#endif 911#endif
827 array_free (idle, EMPTY); 912 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 913 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 914 array_free (check, EMPTY0);
830 915
831 method = 0; 916 backend = 0;
832} 917}
833 918
834static void 919static void
835loop_fork (EV_P) 920loop_fork (EV_P)
836{ 921{
922#if EV_USE_PORT
923 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
924#endif
925#if EV_USE_KQUEUE
926 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
927#endif
837#if EV_USE_EPOLL 928#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 929 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 930#endif
843 931
844 if (ev_is_active (&sigev)) 932 if (ev_is_active (&sigev))
845 { 933 {
846 /* default loop */ 934 /* default loop */
… …
859 postfork = 0; 947 postfork = 0;
860} 948}
861 949
862#if EV_MULTIPLICITY 950#if EV_MULTIPLICITY
863struct ev_loop * 951struct ev_loop *
864ev_loop_new (int methods) 952ev_loop_new (unsigned int flags)
865{ 953{
866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 954 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
867 955
868 memset (loop, 0, sizeof (struct ev_loop)); 956 memset (loop, 0, sizeof (struct ev_loop));
869 957
870 loop_init (EV_A_ methods); 958 loop_init (EV_A_ flags);
871 959
872 if (ev_method (EV_A)) 960 if (ev_backend (EV_A))
873 return loop; 961 return loop;
874 962
875 return 0; 963 return 0;
876} 964}
877 965
… …
890 978
891#endif 979#endif
892 980
893#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
894struct ev_loop * 982struct ev_loop *
983ev_default_loop_init (unsigned int flags)
895#else 984#else
896int 985int
986ev_default_loop (unsigned int flags)
897#endif 987#endif
898ev_default_loop (int methods)
899{ 988{
900 if (sigpipe [0] == sigpipe [1]) 989 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 990 if (pipe (sigpipe))
902 return 0; 991 return 0;
903 992
904 if (!default_loop) 993 if (!ev_default_loop_ptr)
905 { 994 {
906#if EV_MULTIPLICITY 995#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 996 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 997#else
909 default_loop = 1; 998 ev_default_loop_ptr = 1;
910#endif 999#endif
911 1000
912 loop_init (EV_A_ methods); 1001 loop_init (EV_A_ flags);
913 1002
914 if (ev_method (EV_A)) 1003 if (ev_backend (EV_A))
915 { 1004 {
916 siginit (EV_A); 1005 siginit (EV_A);
917 1006
918#ifndef _WIN32 1007#ifndef _WIN32
919 ev_signal_init (&childev, childcb, SIGCHLD); 1008 ev_signal_init (&childev, childcb, SIGCHLD);
… …
921 ev_signal_start (EV_A_ &childev); 1010 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1011 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 1012#endif
924 } 1013 }
925 else 1014 else
926 default_loop = 0; 1015 ev_default_loop_ptr = 0;
927 } 1016 }
928 1017
929 return default_loop; 1018 return ev_default_loop_ptr;
930} 1019}
931 1020
932void 1021void
933ev_default_destroy (void) 1022ev_default_destroy (void)
934{ 1023{
935#if EV_MULTIPLICITY 1024#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 1025 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 1026#endif
938 1027
939#ifndef _WIN32 1028#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 1029 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 1030 ev_signal_stop (EV_A_ &childev);
… …
952 1041
953void 1042void
954ev_default_fork (void) 1043ev_default_fork (void)
955{ 1044{
956#if EV_MULTIPLICITY 1045#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1046 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1047#endif
959 1048
960 if (method) 1049 if (backend)
961 postfork = 1; 1050 postfork = 1;
962} 1051}
963 1052
964/*****************************************************************************/ 1053/*****************************************************************************/
965 1054
… …
973 return 1; 1062 return 1;
974 1063
975 return 0; 1064 return 0;
976} 1065}
977 1066
978static void 1067inline void
979call_pending (EV_P) 1068call_pending (EV_P)
980{ 1069{
981 int pri; 1070 int pri;
982 1071
983 for (pri = NUMPRI; pri--; ) 1072 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1073 while (pendingcnt [pri])
985 { 1074 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1075 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1076
988 if (p->w) 1077 if (expect_true (p->w))
989 { 1078 {
990 p->w->pending = 0; 1079 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1080 EV_CB_INVOKE (p->w, p->events);
992 } 1081 }
993 } 1082 }
994} 1083}
995 1084
996static void 1085inline void
997timers_reify (EV_P) 1086timers_reify (EV_P)
998{ 1087{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1088 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1089 {
1001 struct ev_timer *w = timers [0]; 1090 ev_timer *w = timers [0];
1002 1091
1003 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1092 assert (("inactive timer on timer heap detected", ev_is_active (w)));
1004 1093
1005 /* first reschedule or stop timer */ 1094 /* first reschedule or stop timer */
1006 if (w->repeat) 1095 if (w->repeat)
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1108 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1109 }
1021} 1110}
1022 1111
1023#if EV_PERIODICS 1112#if EV_PERIODICS
1024static void 1113inline void
1025periodics_reify (EV_P) 1114periodics_reify (EV_P)
1026{ 1115{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1116 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1117 {
1029 struct ev_periodic *w = periodics [0]; 1118 ev_periodic *w = periodics [0];
1030 1119
1031 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1120 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1032 1121
1033 /* first reschedule or stop timer */ 1122 /* first reschedule or stop timer */
1034 if (w->reschedule_cb) 1123 if (w->reschedule_cb)
1035 { 1124 {
1036 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1125 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1037
1038 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1126 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1039 downheap ((WT *)periodics, periodiccnt, 0); 1127 downheap ((WT *)periodics, periodiccnt, 0);
1040 } 1128 }
1041 else if (w->interval) 1129 else if (w->interval)
1042 { 1130 {
… …
1057 int i; 1145 int i;
1058 1146
1059 /* adjust periodics after time jump */ 1147 /* adjust periodics after time jump */
1060 for (i = 0; i < periodiccnt; ++i) 1148 for (i = 0; i < periodiccnt; ++i)
1061 { 1149 {
1062 struct ev_periodic *w = periodics [i]; 1150 ev_periodic *w = periodics [i];
1063 1151
1064 if (w->reschedule_cb) 1152 if (w->reschedule_cb)
1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1153 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1066 else if (w->interval) 1154 else if (w->interval)
1067 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1155 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
… …
1089 ev_rt_now = ev_time (); 1177 ev_rt_now = ev_time ();
1090 return 1; 1178 return 1;
1091 } 1179 }
1092} 1180}
1093 1181
1094static void 1182inline void
1095time_update (EV_P) 1183time_update (EV_P)
1096{ 1184{
1097 int i; 1185 int i;
1098 1186
1099#if EV_USE_MONOTONIC 1187#if EV_USE_MONOTONIC
… …
1157static int loop_done; 1245static int loop_done;
1158 1246
1159void 1247void
1160ev_loop (EV_P_ int flags) 1248ev_loop (EV_P_ int flags)
1161{ 1249{
1162 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1250 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1251 ? EVUNLOOP_ONE
1252 : EVUNLOOP_CANCEL;
1164 1253
1165 do 1254 while (activecnt)
1166 { 1255 {
1167 /* queue check watchers (and execute them) */ 1256 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1257 if (expect_false (preparecnt))
1169 { 1258 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1259 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1177 1266
1178 /* update fd-related kernel structures */ 1267 /* update fd-related kernel structures */
1179 fd_reify (EV_A); 1268 fd_reify (EV_A);
1180 1269
1181 /* calculate blocking time */ 1270 /* calculate blocking time */
1271 {
1272 double block;
1182 1273
1183 /* we only need this for !monotonic clock or timers, but as we basically 1274 if (flags & EVLOOP_NONBLOCK || idlecnt)
1184 always have timers, we just calculate it always */ 1275 block = 0.; /* do not block at all */
1276 else
1277 {
1278 /* update time to cancel out callback processing overhead */
1185#if EV_USE_MONOTONIC 1279#if EV_USE_MONOTONIC
1186 if (expect_true (have_monotonic)) 1280 if (expect_true (have_monotonic))
1187 time_update_monotonic (EV_A); 1281 time_update_monotonic (EV_A);
1188 else 1282 else
1189#endif 1283#endif
1190 { 1284 {
1191 ev_rt_now = ev_time (); 1285 ev_rt_now = ev_time ();
1192 mn_now = ev_rt_now; 1286 mn_now = ev_rt_now;
1193 } 1287 }
1194 1288
1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1196 block = 0.;
1197 else
1198 {
1199 block = MAX_BLOCKTIME; 1289 block = MAX_BLOCKTIME;
1200 1290
1201 if (timercnt) 1291 if (timercnt)
1202 { 1292 {
1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1293 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1204 if (block > to) block = to; 1294 if (block > to) block = to;
1205 } 1295 }
1206 1296
1207#if EV_PERIODICS 1297#if EV_PERIODICS
1208 if (periodiccnt) 1298 if (periodiccnt)
1209 { 1299 {
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1300 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1211 if (block > to) block = to; 1301 if (block > to) block = to;
1212 } 1302 }
1213#endif 1303#endif
1214 1304
1215 if (block < 0.) block = 0.; 1305 if (expect_false (block < 0.)) block = 0.;
1216 } 1306 }
1217 1307
1218 method_poll (EV_A_ block); 1308 backend_poll (EV_A_ block);
1309 }
1219 1310
1220 /* update ev_rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1221 time_update (EV_A); 1312 time_update (EV_A);
1222 1313
1223 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
1224 timers_reify (EV_A); /* relative timers called last */ 1315 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS 1316#if EV_PERIODICS
1226 periodics_reify (EV_A); /* absolute timers called first */ 1317 periodics_reify (EV_A); /* absolute timers called first */
1227#endif 1318#endif
1228 1319
1229 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless other events are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1321 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1323
1233 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1325 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1327
1237 call_pending (EV_A); 1328 call_pending (EV_A);
1238 }
1239 while (activecnt && !loop_done);
1240 1329
1241 if (loop_done != 2) 1330 if (expect_false (loop_done))
1242 loop_done = 0; 1331 break;
1332 }
1333
1334 if (loop_done == EVUNLOOP_ONE)
1335 loop_done = EVUNLOOP_CANCEL;
1243} 1336}
1244 1337
1245void 1338void
1246ev_unloop (EV_P_ int how) 1339ev_unloop (EV_P_ int how)
1247{ 1340{
… …
1300} 1393}
1301 1394
1302/*****************************************************************************/ 1395/*****************************************************************************/
1303 1396
1304void 1397void
1305ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ ev_io *w)
1306{ 1399{
1307 int fd = w->fd; 1400 int fd = w->fd;
1308 1401
1309 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1310 return; 1403 return;
1311 1404
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1406
1314 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
… …
1317 1410
1318 fd_change (EV_A_ fd); 1411 fd_change (EV_A_ fd);
1319} 1412}
1320 1413
1321void 1414void
1322ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ ev_io *w)
1323{ 1416{
1324 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1326 return; 1419 return;
1327 1420
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329 1422
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1332 1425
1333 fd_change (EV_A_ w->fd); 1426 fd_change (EV_A_ w->fd);
1334} 1427}
1335 1428
1336void 1429void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ ev_timer *w)
1338{ 1431{
1339 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1340 return; 1433 return;
1341 1434
1342 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1343 1436
1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1437 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1345 1438
1346 ev_start (EV_A_ (W)w, ++timercnt); 1439 ev_start (EV_A_ (W)w, ++timercnt);
1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1440 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1348 timers [timercnt - 1] = w; 1441 timers [timercnt - 1] = w;
1349 upheap ((WT *)timers, timercnt - 1); 1442 upheap ((WT *)timers, timercnt - 1);
1350 1443
1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1444 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1352} 1445}
1353 1446
1354void 1447void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ ev_timer *w)
1356{ 1449{
1357 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1359 return; 1452 return;
1360 1453
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1455
1363 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1364 { 1457 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1460 }
1368 1461
… …
1370 1463
1371 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1372} 1465}
1373 1466
1374void 1467void
1375ev_timer_again (EV_P_ struct ev_timer *w) 1468ev_timer_again (EV_P_ ev_timer *w)
1376{ 1469{
1377 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1378 { 1471 {
1379 if (w->repeat) 1472 if (w->repeat)
1380 { 1473 {
… …
1383 } 1476 }
1384 else 1477 else
1385 ev_timer_stop (EV_A_ w); 1478 ev_timer_stop (EV_A_ w);
1386 } 1479 }
1387 else if (w->repeat) 1480 else if (w->repeat)
1481 {
1482 w->at = w->repeat;
1388 ev_timer_start (EV_A_ w); 1483 ev_timer_start (EV_A_ w);
1484 }
1389} 1485}
1390 1486
1391#if EV_PERIODICS 1487#if EV_PERIODICS
1392void 1488void
1393ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ ev_periodic *w)
1394{ 1490{
1395 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1396 return; 1492 return;
1397 1493
1398 if (w->reschedule_cb) 1494 if (w->reschedule_cb)
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1400 else if (w->interval) 1496 else if (w->interval)
… …
1403 /* this formula differs from the one in periodic_reify because we do not always round up */ 1499 /* this formula differs from the one in periodic_reify because we do not always round up */
1404 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1500 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1405 } 1501 }
1406 1502
1407 ev_start (EV_A_ (W)w, ++periodiccnt); 1503 ev_start (EV_A_ (W)w, ++periodiccnt);
1408 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1504 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1409 periodics [periodiccnt - 1] = w; 1505 periodics [periodiccnt - 1] = w;
1410 upheap ((WT *)periodics, periodiccnt - 1); 1506 upheap ((WT *)periodics, periodiccnt - 1);
1411 1507
1412 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1508 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1413} 1509}
1414 1510
1415void 1511void
1416ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ ev_periodic *w)
1417{ 1513{
1418 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1419 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1420 return; 1516 return;
1421 1517
1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1423 1519
1424 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1425 { 1521 {
1426 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1428 } 1524 }
1429 1525
1430 ev_stop (EV_A_ (W)w); 1526 ev_stop (EV_A_ (W)w);
1431} 1527}
1432 1528
1433void 1529void
1434ev_periodic_again (EV_P_ struct ev_periodic *w) 1530ev_periodic_again (EV_P_ ev_periodic *w)
1435{ 1531{
1436 /* TODO: use adjustheap and recalculation */ 1532 /* TODO: use adjustheap and recalculation */
1437 ev_periodic_stop (EV_A_ w); 1533 ev_periodic_stop (EV_A_ w);
1438 ev_periodic_start (EV_A_ w); 1534 ev_periodic_start (EV_A_ w);
1439} 1535}
1440#endif 1536#endif
1441 1537
1442void 1538void
1443ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ ev_idle *w)
1444{ 1540{
1445 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1446 return; 1542 return;
1447 1543
1448 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1449 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1545 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1450 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
1451} 1547}
1452 1548
1453void 1549void
1454ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ ev_idle *w)
1455{ 1551{
1456 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1457 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1458 return; 1554 return;
1459 1555
1460 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1461 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1462} 1558}
1463 1559
1464void 1560void
1465ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ ev_prepare *w)
1466{ 1562{
1467 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1468 return; 1564 return;
1469 1565
1470 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1471 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1567 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1472 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
1473} 1569}
1474 1570
1475void 1571void
1476ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ ev_prepare *w)
1477{ 1573{
1478 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1479 if (!ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1480 return; 1576 return;
1481 1577
1482 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1483 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1484} 1580}
1485 1581
1486void 1582void
1487ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ ev_check *w)
1488{ 1584{
1489 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1490 return; 1586 return;
1491 1587
1492 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1493 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1589 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1494 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
1495} 1591}
1496 1592
1497void 1593void
1498ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ ev_check *w)
1499{ 1595{
1500 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1501 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1502 return; 1598 return;
1503 1599
1504 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1505 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1506} 1602}
… …
1508#ifndef SA_RESTART 1604#ifndef SA_RESTART
1509# define SA_RESTART 0 1605# define SA_RESTART 0
1510#endif 1606#endif
1511 1607
1512void 1608void
1513ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ ev_signal *w)
1514{ 1610{
1515#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1516 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1612 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1613#endif
1518 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1519 return; 1615 return;
1520 1616
1521 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1617 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1522 1618
1523 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
… …
1537#endif 1633#endif
1538 } 1634 }
1539} 1635}
1540 1636
1541void 1637void
1542ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ ev_signal *w)
1543{ 1639{
1544 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1545 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1546 return; 1642 return;
1547 1643
1548 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1549 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1550 1646
1551 if (!signals [w->signum - 1].head) 1647 if (!signals [w->signum - 1].head)
1552 signal (w->signum, SIG_DFL); 1648 signal (w->signum, SIG_DFL);
1553} 1649}
1554 1650
1555void 1651void
1556ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ ev_child *w)
1557{ 1653{
1558#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1559 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1655 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1560#endif 1656#endif
1561 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1562 return; 1658 return;
1563 1659
1564 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1565 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1566} 1662}
1567 1663
1568void 1664void
1569ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ ev_child *w)
1570{ 1666{
1571 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1572 if (!ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1573 return; 1669 return;
1574 1670
1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1576 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1577} 1673}
1578 1674
1675#if EV_MULTIPLICITY
1676void
1677ev_embed_loop (EV_P_ ev_embed *w)
1678{
1679 ev_loop (w->loop, EVLOOP_NONBLOCK);
1680}
1681
1682static void
1683embed_cb (EV_P_ ev_io *io, int revents)
1684{
1685 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1686
1687 if (ev_cb (w))
1688 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1689 else
1690 ev_embed_loop (loop, w);
1691}
1692
1693void
1694ev_embed_start (EV_P_ ev_embed *w)
1695{
1696 if (expect_false (ev_is_active (w)))
1697 return;
1698
1699 {
1700 struct ev_loop *loop = w->loop;
1701 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1702 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1703 }
1704
1705 ev_set_priority (&w->io, ev_priority (w));
1706 ev_io_start (EV_A_ &w->io);
1707 ev_start (EV_A_ (W)w, 1);
1708}
1709
1710void
1711ev_embed_stop (EV_P_ ev_embed *w)
1712{
1713 ev_clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w)))
1715 return;
1716
1717 ev_io_stop (EV_A_ &w->io);
1718 ev_stop (EV_A_ (W)w);
1719}
1720#endif
1721
1579/*****************************************************************************/ 1722/*****************************************************************************/
1580 1723
1581struct ev_once 1724struct ev_once
1582{ 1725{
1583 struct ev_io io; 1726 ev_io io;
1584 struct ev_timer to; 1727 ev_timer to;
1585 void (*cb)(int revents, void *arg); 1728 void (*cb)(int revents, void *arg);
1586 void *arg; 1729 void *arg;
1587}; 1730};
1588 1731
1589static void 1732static void
… …
1598 1741
1599 cb (revents, arg); 1742 cb (revents, arg);
1600} 1743}
1601 1744
1602static void 1745static void
1603once_cb_io (EV_P_ struct ev_io *w, int revents) 1746once_cb_io (EV_P_ ev_io *w, int revents)
1604{ 1747{
1605 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1748 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1606} 1749}
1607 1750
1608static void 1751static void
1609once_cb_to (EV_P_ struct ev_timer *w, int revents) 1752once_cb_to (EV_P_ ev_timer *w, int revents)
1610{ 1753{
1611 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1754 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1612} 1755}
1613 1756
1614void 1757void
1615ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1758ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1616{ 1759{
1617 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1760 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1618 1761
1619 if (!once) 1762 if (expect_false (!once))
1763 {
1620 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1764 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1621 else 1765 return;
1622 { 1766 }
1767
1623 once->cb = cb; 1768 once->cb = cb;
1624 once->arg = arg; 1769 once->arg = arg;
1625 1770
1626 ev_init (&once->io, once_cb_io); 1771 ev_init (&once->io, once_cb_io);
1627 if (fd >= 0) 1772 if (fd >= 0)
1628 { 1773 {
1629 ev_io_set (&once->io, fd, events); 1774 ev_io_set (&once->io, fd, events);
1630 ev_io_start (EV_A_ &once->io); 1775 ev_io_start (EV_A_ &once->io);
1631 } 1776 }
1632 1777
1633 ev_init (&once->to, once_cb_to); 1778 ev_init (&once->to, once_cb_to);
1634 if (timeout >= 0.) 1779 if (timeout >= 0.)
1635 { 1780 {
1636 ev_timer_set (&once->to, timeout, 0.); 1781 ev_timer_set (&once->to, timeout, 0.);
1637 ev_timer_start (EV_A_ &once->to); 1782 ev_timer_start (EV_A_ &once->to);
1638 }
1639 } 1783 }
1640} 1784}
1641 1785
1642#ifdef __cplusplus 1786#ifdef __cplusplus
1643} 1787}

Diff Legend

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