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.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#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);
… …
698 738
699#endif 739#endif
700 740
701/*****************************************************************************/ 741/*****************************************************************************/
702 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
703#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 747# include "ev_kqueue.c"
705#endif 748#endif
706#if EV_USE_EPOLL 749#if EV_USE_EPOLL
707# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 778 return getuid () != geteuid ()
736 || getgid () != getegid (); 779 || getgid () != getegid ();
737#endif 780#endif
738} 781}
739 782
740int 783unsigned int
741ev_method (EV_P) 784ev_supported_backends (void)
742{ 785{
743 return method; 786 unsigned int flags = 0;
744}
745 787
746static void 788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
747loop_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)
748{ 799{
749 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)
750 { 825 {
751#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
752 { 827 {
753 struct timespec ts; 828 struct timespec ts;
754 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
759 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 835 mn_now = get_clock ();
761 now_floor = mn_now; 836 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
763 838
764 if (methods == EVMETHOD_AUTO) 839 if (!(flags & EVFLAG_NOENV)
765 if (!enable_secure () && getenv ("LIBEV_METHODS")) 840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else
768 methods = EVMETHOD_ANY;
769 843
770 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
771#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
773#endif 853#endif
774#if EV_USE_EPOLL 854#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
776#endif 856#endif
777#if EV_USE_POLL 857#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
779#endif 859#endif
780#if EV_USE_SELECT 860#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
782#endif 862#endif
783 863
784 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
786 } 866 }
787} 867}
788 868
789void 869static void
790loop_destroy (EV_P) 870loop_destroy (EV_P)
791{ 871{
792 int i; 872 int i;
793 873
874#if EV_USE_PORT
875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
876#endif
794#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 879#endif
797#if EV_USE_EPOLL 880#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 882#endif
800#if EV_USE_POLL 883#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 885#endif
803#if EV_USE_SELECT 886#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 888#endif
806 889
807 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 891 array_free (pending, [i]);
809 892
810 /* have to use the microsoft-never-gets-it-right macro */ 893 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 894 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 895 array_free (timer, EMPTY0);
813#if EV_PERIODICS 896#if EV_PERIODICS
814 array_free (periodic, EMPTY); 897 array_free (periodic, EMPTY0);
815#endif 898#endif
816 array_free (idle, EMPTY); 899 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 900 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 901 array_free (check, EMPTY0);
819 902
820 method = 0; 903 backend = 0;
821} 904}
822 905
823static void 906static void
824loop_fork (EV_P) 907loop_fork (EV_P)
825{ 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
826#if EV_USE_EPOLL 915#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 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 917#endif
832 918
833 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
834 { 920 {
835 /* default loop */ 921 /* default loop */
… …
848 postfork = 0; 934 postfork = 0;
849} 935}
850 936
851#if EV_MULTIPLICITY 937#if EV_MULTIPLICITY
852struct ev_loop * 938struct ev_loop *
853ev_loop_new (int methods) 939ev_loop_new (unsigned int flags)
854{ 940{
855 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));
856 942
857 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
858 944
859 loop_init (EV_A_ methods); 945 loop_init (EV_A_ flags);
860 946
861 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
862 return loop; 948 return loop;
863 949
864 return 0; 950 return 0;
865} 951}
866 952
… …
879 965
880#endif 966#endif
881 967
882#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
883struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
884#else 971#else
885int 972int
973ev_default_loop (unsigned int flags)
886#endif 974#endif
887ev_default_loop (int methods)
888{ 975{
889 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
891 return 0; 978 return 0;
892 979
893 if (!default_loop) 980 if (!ev_default_loop_ptr)
894 { 981 {
895#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 984#else
898 default_loop = 1; 985 ev_default_loop_ptr = 1;
899#endif 986#endif
900 987
901 loop_init (EV_A_ methods); 988 loop_init (EV_A_ flags);
902 989
903 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
904 { 991 {
905 siginit (EV_A); 992 siginit (EV_A);
906 993
907#ifndef _WIN32 994#ifndef _WIN32
908 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
910 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 999#endif
913 } 1000 }
914 else 1001 else
915 default_loop = 0; 1002 ev_default_loop_ptr = 0;
916 } 1003 }
917 1004
918 return default_loop; 1005 return ev_default_loop_ptr;
919} 1006}
920 1007
921void 1008void
922ev_default_destroy (void) 1009ev_default_destroy (void)
923{ 1010{
924#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1013#endif
927 1014
928#ifndef _WIN32 1015#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
… …
941 1028
942void 1029void
943ev_default_fork (void) 1030ev_default_fork (void)
944{ 1031{
945#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1034#endif
948 1035
949 if (method) 1036 if (backend)
950 postfork = 1; 1037 postfork = 1;
951} 1038}
952 1039
953/*****************************************************************************/ 1040/*****************************************************************************/
954 1041
… …
962 return 1; 1049 return 1;
963 1050
964 return 0; 1051 return 0;
965} 1052}
966 1053
967static void 1054inline void
968call_pending (EV_P) 1055call_pending (EV_P)
969{ 1056{
970 int pri; 1057 int pri;
971 1058
972 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
974 { 1061 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1063
977 if (p->w) 1064 if (expect_true (p->w))
978 { 1065 {
979 p->w->pending = 0; 1066 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
981 } 1068 }
982 } 1069 }
983} 1070}
984 1071
985static void 1072inline void
986timers_reify (EV_P) 1073timers_reify (EV_P)
987{ 1074{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1076 {
990 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1096 }
1010} 1097}
1011 1098
1012#if EV_PERIODICS 1099#if EV_PERIODICS
1013static void 1100inline void
1014periodics_reify (EV_P) 1101periodics_reify (EV_P)
1015{ 1102{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1104 {
1018 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1107 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1108
1022 /* first reschedule or stop timer */ 1109 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1110 if (w->reschedule_cb)
1024 { 1111 {
1025 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);
1026
1027 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));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1114 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1115 }
1030 else if (w->interval) 1116 else if (w->interval)
1031 { 1117 {
… …
1078 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1079 return 1; 1165 return 1;
1080 } 1166 }
1081} 1167}
1082 1168
1083static void 1169inline void
1084time_update (EV_P) 1170time_update (EV_P)
1085{ 1171{
1086 int i; 1172 int i;
1087 1173
1088#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1235ev_loop (EV_P_ int flags)
1150{ 1236{
1151 double block; 1237 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1238 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1239
1154 do 1240 while (activecnt)
1155 { 1241 {
1156 /* queue check watchers (and execute them) */ 1242 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1243 if (expect_false (preparecnt))
1158 { 1244 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1245 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1187 { 1273 {
1188 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1189 1275
1190 if (timercnt) 1276 if (timercnt)
1191 { 1277 {
1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1193 if (block > to) block = to; 1279 if (block > to) block = to;
1194 } 1280 }
1195 1281
1196#if EV_PERIODICS 1282#if EV_PERIODICS
1197 if (periodiccnt) 1283 if (periodiccnt)
1198 { 1284 {
1199 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;
1200 if (block > to) block = to; 1286 if (block > to) block = to;
1201 } 1287 }
1202#endif 1288#endif
1203 1289
1204 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1205 } 1291 }
1206 1292
1207 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1208 1294
1209 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1210 time_update (EV_A); 1296 time_update (EV_A);
1211 1297
1212 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1307
1222 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1309 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1311
1226 call_pending (EV_A); 1312 call_pending (EV_A);
1313
1314 if (expect_false (loop_done))
1315 break;
1227 } 1316 }
1228 while (activecnt && !loop_done);
1229 1317
1230 if (loop_done != 2) 1318 if (loop_done != 2)
1231 loop_done = 0; 1319 loop_done = 0;
1232} 1320}
1233 1321
… …
1293void 1381void
1294ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1295{ 1383{
1296 int fd = w->fd; 1384 int fd = w->fd;
1297 1385
1298 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1299 return; 1387 return;
1300 1388
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1390
1303 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
… …
1309 1397
1310void 1398void
1311ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1400{
1313 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1315 return; 1403 return;
1316 1404
1317 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));
1318 1406
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1411}
1324 1412
1325void 1413void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1415{
1328 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1329 return; 1417 return;
1330 1418
1331 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1332 1420
1333 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.));
1334 1422
1335 ev_start (EV_A_ (W)w, ++timercnt); 1423 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1424 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1425 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1426 upheap ((WT *)timers, timercnt - 1);
1339 1427
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1428 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1429}
1342 1430
1343void 1431void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1433{
1346 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1348 return; 1436 return;
1349 1437
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1439
1352 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1353 { 1441 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1444 }
1357 1445
… …
1372 } 1460 }
1373 else 1461 else
1374 ev_timer_stop (EV_A_ w); 1462 ev_timer_stop (EV_A_ w);
1375 } 1463 }
1376 else if (w->repeat) 1464 else if (w->repeat)
1465 {
1466 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1467 ev_timer_start (EV_A_ w);
1468 }
1378} 1469}
1379 1470
1380#if EV_PERIODICS 1471#if EV_PERIODICS
1381void 1472void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1474{
1384 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1385 return; 1476 return;
1386 1477
1387 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1480 else if (w->interval)
… …
1392 /* 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 */
1393 ((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;
1394 } 1485 }
1395 1486
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1487 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1488 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1489 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1490 upheap ((WT *)periodics, periodiccnt - 1);
1400 1491
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1492 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1493}
1403 1494
1404void 1495void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1497{
1407 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1409 return; 1500 return;
1410 1501
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1503
1413 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1505 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1508 }
1418 1509
… …
1429#endif 1520#endif
1430 1521
1431void 1522void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1524{
1434 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1435 return; 1526 return;
1436 1527
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
1440} 1531}
1441 1532
1442void 1533void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1535{
1445 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1447 return; 1538 return;
1448 1539
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1451} 1542}
1452 1543
1453void 1544void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1546{
1456 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1457 return; 1548 return;
1458 1549
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
1462} 1553}
1463 1554
1464void 1555void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1557{
1467 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1469 return; 1560 return;
1470 1561
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1473} 1564}
1474 1565
1475void 1566void
1476ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1477{ 1568{
1478 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1479 return; 1570 return;
1480 1571
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
1484} 1575}
1485 1576
1486void 1577void
1487ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1579{
1489 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1491 return; 1582 return;
1492 1583
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1495} 1586}
… …
1500 1591
1501void 1592void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1594{
1504#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1505 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));
1506#endif 1597#endif
1507 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1508 return; 1599 return;
1509 1600
1510 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));
1511 1602
1512 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
… …
1529 1620
1530void 1621void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1623{
1533 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1535 return; 1626 return;
1536 1627
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1539 1630
… …
1543 1634
1544void 1635void
1545ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1546{ 1637{
1547#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1548 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));
1549#endif 1640#endif
1550 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1551 return; 1642 return;
1552 1643
1553 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1646}
1556 1647
1557void 1648void
1558ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1650{
1560 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1562 return; 1653 return;
1563 1654
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1566} 1657}
… …
1603void 1694void
1604ev_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)
1605{ 1696{
1606 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));
1607 1698
1608 if (!once) 1699 if (expect_false (!once))
1700 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1702 return;
1611 { 1703 }
1704
1612 once->cb = cb; 1705 once->cb = cb;
1613 once->arg = arg; 1706 once->arg = arg;
1614 1707
1615 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1709 if (fd >= 0)
1617 { 1710 {
1618 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1620 } 1713 }
1621 1714
1622 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1716 if (timeout >= 0.)
1624 { 1717 {
1625 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1720 }
1629} 1721}
1630 1722
1631#ifdef __cplusplus 1723#ifdef __cplusplus
1632} 1724}

Diff Legend

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