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

Comparing libev/ev.c (file contents):
Revision 1.74 by root, Tue Nov 6 16:51:20 2007 UTC vs.
Revision 1.134 by root, Fri Nov 23 19:13:33 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
316 386
317 ++base; 387 ++base;
318 } 388 }
319} 389}
320 390
321static void 391void
322event (EV_P_ W w, int events) 392ev_feed_event (EV_P_ void *w, int revents)
323{ 393{
324 if (w->pending) 394 W w_ = (W)w;
395
396 if (expect_false (w_->pending))
325 { 397 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 399 return;
328 } 400 }
329 401
402 if (expect_false (!w_->cb))
403 return;
404
330 w->pending = ++pendingcnt [ABSPRI (w)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 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);
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 409}
335 410
336static void 411static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 412queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 413{
339 int i; 414 int i;
340 415
341 for (i = 0; i < eventcnt; ++i) 416 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 417 ev_feed_event (EV_A_ events [i], type);
343} 418}
344 419
345static void 420inline void
346fd_event (EV_P_ int fd, int events) 421fd_event (EV_P_ int fd, int revents)
347{ 422{
348 ANFD *anfd = anfds + fd; 423 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 424 struct ev_io *w;
350 425
351 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)
352 { 427 {
353 int ev = w->events & events; 428 int ev = w->events & revents;
354 429
355 if (ev) 430 if (ev)
356 event (EV_A_ (W)w, ev); 431 ev_feed_event (EV_A_ (W)w, ev);
357 } 432 }
433}
434
435void
436ev_feed_fd_event (EV_P_ int fd, int revents)
437{
438 fd_event (EV_A_ fd, revents);
358} 439}
359 440
360/*****************************************************************************/ 441/*****************************************************************************/
361 442
362static void 443inline void
363fd_reify (EV_P) 444fd_reify (EV_P)
364{ 445{
365 int i; 446 int i;
366 447
367 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
373 int events = 0; 454 int events = 0;
374 455
375 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)
376 events |= w->events; 457 events |= w->events;
377 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
378 anfd->reify = 0; 468 anfd->reify = 0;
379 469
380 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 471 anfd->events = events;
382 } 472 }
383 473
384 fdchangecnt = 0; 474 fdchangecnt = 0;
385} 475}
386 476
387static void 477static void
388fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
389{ 479{
390 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
391 return; 481 return;
392 482
393 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
394 484
395 ++fdchangecnt; 485 ++fdchangecnt;
396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 486 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
397 fdchanges [fdchangecnt - 1] = fd; 487 fdchanges [fdchangecnt - 1] = fd;
398} 488}
399 489
400static void 490static void
401fd_kill (EV_P_ int fd) 491fd_kill (EV_P_ int fd)
403 struct ev_io *w; 493 struct ev_io *w;
404 494
405 while ((w = (struct ev_io *)anfds [fd].head)) 495 while ((w = (struct ev_io *)anfds [fd].head))
406 { 496 {
407 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
408 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);
409 } 499 }
410} 500}
411 501
412static int 502inline int
413fd_valid (int fd) 503fd_valid (int fd)
414{ 504{
415#ifdef WIN32 505#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 506 return _get_osfhandle (fd) != -1;
417#else 507#else
418 return fcntl (fd, F_GETFD) != -1; 508 return fcntl (fd, F_GETFD) != -1;
419#endif 509#endif
420} 510}
421 511
443 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
444 return; 534 return;
445 } 535 }
446} 536}
447 537
448/* 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 */
449static void 539static void
450fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
451{ 541{
452 int fd; 542 int fd;
453 543
501 591
502 heap [k] = w; 592 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 593 ((W)heap [k])->active = k + 1;
504} 594}
505 595
596inline void
597adjustheap (WT *heap, int N, int k)
598{
599 upheap (heap, k);
600 downheap (heap, N, k);
601}
602
506/*****************************************************************************/ 603/*****************************************************************************/
507 604
508typedef struct 605typedef struct
509{ 606{
510 WL head; 607 WL head;
531} 628}
532 629
533static void 630static void
534sighandler (int signum) 631sighandler (int signum)
535{ 632{
536#if WIN32 633#if _WIN32
537 signal (signum, sighandler); 634 signal (signum, sighandler);
538#endif 635#endif
539 636
540 signals [signum - 1].gotsig = 1; 637 signals [signum - 1].gotsig = 1;
541 638
546 write (sigpipe [1], &signum, 1); 643 write (sigpipe [1], &signum, 1);
547 errno = old_errno; 644 errno = old_errno;
548 } 645 }
549} 646}
550 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
551static void 668static void
552sigcb (EV_P_ struct ev_io *iow, int revents) 669sigcb (EV_P_ struct ev_io *iow, int revents)
553{ 670{
554 WL w;
555 int signum; 671 int signum;
556 672
557 read (sigpipe [0], &revents, 1); 673 read (sigpipe [0], &revents, 1);
558 gotsig = 0; 674 gotsig = 0;
559 675
560 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
561 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
562 { 678 ev_feed_signal_event (EV_A_ signum + 1);
563 signals [signum].gotsig = 0; 679}
564 680
565 for (w = signals [signum].head; w; w = w->next) 681static void
566 event (EV_A_ (W)w, EV_SIGNAL); 682fd_intern (int fd)
567 } 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
568} 691}
569 692
570static void 693static void
571siginit (EV_P) 694siginit (EV_P)
572{ 695{
573#ifndef WIN32 696 fd_intern (sigpipe [0]);
574 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 697 fd_intern (sigpipe [1]);
575 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
576
577 /* rather than sort out wether we really need nb, set it */
578 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
579 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
580#endif
581 698
582 ev_io_set (&sigev, sigpipe [0], EV_READ); 699 ev_io_set (&sigev, sigpipe [0], EV_READ);
583 ev_io_start (EV_A_ &sigev); 700 ev_io_start (EV_A_ &sigev);
584 ev_unref (EV_A); /* child watcher should not keep loop alive */ 701 ev_unref (EV_A); /* child watcher should not keep loop alive */
585} 702}
586 703
587/*****************************************************************************/ 704/*****************************************************************************/
588 705
589static struct ev_child *childs [PID_HASHSIZE]; 706static struct ev_child *childs [PID_HASHSIZE];
590 707
591#ifndef WIN32 708#ifndef _WIN32
592 709
593static struct ev_signal childev; 710static struct ev_signal childev;
594 711
595#ifndef WCONTINUED 712#ifndef WCONTINUED
596# define WCONTINUED 0 713# define WCONTINUED 0
605 if (w->pid == pid || !w->pid) 722 if (w->pid == pid || !w->pid)
606 { 723 {
607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 724 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
608 w->rpid = pid; 725 w->rpid = pid;
609 w->rstatus = status; 726 w->rstatus = status;
610 event (EV_A_ (W)w, EV_CHILD); 727 ev_feed_event (EV_A_ (W)w, EV_CHILD);
611 } 728 }
612} 729}
613 730
614static void 731static void
615childcb (EV_P_ struct ev_signal *sw, int revents) 732childcb (EV_P_ struct ev_signal *sw, int revents)
617 int pid, status; 734 int pid, status;
618 735
619 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
620 { 737 {
621 /* 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 */
622 event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
623 741
624 child_reap (EV_A_ sw, pid, pid, status); 742 child_reap (EV_A_ sw, pid, pid, status);
625 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 */
626 } 744 }
627} 745}
628 746
629#endif 747#endif
630 748
631/*****************************************************************************/ 749/*****************************************************************************/
632 750
751#if EV_USE_PORT
752# include "ev_port.c"
753#endif
633#if EV_USE_KQUEUE 754#if EV_USE_KQUEUE
634# include "ev_kqueue.c" 755# include "ev_kqueue.c"
635#endif 756#endif
636#if EV_USE_EPOLL 757#if EV_USE_EPOLL
637# include "ev_epoll.c" 758# include "ev_epoll.c"
657 778
658/* 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 */
659static int 780static int
660enable_secure (void) 781enable_secure (void)
661{ 782{
662#ifdef WIN32 783#ifdef _WIN32
663 return 0; 784 return 0;
664#else 785#else
665 return getuid () != geteuid () 786 return getuid () != geteuid ()
666 || getgid () != getegid (); 787 || getgid () != getegid ();
667#endif 788#endif
668} 789}
669 790
670int 791unsigned int
671ev_method (EV_P) 792ev_supported_backends (void)
672{ 793{
673 return method; 794 unsigned int flags = 0;
674}
675 795
676static void 796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
677loop_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)
678{ 807{
679 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)
680 { 841 {
681#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
682 { 843 {
683 struct timespec ts; 844 struct timespec ts;
684 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
685 have_monotonic = 1; 846 have_monotonic = 1;
686 } 847 }
687#endif 848#endif
688 849
689 rt_now = ev_time (); 850 ev_rt_now = ev_time ();
690 mn_now = get_clock (); 851 mn_now = get_clock ();
691 now_floor = mn_now; 852 now_floor = mn_now;
692 rtmn_diff = rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
693 854
694 if (methods == EVMETHOD_AUTO) 855 if (!(flags & EVFLAG_NOENV)
695 if (!enable_secure () && getenv ("LIBEV_METHODS")) 856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
696 methods = atoi (getenv ("LIBEV_METHODS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
697 else
698 methods = EVMETHOD_ANY;
699 859
700 method = 0; 860 if (!(flags & 0x0000ffffUL))
701#if EV_USE_WIN32 861 flags |= ev_recommended_backends ();
702 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);
703#endif 866#endif
704#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
706#endif 869#endif
707#if EV_USE_EPOLL 870#if EV_USE_EPOLL
708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
709#endif 872#endif
710#if EV_USE_POLL 873#if EV_USE_POLL
711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
712#endif 875#endif
713#if EV_USE_SELECT 876#if EV_USE_SELECT
714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
715#endif 878#endif
716 879
717 ev_watcher_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
719 } 882 }
720} 883}
721 884
722void 885static void
723loop_destroy (EV_P) 886loop_destroy (EV_P)
724{ 887{
725 int i; 888 int i;
726 889
727#if EV_USE_WIN32 890#if EV_USE_PORT
728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
729#endif 892#endif
730#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
732#endif 895#endif
733#if EV_USE_EPOLL 896#if EV_USE_EPOLL
734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
735#endif 898#endif
736#if EV_USE_POLL 899#if EV_USE_POLL
737 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
738#endif 901#endif
739#if EV_USE_SELECT 902#if EV_USE_SELECT
740 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
741#endif 904#endif
742 905
743 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
744 array_free (pending, [i]); 907 array_free (pending, [i]);
745 908
746 /* have to use the microsoft-never-gets-it-right macro */ 909 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange); 910 array_free (fdchange, EMPTY0);
748 array_free_microshit (timer); 911 array_free (timer, EMPTY0);
749 array_free_microshit (periodic); 912#if EV_PERIODICS
750 array_free_microshit (idle); 913 array_free (periodic, EMPTY0);
751 array_free_microshit (prepare); 914#endif
752 array_free_microshit (check); 915 array_free (idle, EMPTY0);
916 array_free (prepare, EMPTY0);
917 array_free (check, EMPTY0);
753 918
754 method = 0; 919 backend = 0;
755} 920}
756 921
757static void 922static void
758loop_fork (EV_P) 923loop_fork (EV_P)
759{ 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
760#if EV_USE_EPOLL 931#if EV_USE_EPOLL
761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
762#endif
763#if EV_USE_KQUEUE
764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
765#endif 933#endif
766 934
767 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
768 { 936 {
769 /* default loop */ 937 /* default loop */
782 postfork = 0; 950 postfork = 0;
783} 951}
784 952
785#if EV_MULTIPLICITY 953#if EV_MULTIPLICITY
786struct ev_loop * 954struct ev_loop *
787ev_loop_new (int methods) 955ev_loop_new (unsigned int flags)
788{ 956{
789 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));
790 958
791 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
792 960
793 loop_init (EV_A_ methods); 961 loop_init (EV_A_ flags);
794 962
795 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
796 return loop; 964 return loop;
797 965
798 return 0; 966 return 0;
799} 967}
800 968
812} 980}
813 981
814#endif 982#endif
815 983
816#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
817struct ev_loop default_loop_struct;
818static struct ev_loop *default_loop;
819
820struct ev_loop * 985struct ev_loop *
986ev_default_loop_init (unsigned int flags)
821#else 987#else
822static int default_loop;
823
824int 988int
989ev_default_loop (unsigned int flags)
825#endif 990#endif
826ev_default_loop (int methods)
827{ 991{
828 if (sigpipe [0] == sigpipe [1]) 992 if (sigpipe [0] == sigpipe [1])
829 if (pipe (sigpipe)) 993 if (pipe (sigpipe))
830 return 0; 994 return 0;
831 995
832 if (!default_loop) 996 if (!ev_default_loop_ptr)
833 { 997 {
834#if EV_MULTIPLICITY 998#if EV_MULTIPLICITY
835 struct ev_loop *loop = default_loop = &default_loop_struct; 999 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
836#else 1000#else
837 default_loop = 1; 1001 ev_default_loop_ptr = 1;
838#endif 1002#endif
839 1003
840 loop_init (EV_A_ methods); 1004 loop_init (EV_A_ flags);
841 1005
842 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
843 { 1007 {
844 siginit (EV_A); 1008 siginit (EV_A);
845 1009
846#ifndef WIN32 1010#ifndef _WIN32
847 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
848 ev_set_priority (&childev, EV_MAXPRI); 1012 ev_set_priority (&childev, EV_MAXPRI);
849 ev_signal_start (EV_A_ &childev); 1013 ev_signal_start (EV_A_ &childev);
850 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1014 ev_unref (EV_A); /* child watcher should not keep loop alive */
851#endif 1015#endif
852 } 1016 }
853 else 1017 else
854 default_loop = 0; 1018 ev_default_loop_ptr = 0;
855 } 1019 }
856 1020
857 return default_loop; 1021 return ev_default_loop_ptr;
858} 1022}
859 1023
860void 1024void
861ev_default_destroy (void) 1025ev_default_destroy (void)
862{ 1026{
863#if EV_MULTIPLICITY 1027#if EV_MULTIPLICITY
864 struct ev_loop *loop = default_loop; 1028 struct ev_loop *loop = ev_default_loop_ptr;
865#endif 1029#endif
866 1030
867#ifndef WIN32 1031#ifndef _WIN32
868 ev_ref (EV_A); /* child watcher */ 1032 ev_ref (EV_A); /* child watcher */
869 ev_signal_stop (EV_A_ &childev); 1033 ev_signal_stop (EV_A_ &childev);
870#endif 1034#endif
871 1035
872 ev_ref (EV_A); /* signal watcher */ 1036 ev_ref (EV_A); /* signal watcher */
880 1044
881void 1045void
882ev_default_fork (void) 1046ev_default_fork (void)
883{ 1047{
884#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop; 1049 struct ev_loop *loop = ev_default_loop_ptr;
886#endif 1050#endif
887 1051
888 if (method) 1052 if (backend)
889 postfork = 1; 1053 postfork = 1;
890} 1054}
891 1055
892/*****************************************************************************/ 1056/*****************************************************************************/
893 1057
894static void 1058static int
1059any_pending (EV_P)
1060{
1061 int pri;
1062
1063 for (pri = NUMPRI; pri--; )
1064 if (pendingcnt [pri])
1065 return 1;
1066
1067 return 0;
1068}
1069
1070inline void
895call_pending (EV_P) 1071call_pending (EV_P)
896{ 1072{
897 int pri; 1073 int pri;
898 1074
899 for (pri = NUMPRI; pri--; ) 1075 for (pri = NUMPRI; pri--; )
900 while (pendingcnt [pri]) 1076 while (pendingcnt [pri])
901 { 1077 {
902 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1078 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
903 1079
904 if (p->w) 1080 if (expect_true (p->w))
905 { 1081 {
906 p->w->pending = 0; 1082 p->w->pending = 0;
907 p->w->cb (EV_A_ p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
908 } 1084 }
909 } 1085 }
910} 1086}
911 1087
912static void 1088inline void
913timers_reify (EV_P) 1089timers_reify (EV_P)
914{ 1090{
915 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
916 { 1092 {
917 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
920 1096
921 /* first reschedule or stop timer */ 1097 /* first reschedule or stop timer */
922 if (w->repeat) 1098 if (w->repeat)
923 { 1099 {
924 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
925 ((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
926 downheap ((WT *)timers, timercnt, 0); 1106 downheap ((WT *)timers, timercnt, 0);
927 } 1107 }
928 else 1108 else
929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1109 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
930 1110
931 event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
932 } 1112 }
933} 1113}
934 1114
935static void 1115#if EV_PERIODICS
1116inline void
936periodics_reify (EV_P) 1117periodics_reify (EV_P)
937{ 1118{
938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
939 { 1120 {
940 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
941 1122
942 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1123 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
943 1124
944 /* first reschedule or stop timer */ 1125 /* first reschedule or stop timer */
945 if (w->interval) 1126 if (w->reschedule_cb)
946 { 1127 {
1128 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1129 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1130 downheap ((WT *)periodics, periodiccnt, 0);
1131 }
1132 else if (w->interval)
1133 {
947 ((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;
948 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));
949 downheap ((WT *)periodics, periodiccnt, 0); 1136 downheap ((WT *)periodics, periodiccnt, 0);
950 } 1137 }
951 else 1138 else
952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1139 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
953 1140
954 event (EV_A_ (W)w, EV_PERIODIC); 1141 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
955 } 1142 }
956} 1143}
957 1144
958static void 1145static void
959periodics_reschedule (EV_P) 1146periodics_reschedule (EV_P)
963 /* adjust periodics after time jump */ 1150 /* adjust periodics after time jump */
964 for (i = 0; i < periodiccnt; ++i) 1151 for (i = 0; i < periodiccnt; ++i)
965 { 1152 {
966 struct ev_periodic *w = periodics [i]; 1153 struct ev_periodic *w = periodics [i];
967 1154
1155 if (w->reschedule_cb)
1156 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
968 if (w->interval) 1157 else if (w->interval)
969 {
970 ev_tstamp diff = 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;
971
972 if (fabs (diff) >= 1e-4)
973 {
974 ev_periodic_stop (EV_A_ w);
975 ev_periodic_start (EV_A_ w);
976
977 i = 0; /* restart loop, inefficient, but time jumps should be rare */
978 }
979 }
980 } 1159 }
1160
1161 /* now rebuild the heap */
1162 for (i = periodiccnt >> 1; i--; )
1163 downheap ((WT *)periodics, periodiccnt, i);
981} 1164}
1165#endif
982 1166
983inline int 1167inline int
984time_update_monotonic (EV_P) 1168time_update_monotonic (EV_P)
985{ 1169{
986 mn_now = get_clock (); 1170 mn_now = get_clock ();
987 1171
988 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1172 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
989 { 1173 {
990 rt_now = rtmn_diff + mn_now; 1174 ev_rt_now = rtmn_diff + mn_now;
991 return 0; 1175 return 0;
992 } 1176 }
993 else 1177 else
994 { 1178 {
995 now_floor = mn_now; 1179 now_floor = mn_now;
996 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
997 return 1; 1181 return 1;
998 } 1182 }
999} 1183}
1000 1184
1001static void 1185inline void
1002time_update (EV_P) 1186time_update (EV_P)
1003{ 1187{
1004 int i; 1188 int i;
1005 1189
1006#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
1010 { 1194 {
1011 ev_tstamp odiff = rtmn_diff; 1195 ev_tstamp odiff = rtmn_diff;
1012 1196
1013 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 */
1014 { 1198 {
1015 rtmn_diff = rt_now - mn_now; 1199 rtmn_diff = ev_rt_now - mn_now;
1016 1200
1017 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1201 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1018 return; /* all is well */ 1202 return; /* all is well */
1019 1203
1020 rt_now = ev_time (); 1204 ev_rt_now = ev_time ();
1021 mn_now = get_clock (); 1205 mn_now = get_clock ();
1022 now_floor = mn_now; 1206 now_floor = mn_now;
1023 } 1207 }
1024 1208
1209# if EV_PERIODICS
1025 periodics_reschedule (EV_A); 1210 periodics_reschedule (EV_A);
1211# endif
1026 /* no timer adjustment, as the monotonic clock doesn't jump */ 1212 /* no timer adjustment, as the monotonic clock doesn't jump */
1027 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1213 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1028 } 1214 }
1029 } 1215 }
1030 else 1216 else
1031#endif 1217#endif
1032 { 1218 {
1033 rt_now = ev_time (); 1219 ev_rt_now = ev_time ();
1034 1220
1035 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))
1036 { 1222 {
1223#if EV_PERIODICS
1037 periodics_reschedule (EV_A); 1224 periodics_reschedule (EV_A);
1225#endif
1038 1226
1039 /* 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 */
1040 for (i = 0; i < timercnt; ++i) 1228 for (i = 0; i < timercnt; ++i)
1041 ((WT)timers [i])->at += rt_now - mn_now; 1229 ((WT)timers [i])->at += ev_rt_now - mn_now;
1042 } 1230 }
1043 1231
1044 mn_now = rt_now; 1232 mn_now = ev_rt_now;
1045 } 1233 }
1046} 1234}
1047 1235
1048void 1236void
1049ev_ref (EV_P) 1237ev_ref (EV_P)
1063ev_loop (EV_P_ int flags) 1251ev_loop (EV_P_ int flags)
1064{ 1252{
1065 double block; 1253 double block;
1066 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1254 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1067 1255
1068 do 1256 while (activecnt)
1069 { 1257 {
1070 /* queue check watchers (and execute them) */ 1258 /* queue check watchers (and execute them) */
1071 if (expect_false (preparecnt)) 1259 if (expect_false (preparecnt))
1072 { 1260 {
1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1261 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1081 /* update fd-related kernel structures */ 1269 /* update fd-related kernel structures */
1082 fd_reify (EV_A); 1270 fd_reify (EV_A);
1083 1271
1084 /* calculate blocking time */ 1272 /* calculate blocking time */
1085 1273
1086 /* we only need this for !monotonic clockor timers, but as we basically 1274 /* we only need this for !monotonic clock or timers, but as we basically
1087 always have timers, we just calculate it always */ 1275 always have timers, we just calculate it always */
1088#if EV_USE_MONOTONIC 1276#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic)) 1277 if (expect_true (have_monotonic))
1090 time_update_monotonic (EV_A); 1278 time_update_monotonic (EV_A);
1091 else 1279 else
1092#endif 1280#endif
1093 { 1281 {
1094 rt_now = ev_time (); 1282 ev_rt_now = ev_time ();
1095 mn_now = rt_now; 1283 mn_now = ev_rt_now;
1096 } 1284 }
1097 1285
1098 if (flags & EVLOOP_NONBLOCK || idlecnt) 1286 if (flags & EVLOOP_NONBLOCK || idlecnt)
1099 block = 0.; 1287 block = 0.;
1100 else 1288 else
1101 { 1289 {
1102 block = MAX_BLOCKTIME; 1290 block = MAX_BLOCKTIME;
1103 1291
1104 if (timercnt) 1292 if (timercnt)
1105 { 1293 {
1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1294 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1107 if (block > to) block = to; 1295 if (block > to) block = to;
1108 } 1296 }
1109 1297
1298#if EV_PERIODICS
1110 if (periodiccnt) 1299 if (periodiccnt)
1111 { 1300 {
1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1301 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1113 if (block > to) block = to; 1302 if (block > to) block = to;
1114 } 1303 }
1304#endif
1115 1305
1116 if (block < 0.) block = 0.; 1306 if (expect_false (block < 0.)) block = 0.;
1117 } 1307 }
1118 1308
1119 method_poll (EV_A_ block); 1309 backend_poll (EV_A_ block);
1120 1310
1121 /* update rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1122 time_update (EV_A); 1312 time_update (EV_A);
1123 1313
1124 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
1125 timers_reify (EV_A); /* relative timers called last */ 1315 timers_reify (EV_A); /* relative timers called last */
1316#if EV_PERIODICS
1126 periodics_reify (EV_A); /* absolute timers called first */ 1317 periodics_reify (EV_A); /* absolute timers called first */
1318#endif
1127 1319
1128 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless io or timers are pending */
1129 if (!pendingcnt) 1321 if (idlecnt && !any_pending (EV_A))
1130 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1131 1323
1132 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1133 if (checkcnt) 1325 if (expect_false (checkcnt))
1134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1135 1327
1136 call_pending (EV_A); 1328 call_pending (EV_A);
1329
1330 if (expect_false (loop_done))
1331 break;
1137 } 1332 }
1138 while (activecnt && !loop_done);
1139 1333
1140 if (loop_done != 2) 1334 if (loop_done != 2)
1141 loop_done = 0; 1335 loop_done = 0;
1142} 1336}
1143 1337
1203void 1397void
1204ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ struct ev_io *w)
1205{ 1399{
1206 int fd = w->fd; 1400 int fd = w->fd;
1207 1401
1208 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1209 return; 1403 return;
1210 1404
1211 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1212 1406
1213 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
1219 1413
1220void 1414void
1221ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ struct ev_io *w)
1222{ 1416{
1223 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1224 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1225 return; 1419 return;
1420
1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1226 1422
1227 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1228 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1229 1425
1230 fd_change (EV_A_ w->fd); 1426 fd_change (EV_A_ w->fd);
1231} 1427}
1232 1428
1233void 1429void
1234ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ struct ev_timer *w)
1235{ 1431{
1236 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1237 return; 1433 return;
1238 1434
1239 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1240 1436
1241 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1437 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1242 1438
1243 ev_start (EV_A_ (W)w, ++timercnt); 1439 ev_start (EV_A_ (W)w, ++timercnt);
1244 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1440 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1245 timers [timercnt - 1] = w; 1441 timers [timercnt - 1] = w;
1246 upheap ((WT *)timers, timercnt - 1); 1442 upheap ((WT *)timers, timercnt - 1);
1247 1443
1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1444 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1249} 1445}
1250 1446
1251void 1447void
1252ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ struct ev_timer *w)
1253{ 1449{
1254 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1255 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1256 return; 1452 return;
1257 1453
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1259 1455
1260 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1261 { 1457 {
1262 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1264 } 1460 }
1265 1461
1266 ((WT)w)->at = w->repeat; 1462 ((WT)w)->at -= mn_now;
1267 1463
1268 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1269} 1465}
1270 1466
1271void 1467void
1274 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1275 { 1471 {
1276 if (w->repeat) 1472 if (w->repeat)
1277 { 1473 {
1278 ((WT)w)->at = mn_now + w->repeat; 1474 ((WT)w)->at = mn_now + w->repeat;
1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1475 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1280 } 1476 }
1281 else 1477 else
1282 ev_timer_stop (EV_A_ w); 1478 ev_timer_stop (EV_A_ w);
1283 } 1479 }
1284 else if (w->repeat) 1480 else if (w->repeat)
1481 {
1482 w->at = w->repeat;
1285 ev_timer_start (EV_A_ w); 1483 ev_timer_start (EV_A_ w);
1484 }
1286} 1485}
1287 1486
1487#if EV_PERIODICS
1288void 1488void
1289ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ struct ev_periodic *w)
1290{ 1490{
1291 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1292 return; 1492 return;
1293 1493
1494 if (w->reschedule_cb)
1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1496 else if (w->interval)
1497 {
1294 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1498 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1295
1296 /* this formula differs from the one in periodic_reify because we do not always round up */ 1499 /* this formula differs from the one in periodic_reify because we do not always round up */
1297 if (w->interval)
1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1500 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1501 }
1299 1502
1300 ev_start (EV_A_ (W)w, ++periodiccnt); 1503 ev_start (EV_A_ (W)w, ++periodiccnt);
1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1504 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1302 periodics [periodiccnt - 1] = w; 1505 periodics [periodiccnt - 1] = w;
1303 upheap ((WT *)periodics, periodiccnt - 1); 1506 upheap ((WT *)periodics, periodiccnt - 1);
1304 1507
1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1508 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1306} 1509}
1307 1510
1308void 1511void
1309ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ struct ev_periodic *w)
1310{ 1513{
1311 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1313 return; 1516 return;
1314 1517
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1316 1519
1317 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1318 { 1521 {
1319 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1321 } 1524 }
1322 1525
1323 ev_stop (EV_A_ (W)w); 1526 ev_stop (EV_A_ (W)w);
1324} 1527}
1325 1528
1326void 1529void
1530ev_periodic_again (EV_P_ struct ev_periodic *w)
1531{
1532 /* TODO: use adjustheap and recalculation */
1533 ev_periodic_stop (EV_A_ w);
1534 ev_periodic_start (EV_A_ w);
1535}
1536#endif
1537
1538void
1327ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ struct ev_idle *w)
1328{ 1540{
1329 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1330 return; 1542 return;
1331 1543
1332 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1333 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1545 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1334 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
1335} 1547}
1336 1548
1337void 1549void
1338ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ struct ev_idle *w)
1339{ 1551{
1340 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1341 if (ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1342 return; 1554 return;
1343 1555
1344 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1345 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1346} 1558}
1347 1559
1348void 1560void
1349ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ struct ev_prepare *w)
1350{ 1562{
1351 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1352 return; 1564 return;
1353 1565
1354 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1355 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1567 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1356 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
1357} 1569}
1358 1570
1359void 1571void
1360ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ struct ev_prepare *w)
1361{ 1573{
1362 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1363 if (ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1364 return; 1576 return;
1365 1577
1366 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1367 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1368} 1580}
1369 1581
1370void 1582void
1371ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ struct ev_check *w)
1372{ 1584{
1373 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1374 return; 1586 return;
1375 1587
1376 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1377 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1589 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1378 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
1379} 1591}
1380 1592
1381void 1593void
1382ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ struct ev_check *w)
1383{ 1595{
1384 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1385 if (ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1386 return; 1598 return;
1387 1599
1388 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1389 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1390} 1602}
1395 1607
1396void 1608void
1397ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ struct ev_signal *w)
1398{ 1610{
1399#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1400 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1612 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1401#endif 1613#endif
1402 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1403 return; 1615 return;
1404 1616
1405 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1617 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1406 1618
1407 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
1408 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1620 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1621 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1410 1622
1411 if (!((WL)w)->next) 1623 if (!((WL)w)->next)
1412 { 1624 {
1413#if WIN32 1625#if _WIN32
1414 signal (w->signum, sighandler); 1626 signal (w->signum, sighandler);
1415#else 1627#else
1416 struct sigaction sa; 1628 struct sigaction sa;
1417 sa.sa_handler = sighandler; 1629 sa.sa_handler = sighandler;
1418 sigfillset (&sa.sa_mask); 1630 sigfillset (&sa.sa_mask);
1424 1636
1425void 1637void
1426ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ struct ev_signal *w)
1427{ 1639{
1428 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1429 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1430 return; 1642 return;
1431 1643
1432 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1433 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1434 1646
1438 1650
1439void 1651void
1440ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ struct ev_child *w)
1441{ 1653{
1442#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1443 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1655 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1444#endif 1656#endif
1445 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1446 return; 1658 return;
1447 1659
1448 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1449 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1450} 1662}
1451 1663
1452void 1664void
1453ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ struct ev_child *w)
1454{ 1666{
1455 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1457 return; 1669 return;
1458 1670
1459 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1460 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1461} 1673}
1674
1675#if EV_MULTIPLICITY
1676static void
1677embed_cb (EV_P_ struct ev_io *io, int revents)
1678{
1679 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1680
1681 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1682 ev_loop (w->loop, EVLOOP_NONBLOCK);
1683}
1684
1685void
1686ev_embed_start (EV_P_ struct ev_embed *w)
1687{
1688 if (expect_false (ev_is_active (w)))
1689 return;
1690
1691 {
1692 struct ev_loop *loop = w->loop;
1693 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1694 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1695 }
1696
1697 ev_io_start (EV_A_ &w->io);
1698 ev_start (EV_A_ (W)w, 1);
1699}
1700
1701void
1702ev_embed_stop (EV_P_ struct ev_embed *w)
1703{
1704 ev_clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w)))
1706 return;
1707
1708 ev_io_stop (EV_A_ &w->io);
1709 ev_stop (EV_A_ (W)w);
1710}
1711#endif
1462 1712
1463/*****************************************************************************/ 1713/*****************************************************************************/
1464 1714
1465struct ev_once 1715struct ev_once
1466{ 1716{
1498void 1748void
1499ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1749ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1500{ 1750{
1501 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1502 1752
1503 if (!once) 1753 if (expect_false (!once))
1754 {
1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1505 else 1756 return;
1506 { 1757 }
1758
1507 once->cb = cb; 1759 once->cb = cb;
1508 once->arg = arg; 1760 once->arg = arg;
1509 1761
1510 ev_watcher_init (&once->io, once_cb_io); 1762 ev_init (&once->io, once_cb_io);
1511 if (fd >= 0) 1763 if (fd >= 0)
1512 { 1764 {
1513 ev_io_set (&once->io, fd, events); 1765 ev_io_set (&once->io, fd, events);
1514 ev_io_start (EV_A_ &once->io); 1766 ev_io_start (EV_A_ &once->io);
1515 } 1767 }
1516 1768
1517 ev_watcher_init (&once->to, once_cb_to); 1769 ev_init (&once->to, once_cb_to);
1518 if (timeout >= 0.) 1770 if (timeout >= 0.)
1519 { 1771 {
1520 ev_timer_set (&once->to, timeout, 0.); 1772 ev_timer_set (&once->to, timeout, 0.);
1521 ev_timer_start (EV_A_ &once->to); 1773 ev_timer_start (EV_A_ &once->to);
1522 }
1523 } 1774 }
1524} 1775}
1525 1776
1777#ifdef __cplusplus
1778}
1779#endif
1780

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines