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

Comparing libev/ev.c (file contents):
Revision 1.106 by root, Mon Nov 12 01:07:50 2007 UTC vs.
Revision 1.135 by root, Sat Nov 24 06:23:27 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 cnanot 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 struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
177 210
… …
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
402 if (expect_false (!w_->cb))
403 return;
404
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 406 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 409}
374 410
375static void 411static void
… …
402 fd_event (EV_A_ fd, revents); 438 fd_event (EV_A_ fd, revents);
403} 439}
404 440
405/*****************************************************************************/ 441/*****************************************************************************/
406 442
407static void 443inline void
408fd_reify (EV_P) 444fd_reify (EV_P)
409{ 445{
410 int i; 446 int i;
411 447
412 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
… …
429 } 465 }
430#endif 466#endif
431 467
432 anfd->reify = 0; 468 anfd->reify = 0;
433 469
434 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
435 anfd->events = events; 471 anfd->events = events;
436 } 472 }
437 473
438 fdchangecnt = 0; 474 fdchangecnt = 0;
439} 475}
440 476
441static void 477static void
442fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
443{ 479{
444 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
445 return; 481 return;
446 482
447 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
448 484
449 ++fdchangecnt; 485 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 486 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 487 fdchanges [fdchangecnt - 1] = fd;
452} 488}
453 489
454static void 490static void
455fd_kill (EV_P_ int fd) 491fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 498 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
463 } 499 }
464} 500}
465 501
466static int 502inline int
467fd_valid (int fd) 503fd_valid (int fd)
468{ 504{
469#ifdef _WIN32 505#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 506 return _get_osfhandle (fd) != -1;
471#else 507#else
… …
497 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
498 return; 534 return;
499 } 535 }
500} 536}
501 537
502/* usually called after fork if method needs to re-arm all fds from scratch */ 538/* usually called after fork if backend needs to re-arm all fds from scratch */
503static void 539static void
504fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
505{ 541{
506 int fd; 542 int fd;
507 543
… …
613ev_feed_signal_event (EV_P_ int signum) 649ev_feed_signal_event (EV_P_ int signum)
614{ 650{
615 WL w; 651 WL w;
616 652
617#if EV_MULTIPLICITY 653#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 654 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
619#endif 655#endif
620 656
621 --signum; 657 --signum;
622 658
623 if (signum < 0 || signum >= signalmax) 659 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 678 ev_feed_signal_event (EV_A_ signum + 1);
643} 679}
644 680
645inline void 681static void
646fd_intern (int fd) 682fd_intern (int fd)
647{ 683{
648#ifdef _WIN32 684#ifdef _WIN32
649 int arg = 1; 685 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 686 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
698 int pid, status; 734 int pid, status;
699 735
700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
701 { 737 {
702 /* make sure we are called again until all childs have been reaped */ 738 /* make sure we are called again until all childs have been reaped */
739 /* 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); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
704 741
705 child_reap (EV_A_ sw, pid, pid, status); 742 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 */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
707 } 744 }
708} 745}
709 746
710#endif 747#endif
711 748
712/*****************************************************************************/ 749/*****************************************************************************/
713 750
751#if EV_USE_PORT
752# include "ev_port.c"
753#endif
714#if EV_USE_KQUEUE 754#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 755# include "ev_kqueue.c"
716#endif 756#endif
717#if EV_USE_EPOLL 757#if EV_USE_EPOLL
718# include "ev_epoll.c" 758# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 786 return getuid () != geteuid ()
747 || getgid () != getegid (); 787 || getgid () != getegid ();
748#endif 788#endif
749} 789}
750 790
751int 791unsigned int
752ev_method (EV_P) 792ev_supported_backends (void)
753{ 793{
754 return method; 794 unsigned int flags = 0;
755}
756 795
757static void 796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
758loop_init (EV_P_ int methods) 797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
800 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
801
802 return flags;
803}
804
805unsigned int
806ev_recommended_backends (void)
759{ 807{
760 if (!method) 808 unsigned int flags = ev_supported_backends ();
809
810#ifndef __NetBSD__
811 /* kqueue is borked on everything but netbsd apparently */
812 /* it usually doesn't work correctly on anything but sockets and pipes */
813 flags &= ~EVBACKEND_KQUEUE;
814#endif
815#ifdef __APPLE__
816 // flags &= ~EVBACKEND_KQUEUE; for documentation
817 flags &= ~EVBACKEND_POLL;
818#endif
819
820 return flags;
821}
822
823unsigned int
824ev_embeddable_backends (void)
825{
826 return EVBACKEND_EPOLL
827 | EVBACKEND_KQUEUE
828 | EVBACKEND_PORT;
829}
830
831unsigned int
832ev_backend (EV_P)
833{
834 return backend;
835}
836
837static void
838loop_init (EV_P_ unsigned int flags)
839{
840 if (!backend)
761 { 841 {
762#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
763 { 843 {
764 struct timespec ts; 844 struct timespec ts;
765 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
770 ev_rt_now = ev_time (); 850 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 851 mn_now = get_clock ();
772 now_floor = mn_now; 852 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
774 854
775 if (methods == EVMETHOD_AUTO) 855 if (!(flags & EVFLAG_NOENV)
776 if (!enable_secure () && getenv ("LIBEV_METHODS")) 856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
777 methods = atoi (getenv ("LIBEV_METHODS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
778 else
779 methods = EVMETHOD_ANY;
780 859
781 method = 0; 860 if (!(flags & 0x0000ffffUL))
861 flags |= ev_recommended_backends ();
862
863 backend = 0;
864#if EV_USE_PORT
865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
866#endif
782#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
784#endif 869#endif
785#if EV_USE_EPOLL 870#if EV_USE_EPOLL
786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
787#endif 872#endif
788#if EV_USE_POLL 873#if EV_USE_POLL
789 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
790#endif 875#endif
791#if EV_USE_SELECT 876#if EV_USE_SELECT
792 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
793#endif 878#endif
794 879
795 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
797 } 882 }
798} 883}
799 884
800void 885static void
801loop_destroy (EV_P) 886loop_destroy (EV_P)
802{ 887{
803 int i; 888 int i;
804 889
890#if EV_USE_PORT
891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
892#endif
805#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
807#endif 895#endif
808#if EV_USE_EPOLL 896#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
810#endif 898#endif
811#if EV_USE_POLL 899#if EV_USE_POLL
812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
813#endif 901#endif
814#if EV_USE_SELECT 902#if EV_USE_SELECT
815 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
816#endif 904#endif
817 905
818 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 907 array_free (pending, [i]);
820 908
821 /* have to use the microsoft-never-gets-it-right macro */ 909 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 910 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 911 array_free (timer, EMPTY0);
824#if EV_PERIODICS 912#if EV_PERIODICS
825 array_free (periodic, EMPTY); 913 array_free (periodic, EMPTY0);
826#endif 914#endif
827 array_free (idle, EMPTY); 915 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 916 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 917 array_free (check, EMPTY0);
830 918
831 method = 0; 919 backend = 0;
832} 920}
833 921
834static void 922static void
835loop_fork (EV_P) 923loop_fork (EV_P)
836{ 924{
925#if EV_USE_PORT
926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
927#endif
928#if EV_USE_KQUEUE
929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
930#endif
837#if EV_USE_EPOLL 931#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 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 933#endif
843 934
844 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
845 { 936 {
846 /* default loop */ 937 /* default loop */
… …
859 postfork = 0; 950 postfork = 0;
860} 951}
861 952
862#if EV_MULTIPLICITY 953#if EV_MULTIPLICITY
863struct ev_loop * 954struct ev_loop *
864ev_loop_new (int methods) 955ev_loop_new (unsigned int flags)
865{ 956{
866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 957 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
867 958
868 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
869 960
870 loop_init (EV_A_ methods); 961 loop_init (EV_A_ flags);
871 962
872 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
873 return loop; 964 return loop;
874 965
875 return 0; 966 return 0;
876} 967}
877 968
… …
890 981
891#endif 982#endif
892 983
893#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
894struct ev_loop * 985struct ev_loop *
986ev_default_loop_init (unsigned int flags)
895#else 987#else
896int 988int
989ev_default_loop (unsigned int flags)
897#endif 990#endif
898ev_default_loop (int methods)
899{ 991{
900 if (sigpipe [0] == sigpipe [1]) 992 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 993 if (pipe (sigpipe))
902 return 0; 994 return 0;
903 995
904 if (!default_loop) 996 if (!ev_default_loop_ptr)
905 { 997 {
906#if EV_MULTIPLICITY 998#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 999 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 1000#else
909 default_loop = 1; 1001 ev_default_loop_ptr = 1;
910#endif 1002#endif
911 1003
912 loop_init (EV_A_ methods); 1004 loop_init (EV_A_ flags);
913 1005
914 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
915 { 1007 {
916 siginit (EV_A); 1008 siginit (EV_A);
917 1009
918#ifndef _WIN32 1010#ifndef _WIN32
919 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
921 ev_signal_start (EV_A_ &childev); 1013 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1014 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 1015#endif
924 } 1016 }
925 else 1017 else
926 default_loop = 0; 1018 ev_default_loop_ptr = 0;
927 } 1019 }
928 1020
929 return default_loop; 1021 return ev_default_loop_ptr;
930} 1022}
931 1023
932void 1024void
933ev_default_destroy (void) 1025ev_default_destroy (void)
934{ 1026{
935#if EV_MULTIPLICITY 1027#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 1028 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 1029#endif
938 1030
939#ifndef _WIN32 1031#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 1032 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 1033 ev_signal_stop (EV_A_ &childev);
… …
952 1044
953void 1045void
954ev_default_fork (void) 1046ev_default_fork (void)
955{ 1047{
956#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1049 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1050#endif
959 1051
960 if (method) 1052 if (backend)
961 postfork = 1; 1053 postfork = 1;
962} 1054}
963 1055
964/*****************************************************************************/ 1056/*****************************************************************************/
965 1057
… …
973 return 1; 1065 return 1;
974 1066
975 return 0; 1067 return 0;
976} 1068}
977 1069
978static void 1070inline void
979call_pending (EV_P) 1071call_pending (EV_P)
980{ 1072{
981 int pri; 1073 int pri;
982 1074
983 for (pri = NUMPRI; pri--; ) 1075 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1076 while (pendingcnt [pri])
985 { 1077 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1078 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1079
988 if (p->w) 1080 if (expect_true (p->w))
989 { 1081 {
990 p->w->pending = 0; 1082 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
992 } 1084 }
993 } 1085 }
994} 1086}
995 1087
996static void 1088inline void
997timers_reify (EV_P) 1089timers_reify (EV_P)
998{ 1090{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1092 {
1001 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1112 }
1021} 1113}
1022 1114
1023#if EV_PERIODICS 1115#if EV_PERIODICS
1024static void 1116inline void
1025periodics_reify (EV_P) 1117periodics_reify (EV_P)
1026{ 1118{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1120 {
1029 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
… …
1031 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1123 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1032 1124
1033 /* first reschedule or stop timer */ 1125 /* first reschedule or stop timer */
1034 if (w->reschedule_cb) 1126 if (w->reschedule_cb)
1035 { 1127 {
1036 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1128 ((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)); 1129 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1039 downheap ((WT *)periodics, periodiccnt, 0); 1130 downheap ((WT *)periodics, periodiccnt, 0);
1040 } 1131 }
1041 else if (w->interval) 1132 else if (w->interval)
1042 { 1133 {
… …
1089 ev_rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1090 return 1; 1181 return 1;
1091 } 1182 }
1092} 1183}
1093 1184
1094static void 1185inline void
1095time_update (EV_P) 1186time_update (EV_P)
1096{ 1187{
1097 int i; 1188 int i;
1098 1189
1099#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
… …
1157static int loop_done; 1248static int loop_done;
1158 1249
1159void 1250void
1160ev_loop (EV_P_ int flags) 1251ev_loop (EV_P_ int flags)
1161{ 1252{
1162 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1253 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1254 ? EVUNLOOP_ONE
1255 : EVUNLOOP_CANCEL;
1164 1256
1165 do 1257 while (activecnt)
1166 { 1258 {
1167 /* queue check watchers (and execute them) */ 1259 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1260 if (expect_false (preparecnt))
1169 { 1261 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1262 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1177 1269
1178 /* update fd-related kernel structures */ 1270 /* update fd-related kernel structures */
1179 fd_reify (EV_A); 1271 fd_reify (EV_A);
1180 1272
1181 /* calculate blocking time */ 1273 /* calculate blocking time */
1274 {
1275 double block;
1182 1276
1183 /* we only need this for !monotonic clock or timers, but as we basically 1277 if (flags & EVLOOP_NONBLOCK || idlecnt)
1184 always have timers, we just calculate it always */ 1278 block = 0.; /* do not block at all */
1279 else
1280 {
1281 /* update time to cancel out callback processing overhead */
1185#if EV_USE_MONOTONIC 1282#if EV_USE_MONOTONIC
1186 if (expect_true (have_monotonic)) 1283 if (expect_true (have_monotonic))
1187 time_update_monotonic (EV_A); 1284 time_update_monotonic (EV_A);
1188 else 1285 else
1189#endif 1286#endif
1190 { 1287 {
1191 ev_rt_now = ev_time (); 1288 ev_rt_now = ev_time ();
1192 mn_now = ev_rt_now; 1289 mn_now = ev_rt_now;
1193 } 1290 }
1194 1291
1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1196 block = 0.;
1197 else
1198 {
1199 block = MAX_BLOCKTIME; 1292 block = MAX_BLOCKTIME;
1200 1293
1201 if (timercnt) 1294 if (timercnt)
1202 { 1295 {
1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1296 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1204 if (block > to) block = to; 1297 if (block > to) block = to;
1205 } 1298 }
1206 1299
1207#if EV_PERIODICS 1300#if EV_PERIODICS
1208 if (periodiccnt) 1301 if (periodiccnt)
1209 { 1302 {
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1303 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1211 if (block > to) block = to; 1304 if (block > to) block = to;
1212 } 1305 }
1213#endif 1306#endif
1214 1307
1215 if (block < 0.) block = 0.; 1308 if (expect_false (block < 0.)) block = 0.;
1216 } 1309 }
1217 1310
1218 method_poll (EV_A_ block); 1311 backend_poll (EV_A_ block);
1312 }
1219 1313
1220 /* update ev_rt_now, do magic */ 1314 /* update ev_rt_now, do magic */
1221 time_update (EV_A); 1315 time_update (EV_A);
1222 1316
1223 /* queue pending timers and reschedule them */ 1317 /* queue pending timers and reschedule them */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1323 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1324 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1325 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1326
1233 /* queue check watchers, to be executed first */ 1327 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1328 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1329 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1330
1237 call_pending (EV_A); 1331 call_pending (EV_A);
1238 }
1239 while (activecnt && !loop_done);
1240 1332
1241 if (loop_done != 2) 1333 if (expect_false (loop_done))
1242 loop_done = 0; 1334 break;
1335 }
1336
1337 if (loop_done == EVUNLOOP_ONE)
1338 loop_done = EVUNLOOP_CANCEL;
1243} 1339}
1244 1340
1245void 1341void
1246ev_unloop (EV_P_ int how) 1342ev_unloop (EV_P_ int how)
1247{ 1343{
… …
1304void 1400void
1305ev_io_start (EV_P_ struct ev_io *w) 1401ev_io_start (EV_P_ struct ev_io *w)
1306{ 1402{
1307 int fd = w->fd; 1403 int fd = w->fd;
1308 1404
1309 if (ev_is_active (w)) 1405 if (expect_false (ev_is_active (w)))
1310 return; 1406 return;
1311 1407
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1408 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1409
1314 ev_start (EV_A_ (W)w, 1); 1410 ev_start (EV_A_ (W)w, 1);
… …
1320 1416
1321void 1417void
1322ev_io_stop (EV_P_ struct ev_io *w) 1418ev_io_stop (EV_P_ struct ev_io *w)
1323{ 1419{
1324 ev_clear_pending (EV_A_ (W)w); 1420 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1421 if (expect_false (!ev_is_active (w)))
1326 return; 1422 return;
1327 1423
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1424 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329 1425
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1426 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1334} 1430}
1335 1431
1336void 1432void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1433ev_timer_start (EV_P_ struct ev_timer *w)
1338{ 1434{
1339 if (ev_is_active (w)) 1435 if (expect_false (ev_is_active (w)))
1340 return; 1436 return;
1341 1437
1342 ((WT)w)->at += mn_now; 1438 ((WT)w)->at += mn_now;
1343 1439
1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1440 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1345 1441
1346 ev_start (EV_A_ (W)w, ++timercnt); 1442 ev_start (EV_A_ (W)w, ++timercnt);
1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1443 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1348 timers [timercnt - 1] = w; 1444 timers [timercnt - 1] = w;
1349 upheap ((WT *)timers, timercnt - 1); 1445 upheap ((WT *)timers, timercnt - 1);
1350 1446
1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1447 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1352} 1448}
1353 1449
1354void 1450void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1451ev_timer_stop (EV_P_ struct ev_timer *w)
1356{ 1452{
1357 ev_clear_pending (EV_A_ (W)w); 1453 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1454 if (expect_false (!ev_is_active (w)))
1359 return; 1455 return;
1360 1456
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1457 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1458
1363 if (((W)w)->active < timercnt--) 1459 if (expect_true (((W)w)->active < timercnt--))
1364 { 1460 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1461 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1462 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1463 }
1368 1464
… …
1383 } 1479 }
1384 else 1480 else
1385 ev_timer_stop (EV_A_ w); 1481 ev_timer_stop (EV_A_ w);
1386 } 1482 }
1387 else if (w->repeat) 1483 else if (w->repeat)
1484 {
1485 w->at = w->repeat;
1388 ev_timer_start (EV_A_ w); 1486 ev_timer_start (EV_A_ w);
1487 }
1389} 1488}
1390 1489
1391#if EV_PERIODICS 1490#if EV_PERIODICS
1392void 1491void
1393ev_periodic_start (EV_P_ struct ev_periodic *w) 1492ev_periodic_start (EV_P_ struct ev_periodic *w)
1394{ 1493{
1395 if (ev_is_active (w)) 1494 if (expect_false (ev_is_active (w)))
1396 return; 1495 return;
1397 1496
1398 if (w->reschedule_cb) 1497 if (w->reschedule_cb)
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1498 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1400 else if (w->interval) 1499 else if (w->interval)
… …
1403 /* this formula differs from the one in periodic_reify because we do not always round up */ 1502 /* 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; 1503 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1405 } 1504 }
1406 1505
1407 ev_start (EV_A_ (W)w, ++periodiccnt); 1506 ev_start (EV_A_ (W)w, ++periodiccnt);
1408 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1507 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1409 periodics [periodiccnt - 1] = w; 1508 periodics [periodiccnt - 1] = w;
1410 upheap ((WT *)periodics, periodiccnt - 1); 1509 upheap ((WT *)periodics, periodiccnt - 1);
1411 1510
1412 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1511 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1413} 1512}
1414 1513
1415void 1514void
1416ev_periodic_stop (EV_P_ struct ev_periodic *w) 1515ev_periodic_stop (EV_P_ struct ev_periodic *w)
1417{ 1516{
1418 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1419 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1420 return; 1519 return;
1421 1520
1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1521 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1423 1522
1424 if (((W)w)->active < periodiccnt--) 1523 if (expect_true (((W)w)->active < periodiccnt--))
1425 { 1524 {
1426 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1525 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1526 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1428 } 1527 }
1429 1528
… …
1440#endif 1539#endif
1441 1540
1442void 1541void
1443ev_idle_start (EV_P_ struct ev_idle *w) 1542ev_idle_start (EV_P_ struct ev_idle *w)
1444{ 1543{
1445 if (ev_is_active (w)) 1544 if (expect_false (ev_is_active (w)))
1446 return; 1545 return;
1447 1546
1448 ev_start (EV_A_ (W)w, ++idlecnt); 1547 ev_start (EV_A_ (W)w, ++idlecnt);
1449 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1548 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1450 idles [idlecnt - 1] = w; 1549 idles [idlecnt - 1] = w;
1451} 1550}
1452 1551
1453void 1552void
1454ev_idle_stop (EV_P_ struct ev_idle *w) 1553ev_idle_stop (EV_P_ struct ev_idle *w)
1455{ 1554{
1456 ev_clear_pending (EV_A_ (W)w); 1555 ev_clear_pending (EV_A_ (W)w);
1457 if (!ev_is_active (w)) 1556 if (expect_false (!ev_is_active (w)))
1458 return; 1557 return;
1459 1558
1460 idles [((W)w)->active - 1] = idles [--idlecnt]; 1559 idles [((W)w)->active - 1] = idles [--idlecnt];
1461 ev_stop (EV_A_ (W)w); 1560 ev_stop (EV_A_ (W)w);
1462} 1561}
1463 1562
1464void 1563void
1465ev_prepare_start (EV_P_ struct ev_prepare *w) 1564ev_prepare_start (EV_P_ struct ev_prepare *w)
1466{ 1565{
1467 if (ev_is_active (w)) 1566 if (expect_false (ev_is_active (w)))
1468 return; 1567 return;
1469 1568
1470 ev_start (EV_A_ (W)w, ++preparecnt); 1569 ev_start (EV_A_ (W)w, ++preparecnt);
1471 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1570 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1472 prepares [preparecnt - 1] = w; 1571 prepares [preparecnt - 1] = w;
1473} 1572}
1474 1573
1475void 1574void
1476ev_prepare_stop (EV_P_ struct ev_prepare *w) 1575ev_prepare_stop (EV_P_ struct ev_prepare *w)
1477{ 1576{
1478 ev_clear_pending (EV_A_ (W)w); 1577 ev_clear_pending (EV_A_ (W)w);
1479 if (!ev_is_active (w)) 1578 if (expect_false (!ev_is_active (w)))
1480 return; 1579 return;
1481 1580
1482 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1581 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1483 ev_stop (EV_A_ (W)w); 1582 ev_stop (EV_A_ (W)w);
1484} 1583}
1485 1584
1486void 1585void
1487ev_check_start (EV_P_ struct ev_check *w) 1586ev_check_start (EV_P_ struct ev_check *w)
1488{ 1587{
1489 if (ev_is_active (w)) 1588 if (expect_false (ev_is_active (w)))
1490 return; 1589 return;
1491 1590
1492 ev_start (EV_A_ (W)w, ++checkcnt); 1591 ev_start (EV_A_ (W)w, ++checkcnt);
1493 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1592 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1494 checks [checkcnt - 1] = w; 1593 checks [checkcnt - 1] = w;
1495} 1594}
1496 1595
1497void 1596void
1498ev_check_stop (EV_P_ struct ev_check *w) 1597ev_check_stop (EV_P_ struct ev_check *w)
1499{ 1598{
1500 ev_clear_pending (EV_A_ (W)w); 1599 ev_clear_pending (EV_A_ (W)w);
1501 if (!ev_is_active (w)) 1600 if (expect_false (!ev_is_active (w)))
1502 return; 1601 return;
1503 1602
1504 checks [((W)w)->active - 1] = checks [--checkcnt]; 1603 checks [((W)w)->active - 1] = checks [--checkcnt];
1505 ev_stop (EV_A_ (W)w); 1604 ev_stop (EV_A_ (W)w);
1506} 1605}
… …
1511 1610
1512void 1611void
1513ev_signal_start (EV_P_ struct ev_signal *w) 1612ev_signal_start (EV_P_ struct ev_signal *w)
1514{ 1613{
1515#if EV_MULTIPLICITY 1614#if EV_MULTIPLICITY
1516 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1615 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1616#endif
1518 if (ev_is_active (w)) 1617 if (expect_false (ev_is_active (w)))
1519 return; 1618 return;
1520 1619
1521 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1620 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1522 1621
1523 ev_start (EV_A_ (W)w, 1); 1622 ev_start (EV_A_ (W)w, 1);
… …
1540 1639
1541void 1640void
1542ev_signal_stop (EV_P_ struct ev_signal *w) 1641ev_signal_stop (EV_P_ struct ev_signal *w)
1543{ 1642{
1544 ev_clear_pending (EV_A_ (W)w); 1643 ev_clear_pending (EV_A_ (W)w);
1545 if (!ev_is_active (w)) 1644 if (expect_false (!ev_is_active (w)))
1546 return; 1645 return;
1547 1646
1548 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1647 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1549 ev_stop (EV_A_ (W)w); 1648 ev_stop (EV_A_ (W)w);
1550 1649
… …
1554 1653
1555void 1654void
1556ev_child_start (EV_P_ struct ev_child *w) 1655ev_child_start (EV_P_ struct ev_child *w)
1557{ 1656{
1558#if EV_MULTIPLICITY 1657#if EV_MULTIPLICITY
1559 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1658 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1560#endif 1659#endif
1561 if (ev_is_active (w)) 1660 if (expect_false (ev_is_active (w)))
1562 return; 1661 return;
1563 1662
1564 ev_start (EV_A_ (W)w, 1); 1663 ev_start (EV_A_ (W)w, 1);
1565 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1664 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1566} 1665}
1567 1666
1568void 1667void
1569ev_child_stop (EV_P_ struct ev_child *w) 1668ev_child_stop (EV_P_ struct ev_child *w)
1570{ 1669{
1571 ev_clear_pending (EV_A_ (W)w); 1670 ev_clear_pending (EV_A_ (W)w);
1572 if (!ev_is_active (w)) 1671 if (expect_false (!ev_is_active (w)))
1573 return; 1672 return;
1574 1673
1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1674 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1576 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1577} 1676}
1677
1678#if EV_MULTIPLICITY
1679static void
1680embed_cb (EV_P_ struct ev_io *io, int revents)
1681{
1682 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1683
1684 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1685 ev_loop (w->loop, EVLOOP_NONBLOCK);
1686}
1687
1688void
1689ev_embed_start (EV_P_ struct ev_embed *w)
1690{
1691 if (expect_false (ev_is_active (w)))
1692 return;
1693
1694 {
1695 struct ev_loop *loop = w->loop;
1696 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1697 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1698 }
1699
1700 ev_io_start (EV_A_ &w->io);
1701 ev_start (EV_A_ (W)w, 1);
1702}
1703
1704void
1705ev_embed_stop (EV_P_ struct ev_embed *w)
1706{
1707 ev_clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w)))
1709 return;
1710
1711 ev_io_stop (EV_A_ &w->io);
1712 ev_stop (EV_A_ (W)w);
1713}
1714#endif
1578 1715
1579/*****************************************************************************/ 1716/*****************************************************************************/
1580 1717
1581struct ev_once 1718struct ev_once
1582{ 1719{
… …
1614void 1751void
1615ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1752ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1616{ 1753{
1617 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1754 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1618 1755
1619 if (!once) 1756 if (expect_false (!once))
1757 {
1620 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1758 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1621 else 1759 return;
1622 { 1760 }
1761
1623 once->cb = cb; 1762 once->cb = cb;
1624 once->arg = arg; 1763 once->arg = arg;
1625 1764
1626 ev_init (&once->io, once_cb_io); 1765 ev_init (&once->io, once_cb_io);
1627 if (fd >= 0) 1766 if (fd >= 0)
1628 { 1767 {
1629 ev_io_set (&once->io, fd, events); 1768 ev_io_set (&once->io, fd, events);
1630 ev_io_start (EV_A_ &once->io); 1769 ev_io_start (EV_A_ &once->io);
1631 } 1770 }
1632 1771
1633 ev_init (&once->to, once_cb_to); 1772 ev_init (&once->to, once_cb_to);
1634 if (timeout >= 0.) 1773 if (timeout >= 0.)
1635 { 1774 {
1636 ev_timer_set (&once->to, timeout, 0.); 1775 ev_timer_set (&once->to, timeout, 0.);
1637 ev_timer_start (EV_A_ &once->to); 1776 ev_timer_start (EV_A_ &once->to);
1638 }
1639 } 1777 }
1640} 1778}
1641 1779
1642#ifdef __cplusplus 1780#ifdef __cplusplus
1643} 1781}

Diff Legend

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