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.132 by root, Fri Nov 23 10:36:30 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
62# endif 93# endif
63 94
64#endif 95#endif
65 96
66#include <math.h> 97#include <math.h>
… …
90#endif 121#endif
91 122
92/**/ 123/**/
93 124
94#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
96#endif 131#endif
97 132
98#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
100#endif 135#endif
101 136
102#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
103# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
104#endif 143#endif
105 144
106#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
107# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
108#endif 147#endif
109 148
110#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
111# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
112#endif 151#endif
113 152
114#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
115# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
116#endif 155#endif
117 156
118/**/ 157/**/
119 158
120#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
… …
132#endif 171#endif
133 172
134/**/ 173/**/
135 174
136#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#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) */ 176#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 */ 177#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 */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
140 179
141#ifdef EV_H 180#ifdef EV_H
142# include EV_H 181# include EV_H
143#else 182#else
144# include "ev.h" 183# include "ev.h"
145#endif 184#endif
146 185
147#if __GNUC__ >= 3 186#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline 188# define inline static inline
150#else 189#else
151# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
152# define inline static 191# define inline static
153#endif 192#endif
154 193
… …
156#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
157 196
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160 199
161#define EMPTY /* required for microsofts broken pseudo-c compiler */ 200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
162 202
163typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
164typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
165typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
166 206
… …
246 #include "ev_vars.h" 286 #include "ev_vars.h"
247 #undef VAR 287 #undef VAR
248 }; 288 };
249 #include "ev_wrap.h" 289 #include "ev_wrap.h"
250 290
251 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
253 293
254#else 294#else
255 295
256 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
257 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
258 #include "ev_vars.h" 298 #include "ev_vars.h"
259 #undef VAR 299 #undef VAR
260 300
261 static int default_loop; 301 static int ev_default_loop_ptr;
262 302
263#endif 303#endif
264 304
265/*****************************************************************************/ 305/*****************************************************************************/
266 306
… …
299{ 339{
300 return ev_rt_now; 340 return ev_rt_now;
301} 341}
302#endif 342#endif
303 343
304#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
305 345
306#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
307 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
308 { \ 348 { \
309 int newcnt = cur; \ 349 int newcnt = cur; \
… …
347void 387void
348ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
349{ 389{
350 W w_ = (W)w; 390 W w_ = (W)w;
351 391
352 if (w_->pending) 392 if (expect_false (w_->pending))
353 { 393 {
354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return; 395 return;
356 } 396 }
357 397
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 402}
363 403
364static void 404static void
… …
391 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
392} 432}
393 433
394/*****************************************************************************/ 434/*****************************************************************************/
395 435
396static void 436inline void
397fd_reify (EV_P) 437fd_reify (EV_P)
398{ 438{
399 int i; 439 int i;
400 440
401 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
418 } 458 }
419#endif 459#endif
420 460
421 anfd->reify = 0; 461 anfd->reify = 0;
422 462
423 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
424 anfd->events = events; 464 anfd->events = events;
425 } 465 }
426 466
427 fdchangecnt = 0; 467 fdchangecnt = 0;
428} 468}
429 469
430static void 470static void
431fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
432{ 472{
433 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
434 return; 474 return;
435 475
436 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
437 477
438 ++fdchangecnt; 478 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
441} 481}
442 482
443static void 483static void
444fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
451 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
452 } 492 }
453} 493}
454 494
455static int 495inline int
456fd_valid (int fd) 496fd_valid (int fd)
457{ 497{
458#ifdef _WIN32 498#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
460#else 500#else
… …
486 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
487 return; 527 return;
488 } 528 }
489} 529}
490 530
491/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
492static void 532static void
493fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
494{ 534{
495 int fd; 535 int fd;
496 536
… …
602ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
603{ 643{
604 WL w; 644 WL w;
605 645
606#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
607 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
608#endif 648#endif
609 649
610 --signum; 650 --signum;
611 651
612 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
632} 672}
633 673
634inline void 674static void
635fd_intern (int fd) 675fd_intern (int fd)
636{ 676{
637#ifdef _WIN32 677#ifdef _WIN32
638 int arg = 1; 678 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
687 int pid, status; 727 int pid, status;
688 728
689 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
690 { 730 {
691 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* 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); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
693 734
694 child_reap (EV_A_ sw, pid, pid, status); 735 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 */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
696 } 737 }
697} 738}
698 739
699#endif 740#endif
700 741
701/*****************************************************************************/ 742/*****************************************************************************/
702 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
703#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 748# include "ev_kqueue.c"
705#endif 749#endif
706#if EV_USE_EPOLL 750#if EV_USE_EPOLL
707# include "ev_epoll.c" 751# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 779 return getuid () != geteuid ()
736 || getgid () != getegid (); 780 || getgid () != getegid ();
737#endif 781#endif
738} 782}
739 783
740int 784unsigned int
741ev_method (EV_P) 785ev_supported_backends (void)
742{ 786{
743 return method; 787 unsigned int flags = 0;
744}
745 788
746static void 789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
747loop_init (EV_P_ int methods) 790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
748{ 800{
749 if (!method) 801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
820}
821
822static void
823loop_init (EV_P_ unsigned int flags)
824{
825 if (!backend)
750 { 826 {
751#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
752 { 828 {
753 struct timespec ts; 829 struct timespec ts;
754 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
759 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 836 mn_now = get_clock ();
761 now_floor = mn_now; 837 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
763 839
764 if (methods == EVMETHOD_AUTO) 840 if (!(flags & EVFLAG_NOENV)
765 if (!enable_secure () && getenv ("LIBEV_METHODS")) 841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else
768 methods = EVMETHOD_ANY;
769 844
770 method = 0; 845 if (!(flags & 0x0000ffffUL))
846 flags |= ev_recommended_backends ();
847
848 backend = 0;
849#if EV_USE_PORT
850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
851#endif
771#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
773#endif 854#endif
774#if EV_USE_EPOLL 855#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
776#endif 857#endif
777#if EV_USE_POLL 858#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
779#endif 860#endif
780#if EV_USE_SELECT 861#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
782#endif 863#endif
783 864
784 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
786 } 867 }
787} 868}
788 869
789void 870static void
790loop_destroy (EV_P) 871loop_destroy (EV_P)
791{ 872{
792 int i; 873 int i;
793 874
875#if EV_USE_PORT
876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
877#endif
794#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 880#endif
797#if EV_USE_EPOLL 881#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 883#endif
800#if EV_USE_POLL 884#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 886#endif
803#if EV_USE_SELECT 887#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 889#endif
806 890
807 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 892 array_free (pending, [i]);
809 893
810 /* have to use the microsoft-never-gets-it-right macro */ 894 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 895 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 896 array_free (timer, EMPTY0);
813#if EV_PERIODICS 897#if EV_PERIODICS
814 array_free (periodic, EMPTY); 898 array_free (periodic, EMPTY0);
815#endif 899#endif
816 array_free (idle, EMPTY); 900 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 901 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 902 array_free (check, EMPTY0);
819 903
820 method = 0; 904 backend = 0;
821} 905}
822 906
823static void 907static void
824loop_fork (EV_P) 908loop_fork (EV_P)
825{ 909{
910#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
912#endif
913#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
915#endif
826#if EV_USE_EPOLL 916#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 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 918#endif
832 919
833 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
834 { 921 {
835 /* default loop */ 922 /* default loop */
… …
848 postfork = 0; 935 postfork = 0;
849} 936}
850 937
851#if EV_MULTIPLICITY 938#if EV_MULTIPLICITY
852struct ev_loop * 939struct ev_loop *
853ev_loop_new (int methods) 940ev_loop_new (unsigned int flags)
854{ 941{
855 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 942 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
856 943
857 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
858 945
859 loop_init (EV_A_ methods); 946 loop_init (EV_A_ flags);
860 947
861 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
862 return loop; 949 return loop;
863 950
864 return 0; 951 return 0;
865} 952}
866 953
… …
879 966
880#endif 967#endif
881 968
882#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
883struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
884#else 972#else
885int 973int
974ev_default_loop (unsigned int flags)
886#endif 975#endif
887ev_default_loop (int methods)
888{ 976{
889 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
891 return 0; 979 return 0;
892 980
893 if (!default_loop) 981 if (!ev_default_loop_ptr)
894 { 982 {
895#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 985#else
898 default_loop = 1; 986 ev_default_loop_ptr = 1;
899#endif 987#endif
900 988
901 loop_init (EV_A_ methods); 989 loop_init (EV_A_ flags);
902 990
903 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
904 { 992 {
905 siginit (EV_A); 993 siginit (EV_A);
906 994
907#ifndef _WIN32 995#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
… …
910 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 1000#endif
913 } 1001 }
914 else 1002 else
915 default_loop = 0; 1003 ev_default_loop_ptr = 0;
916 } 1004 }
917 1005
918 return default_loop; 1006 return ev_default_loop_ptr;
919} 1007}
920 1008
921void 1009void
922ev_default_destroy (void) 1010ev_default_destroy (void)
923{ 1011{
924#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1014#endif
927 1015
928#ifndef _WIN32 1016#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
… …
941 1029
942void 1030void
943ev_default_fork (void) 1031ev_default_fork (void)
944{ 1032{
945#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1035#endif
948 1036
949 if (method) 1037 if (backend)
950 postfork = 1; 1038 postfork = 1;
951} 1039}
952 1040
953/*****************************************************************************/ 1041/*****************************************************************************/
954 1042
… …
962 return 1; 1050 return 1;
963 1051
964 return 0; 1052 return 0;
965} 1053}
966 1054
967static void 1055inline void
968call_pending (EV_P) 1056call_pending (EV_P)
969{ 1057{
970 int pri; 1058 int pri;
971 1059
972 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
974 { 1062 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1064
977 if (p->w) 1065 if (expect_true (p->w))
978 { 1066 {
979 p->w->pending = 0; 1067 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
981 } 1069 }
982 } 1070 }
983} 1071}
984 1072
985static void 1073inline void
986timers_reify (EV_P) 1074timers_reify (EV_P)
987{ 1075{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1077 {
990 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1097 }
1010} 1098}
1011 1099
1012#if EV_PERIODICS 1100#if EV_PERIODICS
1013static void 1101inline void
1014periodics_reify (EV_P) 1102periodics_reify (EV_P)
1015{ 1103{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1105 {
1018 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1108 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1109
1022 /* first reschedule or stop timer */ 1110 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1111 if (w->reschedule_cb)
1024 { 1112 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1113 ((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)); 1114 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1115 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1116 }
1030 else if (w->interval) 1117 else if (w->interval)
1031 { 1118 {
… …
1078 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1079 return 1; 1166 return 1;
1080 } 1167 }
1081} 1168}
1082 1169
1083static void 1170inline void
1084time_update (EV_P) 1171time_update (EV_P)
1085{ 1172{
1086 int i; 1173 int i;
1087 1174
1088#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1236ev_loop (EV_P_ int flags)
1150{ 1237{
1151 double block; 1238 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1239 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1240
1154 do 1241 while (activecnt)
1155 { 1242 {
1156 /* queue check watchers (and execute them) */ 1243 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1244 if (expect_false (preparecnt))
1158 { 1245 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1246 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1187 { 1274 {
1188 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1189 1276
1190 if (timercnt) 1277 if (timercnt)
1191 { 1278 {
1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1193 if (block > to) block = to; 1280 if (block > to) block = to;
1194 } 1281 }
1195 1282
1196#if EV_PERIODICS 1283#if EV_PERIODICS
1197 if (periodiccnt) 1284 if (periodiccnt)
1198 { 1285 {
1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1200 if (block > to) block = to; 1287 if (block > to) block = to;
1201 } 1288 }
1202#endif 1289#endif
1203 1290
1204 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1205 } 1292 }
1206 1293
1207 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1208 1295
1209 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1210 time_update (EV_A); 1297 time_update (EV_A);
1211 1298
1212 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1308
1222 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1310 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1312
1226 call_pending (EV_A); 1313 call_pending (EV_A);
1314
1315 if (expect_false (loop_done))
1316 break;
1227 } 1317 }
1228 while (activecnt && !loop_done);
1229 1318
1230 if (loop_done != 2) 1319 if (loop_done != 2)
1231 loop_done = 0; 1320 loop_done = 0;
1232} 1321}
1233 1322
… …
1293void 1382void
1294ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1295{ 1384{
1296 int fd = w->fd; 1385 int fd = w->fd;
1297 1386
1298 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1299 return; 1388 return;
1300 1389
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1391
1303 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
… …
1309 1398
1310void 1399void
1311ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1401{
1313 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1315 return; 1404 return;
1316 1405
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318 1407
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1412}
1324 1413
1325void 1414void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1416{
1328 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1329 return; 1418 return;
1330 1419
1331 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1332 1421
1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1334 1423
1335 ev_start (EV_A_ (W)w, ++timercnt); 1424 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1425 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1426 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1427 upheap ((WT *)timers, timercnt - 1);
1339 1428
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1429 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1430}
1342 1431
1343void 1432void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1434{
1346 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1348 return; 1437 return;
1349 1438
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1440
1352 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1353 { 1442 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1445 }
1357 1446
… …
1372 } 1461 }
1373 else 1462 else
1374 ev_timer_stop (EV_A_ w); 1463 ev_timer_stop (EV_A_ w);
1375 } 1464 }
1376 else if (w->repeat) 1465 else if (w->repeat)
1466 {
1467 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1468 ev_timer_start (EV_A_ w);
1469 }
1378} 1470}
1379 1471
1380#if EV_PERIODICS 1472#if EV_PERIODICS
1381void 1473void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1475{
1384 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1385 return; 1477 return;
1386 1478
1387 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1481 else if (w->interval)
… …
1392 /* this formula differs from the one in periodic_reify because we do not always round up */ 1484 /* 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; 1485 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1394 } 1486 }
1395 1487
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1488 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1489 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1490 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1491 upheap ((WT *)periodics, periodiccnt - 1);
1400 1492
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1493 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1494}
1403 1495
1404void 1496void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1498{
1407 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1409 return; 1501 return;
1410 1502
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1504
1413 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1506 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1509 }
1418 1510
… …
1429#endif 1521#endif
1430 1522
1431void 1523void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1525{
1434 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1435 return; 1527 return;
1436 1528
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
1440} 1532}
1441 1533
1442void 1534void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1536{
1445 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1447 return; 1539 return;
1448 1540
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1451} 1543}
1452 1544
1453void 1545void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1547{
1456 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1457 return; 1549 return;
1458 1550
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
1462} 1554}
1463 1555
1464void 1556void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1558{
1467 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1469 return; 1561 return;
1470 1562
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1473} 1565}
1474 1566
1475void 1567void
1476ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1477{ 1569{
1478 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1479 return; 1571 return;
1480 1572
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
1484} 1576}
1485 1577
1486void 1578void
1487ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1580{
1489 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1491 return; 1583 return;
1492 1584
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1495} 1587}
… …
1500 1592
1501void 1593void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1595{
1504#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1505 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1506#endif 1598#endif
1507 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1508 return; 1600 return;
1509 1601
1510 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1511 1603
1512 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
… …
1529 1621
1530void 1622void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1624{
1533 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1535 return; 1627 return;
1536 1628
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1539 1631
… …
1543 1635
1544void 1636void
1545ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1546{ 1638{
1547#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1548 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1549#endif 1641#endif
1550 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1551 return; 1643 return;
1552 1644
1553 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1647}
1556 1648
1557void 1649void
1558ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1651{
1560 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1562 return; 1654 return;
1563 1655
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1566} 1658}
… …
1603void 1695void
1604ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1605{ 1697{
1606 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1607 1699
1608 if (!once) 1700 if (expect_false (!once))
1701 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1703 return;
1611 { 1704 }
1705
1612 once->cb = cb; 1706 once->cb = cb;
1613 once->arg = arg; 1707 once->arg = arg;
1614 1708
1615 ev_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1710 if (fd >= 0)
1617 { 1711 {
1618 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1620 } 1714 }
1621 1715
1622 ev_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1717 if (timeout >= 0.)
1624 { 1718 {
1625 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1721 }
1629} 1722}
1630 1723
1631#ifdef __cplusplus 1724#ifdef __cplusplus
1632} 1725}

Diff Legend

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