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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.135 by root, Sat Nov 24 06:23:27 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
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
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# 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
53# endif 97# endif
54 98
55#endif 99#endif
56 100
57#include <math.h> 101#include <math.h>
66#include <sys/types.h> 110#include <sys/types.h>
67#include <time.h> 111#include <time.h>
68 112
69#include <signal.h> 113#include <signal.h>
70 114
71#ifndef WIN32 115#ifndef _WIN32
72# include <unistd.h> 116# include <unistd.h>
73# include <sys/time.h> 117# include <sys/time.h>
74# include <sys/wait.h> 118# include <sys/wait.h>
119#else
120# define WIN32_LEAN_AND_MEAN
121# include <windows.h>
122# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1
75#endif 124# endif
125#endif
126
76/**/ 127/**/
77 128
78#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
79# 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
80#endif 135#endif
81 136
82#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
84#endif 139#endif
85 140
86#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 142# ifdef _WIN32
143# define EV_USE_POLL 0
144# else
145# define EV_USE_POLL 1
146# endif
88#endif 147#endif
89 148
90#ifndef EV_USE_EPOLL 149#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 150# define EV_USE_EPOLL 0
92#endif 151#endif
93 152
94#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
96#endif 155#endif
97 156
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
110#endif 159#endif
111 160
112/**/ 161/**/
113 162
114#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 168#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 169# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 170# define EV_USE_REALTIME 0
122#endif 171#endif
123 172
173#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h>
175#endif
176
124/**/ 177/**/
125 178
126#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) */
127#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) */
128#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 */
129/*#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 */
130 183
184#ifdef EV_H
185# include EV_H
186#else
131#include "ev.h" 187# include "ev.h"
188#endif
132 189
133#if __GNUC__ >= 3 190#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 192# define inline static inline
136#else 193#else
137# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
138# define inline static 195# define inline static
139#endif 196#endif
140 197
142#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
143 200
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 203
204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
206
147typedef struct ev_watcher *W; 207typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 208typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 209typedef struct ev_watcher_time *WT;
150 210
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 212
213#ifdef _WIN32
153#include "ev_win32.c" 214# include "ev_win32.c"
215#endif
154 216
155/*****************************************************************************/ 217/*****************************************************************************/
156 218
157static void (*syserr_cb)(const char *msg); 219static void (*syserr_cb)(const char *msg);
158 220
205typedef struct 267typedef struct
206{ 268{
207 WL head; 269 WL head;
208 unsigned char events; 270 unsigned char events;
209 unsigned char reify; 271 unsigned char reify;
272#if EV_SELECT_IS_WINSOCKET
273 SOCKET handle;
274#endif
210} ANFD; 275} ANFD;
211 276
212typedef struct 277typedef struct
213{ 278{
214 W w; 279 W w;
215 int events; 280 int events;
216} ANPENDING; 281} ANPENDING;
217 282
218#if EV_MULTIPLICITY 283#if EV_MULTIPLICITY
219 284
220struct ev_loop 285 struct ev_loop
221{ 286 {
287 ev_tstamp ev_rt_now;
288 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 289 #define VAR(name,decl) decl;
223# include "ev_vars.h" 290 #include "ev_vars.h"
224};
225# undef VAR 291 #undef VAR
292 };
226# include "ev_wrap.h" 293 #include "ev_wrap.h"
294
295 static struct ev_loop default_loop_struct;
296 struct ev_loop *ev_default_loop_ptr;
227 297
228#else 298#else
229 299
300 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 302 #include "ev_vars.h"
232# undef VAR 303 #undef VAR
304
305 static int ev_default_loop_ptr;
233 306
234#endif 307#endif
235 308
236/*****************************************************************************/ 309/*****************************************************************************/
237 310
238inline ev_tstamp 311ev_tstamp
239ev_time (void) 312ev_time (void)
240{ 313{
241#if EV_USE_REALTIME 314#if EV_USE_REALTIME
242 struct timespec ts; 315 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 316 clock_gettime (CLOCK_REALTIME, &ts);
262#endif 335#endif
263 336
264 return ev_time (); 337 return ev_time ();
265} 338}
266 339
340#if EV_MULTIPLICITY
267ev_tstamp 341ev_tstamp
268ev_now (EV_P) 342ev_now (EV_P)
269{ 343{
270 return rt_now; 344 return ev_rt_now;
271} 345}
346#endif
272 347
273#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
274 349
275#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
277 { \ 352 { \
278 int newcnt = cur; \ 353 int newcnt = cur; \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 368 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 371 }
297 372
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \ 373#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 374 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
305 375
306/*****************************************************************************/ 376/*****************************************************************************/
307 377
321void 391void
322ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
323{ 393{
324 W w_ = (W)w; 394 W w_ = (W)w;
325 395
326 if (w_->pending) 396 if (expect_false (w_->pending))
327 { 397 {
328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
329 return; 399 return;
330 } 400 }
331 401
402 if (expect_false (!w_->cb))
403 return;
404
332 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
333 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 406 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
336} 409}
337 410
338static void 411static void
342 415
343 for (i = 0; i < eventcnt; ++i) 416 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 417 ev_feed_event (EV_A_ events [i], type);
345} 418}
346 419
347static void 420inline void
348fd_event (EV_P_ int fd, int events) 421fd_event (EV_P_ int fd, int revents)
349{ 422{
350 ANFD *anfd = anfds + fd; 423 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 424 struct ev_io *w;
352 425
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 426 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 427 {
355 int ev = w->events & events; 428 int ev = w->events & revents;
356 429
357 if (ev) 430 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 431 ev_feed_event (EV_A_ (W)w, ev);
359 } 432 }
360} 433}
361 434
435void
436ev_feed_fd_event (EV_P_ int fd, int revents)
437{
438 fd_event (EV_A_ fd, revents);
439}
440
362/*****************************************************************************/ 441/*****************************************************************************/
363 442
364static void 443inline void
365fd_reify (EV_P) 444fd_reify (EV_P)
366{ 445{
367 int i; 446 int i;
368 447
369 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
375 int events = 0; 454 int events = 0;
376 455
377 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 456 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
378 events |= w->events; 457 events |= w->events;
379 458
459#if EV_SELECT_IS_WINSOCKET
460 if (events)
461 {
462 unsigned long argp;
463 anfd->handle = _get_osfhandle (fd);
464 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
465 }
466#endif
467
380 anfd->reify = 0; 468 anfd->reify = 0;
381 469
382 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 471 anfd->events = events;
384 } 472 }
385 473
386 fdchangecnt = 0; 474 fdchangecnt = 0;
387} 475}
388 476
389static void 477static void
390fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
391{ 479{
392 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
393 return; 481 return;
394 482
395 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
396 484
397 ++fdchangecnt; 485 ++fdchangecnt;
398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 486 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
399 fdchanges [fdchangecnt - 1] = fd; 487 fdchanges [fdchangecnt - 1] = fd;
400} 488}
401 489
402static void 490static void
403fd_kill (EV_P_ int fd) 491fd_kill (EV_P_ int fd)
409 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
410 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 498 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
411 } 499 }
412} 500}
413 501
414static int 502inline int
415fd_valid (int fd) 503fd_valid (int fd)
416{ 504{
417#ifdef WIN32 505#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 506 return _get_osfhandle (fd) != -1;
419#else 507#else
420 return fcntl (fd, F_GETFD) != -1; 508 return fcntl (fd, F_GETFD) != -1;
421#endif 509#endif
422} 510}
423 511
445 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
446 return; 534 return;
447 } 535 }
448} 536}
449 537
450/* usually called after fork if method needs to re-arm all fds from scratch */ 538/* usually called after fork if backend needs to re-arm all fds from scratch */
451static void 539static void
452fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
453{ 541{
454 int fd; 542 int fd;
455 543
503 591
504 heap [k] = w; 592 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 593 ((W)heap [k])->active = k + 1;
506} 594}
507 595
596inline void
597adjustheap (WT *heap, int N, int k)
598{
599 upheap (heap, k);
600 downheap (heap, N, k);
601}
602
508/*****************************************************************************/ 603/*****************************************************************************/
509 604
510typedef struct 605typedef struct
511{ 606{
512 WL head; 607 WL head;
533} 628}
534 629
535static void 630static void
536sighandler (int signum) 631sighandler (int signum)
537{ 632{
538#if WIN32 633#if _WIN32
539 signal (signum, sighandler); 634 signal (signum, sighandler);
540#endif 635#endif
541 636
542 signals [signum - 1].gotsig = 1; 637 signals [signum - 1].gotsig = 1;
543 638
544 if (!gotsig) 639 if (!gotsig)
545 { 640 {
546 int old_errno = errno; 641 int old_errno = errno;
547 gotsig = 1; 642 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 643 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 644 errno = old_errno;
554 } 645 }
555} 646}
556 647
648void
649ev_feed_signal_event (EV_P_ int signum)
650{
651 WL w;
652
653#if EV_MULTIPLICITY
654 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
655#endif
656
657 --signum;
658
659 if (signum < 0 || signum >= signalmax)
660 return;
661
662 signals [signum].gotsig = 0;
663
664 for (w = signals [signum].head; w; w = w->next)
665 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
666}
667
557static void 668static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 669sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 670{
560 WL w;
561 int signum; 671 int signum;
562 672
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 673 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 674 gotsig = 0;
569 675
570 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
572 { 678 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 679}
574 680
575 for (w = signals [signum].head; w; w = w->next) 681static void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 682fd_intern (int fd)
577 } 683{
684#ifdef _WIN32
685 int arg = 1;
686 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
687#else
688 fcntl (fd, F_SETFD, FD_CLOEXEC);
689 fcntl (fd, F_SETFL, O_NONBLOCK);
690#endif
578} 691}
579 692
580static void 693static void
581siginit (EV_P) 694siginit (EV_P)
582{ 695{
583#ifndef WIN32 696 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 697 fd_intern (sigpipe [1]);
585 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
586
587 /* rather than sort out wether we really need nb, set it */
588 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
589 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
590#endif
591 698
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 699 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 700 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 701 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 702}
596 703
597/*****************************************************************************/ 704/*****************************************************************************/
598 705
599static struct ev_child *childs [PID_HASHSIZE]; 706static struct ev_child *childs [PID_HASHSIZE];
600 707
601#ifndef WIN32 708#ifndef _WIN32
602 709
603static struct ev_signal childev; 710static struct ev_signal childev;
604 711
605#ifndef WCONTINUED 712#ifndef WCONTINUED
606# define WCONTINUED 0 713# define WCONTINUED 0
627 int pid, status; 734 int pid, status;
628 735
629 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
630 { 737 {
631 /* make sure we are called again until all childs have been reaped */ 738 /* make sure we are called again until all childs have been reaped */
739 /* we need to do it this way so that the callback gets called before we continue */
632 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
633 741
634 child_reap (EV_A_ sw, pid, pid, status); 742 child_reap (EV_A_ sw, pid, pid, status);
635 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
636 } 744 }
637} 745}
638 746
639#endif 747#endif
640 748
641/*****************************************************************************/ 749/*****************************************************************************/
642 750
751#if EV_USE_PORT
752# include "ev_port.c"
753#endif
643#if EV_USE_KQUEUE 754#if EV_USE_KQUEUE
644# include "ev_kqueue.c" 755# include "ev_kqueue.c"
645#endif 756#endif
646#if EV_USE_EPOLL 757#if EV_USE_EPOLL
647# include "ev_epoll.c" 758# include "ev_epoll.c"
667 778
668/* return true if we are running with elevated privileges and should ignore env variables */ 779/* return true if we are running with elevated privileges and should ignore env variables */
669static int 780static int
670enable_secure (void) 781enable_secure (void)
671{ 782{
672#ifdef WIN32 783#ifdef _WIN32
673 return 0; 784 return 0;
674#else 785#else
675 return getuid () != geteuid () 786 return getuid () != geteuid ()
676 || getgid () != getegid (); 787 || getgid () != getegid ();
677#endif 788#endif
678} 789}
679 790
680int 791unsigned int
681ev_method (EV_P) 792ev_supported_backends (void)
682{ 793{
683 return method; 794 unsigned int flags = 0;
684}
685 795
686static void 796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
687loop_init (EV_P_ int methods) 797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
800 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
801
802 return flags;
803}
804
805unsigned int
806ev_recommended_backends (void)
688{ 807{
689 if (!method) 808 unsigned int flags = ev_supported_backends ();
809
810#ifndef __NetBSD__
811 /* kqueue is borked on everything but netbsd apparently */
812 /* it usually doesn't work correctly on anything but sockets and pipes */
813 flags &= ~EVBACKEND_KQUEUE;
814#endif
815#ifdef __APPLE__
816 // flags &= ~EVBACKEND_KQUEUE; for documentation
817 flags &= ~EVBACKEND_POLL;
818#endif
819
820 return flags;
821}
822
823unsigned int
824ev_embeddable_backends (void)
825{
826 return EVBACKEND_EPOLL
827 | EVBACKEND_KQUEUE
828 | EVBACKEND_PORT;
829}
830
831unsigned int
832ev_backend (EV_P)
833{
834 return backend;
835}
836
837static void
838loop_init (EV_P_ unsigned int flags)
839{
840 if (!backend)
690 { 841 {
691#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
692 { 843 {
693 struct timespec ts; 844 struct timespec ts;
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 846 have_monotonic = 1;
696 } 847 }
697#endif 848#endif
698 849
699 rt_now = ev_time (); 850 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 851 mn_now = get_clock ();
701 now_floor = mn_now; 852 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
703 854
704 if (methods == EVMETHOD_AUTO) 855 if (!(flags & EVFLAG_NOENV)
705 if (!enable_secure () && getenv ("LIBEV_METHODS")) 856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
707 else
708 methods = EVMETHOD_ANY;
709 859
710 method = 0; 860 if (!(flags & 0x0000ffffUL))
711#if EV_USE_WIN32 861 flags |= ev_recommended_backends ();
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 862
863 backend = 0;
864#if EV_USE_PORT
865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
713#endif 866#endif
714#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
716#endif 869#endif
717#if EV_USE_EPOLL 870#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
719#endif 872#endif
720#if EV_USE_POLL 873#if EV_USE_POLL
721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
722#endif 875#endif
723#if EV_USE_SELECT 876#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
725#endif 878#endif
726 879
727 ev_watcher_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
729 } 882 }
730} 883}
731 884
732void 885static void
733loop_destroy (EV_P) 886loop_destroy (EV_P)
734{ 887{
735 int i; 888 int i;
736 889
737#if EV_USE_WIN32 890#if EV_USE_PORT
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
739#endif 892#endif
740#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
742#endif 895#endif
743#if EV_USE_EPOLL 896#if EV_USE_EPOLL
744 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
745#endif 898#endif
746#if EV_USE_POLL 899#if EV_USE_POLL
747 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
748#endif 901#endif
749#if EV_USE_SELECT 902#if EV_USE_SELECT
750 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
751#endif 904#endif
752 905
753 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 907 array_free (pending, [i]);
755 908
756 /* have to use the microsoft-never-gets-it-right macro */ 909 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 910 array_free (fdchange, EMPTY0);
758 array_free_microshit (timer); 911 array_free (timer, EMPTY0);
759 array_free_microshit (periodic); 912#if EV_PERIODICS
760 array_free_microshit (idle); 913 array_free (periodic, EMPTY0);
761 array_free_microshit (prepare); 914#endif
762 array_free_microshit (check); 915 array_free (idle, EMPTY0);
916 array_free (prepare, EMPTY0);
917 array_free (check, EMPTY0);
763 918
764 method = 0; 919 backend = 0;
765} 920}
766 921
767static void 922static void
768loop_fork (EV_P) 923loop_fork (EV_P)
769{ 924{
925#if EV_USE_PORT
926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
927#endif
928#if EV_USE_KQUEUE
929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
930#endif
770#if EV_USE_EPOLL 931#if EV_USE_EPOLL
771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
772#endif
773#if EV_USE_KQUEUE
774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
775#endif 933#endif
776 934
777 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
778 { 936 {
779 /* default loop */ 937 /* default loop */
792 postfork = 0; 950 postfork = 0;
793} 951}
794 952
795#if EV_MULTIPLICITY 953#if EV_MULTIPLICITY
796struct ev_loop * 954struct ev_loop *
797ev_loop_new (int methods) 955ev_loop_new (unsigned int flags)
798{ 956{
799 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 957 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
800 958
801 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
802 960
803 loop_init (EV_A_ methods); 961 loop_init (EV_A_ flags);
804 962
805 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
806 return loop; 964 return loop;
807 965
808 return 0; 966 return 0;
809} 967}
810 968
822} 980}
823 981
824#endif 982#endif
825 983
826#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 985struct ev_loop *
986ev_default_loop_init (unsigned int flags)
831#else 987#else
832static int default_loop;
833
834int 988int
989ev_default_loop (unsigned int flags)
835#endif 990#endif
836ev_default_loop (int methods)
837{ 991{
838 if (sigpipe [0] == sigpipe [1]) 992 if (sigpipe [0] == sigpipe [1])
839 if (pipe (sigpipe)) 993 if (pipe (sigpipe))
840 return 0; 994 return 0;
841 995
842 if (!default_loop) 996 if (!ev_default_loop_ptr)
843 { 997 {
844#if EV_MULTIPLICITY 998#if EV_MULTIPLICITY
845 struct ev_loop *loop = default_loop = &default_loop_struct; 999 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
846#else 1000#else
847 default_loop = 1; 1001 ev_default_loop_ptr = 1;
848#endif 1002#endif
849 1003
850 loop_init (EV_A_ methods); 1004 loop_init (EV_A_ flags);
851 1005
852 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
853 { 1007 {
854 siginit (EV_A); 1008 siginit (EV_A);
855 1009
856#ifndef WIN32 1010#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 1012 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 1013 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1014 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 1015#endif
862 } 1016 }
863 else 1017 else
864 default_loop = 0; 1018 ev_default_loop_ptr = 0;
865 } 1019 }
866 1020
867 return default_loop; 1021 return ev_default_loop_ptr;
868} 1022}
869 1023
870void 1024void
871ev_default_destroy (void) 1025ev_default_destroy (void)
872{ 1026{
873#if EV_MULTIPLICITY 1027#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 1028 struct ev_loop *loop = ev_default_loop_ptr;
875#endif 1029#endif
876 1030
877#ifndef WIN32 1031#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 1032 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 1033 ev_signal_stop (EV_A_ &childev);
880#endif 1034#endif
881 1035
882 ev_ref (EV_A); /* signal watcher */ 1036 ev_ref (EV_A); /* signal watcher */
890 1044
891void 1045void
892ev_default_fork (void) 1046ev_default_fork (void)
893{ 1047{
894#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
895 struct ev_loop *loop = default_loop; 1049 struct ev_loop *loop = ev_default_loop_ptr;
896#endif 1050#endif
897 1051
898 if (method) 1052 if (backend)
899 postfork = 1; 1053 postfork = 1;
900} 1054}
901 1055
902/*****************************************************************************/ 1056/*****************************************************************************/
903 1057
911 return 1; 1065 return 1;
912 1066
913 return 0; 1067 return 0;
914} 1068}
915 1069
916static void 1070inline void
917call_pending (EV_P) 1071call_pending (EV_P)
918{ 1072{
919 int pri; 1073 int pri;
920 1074
921 for (pri = NUMPRI; pri--; ) 1075 for (pri = NUMPRI; pri--; )
922 while (pendingcnt [pri]) 1076 while (pendingcnt [pri])
923 { 1077 {
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1078 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 1079
926 if (p->w) 1080 if (expect_true (p->w))
927 { 1081 {
928 p->w->pending = 0; 1082 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
930 } 1084 }
931 } 1085 }
932} 1086}
933 1087
934static void 1088inline void
935timers_reify (EV_P) 1089timers_reify (EV_P)
936{ 1090{
937 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
938 { 1092 {
939 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
942 1096
943 /* first reschedule or stop timer */ 1097 /* first reschedule or stop timer */
944 if (w->repeat) 1098 if (w->repeat)
945 { 1099 {
946 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1100 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1101
947 ((WT)w)->at = mn_now + w->repeat; 1102 ((WT)w)->at += w->repeat;
1103 if (((WT)w)->at < mn_now)
1104 ((WT)w)->at = mn_now;
1105
948 downheap ((WT *)timers, timercnt, 0); 1106 downheap ((WT *)timers, timercnt, 0);
949 } 1107 }
950 else 1108 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1109 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1110
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1112 }
955} 1113}
956 1114
957static void 1115#if EV_PERIODICS
1116inline void
958periodics_reify (EV_P) 1117periodics_reify (EV_P)
959{ 1118{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1120 {
962 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
963 1122
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1123 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1124
966 /* first reschedule or stop timer */ 1125 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1126 if (w->reschedule_cb)
968 { 1127 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1128 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
970
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1129 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0); 1130 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1131 }
974 else if (w->interval) 1132 else if (w->interval)
975 { 1133 {
976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1134 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1135 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
978 downheap ((WT *)periodics, periodiccnt, 0); 1136 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1137 }
980 else 1138 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1139 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1140
993 for (i = 0; i < periodiccnt; ++i) 1151 for (i = 0; i < periodiccnt; ++i)
994 { 1152 {
995 struct ev_periodic *w = periodics [i]; 1153 struct ev_periodic *w = periodics [i];
996 1154
997 if (w->reschedule_cb) 1155 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1156 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1157 else if (w->interval)
1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1158 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1001 } 1159 }
1002 1160
1003 /* now rebuild the heap */ 1161 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1162 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1163 downheap ((WT *)periodics, periodiccnt, i);
1006} 1164}
1165#endif
1007 1166
1008inline int 1167inline int
1009time_update_monotonic (EV_P) 1168time_update_monotonic (EV_P)
1010{ 1169{
1011 mn_now = get_clock (); 1170 mn_now = get_clock ();
1012 1171
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1172 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1173 {
1015 rt_now = rtmn_diff + mn_now; 1174 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1175 return 0;
1017 } 1176 }
1018 else 1177 else
1019 { 1178 {
1020 now_floor = mn_now; 1179 now_floor = mn_now;
1021 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1022 return 1; 1181 return 1;
1023 } 1182 }
1024} 1183}
1025 1184
1026static void 1185inline void
1027time_update (EV_P) 1186time_update (EV_P)
1028{ 1187{
1029 int i; 1188 int i;
1030 1189
1031#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
1035 { 1194 {
1036 ev_tstamp odiff = rtmn_diff; 1195 ev_tstamp odiff = rtmn_diff;
1037 1196
1038 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1197 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1039 { 1198 {
1040 rtmn_diff = rt_now - mn_now; 1199 rtmn_diff = ev_rt_now - mn_now;
1041 1200
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1201 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1202 return; /* all is well */
1044 1203
1045 rt_now = ev_time (); 1204 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1205 mn_now = get_clock ();
1047 now_floor = mn_now; 1206 now_floor = mn_now;
1048 } 1207 }
1049 1208
1209# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1210 periodics_reschedule (EV_A);
1211# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1212 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1213 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1214 }
1054 } 1215 }
1055 else 1216 else
1056#endif 1217#endif
1057 { 1218 {
1058 rt_now = ev_time (); 1219 ev_rt_now = ev_time ();
1059 1220
1060 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1221 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1061 { 1222 {
1223#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1224 periodics_reschedule (EV_A);
1225#endif
1063 1226
1064 /* adjust timers. this is easy, as the offset is the same for all */ 1227 /* adjust timers. this is easy, as the offset is the same for all */
1065 for (i = 0; i < timercnt; ++i) 1228 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1229 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1230 }
1068 1231
1069 mn_now = rt_now; 1232 mn_now = ev_rt_now;
1070 } 1233 }
1071} 1234}
1072 1235
1073void 1236void
1074ev_ref (EV_P) 1237ev_ref (EV_P)
1085static int loop_done; 1248static int loop_done;
1086 1249
1087void 1250void
1088ev_loop (EV_P_ int flags) 1251ev_loop (EV_P_ int flags)
1089{ 1252{
1090 double block;
1091 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1253 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1254 ? EVUNLOOP_ONE
1255 : EVUNLOOP_CANCEL;
1092 1256
1093 do 1257 while (activecnt)
1094 { 1258 {
1095 /* queue check watchers (and execute them) */ 1259 /* queue check watchers (and execute them) */
1096 if (expect_false (preparecnt)) 1260 if (expect_false (preparecnt))
1097 { 1261 {
1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1262 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1105 1269
1106 /* update fd-related kernel structures */ 1270 /* update fd-related kernel structures */
1107 fd_reify (EV_A); 1271 fd_reify (EV_A);
1108 1272
1109 /* calculate blocking time */ 1273 /* calculate blocking time */
1274 {
1275 double block;
1110 1276
1111 /* we only need this for !monotonic clock or timers, but as we basically 1277 if (flags & EVLOOP_NONBLOCK || idlecnt)
1112 always have timers, we just calculate it always */ 1278 block = 0.; /* do not block at all */
1279 else
1280 {
1281 /* update time to cancel out callback processing overhead */
1113#if EV_USE_MONOTONIC 1282#if EV_USE_MONOTONIC
1114 if (expect_true (have_monotonic)) 1283 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1284 time_update_monotonic (EV_A);
1116 else 1285 else
1117#endif 1286#endif
1118 { 1287 {
1119 rt_now = ev_time (); 1288 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1289 mn_now = ev_rt_now;
1121 } 1290 }
1122 1291
1123 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.;
1125 else
1126 {
1127 block = MAX_BLOCKTIME; 1292 block = MAX_BLOCKTIME;
1128 1293
1129 if (timercnt) 1294 if (timercnt)
1130 { 1295 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1296 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1132 if (block > to) block = to; 1297 if (block > to) block = to;
1133 } 1298 }
1134 1299
1300#if EV_PERIODICS
1135 if (periodiccnt) 1301 if (periodiccnt)
1136 { 1302 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1303 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1138 if (block > to) block = to; 1304 if (block > to) block = to;
1139 } 1305 }
1306#endif
1140 1307
1141 if (block < 0.) block = 0.; 1308 if (expect_false (block < 0.)) block = 0.;
1142 } 1309 }
1143 1310
1144 method_poll (EV_A_ block); 1311 backend_poll (EV_A_ block);
1312 }
1145 1313
1146 /* update rt_now, do magic */ 1314 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1315 time_update (EV_A);
1148 1316
1149 /* queue pending timers and reschedule them */ 1317 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1318 timers_reify (EV_A); /* relative timers called last */
1319#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1320 periodics_reify (EV_A); /* absolute timers called first */
1321#endif
1152 1322
1153 /* queue idle watchers unless io or timers are pending */ 1323 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1324 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1325 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1326
1157 /* queue check watchers, to be executed first */ 1327 /* queue check watchers, to be executed first */
1158 if (checkcnt) 1328 if (expect_false (checkcnt))
1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1329 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1160 1330
1161 call_pending (EV_A); 1331 call_pending (EV_A);
1162 }
1163 while (activecnt && !loop_done);
1164 1332
1165 if (loop_done != 2) 1333 if (expect_false (loop_done))
1166 loop_done = 0; 1334 break;
1335 }
1336
1337 if (loop_done == EVUNLOOP_ONE)
1338 loop_done = EVUNLOOP_CANCEL;
1167} 1339}
1168 1340
1169void 1341void
1170ev_unloop (EV_P_ int how) 1342ev_unloop (EV_P_ int how)
1171{ 1343{
1228void 1400void
1229ev_io_start (EV_P_ struct ev_io *w) 1401ev_io_start (EV_P_ struct ev_io *w)
1230{ 1402{
1231 int fd = w->fd; 1403 int fd = w->fd;
1232 1404
1233 if (ev_is_active (w)) 1405 if (expect_false (ev_is_active (w)))
1234 return; 1406 return;
1235 1407
1236 assert (("ev_io_start called with negative fd", fd >= 0)); 1408 assert (("ev_io_start called with negative fd", fd >= 0));
1237 1409
1238 ev_start (EV_A_ (W)w, 1); 1410 ev_start (EV_A_ (W)w, 1);
1244 1416
1245void 1417void
1246ev_io_stop (EV_P_ struct ev_io *w) 1418ev_io_stop (EV_P_ struct ev_io *w)
1247{ 1419{
1248 ev_clear_pending (EV_A_ (W)w); 1420 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1421 if (expect_false (!ev_is_active (w)))
1250 return; 1422 return;
1423
1424 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1251 1425
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1426 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1427 ev_stop (EV_A_ (W)w);
1254 1428
1255 fd_change (EV_A_ w->fd); 1429 fd_change (EV_A_ w->fd);
1256} 1430}
1257 1431
1258void 1432void
1259ev_timer_start (EV_P_ struct ev_timer *w) 1433ev_timer_start (EV_P_ struct ev_timer *w)
1260{ 1434{
1261 if (ev_is_active (w)) 1435 if (expect_false (ev_is_active (w)))
1262 return; 1436 return;
1263 1437
1264 ((WT)w)->at += mn_now; 1438 ((WT)w)->at += mn_now;
1265 1439
1266 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1440 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1267 1441
1268 ev_start (EV_A_ (W)w, ++timercnt); 1442 ev_start (EV_A_ (W)w, ++timercnt);
1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1443 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1270 timers [timercnt - 1] = w; 1444 timers [timercnt - 1] = w;
1271 upheap ((WT *)timers, timercnt - 1); 1445 upheap ((WT *)timers, timercnt - 1);
1272 1446
1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1447 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1274} 1448}
1275 1449
1276void 1450void
1277ev_timer_stop (EV_P_ struct ev_timer *w) 1451ev_timer_stop (EV_P_ struct ev_timer *w)
1278{ 1452{
1279 ev_clear_pending (EV_A_ (W)w); 1453 ev_clear_pending (EV_A_ (W)w);
1280 if (!ev_is_active (w)) 1454 if (expect_false (!ev_is_active (w)))
1281 return; 1455 return;
1282 1456
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1457 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1458
1285 if (((W)w)->active < timercnt--) 1459 if (expect_true (((W)w)->active < timercnt--))
1286 { 1460 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1461 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1462 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1463 }
1290 1464
1291 ((WT)w)->at = w->repeat; 1465 ((WT)w)->at -= mn_now;
1292 1466
1293 ev_stop (EV_A_ (W)w); 1467 ev_stop (EV_A_ (W)w);
1294} 1468}
1295 1469
1296void 1470void
1299 if (ev_is_active (w)) 1473 if (ev_is_active (w))
1300 { 1474 {
1301 if (w->repeat) 1475 if (w->repeat)
1302 { 1476 {
1303 ((WT)w)->at = mn_now + w->repeat; 1477 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1478 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1479 }
1306 else 1480 else
1307 ev_timer_stop (EV_A_ w); 1481 ev_timer_stop (EV_A_ w);
1308 } 1482 }
1309 else if (w->repeat) 1483 else if (w->repeat)
1484 {
1485 w->at = w->repeat;
1310 ev_timer_start (EV_A_ w); 1486 ev_timer_start (EV_A_ w);
1487 }
1311} 1488}
1312 1489
1490#if EV_PERIODICS
1313void 1491void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1492ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1493{
1316 if (ev_is_active (w)) 1494 if (expect_false (ev_is_active (w)))
1317 return; 1495 return;
1318 1496
1319 if (w->reschedule_cb) 1497 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1498 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1499 else if (w->interval)
1322 { 1500 {
1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1501 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1324 /* this formula differs from the one in periodic_reify because we do not always round up */ 1502 /* this formula differs from the one in periodic_reify because we do not always round up */
1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1503 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 } 1504 }
1327 1505
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1506 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1507 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1330 periodics [periodiccnt - 1] = w; 1508 periodics [periodiccnt - 1] = w;
1331 upheap ((WT *)periodics, periodiccnt - 1); 1509 upheap ((WT *)periodics, periodiccnt - 1);
1332 1510
1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1511 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1334} 1512}
1335 1513
1336void 1514void
1337ev_periodic_stop (EV_P_ struct ev_periodic *w) 1515ev_periodic_stop (EV_P_ struct ev_periodic *w)
1338{ 1516{
1339 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1340 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1341 return; 1519 return;
1342 1520
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1521 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1522
1345 if (((W)w)->active < periodiccnt--) 1523 if (expect_true (((W)w)->active < periodiccnt--))
1346 { 1524 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1525 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1526 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1527 }
1350 1528
1351 ev_stop (EV_A_ (W)w); 1529 ev_stop (EV_A_ (W)w);
1352} 1530}
1353 1531
1354void 1532void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1533ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1534{
1535 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1536 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1537 ev_periodic_start (EV_A_ w);
1359} 1538}
1539#endif
1360 1540
1361void 1541void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1542ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1543{
1364 if (ev_is_active (w)) 1544 if (expect_false (ev_is_active (w)))
1365 return; 1545 return;
1366 1546
1367 ev_start (EV_A_ (W)w, ++idlecnt); 1547 ev_start (EV_A_ (W)w, ++idlecnt);
1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1548 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1369 idles [idlecnt - 1] = w; 1549 idles [idlecnt - 1] = w;
1370} 1550}
1371 1551
1372void 1552void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1553ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1554{
1375 ev_clear_pending (EV_A_ (W)w); 1555 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1556 if (expect_false (!ev_is_active (w)))
1377 return; 1557 return;
1378 1558
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1559 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1560 ev_stop (EV_A_ (W)w);
1381} 1561}
1382 1562
1383void 1563void
1384ev_prepare_start (EV_P_ struct ev_prepare *w) 1564ev_prepare_start (EV_P_ struct ev_prepare *w)
1385{ 1565{
1386 if (ev_is_active (w)) 1566 if (expect_false (ev_is_active (w)))
1387 return; 1567 return;
1388 1568
1389 ev_start (EV_A_ (W)w, ++preparecnt); 1569 ev_start (EV_A_ (W)w, ++preparecnt);
1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1570 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1391 prepares [preparecnt - 1] = w; 1571 prepares [preparecnt - 1] = w;
1392} 1572}
1393 1573
1394void 1574void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1575ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1576{
1397 ev_clear_pending (EV_A_ (W)w); 1577 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1578 if (expect_false (!ev_is_active (w)))
1399 return; 1579 return;
1400 1580
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1581 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1582 ev_stop (EV_A_ (W)w);
1403} 1583}
1404 1584
1405void 1585void
1406ev_check_start (EV_P_ struct ev_check *w) 1586ev_check_start (EV_P_ struct ev_check *w)
1407{ 1587{
1408 if (ev_is_active (w)) 1588 if (expect_false (ev_is_active (w)))
1409 return; 1589 return;
1410 1590
1411 ev_start (EV_A_ (W)w, ++checkcnt); 1591 ev_start (EV_A_ (W)w, ++checkcnt);
1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1592 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1413 checks [checkcnt - 1] = w; 1593 checks [checkcnt - 1] = w;
1414} 1594}
1415 1595
1416void 1596void
1417ev_check_stop (EV_P_ struct ev_check *w) 1597ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1598{
1419 ev_clear_pending (EV_A_ (W)w); 1599 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1600 if (expect_false (!ev_is_active (w)))
1421 return; 1601 return;
1422 1602
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1603 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1604 ev_stop (EV_A_ (W)w);
1425} 1605}
1430 1610
1431void 1611void
1432ev_signal_start (EV_P_ struct ev_signal *w) 1612ev_signal_start (EV_P_ struct ev_signal *w)
1433{ 1613{
1434#if EV_MULTIPLICITY 1614#if EV_MULTIPLICITY
1435 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1615 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1436#endif 1616#endif
1437 if (ev_is_active (w)) 1617 if (expect_false (ev_is_active (w)))
1438 return; 1618 return;
1439 1619
1440 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1620 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1441 1621
1442 ev_start (EV_A_ (W)w, 1); 1622 ev_start (EV_A_ (W)w, 1);
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1623 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1624 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1625
1446 if (!((WL)w)->next) 1626 if (!((WL)w)->next)
1447 { 1627 {
1448#if WIN32 1628#if _WIN32
1449 signal (w->signum, sighandler); 1629 signal (w->signum, sighandler);
1450#else 1630#else
1451 struct sigaction sa; 1631 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1632 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1633 sigfillset (&sa.sa_mask);
1459 1639
1460void 1640void
1461ev_signal_stop (EV_P_ struct ev_signal *w) 1641ev_signal_stop (EV_P_ struct ev_signal *w)
1462{ 1642{
1463 ev_clear_pending (EV_A_ (W)w); 1643 ev_clear_pending (EV_A_ (W)w);
1464 if (!ev_is_active (w)) 1644 if (expect_false (!ev_is_active (w)))
1465 return; 1645 return;
1466 1646
1467 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1647 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1468 ev_stop (EV_A_ (W)w); 1648 ev_stop (EV_A_ (W)w);
1469 1649
1473 1653
1474void 1654void
1475ev_child_start (EV_P_ struct ev_child *w) 1655ev_child_start (EV_P_ struct ev_child *w)
1476{ 1656{
1477#if EV_MULTIPLICITY 1657#if EV_MULTIPLICITY
1478 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1658 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1479#endif 1659#endif
1480 if (ev_is_active (w)) 1660 if (expect_false (ev_is_active (w)))
1481 return; 1661 return;
1482 1662
1483 ev_start (EV_A_ (W)w, 1); 1663 ev_start (EV_A_ (W)w, 1);
1484 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1664 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1485} 1665}
1486 1666
1487void 1667void
1488ev_child_stop (EV_P_ struct ev_child *w) 1668ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1669{
1490 ev_clear_pending (EV_A_ (W)w); 1670 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1671 if (expect_false (!ev_is_active (w)))
1492 return; 1672 return;
1493 1673
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1674 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1496} 1676}
1677
1678#if EV_MULTIPLICITY
1679static void
1680embed_cb (EV_P_ struct ev_io *io, int revents)
1681{
1682 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1683
1684 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1685 ev_loop (w->loop, EVLOOP_NONBLOCK);
1686}
1687
1688void
1689ev_embed_start (EV_P_ struct ev_embed *w)
1690{
1691 if (expect_false (ev_is_active (w)))
1692 return;
1693
1694 {
1695 struct ev_loop *loop = w->loop;
1696 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1697 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1698 }
1699
1700 ev_io_start (EV_A_ &w->io);
1701 ev_start (EV_A_ (W)w, 1);
1702}
1703
1704void
1705ev_embed_stop (EV_P_ struct ev_embed *w)
1706{
1707 ev_clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w)))
1709 return;
1710
1711 ev_io_stop (EV_A_ &w->io);
1712 ev_stop (EV_A_ (W)w);
1713}
1714#endif
1497 1715
1498/*****************************************************************************/ 1716/*****************************************************************************/
1499 1717
1500struct ev_once 1718struct ev_once
1501{ 1719{
1533void 1751void
1534ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1752ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1535{ 1753{
1536 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1754 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1537 1755
1538 if (!once) 1756 if (expect_false (!once))
1757 {
1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1758 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1540 else 1759 return;
1541 { 1760 }
1761
1542 once->cb = cb; 1762 once->cb = cb;
1543 once->arg = arg; 1763 once->arg = arg;
1544 1764
1545 ev_watcher_init (&once->io, once_cb_io); 1765 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1766 if (fd >= 0)
1547 { 1767 {
1548 ev_io_set (&once->io, fd, events); 1768 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1769 ev_io_start (EV_A_ &once->io);
1550 } 1770 }
1551 1771
1552 ev_watcher_init (&once->to, once_cb_to); 1772 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1773 if (timeout >= 0.)
1554 { 1774 {
1555 ev_timer_set (&once->to, timeout, 0.); 1775 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1776 ev_timer_start (EV_A_ &once->to);
1557 }
1558 } 1777 }
1559} 1778}
1560 1779
1780#ifdef __cplusplus
1781}
1782#endif
1783

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines