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

Comparing libev/ev.c (file contents):
Revision 1.106 by root, Mon Nov 12 01:07:50 2007 UTC vs.
Revision 1.131 by root, Fri Nov 23 05:43:45 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# define EV_SELECT_USE_FD_SET 1
101#endif 135#endif
102 136
103#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
104# ifdef _WIN32 138# ifdef _WIN32
105# define EV_USE_POLL 0 139# define EV_USE_POLL 0
… …
114 148
115#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
117#endif 151#endif
118 152
119#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
121#endif 155#endif
122 156
123/**/ 157/**/
124
125/* darwin simply cnanot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 158
131#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
134#endif 162#endif
… …
143#endif 171#endif
144 172
145/**/ 173/**/
146 174
147#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) */
148#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) */
149#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 */
150/*#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 */
151 179
152#ifdef EV_H 180#ifdef EV_H
153# include EV_H 181# include EV_H
154#else 182#else
155# include "ev.h" 183# include "ev.h"
156#endif 184#endif
157 185
158#if __GNUC__ >= 3 186#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 188# define inline static inline
161#else 189#else
162# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
163# define inline static 191# define inline static
164#endif 192#endif
165 193
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
168 196
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 199
172#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 */
173 202
174typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
177 206
… …
257 #include "ev_vars.h" 286 #include "ev_vars.h"
258 #undef VAR 287 #undef VAR
259 }; 288 };
260 #include "ev_wrap.h" 289 #include "ev_wrap.h"
261 290
262 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
264 293
265#else 294#else
266 295
267 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 298 #include "ev_vars.h"
270 #undef VAR 299 #undef VAR
271 300
272 static int default_loop; 301 static int ev_default_loop_ptr;
273 302
274#endif 303#endif
275 304
276/*****************************************************************************/ 305/*****************************************************************************/
277 306
… …
310{ 339{
311 return ev_rt_now; 340 return ev_rt_now;
312} 341}
313#endif 342#endif
314 343
315#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
316 345
317#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
318 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
319 { \ 348 { \
320 int newcnt = cur; \ 349 int newcnt = cur; \
… …
358void 387void
359ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
360{ 389{
361 W w_ = (W)w; 390 W w_ = (W)w;
362 391
363 if (w_->pending) 392 if (expect_false (w_->pending))
364 { 393 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 395 return;
367 } 396 }
368 397
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 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);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 402}
374 403
375static void 404static void
… …
402 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
403} 432}
404 433
405/*****************************************************************************/ 434/*****************************************************************************/
406 435
407static void 436inline void
408fd_reify (EV_P) 437fd_reify (EV_P)
409{ 438{
410 int i; 439 int i;
411 440
412 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
429 } 458 }
430#endif 459#endif
431 460
432 anfd->reify = 0; 461 anfd->reify = 0;
433 462
434 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
435 anfd->events = events; 464 anfd->events = events;
436 } 465 }
437 466
438 fdchangecnt = 0; 467 fdchangecnt = 0;
439} 468}
440 469
441static void 470static void
442fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
443{ 472{
444 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
445 return; 474 return;
446 475
447 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
448 477
449 ++fdchangecnt; 478 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
452} 481}
453 482
454static void 483static void
455fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
462 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);
463 } 492 }
464} 493}
465 494
466static int 495inline int
467fd_valid (int fd) 496fd_valid (int fd)
468{ 497{
469#ifdef _WIN32 498#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
471#else 500#else
… …
497 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
498 return; 527 return;
499 } 528 }
500} 529}
501 530
502/* 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 */
503static void 532static void
504fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
505{ 534{
506 int fd; 535 int fd;
507 536
… …
613ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
614{ 643{
615 WL w; 644 WL w;
616 645
617#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
618 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));
619#endif 648#endif
620 649
621 --signum; 650 --signum;
622 651
623 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
643} 672}
644 673
645inline void 674static void
646fd_intern (int fd) 675fd_intern (int fd)
647{ 676{
648#ifdef _WIN32 677#ifdef _WIN32
649 int arg = 1; 678 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
709 738
710#endif 739#endif
711 740
712/*****************************************************************************/ 741/*****************************************************************************/
713 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
714#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 747# include "ev_kqueue.c"
716#endif 748#endif
717#if EV_USE_EPOLL 749#if EV_USE_EPOLL
718# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 778 return getuid () != geteuid ()
747 || getgid () != getegid (); 779 || getgid () != getegid ();
748#endif 780#endif
749} 781}
750 782
751int 783unsigned int
752ev_method (EV_P) 784ev_supported_backends (void)
753{ 785{
754 return method; 786 unsigned int flags = 0;
755}
756 787
757static void 788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
758loop_init (EV_P_ int methods) 789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
759{ 799{
760 if (!method) 800 unsigned int flags = ev_supported_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
819}
820
821static void
822loop_init (EV_P_ unsigned int flags)
823{
824 if (!backend)
761 { 825 {
762#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
763 { 827 {
764 struct timespec ts; 828 struct timespec ts;
765 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
770 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 835 mn_now = get_clock ();
772 now_floor = mn_now; 836 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
774 838
775 if (methods == EVMETHOD_AUTO) 839 if (!(flags & EVFLAG_NOENV)
776 if (!enable_secure () && getenv ("LIBEV_METHODS")) 840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
777 methods = atoi (getenv ("LIBEV_METHODS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
778 else
779 methods = EVMETHOD_ANY;
780 843
781 method = 0; 844 if (!(flags & 0x0000ffffUL))
845 flags |= ev_recommended_backends ();
846
847 backend = 0;
848#if EV_USE_PORT
849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
850#endif
782#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
784#endif 853#endif
785#if EV_USE_EPOLL 854#if EV_USE_EPOLL
786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
787#endif 856#endif
788#if EV_USE_POLL 857#if EV_USE_POLL
789 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
790#endif 859#endif
791#if EV_USE_SELECT 860#if EV_USE_SELECT
792 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
793#endif 862#endif
794 863
795 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
797 } 866 }
798} 867}
799 868
800void 869static void
801loop_destroy (EV_P) 870loop_destroy (EV_P)
802{ 871{
803 int i; 872 int i;
804 873
874#if EV_USE_PORT
875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
876#endif
805#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
807#endif 879#endif
808#if EV_USE_EPOLL 880#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
810#endif 882#endif
811#if EV_USE_POLL 883#if EV_USE_POLL
812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
813#endif 885#endif
814#if EV_USE_SELECT 886#if EV_USE_SELECT
815 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
816#endif 888#endif
817 889
818 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 891 array_free (pending, [i]);
820 892
821 /* have to use the microsoft-never-gets-it-right macro */ 893 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 894 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 895 array_free (timer, EMPTY0);
824#if EV_PERIODICS 896#if EV_PERIODICS
825 array_free (periodic, EMPTY); 897 array_free (periodic, EMPTY0);
826#endif 898#endif
827 array_free (idle, EMPTY); 899 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 900 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 901 array_free (check, EMPTY0);
830 902
831 method = 0; 903 backend = 0;
832} 904}
833 905
834static void 906static void
835loop_fork (EV_P) 907loop_fork (EV_P)
836{ 908{
909#if EV_USE_PORT
910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
911#endif
912#if EV_USE_KQUEUE
913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
914#endif
837#if EV_USE_EPOLL 915#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 917#endif
843 918
844 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
845 { 920 {
846 /* default loop */ 921 /* default loop */
… …
859 postfork = 0; 934 postfork = 0;
860} 935}
861 936
862#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
863struct ev_loop * 938struct ev_loop *
864ev_loop_new (int methods) 939ev_loop_new (unsigned int flags)
865{ 940{
866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 941 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
867 942
868 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
869 944
870 loop_init (EV_A_ methods); 945 loop_init (EV_A_ flags);
871 946
872 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
873 return loop; 948 return loop;
874 949
875 return 0; 950 return 0;
876} 951}
877 952
… …
890 965
891#endif 966#endif
892 967
893#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
894struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
895#else 971#else
896int 972int
973ev_default_loop (unsigned int flags)
897#endif 974#endif
898ev_default_loop (int methods)
899{ 975{
900 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
902 return 0; 978 return 0;
903 979
904 if (!default_loop) 980 if (!ev_default_loop_ptr)
905 { 981 {
906#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 984#else
909 default_loop = 1; 985 ev_default_loop_ptr = 1;
910#endif 986#endif
911 987
912 loop_init (EV_A_ methods); 988 loop_init (EV_A_ flags);
913 989
914 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
915 { 991 {
916 siginit (EV_A); 992 siginit (EV_A);
917 993
918#ifndef _WIN32 994#ifndef _WIN32
919 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
921 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 999#endif
924 } 1000 }
925 else 1001 else
926 default_loop = 0; 1002 ev_default_loop_ptr = 0;
927 } 1003 }
928 1004
929 return default_loop; 1005 return ev_default_loop_ptr;
930} 1006}
931 1007
932void 1008void
933ev_default_destroy (void) 1009ev_default_destroy (void)
934{ 1010{
935#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 1013#endif
938 1014
939#ifndef _WIN32 1015#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
… …
952 1028
953void 1029void
954ev_default_fork (void) 1030ev_default_fork (void)
955{ 1031{
956#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1034#endif
959 1035
960 if (method) 1036 if (backend)
961 postfork = 1; 1037 postfork = 1;
962} 1038}
963 1039
964/*****************************************************************************/ 1040/*****************************************************************************/
965 1041
… …
973 return 1; 1049 return 1;
974 1050
975 return 0; 1051 return 0;
976} 1052}
977 1053
978static void 1054inline void
979call_pending (EV_P) 1055call_pending (EV_P)
980{ 1056{
981 int pri; 1057 int pri;
982 1058
983 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
985 { 1061 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1063
988 if (p->w) 1064 if (expect_true (p->w))
989 { 1065 {
990 p->w->pending = 0; 1066 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
992 } 1068 }
993 } 1069 }
994} 1070}
995 1071
996static void 1072inline void
997timers_reify (EV_P) 1073timers_reify (EV_P)
998{ 1074{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1076 {
1001 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1096 }
1021} 1097}
1022 1098
1023#if EV_PERIODICS 1099#if EV_PERIODICS
1024static void 1100inline void
1025periodics_reify (EV_P) 1101periodics_reify (EV_P)
1026{ 1102{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1104 {
1029 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
… …
1031 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1107 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1032 1108
1033 /* first reschedule or stop timer */ 1109 /* first reschedule or stop timer */
1034 if (w->reschedule_cb) 1110 if (w->reschedule_cb)
1035 { 1111 {
1036 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1037
1038 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1113 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1039 downheap ((WT *)periodics, periodiccnt, 0); 1114 downheap ((WT *)periodics, periodiccnt, 0);
1040 } 1115 }
1041 else if (w->interval) 1116 else if (w->interval)
1042 { 1117 {
… …
1089 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1090 return 1; 1165 return 1;
1091 } 1166 }
1092} 1167}
1093 1168
1094static void 1169inline void
1095time_update (EV_P) 1170time_update (EV_P)
1096{ 1171{
1097 int i; 1172 int i;
1098 1173
1099#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
… …
1160ev_loop (EV_P_ int flags) 1235ev_loop (EV_P_ int flags)
1161{ 1236{
1162 double block; 1237 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1238 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1164 1239
1165 do 1240 while (activecnt)
1166 { 1241 {
1167 /* queue check watchers (and execute them) */ 1242 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1243 if (expect_false (preparecnt))
1169 { 1244 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1245 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1198 { 1273 {
1199 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1200 1275
1201 if (timercnt) 1276 if (timercnt)
1202 { 1277 {
1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1204 if (block > to) block = to; 1279 if (block > to) block = to;
1205 } 1280 }
1206 1281
1207#if EV_PERIODICS 1282#if EV_PERIODICS
1208 if (periodiccnt) 1283 if (periodiccnt)
1209 { 1284 {
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1211 if (block > to) block = to; 1286 if (block > to) block = to;
1212 } 1287 }
1213#endif 1288#endif
1214 1289
1215 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1216 } 1291 }
1217 1292
1218 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1219 1294
1220 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1221 time_update (EV_A); 1296 time_update (EV_A);
1222 1297
1223 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1307
1233 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1309 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1311
1237 call_pending (EV_A); 1312 call_pending (EV_A);
1313
1314 if (expect_false (loop_done))
1315 break;
1238 } 1316 }
1239 while (activecnt && !loop_done);
1240 1317
1241 if (loop_done != 2) 1318 if (loop_done != 2)
1242 loop_done = 0; 1319 loop_done = 0;
1243} 1320}
1244 1321
… …
1304void 1381void
1305ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1306{ 1383{
1307 int fd = w->fd; 1384 int fd = w->fd;
1308 1385
1309 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1310 return; 1387 return;
1311 1388
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1390
1314 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
… …
1320 1397
1321void 1398void
1322ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1323{ 1400{
1324 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1326 return; 1403 return;
1327 1404
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1405 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329 1406
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1334} 1411}
1335 1412
1336void 1413void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1338{ 1415{
1339 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1340 return; 1417 return;
1341 1418
1342 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1343 1420
1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1421 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1345 1422
1346 ev_start (EV_A_ (W)w, ++timercnt); 1423 ev_start (EV_A_ (W)w, ++timercnt);
1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1424 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1348 timers [timercnt - 1] = w; 1425 timers [timercnt - 1] = w;
1349 upheap ((WT *)timers, timercnt - 1); 1426 upheap ((WT *)timers, timercnt - 1);
1350 1427
1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1428 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1352} 1429}
1353 1430
1354void 1431void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1356{ 1433{
1357 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1359 return; 1436 return;
1360 1437
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1439
1363 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1364 { 1441 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1444 }
1368 1445
… …
1383 } 1460 }
1384 else 1461 else
1385 ev_timer_stop (EV_A_ w); 1462 ev_timer_stop (EV_A_ w);
1386 } 1463 }
1387 else if (w->repeat) 1464 else if (w->repeat)
1465 {
1466 w->at = w->repeat;
1388 ev_timer_start (EV_A_ w); 1467 ev_timer_start (EV_A_ w);
1468 }
1389} 1469}
1390 1470
1391#if EV_PERIODICS 1471#if EV_PERIODICS
1392void 1472void
1393ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1394{ 1474{
1395 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1396 return; 1476 return;
1397 1477
1398 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1400 else if (w->interval) 1480 else if (w->interval)
… …
1403 /* this formula differs from the one in periodic_reify because we do not always round up */ 1483 /* this formula differs from the one in periodic_reify because we do not always round up */
1404 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1484 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1405 } 1485 }
1406 1486
1407 ev_start (EV_A_ (W)w, ++periodiccnt); 1487 ev_start (EV_A_ (W)w, ++periodiccnt);
1408 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1488 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1409 periodics [periodiccnt - 1] = w; 1489 periodics [periodiccnt - 1] = w;
1410 upheap ((WT *)periodics, periodiccnt - 1); 1490 upheap ((WT *)periodics, periodiccnt - 1);
1411 1491
1412 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1492 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1413} 1493}
1414 1494
1415void 1495void
1416ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1417{ 1497{
1418 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1419 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1420 return; 1500 return;
1421 1501
1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1423 1503
1424 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1425 { 1505 {
1426 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1428 } 1508 }
1429 1509
… …
1440#endif 1520#endif
1441 1521
1442void 1522void
1443ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1444{ 1524{
1445 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1446 return; 1526 return;
1447 1527
1448 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1449 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1450 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
1451} 1531}
1452 1532
1453void 1533void
1454ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1455{ 1535{
1456 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1457 if (!ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1458 return; 1538 return;
1459 1539
1460 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1461 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1462} 1542}
1463 1543
1464void 1544void
1465ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1466{ 1546{
1467 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1468 return; 1548 return;
1469 1549
1470 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1471 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1472 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
1473} 1553}
1474 1554
1475void 1555void
1476ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1477{ 1557{
1478 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1479 if (!ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1480 return; 1560 return;
1481 1561
1482 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1483 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1484} 1564}
1485 1565
1486void 1566void
1487ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1488{ 1568{
1489 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1490 return; 1570 return;
1491 1571
1492 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1493 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1494 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
1495} 1575}
1496 1576
1497void 1577void
1498ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1499{ 1579{
1500 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1501 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1502 return; 1582 return;
1503 1583
1504 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1505 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1506} 1586}
… …
1511 1591
1512void 1592void
1513ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1514{ 1594{
1515#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1516 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1597#endif
1518 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1519 return; 1599 return;
1520 1600
1521 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1601 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1522 1602
1523 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
… …
1540 1620
1541void 1621void
1542ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1543{ 1623{
1544 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1545 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1546 return; 1626 return;
1547 1627
1548 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1549 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1550 1630
… …
1554 1634
1555void 1635void
1556ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1557{ 1637{
1558#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1559 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1560#endif 1640#endif
1561 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1562 return; 1642 return;
1563 1643
1564 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1565 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1566} 1646}
1567 1647
1568void 1648void
1569ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1570{ 1650{
1571 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1572 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1573 return; 1653 return;
1574 1654
1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1576 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1577} 1657}
… …
1614void 1694void
1615ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1695ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1616{ 1696{
1617 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1697 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1618 1698
1619 if (!once) 1699 if (expect_false (!once))
1700 {
1620 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1621 else 1702 return;
1622 { 1703 }
1704
1623 once->cb = cb; 1705 once->cb = cb;
1624 once->arg = arg; 1706 once->arg = arg;
1625 1707
1626 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1627 if (fd >= 0) 1709 if (fd >= 0)
1628 { 1710 {
1629 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1630 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1631 } 1713 }
1632 1714
1633 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1634 if (timeout >= 0.) 1716 if (timeout >= 0.)
1635 { 1717 {
1636 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1637 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1638 }
1639 } 1720 }
1640} 1721}
1641 1722
1642#ifdef __cplusplus 1723#ifdef __cplusplus
1643} 1724}

Diff Legend

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