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

Comparing libev/ev.c (file contents):
Revision 1.105 by root, Mon Nov 12 01:02:09 2007 UTC vs.
Revision 1.138 by root, Sat Nov 24 09:48:38 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) && !defined (__APPLE__) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) && !defined (__APPLE__) 83# ifndef EV_USE_KQUEUE
84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
62# endif 97# endif
63 98
64#endif 99#endif
65 100
66#include <math.h> 101#include <math.h>
… …
90#endif 125#endif
91 126
92/**/ 127/**/
93 128
94#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
96#endif 135#endif
97 136
98#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 139#endif
102 140
103#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
104# ifdef _WIN32 142# ifdef _WIN32
105# define EV_USE_POLL 0 143# define EV_USE_POLL 0
… …
114 152
115#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
117#endif 155#endif
118 156
119#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
121#endif 159#endif
122 160
123/**/ 161/**/
124 162
125#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
… …
137#endif 175#endif
138 176
139/**/ 177/**/
140 178
141#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) */
142#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) */
143#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 */
144/*#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 */
145 183
146#ifdef EV_H 184#ifdef EV_H
147# include EV_H 185# include EV_H
148#else 186#else
149# include "ev.h" 187# include "ev.h"
150#endif 188#endif
151 189
152#if __GNUC__ >= 3 190#if __GNUC__ >= 3
153# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
154# define inline inline 192# define inline static inline
155#else 193#else
156# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
157# define inline static 195# define inline static
158#endif 196#endif
159 197
… …
161#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
162 200
163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
164#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
165 203
166#define EMPTY /* required for microsofts broken pseudo-c compiler */ 204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
167 206
168typedef struct ev_watcher *W; 207typedef ev_watcher *W;
169typedef struct ev_watcher_list *WL; 208typedef ev_watcher_list *WL;
170typedef struct ev_watcher_time *WT; 209typedef ev_watcher_time *WT;
171 210
172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
173 212
174#ifdef _WIN32 213#ifdef _WIN32
175# include "ev_win32.c" 214# include "ev_win32.c"
… …
251 #include "ev_vars.h" 290 #include "ev_vars.h"
252 #undef VAR 291 #undef VAR
253 }; 292 };
254 #include "ev_wrap.h" 293 #include "ev_wrap.h"
255 294
256 struct ev_loop default_loop_struct; 295 static struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop; 296 struct ev_loop *ev_default_loop_ptr;
258 297
259#else 298#else
260 299
261 ev_tstamp ev_rt_now; 300 ev_tstamp ev_rt_now;
262 #define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
263 #include "ev_vars.h" 302 #include "ev_vars.h"
264 #undef VAR 303 #undef VAR
265 304
266 static int default_loop; 305 static int ev_default_loop_ptr;
267 306
268#endif 307#endif
269 308
270/*****************************************************************************/ 309/*****************************************************************************/
271 310
… …
304{ 343{
305 return ev_rt_now; 344 return ev_rt_now;
306} 345}
307#endif 346#endif
308 347
309#define array_roundsize(type,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
310 349
311#define array_needsize(type,base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
312 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
313 { \ 352 { \
314 int newcnt = cur; \ 353 int newcnt = cur; \
… …
352void 391void
353ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
354{ 393{
355 W w_ = (W)w; 394 W w_ = (W)w;
356 395
357 if (w_->pending) 396 if (expect_false (w_->pending))
358 { 397 {
359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
360 return; 399 return;
361 } 400 }
362 401
363 w_->pending = ++pendingcnt [ABSPRI (w_)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
364 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
367} 406}
368 407
369static void 408static void
… …
377 416
378inline void 417inline void
379fd_event (EV_P_ int fd, int revents) 418fd_event (EV_P_ int fd, int revents)
380{ 419{
381 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
382 struct ev_io *w; 421 ev_io *w;
383 422
384 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 423 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
385 { 424 {
386 int ev = w->events & revents; 425 int ev = w->events & revents;
387 426
388 if (ev) 427 if (ev)
389 ev_feed_event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
… …
396 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
397} 436}
398 437
399/*****************************************************************************/ 438/*****************************************************************************/
400 439
401static void 440inline void
402fd_reify (EV_P) 441fd_reify (EV_P)
403{ 442{
404 int i; 443 int i;
405 444
406 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
407 { 446 {
408 int fd = fdchanges [i]; 447 int fd = fdchanges [i];
409 ANFD *anfd = anfds + fd; 448 ANFD *anfd = anfds + fd;
410 struct ev_io *w; 449 ev_io *w;
411 450
412 int events = 0; 451 int events = 0;
413 452
414 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 453 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
415 events |= w->events; 454 events |= w->events;
416 455
417#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
418 if (events) 457 if (events)
419 { 458 {
… …
423 } 462 }
424#endif 463#endif
425 464
426 anfd->reify = 0; 465 anfd->reify = 0;
427 466
428 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
429 anfd->events = events; 468 anfd->events = events;
430 } 469 }
431 470
432 fdchangecnt = 0; 471 fdchangecnt = 0;
433} 472}
434 473
435static void 474static void
436fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
437{ 476{
438 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
439 return; 478 return;
440 479
441 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
442 481
443 ++fdchangecnt; 482 ++fdchangecnt;
444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
445 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
446} 485}
447 486
448static void 487static void
449fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
450{ 489{
451 struct ev_io *w; 490 ev_io *w;
452 491
453 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (ev_io *)anfds [fd].head))
454 { 493 {
455 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
456 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
457 } 496 }
458} 497}
459 498
460static int 499inline int
461fd_valid (int fd) 500fd_valid (int fd)
462{ 501{
463#ifdef _WIN32 502#ifdef _WIN32
464 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
465#else 504#else
… …
491 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
492 return; 531 return;
493 } 532 }
494} 533}
495 534
496/* usually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
497static void 536static void
498fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
499{ 538{
500 int fd; 539 int fd;
501 540
… …
569static ANSIG *signals; 608static ANSIG *signals;
570static int signalmax; 609static int signalmax;
571 610
572static int sigpipe [2]; 611static int sigpipe [2];
573static sig_atomic_t volatile gotsig; 612static sig_atomic_t volatile gotsig;
574static struct ev_io sigev; 613static ev_io sigev;
575 614
576static void 615static void
577signals_init (ANSIG *base, int count) 616signals_init (ANSIG *base, int count)
578{ 617{
579 while (count--) 618 while (count--)
… …
607ev_feed_signal_event (EV_P_ int signum) 646ev_feed_signal_event (EV_P_ int signum)
608{ 647{
609 WL w; 648 WL w;
610 649
611#if EV_MULTIPLICITY 650#if EV_MULTIPLICITY
612 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
613#endif 652#endif
614 653
615 --signum; 654 --signum;
616 655
617 if (signum < 0 || signum >= signalmax) 656 if (signum < 0 || signum >= signalmax)
… …
622 for (w = signals [signum].head; w; w = w->next) 661 for (w = signals [signum].head; w; w = w->next)
623 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
624} 663}
625 664
626static void 665static void
627sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ ev_io *iow, int revents)
628{ 667{
629 int signum; 668 int signum;
630 669
631 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
632 gotsig = 0; 671 gotsig = 0;
… …
634 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
635 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
636 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
637} 676}
638 677
639inline void 678static void
640fd_intern (int fd) 679fd_intern (int fd)
641{ 680{
642#ifdef _WIN32 681#ifdef _WIN32
643 int arg = 1; 682 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
659 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
660} 699}
661 700
662/*****************************************************************************/ 701/*****************************************************************************/
663 702
664static struct ev_child *childs [PID_HASHSIZE]; 703static ev_child *childs [PID_HASHSIZE];
665 704
666#ifndef _WIN32 705#ifndef _WIN32
667 706
668static struct ev_signal childev; 707static ev_signal childev;
669 708
670#ifndef WCONTINUED 709#ifndef WCONTINUED
671# define WCONTINUED 0 710# define WCONTINUED 0
672#endif 711#endif
673 712
674static void 713static void
675child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 714child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
676{ 715{
677 struct ev_child *w; 716 ev_child *w;
678 717
679 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 718 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
680 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
681 { 720 {
682 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
683 w->rpid = pid; 722 w->rpid = pid;
684 w->rstatus = status; 723 w->rstatus = status;
685 ev_feed_event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
686 } 725 }
687} 726}
688 727
689static void 728static void
690childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ ev_signal *sw, int revents)
691{ 730{
692 int pid, status; 731 int pid, status;
693 732
694 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
695 { 734 {
696 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
697 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
698 738
699 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
700 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
701 } 741 }
702} 742}
703 743
704#endif 744#endif
705 745
706/*****************************************************************************/ 746/*****************************************************************************/
707 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
708#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
709# include "ev_kqueue.c" 752# include "ev_kqueue.c"
710#endif 753#endif
711#if EV_USE_EPOLL 754#if EV_USE_EPOLL
712# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
740 return getuid () != geteuid () 783 return getuid () != geteuid ()
741 || getgid () != getegid (); 784 || getgid () != getegid ();
742#endif 785#endif
743} 786}
744 787
745int 788unsigned int
746ev_method (EV_P) 789ev_supported_backends (void)
747{ 790{
748 return method; 791 unsigned int flags = 0;
749}
750 792
751static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
752loop_init (EV_P_ int methods) 794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
753{ 804{
754 if (!method) 805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_embeddable_backends (void)
822{
823 return EVBACKEND_EPOLL
824 | EVBACKEND_KQUEUE
825 | EVBACKEND_PORT;
826}
827
828unsigned int
829ev_backend (EV_P)
830{
831 return backend;
832}
833
834static void
835loop_init (EV_P_ unsigned int flags)
836{
837 if (!backend)
755 { 838 {
756#if EV_USE_MONOTONIC 839#if EV_USE_MONOTONIC
757 { 840 {
758 struct timespec ts; 841 struct timespec ts;
759 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 842 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
764 ev_rt_now = ev_time (); 847 ev_rt_now = ev_time ();
765 mn_now = get_clock (); 848 mn_now = get_clock ();
766 now_floor = mn_now; 849 now_floor = mn_now;
767 rtmn_diff = ev_rt_now - mn_now; 850 rtmn_diff = ev_rt_now - mn_now;
768 851
769 if (methods == EVMETHOD_AUTO) 852 if (!(flags & EVFLAG_NOENV)
770 if (!enable_secure () && getenv ("LIBEV_METHODS")) 853 && !enable_secure ()
854 && getenv ("LIBEV_FLAGS"))
771 methods = atoi (getenv ("LIBEV_METHODS")); 855 flags = atoi (getenv ("LIBEV_FLAGS"));
772 else
773 methods = EVMETHOD_ANY;
774 856
775 method = 0; 857 if (!(flags & 0x0000ffffUL))
858 flags |= ev_recommended_backends ();
859
860 backend = 0;
861#if EV_USE_PORT
862 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
863#endif
776#if EV_USE_KQUEUE 864#if EV_USE_KQUEUE
777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 865 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
778#endif 866#endif
779#if EV_USE_EPOLL 867#if EV_USE_EPOLL
780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
781#endif 869#endif
782#if EV_USE_POLL 870#if EV_USE_POLL
783 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
784#endif 872#endif
785#if EV_USE_SELECT 873#if EV_USE_SELECT
786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
787#endif 875#endif
788 876
789 ev_init (&sigev, sigcb); 877 ev_init (&sigev, sigcb);
790 ev_set_priority (&sigev, EV_MAXPRI); 878 ev_set_priority (&sigev, EV_MAXPRI);
791 } 879 }
792} 880}
793 881
794void 882static void
795loop_destroy (EV_P) 883loop_destroy (EV_P)
796{ 884{
797 int i; 885 int i;
798 886
887#if EV_USE_PORT
888 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
889#endif
799#if EV_USE_KQUEUE 890#if EV_USE_KQUEUE
800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 891 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
801#endif 892#endif
802#if EV_USE_EPOLL 893#if EV_USE_EPOLL
803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 894 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
804#endif 895#endif
805#if EV_USE_POLL 896#if EV_USE_POLL
806 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 897 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
807#endif 898#endif
808#if EV_USE_SELECT 899#if EV_USE_SELECT
809 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 900 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
810#endif 901#endif
811 902
812 for (i = NUMPRI; i--; ) 903 for (i = NUMPRI; i--; )
813 array_free (pending, [i]); 904 array_free (pending, [i]);
814 905
815 /* have to use the microsoft-never-gets-it-right macro */ 906 /* have to use the microsoft-never-gets-it-right macro */
816 array_free (fdchange, EMPTY); 907 array_free (fdchange, EMPTY0);
817 array_free (timer, EMPTY); 908 array_free (timer, EMPTY0);
818#if EV_PERIODICS 909#if EV_PERIODICS
819 array_free (periodic, EMPTY); 910 array_free (periodic, EMPTY0);
820#endif 911#endif
821 array_free (idle, EMPTY); 912 array_free (idle, EMPTY0);
822 array_free (prepare, EMPTY); 913 array_free (prepare, EMPTY0);
823 array_free (check, EMPTY); 914 array_free (check, EMPTY0);
824 915
825 method = 0; 916 backend = 0;
826} 917}
827 918
828static void 919static void
829loop_fork (EV_P) 920loop_fork (EV_P)
830{ 921{
922#if EV_USE_PORT
923 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
924#endif
925#if EV_USE_KQUEUE
926 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
927#endif
831#if EV_USE_EPOLL 928#if EV_USE_EPOLL
832 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 929 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
833#endif
834#if EV_USE_KQUEUE
835 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
836#endif 930#endif
837 931
838 if (ev_is_active (&sigev)) 932 if (ev_is_active (&sigev))
839 { 933 {
840 /* default loop */ 934 /* default loop */
… …
853 postfork = 0; 947 postfork = 0;
854} 948}
855 949
856#if EV_MULTIPLICITY 950#if EV_MULTIPLICITY
857struct ev_loop * 951struct ev_loop *
858ev_loop_new (int methods) 952ev_loop_new (unsigned int flags)
859{ 953{
860 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 954 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
861 955
862 memset (loop, 0, sizeof (struct ev_loop)); 956 memset (loop, 0, sizeof (struct ev_loop));
863 957
864 loop_init (EV_A_ methods); 958 loop_init (EV_A_ flags);
865 959
866 if (ev_method (EV_A)) 960 if (ev_backend (EV_A))
867 return loop; 961 return loop;
868 962
869 return 0; 963 return 0;
870} 964}
871 965
… …
884 978
885#endif 979#endif
886 980
887#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
888struct ev_loop * 982struct ev_loop *
983ev_default_loop_init (unsigned int flags)
889#else 984#else
890int 985int
986ev_default_loop (unsigned int flags)
891#endif 987#endif
892ev_default_loop (int methods)
893{ 988{
894 if (sigpipe [0] == sigpipe [1]) 989 if (sigpipe [0] == sigpipe [1])
895 if (pipe (sigpipe)) 990 if (pipe (sigpipe))
896 return 0; 991 return 0;
897 992
898 if (!default_loop) 993 if (!ev_default_loop_ptr)
899 { 994 {
900#if EV_MULTIPLICITY 995#if EV_MULTIPLICITY
901 struct ev_loop *loop = default_loop = &default_loop_struct; 996 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
902#else 997#else
903 default_loop = 1; 998 ev_default_loop_ptr = 1;
904#endif 999#endif
905 1000
906 loop_init (EV_A_ methods); 1001 loop_init (EV_A_ flags);
907 1002
908 if (ev_method (EV_A)) 1003 if (ev_backend (EV_A))
909 { 1004 {
910 siginit (EV_A); 1005 siginit (EV_A);
911 1006
912#ifndef _WIN32 1007#ifndef _WIN32
913 ev_signal_init (&childev, childcb, SIGCHLD); 1008 ev_signal_init (&childev, childcb, SIGCHLD);
… …
915 ev_signal_start (EV_A_ &childev); 1010 ev_signal_start (EV_A_ &childev);
916 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1011 ev_unref (EV_A); /* child watcher should not keep loop alive */
917#endif 1012#endif
918 } 1013 }
919 else 1014 else
920 default_loop = 0; 1015 ev_default_loop_ptr = 0;
921 } 1016 }
922 1017
923 return default_loop; 1018 return ev_default_loop_ptr;
924} 1019}
925 1020
926void 1021void
927ev_default_destroy (void) 1022ev_default_destroy (void)
928{ 1023{
929#if EV_MULTIPLICITY 1024#if EV_MULTIPLICITY
930 struct ev_loop *loop = default_loop; 1025 struct ev_loop *loop = ev_default_loop_ptr;
931#endif 1026#endif
932 1027
933#ifndef _WIN32 1028#ifndef _WIN32
934 ev_ref (EV_A); /* child watcher */ 1029 ev_ref (EV_A); /* child watcher */
935 ev_signal_stop (EV_A_ &childev); 1030 ev_signal_stop (EV_A_ &childev);
… …
946 1041
947void 1042void
948ev_default_fork (void) 1043ev_default_fork (void)
949{ 1044{
950#if EV_MULTIPLICITY 1045#if EV_MULTIPLICITY
951 struct ev_loop *loop = default_loop; 1046 struct ev_loop *loop = ev_default_loop_ptr;
952#endif 1047#endif
953 1048
954 if (method) 1049 if (backend)
955 postfork = 1; 1050 postfork = 1;
956} 1051}
957 1052
958/*****************************************************************************/ 1053/*****************************************************************************/
959 1054
… …
967 return 1; 1062 return 1;
968 1063
969 return 0; 1064 return 0;
970} 1065}
971 1066
972static void 1067inline void
973call_pending (EV_P) 1068call_pending (EV_P)
974{ 1069{
975 int pri; 1070 int pri;
976 1071
977 for (pri = NUMPRI; pri--; ) 1072 for (pri = NUMPRI; pri--; )
978 while (pendingcnt [pri]) 1073 while (pendingcnt [pri])
979 { 1074 {
980 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1075 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
981 1076
982 if (p->w) 1077 if (expect_true (p->w))
983 { 1078 {
984 p->w->pending = 0; 1079 p->w->pending = 0;
985 EV_CB_INVOKE (p->w, p->events); 1080 EV_CB_INVOKE (p->w, p->events);
986 } 1081 }
987 } 1082 }
988} 1083}
989 1084
990static void 1085inline void
991timers_reify (EV_P) 1086timers_reify (EV_P)
992{ 1087{
993 while (timercnt && ((WT)timers [0])->at <= mn_now) 1088 while (timercnt && ((WT)timers [0])->at <= mn_now)
994 { 1089 {
995 struct ev_timer *w = timers [0]; 1090 ev_timer *w = timers [0];
996 1091
997 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1092 assert (("inactive timer on timer heap detected", ev_is_active (w)));
998 1093
999 /* first reschedule or stop timer */ 1094 /* first reschedule or stop timer */
1000 if (w->repeat) 1095 if (w->repeat)
… …
1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1108 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1014 } 1109 }
1015} 1110}
1016 1111
1017#if EV_PERIODICS 1112#if EV_PERIODICS
1018static void 1113inline void
1019periodics_reify (EV_P) 1114periodics_reify (EV_P)
1020{ 1115{
1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1116 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1022 { 1117 {
1023 struct ev_periodic *w = periodics [0]; 1118 ev_periodic *w = periodics [0];
1024 1119
1025 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1120 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1026 1121
1027 /* first reschedule or stop timer */ 1122 /* first reschedule or stop timer */
1028 if (w->reschedule_cb) 1123 if (w->reschedule_cb)
1029 { 1124 {
1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1125 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1031
1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1126 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1033 downheap ((WT *)periodics, periodiccnt, 0); 1127 downheap ((WT *)periodics, periodiccnt, 0);
1034 } 1128 }
1035 else if (w->interval) 1129 else if (w->interval)
1036 { 1130 {
… …
1051 int i; 1145 int i;
1052 1146
1053 /* adjust periodics after time jump */ 1147 /* adjust periodics after time jump */
1054 for (i = 0; i < periodiccnt; ++i) 1148 for (i = 0; i < periodiccnt; ++i)
1055 { 1149 {
1056 struct ev_periodic *w = periodics [i]; 1150 ev_periodic *w = periodics [i];
1057 1151
1058 if (w->reschedule_cb) 1152 if (w->reschedule_cb)
1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1153 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1060 else if (w->interval) 1154 else if (w->interval)
1061 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1155 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
… …
1083 ev_rt_now = ev_time (); 1177 ev_rt_now = ev_time ();
1084 return 1; 1178 return 1;
1085 } 1179 }
1086} 1180}
1087 1181
1088static void 1182inline void
1089time_update (EV_P) 1183time_update (EV_P)
1090{ 1184{
1091 int i; 1185 int i;
1092 1186
1093#if EV_USE_MONOTONIC 1187#if EV_USE_MONOTONIC
… …
1151static int loop_done; 1245static int loop_done;
1152 1246
1153void 1247void
1154ev_loop (EV_P_ int flags) 1248ev_loop (EV_P_ int flags)
1155{ 1249{
1156 double block;
1157 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1250 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1251 ? EVUNLOOP_ONE
1252 : EVUNLOOP_CANCEL;
1158 1253
1159 do 1254 while (activecnt)
1160 { 1255 {
1161 /* queue check watchers (and execute them) */ 1256 /* queue check watchers (and execute them) */
1162 if (expect_false (preparecnt)) 1257 if (expect_false (preparecnt))
1163 { 1258 {
1164 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1259 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1171 1266
1172 /* update fd-related kernel structures */ 1267 /* update fd-related kernel structures */
1173 fd_reify (EV_A); 1268 fd_reify (EV_A);
1174 1269
1175 /* calculate blocking time */ 1270 /* calculate blocking time */
1271 {
1272 double block;
1176 1273
1177 /* we only need this for !monotonic clock or timers, but as we basically 1274 if (flags & EVLOOP_NONBLOCK || idlecnt)
1178 always have timers, we just calculate it always */ 1275 block = 0.; /* do not block at all */
1276 else
1277 {
1278 /* update time to cancel out callback processing overhead */
1179#if EV_USE_MONOTONIC 1279#if EV_USE_MONOTONIC
1180 if (expect_true (have_monotonic)) 1280 if (expect_true (have_monotonic))
1181 time_update_monotonic (EV_A); 1281 time_update_monotonic (EV_A);
1182 else 1282 else
1183#endif 1283#endif
1184 { 1284 {
1185 ev_rt_now = ev_time (); 1285 ev_rt_now = ev_time ();
1186 mn_now = ev_rt_now; 1286 mn_now = ev_rt_now;
1187 } 1287 }
1188 1288
1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1190 block = 0.;
1191 else
1192 {
1193 block = MAX_BLOCKTIME; 1289 block = MAX_BLOCKTIME;
1194 1290
1195 if (timercnt) 1291 if (timercnt)
1196 { 1292 {
1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1293 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1198 if (block > to) block = to; 1294 if (block > to) block = to;
1199 } 1295 }
1200 1296
1201#if EV_PERIODICS 1297#if EV_PERIODICS
1202 if (periodiccnt) 1298 if (periodiccnt)
1203 { 1299 {
1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1300 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1205 if (block > to) block = to; 1301 if (block > to) block = to;
1206 } 1302 }
1207#endif 1303#endif
1208 1304
1209 if (block < 0.) block = 0.; 1305 if (expect_false (block < 0.)) block = 0.;
1210 } 1306 }
1211 1307
1212 method_poll (EV_A_ block); 1308 backend_poll (EV_A_ block);
1309 }
1213 1310
1214 /* update ev_rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1215 time_update (EV_A); 1312 time_update (EV_A);
1216 1313
1217 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
1218 timers_reify (EV_A); /* relative timers called last */ 1315 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS 1316#if EV_PERIODICS
1220 periodics_reify (EV_A); /* absolute timers called first */ 1317 periodics_reify (EV_A); /* absolute timers called first */
1221#endif 1318#endif
1222 1319
1223 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless other events are pending */
1224 if (idlecnt && !any_pending (EV_A)) 1321 if (idlecnt && !any_pending (EV_A))
1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1226 1323
1227 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1228 if (checkcnt) 1325 if (expect_false (checkcnt))
1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1230 1327
1231 call_pending (EV_A); 1328 call_pending (EV_A);
1232 }
1233 while (activecnt && !loop_done);
1234 1329
1235 if (loop_done != 2) 1330 if (expect_false (loop_done))
1236 loop_done = 0; 1331 break;
1332 }
1333
1334 if (loop_done == EVUNLOOP_ONE)
1335 loop_done = EVUNLOOP_CANCEL;
1237} 1336}
1238 1337
1239void 1338void
1240ev_unloop (EV_P_ int how) 1339ev_unloop (EV_P_ int how)
1241{ 1340{
… …
1294} 1393}
1295 1394
1296/*****************************************************************************/ 1395/*****************************************************************************/
1297 1396
1298void 1397void
1299ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ ev_io *w)
1300{ 1399{
1301 int fd = w->fd; 1400 int fd = w->fd;
1302 1401
1303 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1304 return; 1403 return;
1305 1404
1306 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1307 1406
1308 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
… …
1311 1410
1312 fd_change (EV_A_ fd); 1411 fd_change (EV_A_ fd);
1313} 1412}
1314 1413
1315void 1414void
1316ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ ev_io *w)
1317{ 1416{
1318 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1319 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1320 return; 1419 return;
1321 1420
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323 1422
1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1326 1425
1327 fd_change (EV_A_ w->fd); 1426 fd_change (EV_A_ w->fd);
1328} 1427}
1329 1428
1330void 1429void
1331ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ ev_timer *w)
1332{ 1431{
1333 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1334 return; 1433 return;
1335 1434
1336 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1337 1436
1338 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.));
1339 1438
1340 ev_start (EV_A_ (W)w, ++timercnt); 1439 ev_start (EV_A_ (W)w, ++timercnt);
1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1440 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1342 timers [timercnt - 1] = w; 1441 timers [timercnt - 1] = w;
1343 upheap ((WT *)timers, timercnt - 1); 1442 upheap ((WT *)timers, timercnt - 1);
1344 1443
1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1444 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1346} 1445}
1347 1446
1348void 1447void
1349ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ ev_timer *w)
1350{ 1449{
1351 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1352 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1353 return; 1452 return;
1354 1453
1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1356 1455
1357 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1358 { 1457 {
1359 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1361 } 1460 }
1362 1461
… …
1364 1463
1365 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1366} 1465}
1367 1466
1368void 1467void
1369ev_timer_again (EV_P_ struct ev_timer *w) 1468ev_timer_again (EV_P_ ev_timer *w)
1370{ 1469{
1371 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1372 { 1471 {
1373 if (w->repeat) 1472 if (w->repeat)
1374 { 1473 {
… …
1377 } 1476 }
1378 else 1477 else
1379 ev_timer_stop (EV_A_ w); 1478 ev_timer_stop (EV_A_ w);
1380 } 1479 }
1381 else if (w->repeat) 1480 else if (w->repeat)
1481 {
1482 w->at = w->repeat;
1382 ev_timer_start (EV_A_ w); 1483 ev_timer_start (EV_A_ w);
1484 }
1383} 1485}
1384 1486
1385#if EV_PERIODICS 1487#if EV_PERIODICS
1386void 1488void
1387ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ ev_periodic *w)
1388{ 1490{
1389 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1390 return; 1492 return;
1391 1493
1392 if (w->reschedule_cb) 1494 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval) 1496 else if (w->interval)
… …
1397 /* 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 */
1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1500 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1399 } 1501 }
1400 1502
1401 ev_start (EV_A_ (W)w, ++periodiccnt); 1503 ev_start (EV_A_ (W)w, ++periodiccnt);
1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1504 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1403 periodics [periodiccnt - 1] = w; 1505 periodics [periodiccnt - 1] = w;
1404 upheap ((WT *)periodics, periodiccnt - 1); 1506 upheap ((WT *)periodics, periodiccnt - 1);
1405 1507
1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1508 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1407} 1509}
1408 1510
1409void 1511void
1410ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ ev_periodic *w)
1411{ 1513{
1412 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1413 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1414 return; 1516 return;
1415 1517
1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1417 1519
1418 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1419 { 1521 {
1420 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1422 } 1524 }
1423 1525
1424 ev_stop (EV_A_ (W)w); 1526 ev_stop (EV_A_ (W)w);
1425} 1527}
1426 1528
1427void 1529void
1428ev_periodic_again (EV_P_ struct ev_periodic *w) 1530ev_periodic_again (EV_P_ ev_periodic *w)
1429{ 1531{
1430 /* TODO: use adjustheap and recalculation */ 1532 /* TODO: use adjustheap and recalculation */
1431 ev_periodic_stop (EV_A_ w); 1533 ev_periodic_stop (EV_A_ w);
1432 ev_periodic_start (EV_A_ w); 1534 ev_periodic_start (EV_A_ w);
1433} 1535}
1434#endif 1536#endif
1435 1537
1436void 1538void
1437ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ ev_idle *w)
1438{ 1540{
1439 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1440 return; 1542 return;
1441 1543
1442 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1545 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1444 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
1445} 1547}
1446 1548
1447void 1549void
1448ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ ev_idle *w)
1449{ 1551{
1450 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1451 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1452 return; 1554 return;
1453 1555
1454 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1455 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1456} 1558}
1457 1559
1458void 1560void
1459ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ ev_prepare *w)
1460{ 1562{
1461 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1462 return; 1564 return;
1463 1565
1464 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1567 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1466 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
1467} 1569}
1468 1570
1469void 1571void
1470ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ ev_prepare *w)
1471{ 1573{
1472 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1473 if (!ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1474 return; 1576 return;
1475 1577
1476 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1477 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1478} 1580}
1479 1581
1480void 1582void
1481ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ ev_check *w)
1482{ 1584{
1483 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1484 return; 1586 return;
1485 1587
1486 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1589 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1488 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
1489} 1591}
1490 1592
1491void 1593void
1492ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ ev_check *w)
1493{ 1595{
1494 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1495 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1496 return; 1598 return;
1497 1599
1498 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1499 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1500} 1602}
… …
1502#ifndef SA_RESTART 1604#ifndef SA_RESTART
1503# define SA_RESTART 0 1605# define SA_RESTART 0
1504#endif 1606#endif
1505 1607
1506void 1608void
1507ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ ev_signal *w)
1508{ 1610{
1509#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1510 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));
1511#endif 1613#endif
1512 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1513 return; 1615 return;
1514 1616
1515 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));
1516 1618
1517 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
… …
1531#endif 1633#endif
1532 } 1634 }
1533} 1635}
1534 1636
1535void 1637void
1536ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ ev_signal *w)
1537{ 1639{
1538 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1539 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1540 return; 1642 return;
1541 1643
1542 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1543 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1544 1646
1545 if (!signals [w->signum - 1].head) 1647 if (!signals [w->signum - 1].head)
1546 signal (w->signum, SIG_DFL); 1648 signal (w->signum, SIG_DFL);
1547} 1649}
1548 1650
1549void 1651void
1550ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ ev_child *w)
1551{ 1653{
1552#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1553 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));
1554#endif 1656#endif
1555 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1556 return; 1658 return;
1557 1659
1558 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1559 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1560} 1662}
1561 1663
1562void 1664void
1563ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ ev_child *w)
1564{ 1666{
1565 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1566 if (!ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1567 return; 1669 return;
1568 1670
1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1570 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1571} 1673}
1572 1674
1675#if EV_MULTIPLICITY
1676void
1677ev_embed_sweep (EV_P_ ev_embed *w)
1678{
1679 ev_loop (w->loop, EVLOOP_NONBLOCK);
1680}
1681
1682static void
1683embed_cb (EV_P_ ev_io *io, int revents)
1684{
1685 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1686
1687 if (ev_cb (w))
1688 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1689 else
1690 ev_embed_sweep (loop, w);
1691}
1692
1693void
1694ev_embed_start (EV_P_ ev_embed *w)
1695{
1696 if (expect_false (ev_is_active (w)))
1697 return;
1698
1699 {
1700 struct ev_loop *loop = w->loop;
1701 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1702 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1703 }
1704
1705 ev_set_priority (&w->io, ev_priority (w));
1706 ev_io_start (EV_A_ &w->io);
1707 ev_start (EV_A_ (W)w, 1);
1708}
1709
1710void
1711ev_embed_stop (EV_P_ ev_embed *w)
1712{
1713 ev_clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w)))
1715 return;
1716
1717 ev_io_stop (EV_A_ &w->io);
1718 ev_stop (EV_A_ (W)w);
1719}
1720#endif
1721
1573/*****************************************************************************/ 1722/*****************************************************************************/
1574 1723
1575struct ev_once 1724struct ev_once
1576{ 1725{
1577 struct ev_io io; 1726 ev_io io;
1578 struct ev_timer to; 1727 ev_timer to;
1579 void (*cb)(int revents, void *arg); 1728 void (*cb)(int revents, void *arg);
1580 void *arg; 1729 void *arg;
1581}; 1730};
1582 1731
1583static void 1732static void
… …
1592 1741
1593 cb (revents, arg); 1742 cb (revents, arg);
1594} 1743}
1595 1744
1596static void 1745static void
1597once_cb_io (EV_P_ struct ev_io *w, int revents) 1746once_cb_io (EV_P_ ev_io *w, int revents)
1598{ 1747{
1599 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1748 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1600} 1749}
1601 1750
1602static void 1751static void
1603once_cb_to (EV_P_ struct ev_timer *w, int revents) 1752once_cb_to (EV_P_ ev_timer *w, int revents)
1604{ 1753{
1605 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1754 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1606} 1755}
1607 1756
1608void 1757void
1609ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1758ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1610{ 1759{
1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1760 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1612 1761
1613 if (!once) 1762 if (expect_false (!once))
1763 {
1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1764 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1615 else 1765 return;
1616 { 1766 }
1767
1617 once->cb = cb; 1768 once->cb = cb;
1618 once->arg = arg; 1769 once->arg = arg;
1619 1770
1620 ev_init (&once->io, once_cb_io); 1771 ev_init (&once->io, once_cb_io);
1621 if (fd >= 0) 1772 if (fd >= 0)
1622 { 1773 {
1623 ev_io_set (&once->io, fd, events); 1774 ev_io_set (&once->io, fd, events);
1624 ev_io_start (EV_A_ &once->io); 1775 ev_io_start (EV_A_ &once->io);
1625 } 1776 }
1626 1777
1627 ev_init (&once->to, once_cb_to); 1778 ev_init (&once->to, once_cb_to);
1628 if (timeout >= 0.) 1779 if (timeout >= 0.)
1629 { 1780 {
1630 ev_timer_set (&once->to, timeout, 0.); 1781 ev_timer_set (&once->to, timeout, 0.);
1631 ev_timer_start (EV_A_ &once->to); 1782 ev_timer_start (EV_A_ &once->to);
1632 }
1633 } 1783 }
1634} 1784}
1635 1785
1636#ifdef __cplusplus 1786#ifdef __cplusplus
1637} 1787}

Diff Legend

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