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.133 by root, Fri Nov 23 11:32:22 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
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 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);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 406}
363 407
364static void 408static void
… …
391 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
392} 436}
393 437
394/*****************************************************************************/ 438/*****************************************************************************/
395 439
396static void 440inline void
397fd_reify (EV_P) 441fd_reify (EV_P)
398{ 442{
399 int i; 443 int i;
400 444
401 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
418 } 462 }
419#endif 463#endif
420 464
421 anfd->reify = 0; 465 anfd->reify = 0;
422 466
423 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
424 anfd->events = events; 468 anfd->events = events;
425 } 469 }
426 470
427 fdchangecnt = 0; 471 fdchangecnt = 0;
428} 472}
429 473
430static void 474static void
431fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
432{ 476{
433 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
434 return; 478 return;
435 479
436 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
437 481
438 ++fdchangecnt; 482 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
441} 485}
442 486
443static void 487static void
444fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
451 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);
452 } 496 }
453} 497}
454 498
455static int 499inline int
456fd_valid (int fd) 500fd_valid (int fd)
457{ 501{
458#ifdef _WIN32 502#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
460#else 504#else
… …
486 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
487 return; 531 return;
488 } 532 }
489} 533}
490 534
491/* 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 */
492static void 536static void
493fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
494{ 538{
495 int fd; 539 int fd;
496 540
… …
602ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
603{ 647{
604 WL w; 648 WL w;
605 649
606#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
607 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));
608#endif 652#endif
609 653
610 --signum; 654 --signum;
611 655
612 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
632} 676}
633 677
634inline void 678static void
635fd_intern (int fd) 679fd_intern (int fd)
636{ 680{
637#ifdef _WIN32 681#ifdef _WIN32
638 int arg = 1; 682 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
687 int pid, status; 731 int pid, status;
688 732
689 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
690 { 734 {
691 /* 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 */
692 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
693 738
694 child_reap (EV_A_ sw, pid, pid, status); 739 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 */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
696 } 741 }
697} 742}
698 743
699#endif 744#endif
700 745
701/*****************************************************************************/ 746/*****************************************************************************/
702 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
703#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 752# include "ev_kqueue.c"
705#endif 753#endif
706#if EV_USE_EPOLL 754#if EV_USE_EPOLL
707# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 783 return getuid () != geteuid ()
736 || getgid () != getegid (); 784 || getgid () != getegid ();
737#endif 785#endif
738} 786}
739 787
740int 788unsigned int
741ev_method (EV_P) 789ev_supported_backends (void)
742{ 790{
743 return method; 791 unsigned int flags = 0;
744}
745 792
746static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
747loop_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)
748{ 804{
749 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_backend (EV_P)
822{
823 return backend;
824}
825
826static void
827loop_init (EV_P_ unsigned int flags)
828{
829 if (!backend)
750 { 830 {
751#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
752 { 832 {
753 struct timespec ts; 833 struct timespec ts;
754 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
759 ev_rt_now = ev_time (); 839 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 840 mn_now = get_clock ();
761 now_floor = mn_now; 841 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
763 843
764 if (methods == EVMETHOD_AUTO) 844 if (!(flags & EVFLAG_NOENV)
765 if (!enable_secure () && getenv ("LIBEV_METHODS")) 845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else
768 methods = EVMETHOD_ANY;
769 848
770 method = 0; 849 if (!(flags & 0x0000ffffUL))
850 flags |= ev_recommended_backends ();
851
852 backend = 0;
853#if EV_USE_PORT
854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
855#endif
771#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
773#endif 858#endif
774#if EV_USE_EPOLL 859#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
776#endif 861#endif
777#if EV_USE_POLL 862#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
779#endif 864#endif
780#if EV_USE_SELECT 865#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
782#endif 867#endif
783 868
784 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
786 } 871 }
787} 872}
788 873
789void 874static void
790loop_destroy (EV_P) 875loop_destroy (EV_P)
791{ 876{
792 int i; 877 int i;
793 878
879#if EV_USE_PORT
880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
881#endif
794#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 884#endif
797#if EV_USE_EPOLL 885#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 887#endif
800#if EV_USE_POLL 888#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 890#endif
803#if EV_USE_SELECT 891#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 893#endif
806 894
807 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 896 array_free (pending, [i]);
809 897
810 /* have to use the microsoft-never-gets-it-right macro */ 898 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 899 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 900 array_free (timer, EMPTY0);
813#if EV_PERIODICS 901#if EV_PERIODICS
814 array_free (periodic, EMPTY); 902 array_free (periodic, EMPTY0);
815#endif 903#endif
816 array_free (idle, EMPTY); 904 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 905 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 906 array_free (check, EMPTY0);
819 907
820 method = 0; 908 backend = 0;
821} 909}
822 910
823static void 911static void
824loop_fork (EV_P) 912loop_fork (EV_P)
825{ 913{
914#if EV_USE_PORT
915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
916#endif
917#if EV_USE_KQUEUE
918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
919#endif
826#if EV_USE_EPOLL 920#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 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 922#endif
832 923
833 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
834 { 925 {
835 /* default loop */ 926 /* default loop */
… …
848 postfork = 0; 939 postfork = 0;
849} 940}
850 941
851#if EV_MULTIPLICITY 942#if EV_MULTIPLICITY
852struct ev_loop * 943struct ev_loop *
853ev_loop_new (int methods) 944ev_loop_new (unsigned int flags)
854{ 945{
855 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 946 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
856 947
857 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
858 949
859 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
860 951
861 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
862 return loop; 953 return loop;
863 954
864 return 0; 955 return 0;
865} 956}
866 957
… …
879 970
880#endif 971#endif
881 972
882#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
883struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
884#else 976#else
885int 977int
978ev_default_loop (unsigned int flags)
886#endif 979#endif
887ev_default_loop (int methods)
888{ 980{
889 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
891 return 0; 983 return 0;
892 984
893 if (!default_loop) 985 if (!ev_default_loop_ptr)
894 { 986 {
895#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 989#else
898 default_loop = 1; 990 ev_default_loop_ptr = 1;
899#endif 991#endif
900 992
901 loop_init (EV_A_ methods); 993 loop_init (EV_A_ flags);
902 994
903 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
904 { 996 {
905 siginit (EV_A); 997 siginit (EV_A);
906 998
907#ifndef _WIN32 999#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
910 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 1004#endif
913 } 1005 }
914 else 1006 else
915 default_loop = 0; 1007 ev_default_loop_ptr = 0;
916 } 1008 }
917 1009
918 return default_loop; 1010 return ev_default_loop_ptr;
919} 1011}
920 1012
921void 1013void
922ev_default_destroy (void) 1014ev_default_destroy (void)
923{ 1015{
924#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1018#endif
927 1019
928#ifndef _WIN32 1020#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
… …
941 1033
942void 1034void
943ev_default_fork (void) 1035ev_default_fork (void)
944{ 1036{
945#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1039#endif
948 1040
949 if (method) 1041 if (backend)
950 postfork = 1; 1042 postfork = 1;
951} 1043}
952 1044
953/*****************************************************************************/ 1045/*****************************************************************************/
954 1046
… …
962 return 1; 1054 return 1;
963 1055
964 return 0; 1056 return 0;
965} 1057}
966 1058
967static void 1059inline void
968call_pending (EV_P) 1060call_pending (EV_P)
969{ 1061{
970 int pri; 1062 int pri;
971 1063
972 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
974 { 1066 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1068
977 if (p->w) 1069 if (expect_true (p->w))
978 { 1070 {
979 p->w->pending = 0; 1071 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
981 } 1073 }
982 } 1074 }
983} 1075}
984 1076
985static void 1077inline void
986timers_reify (EV_P) 1078timers_reify (EV_P)
987{ 1079{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1081 {
990 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1101 }
1010} 1102}
1011 1103
1012#if EV_PERIODICS 1104#if EV_PERIODICS
1013static void 1105inline void
1014periodics_reify (EV_P) 1106periodics_reify (EV_P)
1015{ 1107{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1109 {
1018 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1112 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1113
1022 /* first reschedule or stop timer */ 1114 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1115 if (w->reschedule_cb)
1024 { 1116 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1117 ((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)); 1118 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1119 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1120 }
1030 else if (w->interval) 1121 else if (w->interval)
1031 { 1122 {
… …
1078 ev_rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1079 return 1; 1170 return 1;
1080 } 1171 }
1081} 1172}
1082 1173
1083static void 1174inline void
1084time_update (EV_P) 1175time_update (EV_P)
1085{ 1176{
1086 int i; 1177 int i;
1087 1178
1088#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
1150{ 1241{
1151 double block; 1242 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1244
1154 do 1245 while (activecnt)
1155 { 1246 {
1156 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
1158 { 1249 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1187 { 1278 {
1188 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1189 1280
1190 if (timercnt) 1281 if (timercnt)
1191 { 1282 {
1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1193 if (block > to) block = to; 1284 if (block > to) block = to;
1194 } 1285 }
1195 1286
1196#if EV_PERIODICS 1287#if EV_PERIODICS
1197 if (periodiccnt) 1288 if (periodiccnt)
1198 { 1289 {
1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1200 if (block > to) block = to; 1291 if (block > to) block = to;
1201 } 1292 }
1202#endif 1293#endif
1203 1294
1204 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1205 } 1296 }
1206 1297
1207 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1208 1299
1209 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1210 time_update (EV_A); 1301 time_update (EV_A);
1211 1302
1212 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1312
1222 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1314 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1316
1226 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1227 } 1321 }
1228 while (activecnt && !loop_done);
1229 1322
1230 if (loop_done != 2) 1323 if (loop_done != 2)
1231 loop_done = 0; 1324 loop_done = 0;
1232} 1325}
1233 1326
… …
1293void 1386void
1294ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1295{ 1388{
1296 int fd = w->fd; 1389 int fd = w->fd;
1297 1390
1298 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1299 return; 1392 return;
1300 1393
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1395
1303 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1309 1402
1310void 1403void
1311ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1405{
1313 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1315 return; 1408 return;
1316 1409
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318 1411
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1416}
1324 1417
1325void 1418void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1420{
1328 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1329 return; 1422 return;
1330 1423
1331 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1332 1425
1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1426 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1334 1427
1335 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1339 1432
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1434}
1342 1435
1343void 1436void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1438{
1346 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1348 return; 1441 return;
1349 1442
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1444
1352 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1353 { 1446 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1449 }
1357 1450
… …
1372 } 1465 }
1373 else 1466 else
1374 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1375 } 1468 }
1376 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1378} 1474}
1379 1475
1380#if EV_PERIODICS 1476#if EV_PERIODICS
1381void 1477void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1479{
1384 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1385 return; 1481 return;
1386 1482
1387 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1485 else if (w->interval)
… …
1392 /* this formula differs from the one in periodic_reify because we do not always round up */ 1488 /* 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; 1489 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1394 } 1490 }
1395 1491
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1400 1496
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1498}
1403 1499
1404void 1500void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1502{
1407 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1409 return; 1505 return;
1410 1506
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1508
1413 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1510 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1513 }
1418 1514
… …
1429#endif 1525#endif
1430 1526
1431void 1527void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1529{
1434 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1435 return; 1531 return;
1436 1532
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1440} 1536}
1441 1537
1442void 1538void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1540{
1445 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1447 return; 1543 return;
1448 1544
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1451} 1547}
1452 1548
1453void 1549void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1551{
1456 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1457 return; 1553 return;
1458 1554
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1462} 1558}
1463 1559
1464void 1560void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1562{
1467 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1469 return; 1565 return;
1470 1566
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1473} 1569}
1474 1570
1475void 1571void
1476ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1477{ 1573{
1478 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1479 return; 1575 return;
1480 1576
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1484} 1580}
1485 1581
1486void 1582void
1487ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1584{
1489 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1491 return; 1587 return;
1492 1588
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1495} 1591}
… …
1500 1596
1501void 1597void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1599{
1504#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1505 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1601 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1506#endif 1602#endif
1507 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1508 return; 1604 return;
1509 1605
1510 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1606 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1511 1607
1512 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
… …
1529 1625
1530void 1626void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1628{
1533 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1535 return; 1631 return;
1536 1632
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1539 1635
… …
1543 1639
1544void 1640void
1545ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1546{ 1642{
1547#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1548 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1644 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1549#endif 1645#endif
1550 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1551 return; 1647 return;
1552 1648
1553 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1651}
1556 1652
1557void 1653void
1558ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1655{
1560 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1562 return; 1658 return;
1563 1659
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1566} 1662}
… …
1603void 1699void
1604ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1700ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1605{ 1701{
1606 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1702 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1607 1703
1608 if (!once) 1704 if (expect_false (!once))
1705 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1707 return;
1611 { 1708 }
1709
1612 once->cb = cb; 1710 once->cb = cb;
1613 once->arg = arg; 1711 once->arg = arg;
1614 1712
1615 ev_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1714 if (fd >= 0)
1617 { 1715 {
1618 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1620 } 1718 }
1621 1719
1622 ev_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1721 if (timeout >= 0.)
1624 { 1722 {
1625 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1725 }
1629} 1726}
1630 1727
1631#ifdef __cplusplus 1728#ifdef __cplusplus
1632} 1729}

Diff Legend

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