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

Comparing libev/ev.c (file contents):
Revision 1.103 by root, Mon Nov 12 00:31:08 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#endif 139#endif
101 140
102#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
103# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 142# ifdef _WIN32
143# define EV_USE_POLL 0
144# else
145# define EV_USE_POLL 1
146# endif
104#endif 147#endif
105 148
106#ifndef EV_USE_EPOLL 149#ifndef EV_USE_EPOLL
107# define EV_USE_EPOLL 0 150# define EV_USE_EPOLL 0
108#endif 151#endif
109 152
110#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
111# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
112#endif 155#endif
113 156
114#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
115# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
116#endif 159#endif
117 160
118/**/ 161/**/
119 162
120#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
… …
132#endif 175#endif
133 176
134/**/ 177/**/
135 178
136#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) */
137#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) */
138#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 */
139/*#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 */
140 183
141#ifdef EV_H 184#ifdef EV_H
142# include EV_H 185# include EV_H
143#else 186#else
144# include "ev.h" 187# include "ev.h"
145#endif 188#endif
146 189
147#if __GNUC__ >= 3 190#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline 192# define inline static inline
150#else 193#else
151# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
152# define inline static 195# define inline static
153#endif 196#endif
154 197
… …
156#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
157 200
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160 203
161#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 */
162 206
163typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
164typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
165typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
166 210
… …
246 #include "ev_vars.h" 290 #include "ev_vars.h"
247 #undef VAR 291 #undef VAR
248 }; 292 };
249 #include "ev_wrap.h" 293 #include "ev_wrap.h"
250 294
251 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
253 297
254#else 298#else
255 299
256 ev_tstamp ev_rt_now; 300 ev_tstamp ev_rt_now;
257 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
258 #include "ev_vars.h" 302 #include "ev_vars.h"
259 #undef VAR 303 #undef VAR
260 304
261 static int default_loop; 305 static int ev_default_loop_ptr;
262 306
263#endif 307#endif
264 308
265/*****************************************************************************/ 309/*****************************************************************************/
266 310
… …
299{ 343{
300 return ev_rt_now; 344 return ev_rt_now;
301} 345}
302#endif 346#endif
303 347
304#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
305 349
306#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
307 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
308 { \ 352 { \
309 int newcnt = cur; \ 353 int newcnt = cur; \
… …
347void 391void
348ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
349{ 393{
350 W w_ = (W)w; 394 W w_ = (W)w;
351 395
352 if (w_->pending) 396 if (expect_false (w_->pending))
353 { 397 {
354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return; 399 return;
356 } 400 }
357 401
402 if (expect_false (!w_->cb))
403 return;
404
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 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);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 409}
363 410
364static void 411static void
… …
391 fd_event (EV_A_ fd, revents); 438 fd_event (EV_A_ fd, revents);
392} 439}
393 440
394/*****************************************************************************/ 441/*****************************************************************************/
395 442
396static void 443inline void
397fd_reify (EV_P) 444fd_reify (EV_P)
398{ 445{
399 int i; 446 int i;
400 447
401 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
… …
418 } 465 }
419#endif 466#endif
420 467
421 anfd->reify = 0; 468 anfd->reify = 0;
422 469
423 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
424 anfd->events = events; 471 anfd->events = events;
425 } 472 }
426 473
427 fdchangecnt = 0; 474 fdchangecnt = 0;
428} 475}
429 476
430static void 477static void
431fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
432{ 479{
433 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
434 return; 481 return;
435 482
436 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
437 484
438 ++fdchangecnt; 485 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 486 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 487 fdchanges [fdchangecnt - 1] = fd;
441} 488}
442 489
443static void 490static void
444fd_kill (EV_P_ int fd) 491fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
451 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);
452 } 499 }
453} 500}
454 501
455static int 502inline int
456fd_valid (int fd) 503fd_valid (int fd)
457{ 504{
458#ifdef _WIN32 505#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 506 return _get_osfhandle (fd) != -1;
460#else 507#else
… …
486 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
487 return; 534 return;
488 } 535 }
489} 536}
490 537
491/* 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 */
492static void 539static void
493fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
494{ 541{
495 int fd; 542 int fd;
496 543
… …
602ev_feed_signal_event (EV_P_ int signum) 649ev_feed_signal_event (EV_P_ int signum)
603{ 650{
604 WL w; 651 WL w;
605 652
606#if EV_MULTIPLICITY 653#if EV_MULTIPLICITY
607 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));
608#endif 655#endif
609 656
610 --signum; 657 --signum;
611 658
612 if (signum < 0 || signum >= signalmax) 659 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 678 ev_feed_signal_event (EV_A_ signum + 1);
632} 679}
633 680
634inline void 681static void
635fd_intern (int fd) 682fd_intern (int fd)
636{ 683{
637#ifdef _WIN32 684#ifdef _WIN32
638 int arg = 1; 685 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 686 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
687 int pid, status; 734 int pid, status;
688 735
689 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
690 { 737 {
691 /* 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 */
692 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
693 741
694 child_reap (EV_A_ sw, pid, pid, status); 742 child_reap (EV_A_ sw, pid, pid, status);
695 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 */
696 } 744 }
697} 745}
698 746
699#endif 747#endif
700 748
701/*****************************************************************************/ 749/*****************************************************************************/
702 750
751#if EV_USE_PORT
752# include "ev_port.c"
753#endif
703#if EV_USE_KQUEUE 754#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 755# include "ev_kqueue.c"
705#endif 756#endif
706#if EV_USE_EPOLL 757#if EV_USE_EPOLL
707# include "ev_epoll.c" 758# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 786 return getuid () != geteuid ()
736 || getgid () != getegid (); 787 || getgid () != getegid ();
737#endif 788#endif
738} 789}
739 790
740int 791unsigned int
741ev_method (EV_P) 792ev_supported_backends (void)
742{ 793{
743 return method; 794 unsigned int flags = 0;
744}
745 795
746static void 796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
747loop_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)
748{ 807{
749 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)
750 { 841 {
751#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
752 { 843 {
753 struct timespec ts; 844 struct timespec ts;
754 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
759 ev_rt_now = ev_time (); 850 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 851 mn_now = get_clock ();
761 now_floor = mn_now; 852 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
763 854
764 if (methods == EVMETHOD_AUTO) 855 if (!(flags & EVFLAG_NOENV)
765 if (!enable_secure () && getenv ("LIBEV_METHODS")) 856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else
768 methods = EVMETHOD_ANY;
769 859
770 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
771#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
773#endif 869#endif
774#if EV_USE_EPOLL 870#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
776#endif 872#endif
777#if EV_USE_POLL 873#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
779#endif 875#endif
780#if EV_USE_SELECT 876#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
782#endif 878#endif
783 879
784 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
786 } 882 }
787} 883}
788 884
789void 885static void
790loop_destroy (EV_P) 886loop_destroy (EV_P)
791{ 887{
792 int i; 888 int i;
793 889
890#if EV_USE_PORT
891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
892#endif
794#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 895#endif
797#if EV_USE_EPOLL 896#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 898#endif
800#if EV_USE_POLL 899#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 901#endif
803#if EV_USE_SELECT 902#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 904#endif
806 905
807 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 907 array_free (pending, [i]);
809 908
810 /* have to use the microsoft-never-gets-it-right macro */ 909 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 910 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 911 array_free (timer, EMPTY0);
813#if EV_PERIODICS 912#if EV_PERIODICS
814 array_free (periodic, EMPTY); 913 array_free (periodic, EMPTY0);
815#endif 914#endif
816 array_free (idle, EMPTY); 915 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 916 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 917 array_free (check, EMPTY0);
819 918
820 method = 0; 919 backend = 0;
821} 920}
822 921
823static void 922static void
824loop_fork (EV_P) 923loop_fork (EV_P)
825{ 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
826#if EV_USE_EPOLL 931#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif 933#endif
832 934
833 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
834 { 936 {
835 /* default loop */ 937 /* default loop */
… …
848 postfork = 0; 950 postfork = 0;
849} 951}
850 952
851#if EV_MULTIPLICITY 953#if EV_MULTIPLICITY
852struct ev_loop * 954struct ev_loop *
853ev_loop_new (int methods) 955ev_loop_new (unsigned int flags)
854{ 956{
855 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));
856 958
857 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
858 960
859 loop_init (EV_A_ methods); 961 loop_init (EV_A_ flags);
860 962
861 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
862 return loop; 964 return loop;
863 965
864 return 0; 966 return 0;
865} 967}
866 968
… …
879 981
880#endif 982#endif
881 983
882#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
883struct ev_loop * 985struct ev_loop *
986ev_default_loop_init (unsigned int flags)
884#else 987#else
885int 988int
989ev_default_loop (unsigned int flags)
886#endif 990#endif
887ev_default_loop (int methods)
888{ 991{
889 if (sigpipe [0] == sigpipe [1]) 992 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 993 if (pipe (sigpipe))
891 return 0; 994 return 0;
892 995
893 if (!default_loop) 996 if (!ev_default_loop_ptr)
894 { 997 {
895#if EV_MULTIPLICITY 998#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 999 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 1000#else
898 default_loop = 1; 1001 ev_default_loop_ptr = 1;
899#endif 1002#endif
900 1003
901 loop_init (EV_A_ methods); 1004 loop_init (EV_A_ flags);
902 1005
903 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
904 { 1007 {
905 siginit (EV_A); 1008 siginit (EV_A);
906 1009
907#ifndef _WIN32 1010#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
910 ev_signal_start (EV_A_ &childev); 1013 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1014 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 1015#endif
913 } 1016 }
914 else 1017 else
915 default_loop = 0; 1018 ev_default_loop_ptr = 0;
916 } 1019 }
917 1020
918 return default_loop; 1021 return ev_default_loop_ptr;
919} 1022}
920 1023
921void 1024void
922ev_default_destroy (void) 1025ev_default_destroy (void)
923{ 1026{
924#if EV_MULTIPLICITY 1027#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1028 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1029#endif
927 1030
928#ifndef _WIN32 1031#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1032 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1033 ev_signal_stop (EV_A_ &childev);
… …
941 1044
942void 1045void
943ev_default_fork (void) 1046ev_default_fork (void)
944{ 1047{
945#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1049 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1050#endif
948 1051
949 if (method) 1052 if (backend)
950 postfork = 1; 1053 postfork = 1;
951} 1054}
952 1055
953/*****************************************************************************/ 1056/*****************************************************************************/
954 1057
… …
962 return 1; 1065 return 1;
963 1066
964 return 0; 1067 return 0;
965} 1068}
966 1069
967static void 1070inline void
968call_pending (EV_P) 1071call_pending (EV_P)
969{ 1072{
970 int pri; 1073 int pri;
971 1074
972 for (pri = NUMPRI; pri--; ) 1075 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1076 while (pendingcnt [pri])
974 { 1077 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1078 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1079
977 if (p->w) 1080 if (expect_true (p->w))
978 { 1081 {
979 p->w->pending = 0; 1082 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
981 } 1084 }
982 } 1085 }
983} 1086}
984 1087
985static void 1088inline void
986timers_reify (EV_P) 1089timers_reify (EV_P)
987{ 1090{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1092 {
990 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1112 }
1010} 1113}
1011 1114
1012#if EV_PERIODICS 1115#if EV_PERIODICS
1013static void 1116inline void
1014periodics_reify (EV_P) 1117periodics_reify (EV_P)
1015{ 1118{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1120 {
1018 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1123 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1124
1022 /* first reschedule or stop timer */ 1125 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1126 if (w->reschedule_cb)
1024 { 1127 {
1025 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);
1026
1027 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));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1130 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1131 }
1030 else if (w->interval) 1132 else if (w->interval)
1031 { 1133 {
… …
1078 ev_rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1079 return 1; 1181 return 1;
1080 } 1182 }
1081} 1183}
1082 1184
1083static void 1185inline void
1084time_update (EV_P) 1186time_update (EV_P)
1085{ 1187{
1086 int i; 1188 int i;
1087 1189
1088#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
… …
1146static int loop_done; 1248static int loop_done;
1147 1249
1148void 1250void
1149ev_loop (EV_P_ int flags) 1251ev_loop (EV_P_ int flags)
1150{ 1252{
1151 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1253 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1254 ? EVUNLOOP_ONE
1255 : EVUNLOOP_CANCEL;
1153 1256
1154 do 1257 while (activecnt)
1155 { 1258 {
1156 /* queue check watchers (and execute them) */ 1259 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1260 if (expect_false (preparecnt))
1158 { 1261 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1262 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1166 1269
1167 /* update fd-related kernel structures */ 1270 /* update fd-related kernel structures */
1168 fd_reify (EV_A); 1271 fd_reify (EV_A);
1169 1272
1170 /* calculate blocking time */ 1273 /* calculate blocking time */
1274 {
1275 double block;
1171 1276
1172 /* we only need this for !monotonic clock or timers, but as we basically 1277 if (flags & EVLOOP_NONBLOCK || idlecnt)
1173 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 */
1174#if EV_USE_MONOTONIC 1282#if EV_USE_MONOTONIC
1175 if (expect_true (have_monotonic)) 1283 if (expect_true (have_monotonic))
1176 time_update_monotonic (EV_A); 1284 time_update_monotonic (EV_A);
1177 else 1285 else
1178#endif 1286#endif
1179 { 1287 {
1180 ev_rt_now = ev_time (); 1288 ev_rt_now = ev_time ();
1181 mn_now = ev_rt_now; 1289 mn_now = ev_rt_now;
1182 } 1290 }
1183 1291
1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1185 block = 0.;
1186 else
1187 {
1188 block = MAX_BLOCKTIME; 1292 block = MAX_BLOCKTIME;
1189 1293
1190 if (timercnt) 1294 if (timercnt)
1191 { 1295 {
1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1296 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1193 if (block > to) block = to; 1297 if (block > to) block = to;
1194 } 1298 }
1195 1299
1196#if EV_PERIODICS 1300#if EV_PERIODICS
1197 if (periodiccnt) 1301 if (periodiccnt)
1198 { 1302 {
1199 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;
1200 if (block > to) block = to; 1304 if (block > to) block = to;
1201 } 1305 }
1202#endif 1306#endif
1203 1307
1204 if (block < 0.) block = 0.; 1308 if (expect_false (block < 0.)) block = 0.;
1205 } 1309 }
1206 1310
1207 method_poll (EV_A_ block); 1311 backend_poll (EV_A_ block);
1312 }
1208 1313
1209 /* update ev_rt_now, do magic */ 1314 /* update ev_rt_now, do magic */
1210 time_update (EV_A); 1315 time_update (EV_A);
1211 1316
1212 /* queue pending timers and reschedule them */ 1317 /* queue pending timers and reschedule them */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1323 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1324 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1325 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1326
1222 /* queue check watchers, to be executed first */ 1327 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1328 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1329 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1330
1226 call_pending (EV_A); 1331 call_pending (EV_A);
1227 }
1228 while (activecnt && !loop_done);
1229 1332
1230 if (loop_done != 2) 1333 if (expect_false (loop_done))
1231 loop_done = 0; 1334 break;
1335 }
1336
1337 if (loop_done == EVUNLOOP_ONE)
1338 loop_done = EVUNLOOP_CANCEL;
1232} 1339}
1233 1340
1234void 1341void
1235ev_unloop (EV_P_ int how) 1342ev_unloop (EV_P_ int how)
1236{ 1343{
… …
1293void 1400void
1294ev_io_start (EV_P_ struct ev_io *w) 1401ev_io_start (EV_P_ struct ev_io *w)
1295{ 1402{
1296 int fd = w->fd; 1403 int fd = w->fd;
1297 1404
1298 if (ev_is_active (w)) 1405 if (expect_false (ev_is_active (w)))
1299 return; 1406 return;
1300 1407
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1408 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1409
1303 ev_start (EV_A_ (W)w, 1); 1410 ev_start (EV_A_ (W)w, 1);
… …
1309 1416
1310void 1417void
1311ev_io_stop (EV_P_ struct ev_io *w) 1418ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1419{
1313 ev_clear_pending (EV_A_ (W)w); 1420 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1421 if (expect_false (!ev_is_active (w)))
1315 return; 1422 return;
1316 1423
1317 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));
1318 1425
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1426 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1430}
1324 1431
1325void 1432void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1433ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1434{
1328 if (ev_is_active (w)) 1435 if (expect_false (ev_is_active (w)))
1329 return; 1436 return;
1330 1437
1331 ((WT)w)->at += mn_now; 1438 ((WT)w)->at += mn_now;
1332 1439
1333 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.));
1334 1441
1335 ev_start (EV_A_ (W)w, ++timercnt); 1442 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1443 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1444 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1445 upheap ((WT *)timers, timercnt - 1);
1339 1446
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1447 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1448}
1342 1449
1343void 1450void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1451ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1452{
1346 ev_clear_pending (EV_A_ (W)w); 1453 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1454 if (expect_false (!ev_is_active (w)))
1348 return; 1455 return;
1349 1456
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1457 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1458
1352 if (((W)w)->active < timercnt--) 1459 if (expect_true (((W)w)->active < timercnt--))
1353 { 1460 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1461 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1462 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1463 }
1357 1464
… …
1372 } 1479 }
1373 else 1480 else
1374 ev_timer_stop (EV_A_ w); 1481 ev_timer_stop (EV_A_ w);
1375 } 1482 }
1376 else if (w->repeat) 1483 else if (w->repeat)
1484 {
1485 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1486 ev_timer_start (EV_A_ w);
1487 }
1378} 1488}
1379 1489
1380#if EV_PERIODICS 1490#if EV_PERIODICS
1381void 1491void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1492ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1493{
1384 if (ev_is_active (w)) 1494 if (expect_false (ev_is_active (w)))
1385 return; 1495 return;
1386 1496
1387 if (w->reschedule_cb) 1497 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1498 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1499 else if (w->interval)
… …
1392 /* 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 */
1393 ((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;
1394 } 1504 }
1395 1505
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1506 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1507 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1508 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1509 upheap ((WT *)periodics, periodiccnt - 1);
1400 1510
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1511 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1512}
1403 1513
1404void 1514void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1515ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1516{
1407 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1409 return; 1519 return;
1410 1520
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1521 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1522
1413 if (((W)w)->active < periodiccnt--) 1523 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1524 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1525 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1526 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1527 }
1418 1528
… …
1429#endif 1539#endif
1430 1540
1431void 1541void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1542ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1543{
1434 if (ev_is_active (w)) 1544 if (expect_false (ev_is_active (w)))
1435 return; 1545 return;
1436 1546
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1547 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1548 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1549 idles [idlecnt - 1] = w;
1440} 1550}
1441 1551
1442void 1552void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1553ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1554{
1445 ev_clear_pending (EV_A_ (W)w); 1555 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1556 if (expect_false (!ev_is_active (w)))
1447 return; 1557 return;
1448 1558
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1559 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1560 ev_stop (EV_A_ (W)w);
1451} 1561}
1452 1562
1453void 1563void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1564ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1565{
1456 if (ev_is_active (w)) 1566 if (expect_false (ev_is_active (w)))
1457 return; 1567 return;
1458 1568
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1569 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1570 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1571 prepares [preparecnt - 1] = w;
1462} 1572}
1463 1573
1464void 1574void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1575ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1576{
1467 ev_clear_pending (EV_A_ (W)w); 1577 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1578 if (expect_false (!ev_is_active (w)))
1469 return; 1579 return;
1470 1580
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1581 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1582 ev_stop (EV_A_ (W)w);
1473} 1583}
1474 1584
1475void 1585void
1476ev_check_start (EV_P_ struct ev_check *w) 1586ev_check_start (EV_P_ struct ev_check *w)
1477{ 1587{
1478 if (ev_is_active (w)) 1588 if (expect_false (ev_is_active (w)))
1479 return; 1589 return;
1480 1590
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1591 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1592 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1593 checks [checkcnt - 1] = w;
1484} 1594}
1485 1595
1486void 1596void
1487ev_check_stop (EV_P_ struct ev_check *w) 1597ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1598{
1489 ev_clear_pending (EV_A_ (W)w); 1599 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1600 if (expect_false (!ev_is_active (w)))
1491 return; 1601 return;
1492 1602
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1603 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1604 ev_stop (EV_A_ (W)w);
1495} 1605}
… …
1500 1610
1501void 1611void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1612ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1613{
1504#if EV_MULTIPLICITY 1614#if EV_MULTIPLICITY
1505 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));
1506#endif 1616#endif
1507 if (ev_is_active (w)) 1617 if (expect_false (ev_is_active (w)))
1508 return; 1618 return;
1509 1619
1510 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));
1511 1621
1512 ev_start (EV_A_ (W)w, 1); 1622 ev_start (EV_A_ (W)w, 1);
… …
1529 1639
1530void 1640void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1641ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1642{
1533 ev_clear_pending (EV_A_ (W)w); 1643 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1644 if (expect_false (!ev_is_active (w)))
1535 return; 1645 return;
1536 1646
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1647 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1648 ev_stop (EV_A_ (W)w);
1539 1649
… …
1543 1653
1544void 1654void
1545ev_child_start (EV_P_ struct ev_child *w) 1655ev_child_start (EV_P_ struct ev_child *w)
1546{ 1656{
1547#if EV_MULTIPLICITY 1657#if EV_MULTIPLICITY
1548 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));
1549#endif 1659#endif
1550 if (ev_is_active (w)) 1660 if (expect_false (ev_is_active (w)))
1551 return; 1661 return;
1552 1662
1553 ev_start (EV_A_ (W)w, 1); 1663 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1664 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1665}
1556 1666
1557void 1667void
1558ev_child_stop (EV_P_ struct ev_child *w) 1668ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1669{
1560 ev_clear_pending (EV_A_ (W)w); 1670 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1671 if (expect_false (!ev_is_active (w)))
1562 return; 1672 return;
1563 1673
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1674 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1566} 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
1567 1715
1568/*****************************************************************************/ 1716/*****************************************************************************/
1569 1717
1570struct ev_once 1718struct ev_once
1571{ 1719{
… …
1603void 1751void
1604ev_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)
1605{ 1753{
1606 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));
1607 1755
1608 if (!once) 1756 if (expect_false (!once))
1757 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1758 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1759 return;
1611 { 1760 }
1761
1612 once->cb = cb; 1762 once->cb = cb;
1613 once->arg = arg; 1763 once->arg = arg;
1614 1764
1615 ev_init (&once->io, once_cb_io); 1765 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1766 if (fd >= 0)
1617 { 1767 {
1618 ev_io_set (&once->io, fd, events); 1768 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1769 ev_io_start (EV_A_ &once->io);
1620 } 1770 }
1621 1771
1622 ev_init (&once->to, once_cb_to); 1772 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1773 if (timeout >= 0.)
1624 { 1774 {
1625 ev_timer_set (&once->to, timeout, 0.); 1775 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1776 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1777 }
1629} 1778}
1630 1779
1631#ifdef __cplusplus 1780#ifdef __cplusplus
1632} 1781}

Diff Legend

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