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

Comparing libev/ev.c (file contents):
Revision 1.110 by root, Mon Nov 12 05:56:49 2007 UTC vs.
Revision 1.133 by root, Fri Nov 23 11:32:22 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
62# endif 97# endif
63 98
64#endif 99#endif
65 100
66#include <math.h> 101#include <math.h>
… …
90#endif 125#endif
91 126
92/**/ 127/**/
93 128
94#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
96#endif 135#endif
97 136
98#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 139#endif
102 140
103#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
104# ifdef _WIN32 142# ifdef _WIN32
105# define EV_USE_POLL 0 143# define EV_USE_POLL 0
… …
114 152
115#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
117#endif 155#endif
118 156
119#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
121#endif 159#endif
122 160
123/**/ 161/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 162
131#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
134#endif 166#endif
… …
143#endif 175#endif
144 176
145/**/ 177/**/
146 178
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 183
152#ifdef EV_H 184#ifdef EV_H
153# include EV_H 185# include EV_H
154#else 186#else
155# include "ev.h" 187# include "ev.h"
156#endif 188#endif
157 189
158#if __GNUC__ >= 3 190#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 192# define inline static inline
161#else 193#else
162# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
163# define inline static 195# define inline static
164#endif 196#endif
165 197
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
168 200
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 203
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
173 206
174typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
177 210
… …
257 #include "ev_vars.h" 290 #include "ev_vars.h"
258 #undef VAR 291 #undef VAR
259 }; 292 };
260 #include "ev_wrap.h" 293 #include "ev_wrap.h"
261 294
262 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
264 297
265#else 298#else
266 299
267 ev_tstamp ev_rt_now; 300 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 302 #include "ev_vars.h"
270 #undef VAR 303 #undef VAR
271 304
272 static int default_loop; 305 static int ev_default_loop_ptr;
273 306
274#endif 307#endif
275 308
276/*****************************************************************************/ 309/*****************************************************************************/
277 310
… …
358void 391void
359ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
360{ 393{
361 W w_ = (W)w; 394 W w_ = (W)w;
362 395
363 if (w_->pending) 396 if (expect_false (w_->pending))
364 { 397 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 399 return;
367 } 400 }
368 401
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 406}
374 407
375static void 408static void
… …
402 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
403} 436}
404 437
405/*****************************************************************************/ 438/*****************************************************************************/
406 439
407static void 440inline void
408fd_reify (EV_P) 441fd_reify (EV_P)
409{ 442{
410 int i; 443 int i;
411 444
412 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
429 } 462 }
430#endif 463#endif
431 464
432 anfd->reify = 0; 465 anfd->reify = 0;
433 466
434 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
435 anfd->events = events; 468 anfd->events = events;
436 } 469 }
437 470
438 fdchangecnt = 0; 471 fdchangecnt = 0;
439} 472}
440 473
441static void 474static void
442fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
443{ 476{
444 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
445 return; 478 return;
446 479
447 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
448 481
449 ++fdchangecnt; 482 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
452} 485}
453 486
454static void 487static void
455fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
463 } 496 }
464} 497}
465 498
466static int 499inline int
467fd_valid (int fd) 500fd_valid (int fd)
468{ 501{
469#ifdef _WIN32 502#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
471#else 504#else
… …
497 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
498 return; 531 return;
499 } 532 }
500} 533}
501 534
502/* usually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
503static void 536static void
504fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
505{ 538{
506 int fd; 539 int fd;
507 540
… …
613ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
614{ 647{
615 WL w; 648 WL w;
616 649
617#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
619#endif 652#endif
620 653
621 --signum; 654 --signum;
622 655
623 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
643} 676}
644 677
645inline void 678static void
646fd_intern (int fd) 679fd_intern (int fd)
647{ 680{
648#ifdef _WIN32 681#ifdef _WIN32
649 int arg = 1; 682 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
698 int pid, status; 731 int pid, status;
699 732
700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
701 { 734 {
702 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
703 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
704 738
705 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
706 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
707 } 741 }
708} 742}
709 743
710#endif 744#endif
711 745
712/*****************************************************************************/ 746/*****************************************************************************/
713 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
714#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 752# include "ev_kqueue.c"
716#endif 753#endif
717#if EV_USE_EPOLL 754#if EV_USE_EPOLL
718# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 783 return getuid () != geteuid ()
747 || getgid () != getegid (); 784 || getgid () != getegid ();
748#endif 785#endif
749} 786}
750 787
751int 788unsigned int
752ev_method (EV_P) 789ev_supported_backends (void)
753{ 790{
754 return method; 791 unsigned int flags = 0;
792
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
804{
805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_backend (EV_P)
822{
823 return backend;
755} 824}
756 825
757static void 826static void
758loop_init (EV_P_ unsigned int flags) 827loop_init (EV_P_ unsigned int flags)
759{ 828{
760 if (!method) 829 if (!backend)
761 { 830 {
762#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
763 { 832 {
764 struct timespec ts; 833 struct timespec ts;
765 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
770 ev_rt_now = ev_time (); 839 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 840 mn_now = get_clock ();
772 now_floor = mn_now; 841 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
774 843
775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 844 if (!(flags & EVFLAG_NOENV)
845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
776 flags = atoi (getenv ("LIBEV_FLAGS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
777 848
778 if (!(flags & 0x0000ffff)) 849 if (!(flags & 0x0000ffffUL))
779 flags |= 0x0000ffff; 850 flags |= ev_recommended_backends ();
780 851
781 method = 0; 852 backend = 0;
853#if EV_USE_PORT
854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
855#endif
782#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
784#endif 858#endif
785#if EV_USE_EPOLL 859#if EV_USE_EPOLL
786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
787#endif 861#endif
788#if EV_USE_POLL 862#if EV_USE_POLL
789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
790#endif 864#endif
791#if EV_USE_SELECT 865#if EV_USE_SELECT
792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
793#endif 867#endif
794 868
795 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
797 } 871 }
798} 872}
799 873
800void 874static void
801loop_destroy (EV_P) 875loop_destroy (EV_P)
802{ 876{
803 int i; 877 int i;
804 878
879#if EV_USE_PORT
880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
881#endif
805#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
807#endif 884#endif
808#if EV_USE_EPOLL 885#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
810#endif 887#endif
811#if EV_USE_POLL 888#if EV_USE_POLL
812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
813#endif 890#endif
814#if EV_USE_SELECT 891#if EV_USE_SELECT
815 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
816#endif 893#endif
817 894
818 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 896 array_free (pending, [i]);
820 897
821 /* have to use the microsoft-never-gets-it-right macro */ 898 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 899 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 900 array_free (timer, EMPTY0);
824#if EV_PERIODICS 901#if EV_PERIODICS
825 array_free (periodic, EMPTY); 902 array_free (periodic, EMPTY0);
826#endif 903#endif
827 array_free (idle, EMPTY); 904 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 905 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 906 array_free (check, EMPTY0);
830 907
831 method = 0; 908 backend = 0;
832} 909}
833 910
834static void 911static void
835loop_fork (EV_P) 912loop_fork (EV_P)
836{ 913{
914#if EV_USE_PORT
915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
916#endif
917#if EV_USE_KQUEUE
918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
919#endif
837#if EV_USE_EPOLL 920#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 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 922#endif
843 923
844 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
845 { 925 {
846 /* default loop */ 926 /* default loop */
… …
867 947
868 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
869 949
870 loop_init (EV_A_ flags); 950 loop_init (EV_A_ flags);
871 951
872 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
873 return loop; 953 return loop;
874 954
875 return 0; 955 return 0;
876} 956}
877 957
… …
890 970
891#endif 971#endif
892 972
893#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
894struct ev_loop * 974struct ev_loop *
975ev_default_loop_init (unsigned int flags)
895#else 976#else
896int 977int
897#endif
898ev_default_loop (unsigned int flags) 978ev_default_loop (unsigned int flags)
979#endif
899{ 980{
900 if (sigpipe [0] == sigpipe [1]) 981 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 982 if (pipe (sigpipe))
902 return 0; 983 return 0;
903 984
904 if (!default_loop) 985 if (!ev_default_loop_ptr)
905 { 986 {
906#if EV_MULTIPLICITY 987#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 988 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 989#else
909 default_loop = 1; 990 ev_default_loop_ptr = 1;
910#endif 991#endif
911 992
912 loop_init (EV_A_ flags); 993 loop_init (EV_A_ flags);
913 994
914 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
915 { 996 {
916 siginit (EV_A); 997 siginit (EV_A);
917 998
918#ifndef _WIN32 999#ifndef _WIN32
919 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
921 ev_signal_start (EV_A_ &childev); 1002 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1003 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 1004#endif
924 } 1005 }
925 else 1006 else
926 default_loop = 0; 1007 ev_default_loop_ptr = 0;
927 } 1008 }
928 1009
929 return default_loop; 1010 return ev_default_loop_ptr;
930} 1011}
931 1012
932void 1013void
933ev_default_destroy (void) 1014ev_default_destroy (void)
934{ 1015{
935#if EV_MULTIPLICITY 1016#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 1017 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 1018#endif
938 1019
939#ifndef _WIN32 1020#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 1021 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 1022 ev_signal_stop (EV_A_ &childev);
… …
952 1033
953void 1034void
954ev_default_fork (void) 1035ev_default_fork (void)
955{ 1036{
956#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1038 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1039#endif
959 1040
960 if (method) 1041 if (backend)
961 postfork = 1; 1042 postfork = 1;
962} 1043}
963 1044
964/*****************************************************************************/ 1045/*****************************************************************************/
965 1046
… …
973 return 1; 1054 return 1;
974 1055
975 return 0; 1056 return 0;
976} 1057}
977 1058
978static void 1059inline void
979call_pending (EV_P) 1060call_pending (EV_P)
980{ 1061{
981 int pri; 1062 int pri;
982 1063
983 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
985 { 1066 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1068
988 if (p->w) 1069 if (expect_true (p->w))
989 { 1070 {
990 p->w->pending = 0; 1071 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
992 } 1073 }
993 } 1074 }
994} 1075}
995 1076
996static void 1077inline void
997timers_reify (EV_P) 1078timers_reify (EV_P)
998{ 1079{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1081 {
1001 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1101 }
1021} 1102}
1022 1103
1023#if EV_PERIODICS 1104#if EV_PERIODICS
1024static void 1105inline void
1025periodics_reify (EV_P) 1106periodics_reify (EV_P)
1026{ 1107{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1109 {
1029 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
… …
1088 ev_rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1089 return 1; 1170 return 1;
1090 } 1171 }
1091} 1172}
1092 1173
1093static void 1174inline void
1094time_update (EV_P) 1175time_update (EV_P)
1095{ 1176{
1096 int i; 1177 int i;
1097 1178
1098#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1159ev_loop (EV_P_ int flags) 1240ev_loop (EV_P_ int flags)
1160{ 1241{
1161 double block; 1242 double block;
1162 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1243 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1163 1244
1164 do 1245 while (activecnt)
1165 { 1246 {
1166 /* queue check watchers (and execute them) */ 1247 /* queue check watchers (and execute them) */
1167 if (expect_false (preparecnt)) 1248 if (expect_false (preparecnt))
1168 { 1249 {
1169 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1197 { 1278 {
1198 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1199 1280
1200 if (timercnt) 1281 if (timercnt)
1201 { 1282 {
1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1203 if (block > to) block = to; 1284 if (block > to) block = to;
1204 } 1285 }
1205 1286
1206#if EV_PERIODICS 1287#if EV_PERIODICS
1207 if (periodiccnt) 1288 if (periodiccnt)
1208 { 1289 {
1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1210 if (block > to) block = to; 1291 if (block > to) block = to;
1211 } 1292 }
1212#endif 1293#endif
1213 1294
1214 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1215 } 1296 }
1216 1297
1217 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1218 1299
1219 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1220 time_update (EV_A); 1301 time_update (EV_A);
1221 1302
1222 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
… …
1228 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1229 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1231 1312
1232 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1233 if (checkcnt) 1314 if (expect_false (checkcnt))
1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1235 1316
1236 call_pending (EV_A); 1317 call_pending (EV_A);
1318
1319 if (expect_false (loop_done))
1320 break;
1237 } 1321 }
1238 while (activecnt && !loop_done);
1239 1322
1240 if (loop_done != 2) 1323 if (loop_done != 2)
1241 loop_done = 0; 1324 loop_done = 0;
1242} 1325}
1243 1326
… …
1303void 1386void
1304ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1305{ 1388{
1306 int fd = w->fd; 1389 int fd = w->fd;
1307 1390
1308 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1309 return; 1392 return;
1310 1393
1311 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1312 1395
1313 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1319 1402
1320void 1403void
1321ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1322{ 1405{
1323 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1324 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1325 return; 1408 return;
1326 1409
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328 1411
1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1333} 1416}
1334 1417
1335void 1418void
1336ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1337{ 1420{
1338 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1339 return; 1422 return;
1340 1423
1341 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1342 1425
1343 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1426 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1344 1427
1345 ev_start (EV_A_ (W)w, ++timercnt); 1428 ev_start (EV_A_ (W)w, ++timercnt);
1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1429 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1347 timers [timercnt - 1] = w; 1430 timers [timercnt - 1] = w;
1348 upheap ((WT *)timers, timercnt - 1); 1431 upheap ((WT *)timers, timercnt - 1);
1349 1432
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1433 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351} 1434}
1352 1435
1353void 1436void
1354ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1355{ 1438{
1356 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1357 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1358 return; 1441 return;
1359 1442
1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1361 1444
1362 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1363 { 1446 {
1364 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1366 } 1449 }
1367 1450
… …
1382 } 1465 }
1383 else 1466 else
1384 ev_timer_stop (EV_A_ w); 1467 ev_timer_stop (EV_A_ w);
1385 } 1468 }
1386 else if (w->repeat) 1469 else if (w->repeat)
1470 {
1471 w->at = w->repeat;
1387 ev_timer_start (EV_A_ w); 1472 ev_timer_start (EV_A_ w);
1473 }
1388} 1474}
1389 1475
1390#if EV_PERIODICS 1476#if EV_PERIODICS
1391void 1477void
1392ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1393{ 1479{
1394 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1395 return; 1481 return;
1396 1482
1397 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1398 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1399 else if (w->interval) 1485 else if (w->interval)
… …
1402 /* this formula differs from the one in periodic_reify because we do not always round up */ 1488 /* this formula differs from the one in periodic_reify because we do not always round up */
1403 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1489 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1404 } 1490 }
1405 1491
1406 ev_start (EV_A_ (W)w, ++periodiccnt); 1492 ev_start (EV_A_ (W)w, ++periodiccnt);
1407 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1493 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1408 periodics [periodiccnt - 1] = w; 1494 periodics [periodiccnt - 1] = w;
1409 upheap ((WT *)periodics, periodiccnt - 1); 1495 upheap ((WT *)periodics, periodiccnt - 1);
1410 1496
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1497 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412} 1498}
1413 1499
1414void 1500void
1415ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1416{ 1502{
1417 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1418 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1419 return; 1505 return;
1420 1506
1421 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1422 1508
1423 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1424 { 1510 {
1425 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1426 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1427 } 1513 }
1428 1514
… …
1439#endif 1525#endif
1440 1526
1441void 1527void
1442ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1443{ 1529{
1444 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1445 return; 1531 return;
1446 1532
1447 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1448 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1449 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
1450} 1536}
1451 1537
1452void 1538void
1453ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1454{ 1540{
1455 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1456 if (!ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1457 return; 1543 return;
1458 1544
1459 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1460 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1461} 1547}
1462 1548
1463void 1549void
1464ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1465{ 1551{
1466 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1467 return; 1553 return;
1468 1554
1469 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1470 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1471 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
1472} 1558}
1473 1559
1474void 1560void
1475ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1476{ 1562{
1477 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1478 if (!ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1479 return; 1565 return;
1480 1566
1481 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1482 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1483} 1569}
1484 1570
1485void 1571void
1486ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1487{ 1573{
1488 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1489 return; 1575 return;
1490 1576
1491 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1492 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1493 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
1494} 1580}
1495 1581
1496void 1582void
1497ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1498{ 1584{
1499 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1501 return; 1587 return;
1502 1588
1503 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1504 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1505} 1591}
… …
1510 1596
1511void 1597void
1512ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1513{ 1599{
1514#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1515 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1601 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1516#endif 1602#endif
1517 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1518 return; 1604 return;
1519 1605
1520 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1606 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1521 1607
1522 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
… …
1539 1625
1540void 1626void
1541ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1542{ 1628{
1543 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1544 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1545 return; 1631 return;
1546 1632
1547 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1548 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1549 1635
… …
1553 1639
1554void 1640void
1555ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1556{ 1642{
1557#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1558 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1644 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1559#endif 1645#endif
1560 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1561 return; 1647 return;
1562 1648
1563 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1564 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565} 1651}
1566 1652
1567void 1653void
1568ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1569{ 1655{
1570 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1572 return; 1658 return;
1573 1659
1574 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1575 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1576} 1662}
… …
1613void 1699void
1614ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1700ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1615{ 1701{
1616 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1702 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1617 1703
1618 if (!once) 1704 if (expect_false (!once))
1705 {
1619 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1620 else 1707 return;
1621 { 1708 }
1709
1622 once->cb = cb; 1710 once->cb = cb;
1623 once->arg = arg; 1711 once->arg = arg;
1624 1712
1625 ev_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1626 if (fd >= 0) 1714 if (fd >= 0)
1627 { 1715 {
1628 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1629 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1630 } 1718 }
1631 1719
1632 ev_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1633 if (timeout >= 0.) 1721 if (timeout >= 0.)
1634 { 1722 {
1635 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1636 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1637 }
1638 } 1725 }
1639} 1726}
1640 1727
1641#ifdef __cplusplus 1728#ifdef __cplusplus
1642} 1729}

Diff Legend

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