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

Comparing libev/ev.c (file contents):
Revision 1.104 by root, Mon Nov 12 00:39:45 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# 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 162
125#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
… …
137#endif 175#endif
138 176
139/**/ 177/**/
140 178
141#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) */
142#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) */
143#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 */
144/*#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 */
145 183
146#ifdef EV_H 184#ifdef EV_H
147# include EV_H 185# include EV_H
148#else 186#else
149# include "ev.h" 187# include "ev.h"
150#endif 188#endif
151 189
152#if __GNUC__ >= 3 190#if __GNUC__ >= 3
153# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
154# define inline inline 192# define inline static inline
155#else 193#else
156# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
157# define inline static 195# define inline static
158#endif 196#endif
159 197
… …
161#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
162 200
163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
164#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
165 203
166#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 */
167 206
168typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
169typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
170typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
171 210
… …
251 #include "ev_vars.h" 290 #include "ev_vars.h"
252 #undef VAR 291 #undef VAR
253 }; 292 };
254 #include "ev_wrap.h" 293 #include "ev_wrap.h"
255 294
256 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
258 297
259#else 298#else
260 299
261 ev_tstamp ev_rt_now; 300 ev_tstamp ev_rt_now;
262 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
263 #include "ev_vars.h" 302 #include "ev_vars.h"
264 #undef VAR 303 #undef VAR
265 304
266 static int default_loop; 305 static int ev_default_loop_ptr;
267 306
268#endif 307#endif
269 308
270/*****************************************************************************/ 309/*****************************************************************************/
271 310
… …
304{ 343{
305 return ev_rt_now; 344 return ev_rt_now;
306} 345}
307#endif 346#endif
308 347
309#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
310 349
311#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
312 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
313 { \ 352 { \
314 int newcnt = cur; \ 353 int newcnt = cur; \
… …
352void 391void
353ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
354{ 393{
355 W w_ = (W)w; 394 W w_ = (W)w;
356 395
357 if (w_->pending) 396 if (expect_false (w_->pending))
358 { 397 {
359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
360 return; 399 return;
361 } 400 }
362 401
363 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
364 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);
365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
367} 406}
368 407
369static void 408static void
… …
396 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
397} 436}
398 437
399/*****************************************************************************/ 438/*****************************************************************************/
400 439
401static void 440inline void
402fd_reify (EV_P) 441fd_reify (EV_P)
403{ 442{
404 int i; 443 int i;
405 444
406 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
423 } 462 }
424#endif 463#endif
425 464
426 anfd->reify = 0; 465 anfd->reify = 0;
427 466
428 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
429 anfd->events = events; 468 anfd->events = events;
430 } 469 }
431 470
432 fdchangecnt = 0; 471 fdchangecnt = 0;
433} 472}
434 473
435static void 474static void
436fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
437{ 476{
438 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
439 return; 478 return;
440 479
441 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
442 481
443 ++fdchangecnt; 482 ++fdchangecnt;
444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
445 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
446} 485}
447 486
448static void 487static void
449fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
… …
455 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
456 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);
457 } 496 }
458} 497}
459 498
460static int 499inline int
461fd_valid (int fd) 500fd_valid (int fd)
462{ 501{
463#ifdef _WIN32 502#ifdef _WIN32
464 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
465#else 504#else
… …
491 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
492 return; 531 return;
493 } 532 }
494} 533}
495 534
496/* 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 */
497static void 536static void
498fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
499{ 538{
500 int fd; 539 int fd;
501 540
… …
607ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
608{ 647{
609 WL w; 648 WL w;
610 649
611#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
612 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));
613#endif 652#endif
614 653
615 --signum; 654 --signum;
616 655
617 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
634 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
635 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
636 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
637} 676}
638 677
639inline void 678static void
640fd_intern (int fd) 679fd_intern (int fd)
641{ 680{
642#ifdef _WIN32 681#ifdef _WIN32
643 int arg = 1; 682 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
692 int pid, status; 731 int pid, status;
693 732
694 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
695 { 734 {
696 /* 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 */
697 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
698 738
699 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
700 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 */
701 } 741 }
702} 742}
703 743
704#endif 744#endif
705 745
706/*****************************************************************************/ 746/*****************************************************************************/
707 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
708#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
709# include "ev_kqueue.c" 752# include "ev_kqueue.c"
710#endif 753#endif
711#if EV_USE_EPOLL 754#if EV_USE_EPOLL
712# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
740 return getuid () != geteuid () 783 return getuid () != geteuid ()
741 || getgid () != getegid (); 784 || getgid () != getegid ();
742#endif 785#endif
743} 786}
744 787
745int 788unsigned int
746ev_method (EV_P) 789ev_supported_backends (void)
747{ 790{
748 return method; 791 unsigned int flags = 0;
749}
750 792
751static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
752loop_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)
753{ 804{
754 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)
755 { 830 {
756#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
757 { 832 {
758 struct timespec ts; 833 struct timespec ts;
759 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
764 ev_rt_now = ev_time (); 839 ev_rt_now = ev_time ();
765 mn_now = get_clock (); 840 mn_now = get_clock ();
766 now_floor = mn_now; 841 now_floor = mn_now;
767 rtmn_diff = ev_rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
768 843
769 if (methods == EVMETHOD_AUTO) 844 if (!(flags & EVFLAG_NOENV)
770 if (!enable_secure () && getenv ("LIBEV_METHODS")) 845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
771 methods = atoi (getenv ("LIBEV_METHODS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
772 else
773 methods = EVMETHOD_ANY;
774 848
775 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
776#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
778#endif 858#endif
779#if EV_USE_EPOLL 859#if EV_USE_EPOLL
780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
781#endif 861#endif
782#if EV_USE_POLL 862#if EV_USE_POLL
783 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
784#endif 864#endif
785#if EV_USE_SELECT 865#if EV_USE_SELECT
786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
787#endif 867#endif
788 868
789 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
790 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
791 } 871 }
792} 872}
793 873
794void 874static void
795loop_destroy (EV_P) 875loop_destroy (EV_P)
796{ 876{
797 int i; 877 int i;
798 878
879#if EV_USE_PORT
880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
881#endif
799#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
801#endif 884#endif
802#if EV_USE_EPOLL 885#if EV_USE_EPOLL
803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
804#endif 887#endif
805#if EV_USE_POLL 888#if EV_USE_POLL
806 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
807#endif 890#endif
808#if EV_USE_SELECT 891#if EV_USE_SELECT
809 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
810#endif 893#endif
811 894
812 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
813 array_free (pending, [i]); 896 array_free (pending, [i]);
814 897
815 /* have to use the microsoft-never-gets-it-right macro */ 898 /* have to use the microsoft-never-gets-it-right macro */
816 array_free (fdchange, EMPTY); 899 array_free (fdchange, EMPTY0);
817 array_free (timer, EMPTY); 900 array_free (timer, EMPTY0);
818#if EV_PERIODICS 901#if EV_PERIODICS
819 array_free (periodic, EMPTY); 902 array_free (periodic, EMPTY0);
820#endif 903#endif
821 array_free (idle, EMPTY); 904 array_free (idle, EMPTY0);
822 array_free (prepare, EMPTY); 905 array_free (prepare, EMPTY0);
823 array_free (check, EMPTY); 906 array_free (check, EMPTY0);
824 907
825 method = 0; 908 backend = 0;
826} 909}
827 910
828static void 911static void
829loop_fork (EV_P) 912loop_fork (EV_P)
830{ 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
831#if EV_USE_EPOLL 920#if EV_USE_EPOLL
832 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
833#endif
834#if EV_USE_KQUEUE
835 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
836#endif 922#endif
837 923
838 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
839 { 925 {
840 /* default loop */ 926 /* default loop */
… …
853 postfork = 0; 939 postfork = 0;
854} 940}
855 941
856#if EV_MULTIPLICITY 942#if EV_MULTIPLICITY
857struct ev_loop * 943struct ev_loop *
858ev_loop_new (int methods) 944ev_loop_new (unsigned int flags)
859{ 945{
860 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));
861 947
862 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
863 949
864 loop_init (EV_A_ methods); 950 loop_init (EV_A_ flags);
865 951
866 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
867 return loop; 953 return loop;
868 954
869 return 0; 955 return 0;
870} 956}
871 957
… …
884 970
885#endif 971#endif
886 972
887#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
888struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
889#else 976#else
890int 977int
978ev_default_loop (unsigned int flags)
891#endif 979#endif
892ev_default_loop (int methods)
893{ 980{
894 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
895 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
896 return 0; 983 return 0;
897 984
898 if (!default_loop) 985 if (!ev_default_loop_ptr)
899 { 986 {
900#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
901 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
902#else 989#else
903 default_loop = 1; 990 ev_default_loop_ptr = 1;
904#endif 991#endif
905 992
906 loop_init (EV_A_ methods); 993 loop_init (EV_A_ flags);
907 994
908 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
909 { 996 {
910 siginit (EV_A); 997 siginit (EV_A);
911 998
912#ifndef _WIN32 999#ifndef _WIN32
913 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
915 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
916 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
917#endif 1004#endif
918 } 1005 }
919 else 1006 else
920 default_loop = 0; 1007 ev_default_loop_ptr = 0;
921 } 1008 }
922 1009
923 return default_loop; 1010 return ev_default_loop_ptr;
924} 1011}
925 1012
926void 1013void
927ev_default_destroy (void) 1014ev_default_destroy (void)
928{ 1015{
929#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
930 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
931#endif 1018#endif
932 1019
933#ifndef _WIN32 1020#ifndef _WIN32
934 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
935 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
… …
946 1033
947void 1034void
948ev_default_fork (void) 1035ev_default_fork (void)
949{ 1036{
950#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
951 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
952#endif 1039#endif
953 1040
954 if (method) 1041 if (backend)
955 postfork = 1; 1042 postfork = 1;
956} 1043}
957 1044
958/*****************************************************************************/ 1045/*****************************************************************************/
959 1046
… …
967 return 1; 1054 return 1;
968 1055
969 return 0; 1056 return 0;
970} 1057}
971 1058
972static void 1059inline void
973call_pending (EV_P) 1060call_pending (EV_P)
974{ 1061{
975 int pri; 1062 int pri;
976 1063
977 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
978 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
979 { 1066 {
980 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
981 1068
982 if (p->w) 1069 if (expect_true (p->w))
983 { 1070 {
984 p->w->pending = 0; 1071 p->w->pending = 0;
985 EV_CB_INVOKE (p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
986 } 1073 }
987 } 1074 }
988} 1075}
989 1076
990static void 1077inline void
991timers_reify (EV_P) 1078timers_reify (EV_P)
992{ 1079{
993 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
994 { 1081 {
995 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1014 } 1101 }
1015} 1102}
1016 1103
1017#if EV_PERIODICS 1104#if EV_PERIODICS
1018static void 1105inline void
1019periodics_reify (EV_P) 1106periodics_reify (EV_P)
1020{ 1107{
1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1022 { 1109 {
1023 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
… …
1025 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1112 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1026 1113
1027 /* first reschedule or stop timer */ 1114 /* first reschedule or stop timer */
1028 if (w->reschedule_cb) 1115 if (w->reschedule_cb)
1029 { 1116 {
1030 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);
1031
1032 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));
1033 downheap ((WT *)periodics, periodiccnt, 0); 1119 downheap ((WT *)periodics, periodiccnt, 0);
1034 } 1120 }
1035 else if (w->interval) 1121 else if (w->interval)
1036 { 1122 {
… …
1083 ev_rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1084 return 1; 1170 return 1;
1085 } 1171 }
1086} 1172}
1087 1173
1088static void 1174inline void
1089time_update (EV_P) 1175time_update (EV_P)
1090{ 1176{
1091 int i; 1177 int i;
1092 1178
1093#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1154ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
1155{ 1241{
1156 double block; 1242 double block;
1157 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1158 1244
1159 do 1245 while (activecnt)
1160 { 1246 {
1161 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
1162 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
1163 { 1249 {
1164 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1192 { 1278 {
1193 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1194 1280
1195 if (timercnt) 1281 if (timercnt)
1196 { 1282 {
1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1198 if (block > to) block = to; 1284 if (block > to) block = to;
1199 } 1285 }
1200 1286
1201#if EV_PERIODICS 1287#if EV_PERIODICS
1202 if (periodiccnt) 1288 if (periodiccnt)
1203 { 1289 {
1204 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;
1205 if (block > to) block = to; 1291 if (block > to) block = to;
1206 } 1292 }
1207#endif 1293#endif
1208 1294
1209 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1210 } 1296 }
1211 1297
1212 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1213 1299
1214 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1215 time_update (EV_A); 1301 time_update (EV_A);
1216 1302
1217 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
… …
1223 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1224 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1226 1312
1227 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1228 if (checkcnt) 1314 if (expect_false (checkcnt))
1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1230 1316
1231 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1232 } 1321 }
1233 while (activecnt && !loop_done);
1234 1322
1235 if (loop_done != 2) 1323 if (loop_done != 2)
1236 loop_done = 0; 1324 loop_done = 0;
1237} 1325}
1238 1326
… …
1298void 1386void
1299ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1300{ 1388{
1301 int fd = w->fd; 1389 int fd = w->fd;
1302 1390
1303 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1304 return; 1392 return;
1305 1393
1306 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1307 1395
1308 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1314 1402
1315void 1403void
1316ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1317{ 1405{
1318 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1319 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1320 return; 1408 return;
1321 1409
1322 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));
1323 1411
1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1328} 1416}
1329 1417
1330void 1418void
1331ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1332{ 1420{
1333 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1334 return; 1422 return;
1335 1423
1336 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1337 1425
1338 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.));
1339 1427
1340 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1342 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1343 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1344 1432
1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1346} 1434}
1347 1435
1348void 1436void
1349ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1350{ 1438{
1351 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1352 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1353 return; 1441 return;
1354 1442
1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1356 1444
1357 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1358 { 1446 {
1359 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1361 } 1449 }
1362 1450
… …
1377 } 1465 }
1378 else 1466 else
1379 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1380 } 1468 }
1381 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1382 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1383} 1474}
1384 1475
1385#if EV_PERIODICS 1476#if EV_PERIODICS
1386void 1477void
1387ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1388{ 1479{
1389 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1390 return; 1481 return;
1391 1482
1392 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval) 1485 else if (w->interval)
… …
1397 /* 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 */
1398 ((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;
1399 } 1490 }
1400 1491
1401 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1403 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1404 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1405 1496
1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1407} 1498}
1408 1499
1409void 1500void
1410ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1411{ 1502{
1412 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1413 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1414 return; 1505 return;
1415 1506
1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1417 1508
1418 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1419 { 1510 {
1420 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1422 } 1513 }
1423 1514
… …
1434#endif 1525#endif
1435 1526
1436void 1527void
1437ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1438{ 1529{
1439 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1440 return; 1531 return;
1441 1532
1442 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1444 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1445} 1536}
1446 1537
1447void 1538void
1448ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1449{ 1540{
1450 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1451 if (!ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1452 return; 1543 return;
1453 1544
1454 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1455 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1456} 1547}
1457 1548
1458void 1549void
1459ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1460{ 1551{
1461 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1462 return; 1553 return;
1463 1554
1464 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1466 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1467} 1558}
1468 1559
1469void 1560void
1470ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1471{ 1562{
1472 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1473 if (!ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1474 return; 1565 return;
1475 1566
1476 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1477 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1478} 1569}
1479 1570
1480void 1571void
1481ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1482{ 1573{
1483 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1484 return; 1575 return;
1485 1576
1486 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1488 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1489} 1580}
1490 1581
1491void 1582void
1492ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1493{ 1584{
1494 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1495 if (!ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1496 return; 1587 return;
1497 1588
1498 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1499 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1500} 1591}
… …
1505 1596
1506void 1597void
1507ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1508{ 1599{
1509#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1510 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));
1511#endif 1602#endif
1512 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1513 return; 1604 return;
1514 1605
1515 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));
1516 1607
1517 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
… …
1534 1625
1535void 1626void
1536ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1537{ 1628{
1538 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1539 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1540 return; 1631 return;
1541 1632
1542 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1543 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1544 1635
… …
1548 1639
1549void 1640void
1550ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1551{ 1642{
1552#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1553 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));
1554#endif 1645#endif
1555 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1556 return; 1647 return;
1557 1648
1558 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1559 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1560} 1651}
1561 1652
1562void 1653void
1563ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1564{ 1655{
1565 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1566 if (!ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1567 return; 1658 return;
1568 1659
1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1570 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1571} 1662}
… …
1608void 1699void
1609ev_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)
1610{ 1701{
1611 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));
1612 1703
1613 if (!once) 1704 if (expect_false (!once))
1705 {
1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1615 else 1707 return;
1616 { 1708 }
1709
1617 once->cb = cb; 1710 once->cb = cb;
1618 once->arg = arg; 1711 once->arg = arg;
1619 1712
1620 ev_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1621 if (fd >= 0) 1714 if (fd >= 0)
1622 { 1715 {
1623 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1624 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1625 } 1718 }
1626 1719
1627 ev_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1628 if (timeout >= 0.) 1721 if (timeout >= 0.)
1629 { 1722 {
1630 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1631 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1632 }
1633 } 1725 }
1634} 1726}
1635 1727
1636#ifdef __cplusplus 1728#ifdef __cplusplus
1637} 1729}

Diff Legend

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