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

Comparing libev/ev.c (file contents):
Revision 1.118 by root, Fri Nov 16 01:33:54 2007 UTC vs.
Revision 1.139 by root, Sun Nov 25 09:24:37 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
62# endif 89# endif
63 90
64# if HAVE_PORT_H && HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
66# endif 97# endif
67 98
68#endif 99#endif
69 100
70#include <math.h> 101#include <math.h>
… …
94#endif 125#endif
95 126
96/**/ 127/**/
97 128
98#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
99# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
100#endif 131#endif
101 132
102#ifndef EV_USE_REALTIME 133#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1 134# define EV_USE_REALTIME 0
104#endif 135#endif
105 136
106#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
107# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
109#endif 139#endif
110 140
111#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
112# ifdef _WIN32 142# ifdef _WIN32
113# define EV_USE_POLL 0 143# define EV_USE_POLL 0
… …
128# define EV_USE_PORT 0 158# define EV_USE_PORT 0
129#endif 159#endif
130 160
131/**/ 161/**/
132 162
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
138
139#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
140# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
141# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
142#endif 166#endif
143 167
… …
151#endif 175#endif
152 176
153/**/ 177/**/
154 178
155#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) */
156#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) */
157#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 */
158/*#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 */
159 183
160#ifdef EV_H 184#ifdef EV_H
161# include EV_H 185# include EV_H
162#else 186#else
163# include "ev.h" 187# include "ev.h"
164#endif 188#endif
165 189
166#if __GNUC__ >= 3 190#if __GNUC__ >= 3
167# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
168# define inline inline 192# define inline static inline
169#else 193#else
170# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
171# define inline static 195# define inline static
172#endif 196#endif
173 197
… …
178#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
179 203
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */ 205#define EMPTY2(a,b) /* used to suppress some warnings */
182 206
183typedef struct ev_watcher *W; 207typedef ev_watcher *W;
184typedef struct ev_watcher_list *WL; 208typedef ev_watcher_list *WL;
185typedef struct ev_watcher_time *WT; 209typedef ev_watcher_time *WT;
186 210
187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
188 212
189#ifdef _WIN32 213#ifdef _WIN32
190# include "ev_win32.c" 214# include "ev_win32.c"
… …
367void 391void
368ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
369{ 393{
370 W w_ = (W)w; 394 W w_ = (W)w;
371 395
372 if (w_->pending) 396 if (expect_false (w_->pending))
373 { 397 {
374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
375 return; 399 return;
376 } 400 }
377 401
… …
392 416
393inline void 417inline void
394fd_event (EV_P_ int fd, int revents) 418fd_event (EV_P_ int fd, int revents)
395{ 419{
396 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
397 struct ev_io *w; 421 ev_io *w;
398 422
399 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)
400 { 424 {
401 int ev = w->events & revents; 425 int ev = w->events & revents;
402 426
403 if (ev) 427 if (ev)
404 ev_feed_event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
… …
411 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
412} 436}
413 437
414/*****************************************************************************/ 438/*****************************************************************************/
415 439
416static void 440inline void
417fd_reify (EV_P) 441fd_reify (EV_P)
418{ 442{
419 int i; 443 int i;
420 444
421 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
422 { 446 {
423 int fd = fdchanges [i]; 447 int fd = fdchanges [i];
424 ANFD *anfd = anfds + fd; 448 ANFD *anfd = anfds + fd;
425 struct ev_io *w; 449 ev_io *w;
426 450
427 int events = 0; 451 int events = 0;
428 452
429 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)
430 events |= w->events; 454 events |= w->events;
431 455
432#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
433 if (events) 457 if (events)
434 { 458 {
… …
438 } 462 }
439#endif 463#endif
440 464
441 anfd->reify = 0; 465 anfd->reify = 0;
442 466
443 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
444 anfd->events = events; 468 anfd->events = events;
445 } 469 }
446 470
447 fdchangecnt = 0; 471 fdchangecnt = 0;
448} 472}
449 473
450static void 474static void
451fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
452{ 476{
453 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
454 return; 478 return;
455 479
456 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
457 481
458 ++fdchangecnt; 482 ++fdchangecnt;
… …
461} 485}
462 486
463static void 487static void
464fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
465{ 489{
466 struct ev_io *w; 490 ev_io *w;
467 491
468 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (ev_io *)anfds [fd].head))
469 { 493 {
470 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
471 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);
472 } 496 }
473} 497}
474 498
475static int 499inline int
476fd_valid (int fd) 500fd_valid (int fd)
477{ 501{
478#ifdef _WIN32 502#ifdef _WIN32
479 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
480#else 504#else
… …
506 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
507 return; 531 return;
508 } 532 }
509} 533}
510 534
511/* 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 */
512static void 536static void
513fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
514{ 538{
515 int fd; 539 int fd;
516 540
… …
584static ANSIG *signals; 608static ANSIG *signals;
585static int signalmax; 609static int signalmax;
586 610
587static int sigpipe [2]; 611static int sigpipe [2];
588static sig_atomic_t volatile gotsig; 612static sig_atomic_t volatile gotsig;
589static struct ev_io sigev; 613static ev_io sigev;
590 614
591static void 615static void
592signals_init (ANSIG *base, int count) 616signals_init (ANSIG *base, int count)
593{ 617{
594 while (count--) 618 while (count--)
… …
637 for (w = signals [signum].head; w; w = w->next) 661 for (w = signals [signum].head; w; w = w->next)
638 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
639} 663}
640 664
641static void 665static void
642sigcb (EV_P_ struct ev_io *iow, int revents) 666sigcb (EV_P_ ev_io *iow, int revents)
643{ 667{
644 int signum; 668 int signum;
645 669
646 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
647 gotsig = 0; 671 gotsig = 0;
… …
649 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
650 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
651 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
652} 676}
653 677
654inline void 678static void
655fd_intern (int fd) 679fd_intern (int fd)
656{ 680{
657#ifdef _WIN32 681#ifdef _WIN32
658 int arg = 1; 682 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
674 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
675} 699}
676 700
677/*****************************************************************************/ 701/*****************************************************************************/
678 702
679static struct ev_child *childs [PID_HASHSIZE]; 703static ev_child *childs [PID_HASHSIZE];
680 704
681#ifndef _WIN32 705#ifndef _WIN32
682 706
683static struct ev_signal childev; 707static ev_signal childev;
684 708
685#ifndef WCONTINUED 709#ifndef WCONTINUED
686# define WCONTINUED 0 710# define WCONTINUED 0
687#endif 711#endif
688 712
689static void 713static void
690child_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)
691{ 715{
692 struct ev_child *w; 716 ev_child *w;
693 717
694 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)
695 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
696 { 720 {
697 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
698 w->rpid = pid; 722 w->rpid = pid;
699 w->rstatus = status; 723 w->rstatus = status;
700 ev_feed_event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
701 } 725 }
702} 726}
703 727
704static void 728static void
705childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ ev_signal *sw, int revents)
706{ 730{
707 int pid, status; 731 int pid, status;
708 732
709 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
710 { 734 {
711 /* 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 */
712 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
713 738
714 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
715 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 */
716 } 741 }
717} 742}
718 743
719#endif 744#endif
720 745
… …
759 || getgid () != getegid (); 784 || getgid () != getegid ();
760#endif 785#endif
761} 786}
762 787
763unsigned int 788unsigned int
764ev_method (EV_P) 789ev_supported_backends (void)
765{ 790{
766 return method; 791 unsigned int flags = 0;
792
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
804{
805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_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;
767} 832}
768 833
769static void 834static void
770loop_init (EV_P_ unsigned int flags) 835loop_init (EV_P_ unsigned int flags)
771{ 836{
772 if (!method) 837 if (!backend)
773 { 838 {
774#if EV_USE_MONOTONIC 839#if EV_USE_MONOTONIC
775 { 840 {
776 struct timespec ts; 841 struct timespec ts;
777 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 842 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
782 ev_rt_now = ev_time (); 847 ev_rt_now = ev_time ();
783 mn_now = get_clock (); 848 mn_now = get_clock ();
784 now_floor = mn_now; 849 now_floor = mn_now;
785 rtmn_diff = ev_rt_now - mn_now; 850 rtmn_diff = ev_rt_now - mn_now;
786 851
787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 852 if (!(flags & EVFLAG_NOENV)
853 && !enable_secure ()
854 && getenv ("LIBEV_FLAGS"))
788 flags = atoi (getenv ("LIBEV_FLAGS")); 855 flags = atoi (getenv ("LIBEV_FLAGS"));
789 856
790 if (!(flags & 0x0000ffff)) 857 if (!(flags & 0x0000ffffUL))
791 flags |= 0x0000ffff; 858 flags |= ev_recommended_backends ();
792 859
793 method = 0; 860 backend = 0;
794#if EV_USE_PORT 861#if EV_USE_PORT
795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 862 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
796#endif 863#endif
797#if EV_USE_KQUEUE 864#if EV_USE_KQUEUE
798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 865 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
799#endif 866#endif
800#if EV_USE_EPOLL 867#if EV_USE_EPOLL
801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 868 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
802#endif 869#endif
803#if EV_USE_POLL 870#if EV_USE_POLL
804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 871 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
805#endif 872#endif
806#if EV_USE_SELECT 873#if EV_USE_SELECT
807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 874 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
808#endif 875#endif
809 876
810 ev_init (&sigev, sigcb); 877 ev_init (&sigev, sigcb);
811 ev_set_priority (&sigev, EV_MAXPRI); 878 ev_set_priority (&sigev, EV_MAXPRI);
812 } 879 }
813} 880}
814 881
815void 882static void
816loop_destroy (EV_P) 883loop_destroy (EV_P)
817{ 884{
818 int i; 885 int i;
819 886
820#if EV_USE_PORT 887#if EV_USE_PORT
821 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 888 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
822#endif 889#endif
823#if EV_USE_KQUEUE 890#if EV_USE_KQUEUE
824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 891 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
825#endif 892#endif
826#if EV_USE_EPOLL 893#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 894 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
828#endif 895#endif
829#if EV_USE_POLL 896#if EV_USE_POLL
830 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 897 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
831#endif 898#endif
832#if EV_USE_SELECT 899#if EV_USE_SELECT
833 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 900 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
834#endif 901#endif
835 902
836 for (i = NUMPRI; i--; ) 903 for (i = NUMPRI; i--; )
837 array_free (pending, [i]); 904 array_free (pending, [i]);
838 905
… …
844#endif 911#endif
845 array_free (idle, EMPTY0); 912 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0); 913 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0); 914 array_free (check, EMPTY0);
848 915
849 method = 0; 916 backend = 0;
850} 917}
851 918
852static void 919static void
853loop_fork (EV_P) 920loop_fork (EV_P)
854{ 921{
855#if EV_USE_PORT 922#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A); 923 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
857#endif 924#endif
858#if EV_USE_KQUEUE 925#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 926 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
860#endif 927#endif
861#if EV_USE_EPOLL 928#if EV_USE_EPOLL
862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 929 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
863#endif 930#endif
864 931
865 if (ev_is_active (&sigev)) 932 if (ev_is_active (&sigev))
866 { 933 {
867 /* default loop */ 934 /* default loop */
… …
888 955
889 memset (loop, 0, sizeof (struct ev_loop)); 956 memset (loop, 0, sizeof (struct ev_loop));
890 957
891 loop_init (EV_A_ flags); 958 loop_init (EV_A_ flags);
892 959
893 if (ev_method (EV_A)) 960 if (ev_backend (EV_A))
894 return loop; 961 return loop;
895 962
896 return 0; 963 return 0;
897} 964}
898 965
… …
911 978
912#endif 979#endif
913 980
914#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
915struct ev_loop * 982struct ev_loop *
916ev_default_loop_ (unsigned int flags) 983ev_default_loop_init (unsigned int flags)
917#else 984#else
918int 985int
919ev_default_loop (unsigned int flags) 986ev_default_loop (unsigned int flags)
920#endif 987#endif
921{ 988{
… …
931 ev_default_loop_ptr = 1; 998 ev_default_loop_ptr = 1;
932#endif 999#endif
933 1000
934 loop_init (EV_A_ flags); 1001 loop_init (EV_A_ flags);
935 1002
936 if (ev_method (EV_A)) 1003 if (ev_backend (EV_A))
937 { 1004 {
938 siginit (EV_A); 1005 siginit (EV_A);
939 1006
940#ifndef _WIN32 1007#ifndef _WIN32
941 ev_signal_init (&childev, childcb, SIGCHLD); 1008 ev_signal_init (&childev, childcb, SIGCHLD);
… …
977{ 1044{
978#if EV_MULTIPLICITY 1045#if EV_MULTIPLICITY
979 struct ev_loop *loop = ev_default_loop_ptr; 1046 struct ev_loop *loop = ev_default_loop_ptr;
980#endif 1047#endif
981 1048
982 if (method) 1049 if (backend)
983 postfork = 1; 1050 postfork = 1;
984} 1051}
985 1052
986/*****************************************************************************/ 1053/*****************************************************************************/
987 1054
… …
995 return 1; 1062 return 1;
996 1063
997 return 0; 1064 return 0;
998} 1065}
999 1066
1000static void 1067inline void
1001call_pending (EV_P) 1068call_pending (EV_P)
1002{ 1069{
1003 int pri; 1070 int pri;
1004 1071
1005 for (pri = NUMPRI; pri--; ) 1072 for (pri = NUMPRI; pri--; )
1006 while (pendingcnt [pri]) 1073 while (pendingcnt [pri])
1007 { 1074 {
1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1075 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1009 1076
1010 if (p->w) 1077 if (expect_true (p->w))
1011 { 1078 {
1079 assert (("non-pending watcher on pending list", p->w->pending));
1080
1012 p->w->pending = 0; 1081 p->w->pending = 0;
1013 EV_CB_INVOKE (p->w, p->events); 1082 EV_CB_INVOKE (p->w, p->events);
1014 } 1083 }
1015 } 1084 }
1016} 1085}
1017 1086
1018static void 1087inline void
1019timers_reify (EV_P) 1088timers_reify (EV_P)
1020{ 1089{
1021 while (timercnt && ((WT)timers [0])->at <= mn_now) 1090 while (timercnt && ((WT)timers [0])->at <= mn_now)
1022 { 1091 {
1023 struct ev_timer *w = timers [0]; 1092 ev_timer *w = timers [0];
1024 1093
1025 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1094 assert (("inactive timer on timer heap detected", ev_is_active (w)));
1026 1095
1027 /* first reschedule or stop timer */ 1096 /* first reschedule or stop timer */
1028 if (w->repeat) 1097 if (w->repeat)
… …
1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1110 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1042 } 1111 }
1043} 1112}
1044 1113
1045#if EV_PERIODICS 1114#if EV_PERIODICS
1046static void 1115inline void
1047periodics_reify (EV_P) 1116periodics_reify (EV_P)
1048{ 1117{
1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1118 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1050 { 1119 {
1051 struct ev_periodic *w = periodics [0]; 1120 ev_periodic *w = periodics [0];
1052 1121
1053 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1122 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1054 1123
1055 /* first reschedule or stop timer */ 1124 /* first reschedule or stop timer */
1056 if (w->reschedule_cb) 1125 if (w->reschedule_cb)
… …
1078 int i; 1147 int i;
1079 1148
1080 /* adjust periodics after time jump */ 1149 /* adjust periodics after time jump */
1081 for (i = 0; i < periodiccnt; ++i) 1150 for (i = 0; i < periodiccnt; ++i)
1082 { 1151 {
1083 struct ev_periodic *w = periodics [i]; 1152 ev_periodic *w = periodics [i];
1084 1153
1085 if (w->reschedule_cb) 1154 if (w->reschedule_cb)
1086 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1155 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1087 else if (w->interval) 1156 else if (w->interval)
1088 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1157 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
… …
1110 ev_rt_now = ev_time (); 1179 ev_rt_now = ev_time ();
1111 return 1; 1180 return 1;
1112 } 1181 }
1113} 1182}
1114 1183
1115static void 1184inline void
1116time_update (EV_P) 1185time_update (EV_P)
1117{ 1186{
1118 int i; 1187 int i;
1119 1188
1120#if EV_USE_MONOTONIC 1189#if EV_USE_MONOTONIC
… …
1122 { 1191 {
1123 if (time_update_monotonic (EV_A)) 1192 if (time_update_monotonic (EV_A))
1124 { 1193 {
1125 ev_tstamp odiff = rtmn_diff; 1194 ev_tstamp odiff = rtmn_diff;
1126 1195
1127 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1196 /* loop a few times, before making important decisions.
1197 * on the choice of "4": one iteration isn't enough,
1198 * in case we get preempted during the calls to
1199 * ev_time and get_clock. a second call is almost guarenteed
1200 * to succeed in that case, though. and looping a few more times
1201 * doesn't hurt either as we only do this on time-jumps or
1202 * in the unlikely event of getting preempted here.
1203 */
1204 for (i = 4; --i; )
1128 { 1205 {
1129 rtmn_diff = ev_rt_now - mn_now; 1206 rtmn_diff = ev_rt_now - mn_now;
1130 1207
1131 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1208 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1132 return; /* all is well */ 1209 return; /* all is well */
… …
1178static int loop_done; 1255static int loop_done;
1179 1256
1180void 1257void
1181ev_loop (EV_P_ int flags) 1258ev_loop (EV_P_ int flags)
1182{ 1259{
1183 double block;
1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1260 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1261 ? EVUNLOOP_ONE
1262 : EVUNLOOP_CANCEL;
1185 1263
1186 while (activecnt) 1264 while (activecnt)
1187 { 1265 {
1188 /* queue check watchers (and execute them) */ 1266 /* queue check watchers (and execute them) */
1189 if (expect_false (preparecnt)) 1267 if (expect_false (preparecnt))
… …
1198 1276
1199 /* update fd-related kernel structures */ 1277 /* update fd-related kernel structures */
1200 fd_reify (EV_A); 1278 fd_reify (EV_A);
1201 1279
1202 /* calculate blocking time */ 1280 /* calculate blocking time */
1281 {
1282 double block;
1203 1283
1204 /* we only need this for !monotonic clock or timers, but as we basically 1284 if (flags & EVLOOP_NONBLOCK || idlecnt)
1205 always have timers, we just calculate it always */ 1285 block = 0.; /* do not block at all */
1286 else
1287 {
1288 /* update time to cancel out callback processing overhead */
1206#if EV_USE_MONOTONIC 1289#if EV_USE_MONOTONIC
1207 if (expect_true (have_monotonic)) 1290 if (expect_true (have_monotonic))
1208 time_update_monotonic (EV_A); 1291 time_update_monotonic (EV_A);
1209 else 1292 else
1210#endif 1293#endif
1211 { 1294 {
1212 ev_rt_now = ev_time (); 1295 ev_rt_now = ev_time ();
1213 mn_now = ev_rt_now; 1296 mn_now = ev_rt_now;
1214 } 1297 }
1215 1298
1216 if (flags & EVLOOP_NONBLOCK || idlecnt)
1217 block = 0.;
1218 else
1219 {
1220 block = MAX_BLOCKTIME; 1299 block = MAX_BLOCKTIME;
1221 1300
1222 if (timercnt) 1301 if (timercnt)
1223 { 1302 {
1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1303 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1225 if (block > to) block = to; 1304 if (block > to) block = to;
1226 } 1305 }
1227 1306
1228#if EV_PERIODICS 1307#if EV_PERIODICS
1229 if (periodiccnt) 1308 if (periodiccnt)
1230 { 1309 {
1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1310 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1232 if (block > to) block = to; 1311 if (block > to) block = to;
1233 } 1312 }
1234#endif 1313#endif
1235 1314
1236 if (block < 0.) block = 0.; 1315 if (expect_false (block < 0.)) block = 0.;
1237 } 1316 }
1238 1317
1239 method_poll (EV_A_ block); 1318 backend_poll (EV_A_ block);
1319 }
1240 1320
1241 /* update ev_rt_now, do magic */ 1321 /* update ev_rt_now, do magic */
1242 time_update (EV_A); 1322 time_update (EV_A);
1243 1323
1244 /* queue pending timers and reschedule them */ 1324 /* queue pending timers and reschedule them */
1245 timers_reify (EV_A); /* relative timers called last */ 1325 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS 1326#if EV_PERIODICS
1247 periodics_reify (EV_A); /* absolute timers called first */ 1327 periodics_reify (EV_A); /* absolute timers called first */
1248#endif 1328#endif
1249 1329
1250 /* queue idle watchers unless io or timers are pending */ 1330 /* queue idle watchers unless other events are pending */
1251 if (idlecnt && !any_pending (EV_A)) 1331 if (idlecnt && !any_pending (EV_A))
1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1332 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1253 1333
1254 /* queue check watchers, to be executed first */ 1334 /* queue check watchers, to be executed first */
1255 if (checkcnt) 1335 if (expect_false (checkcnt))
1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1336 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1257 1337
1258 call_pending (EV_A); 1338 call_pending (EV_A);
1259 1339
1260 if (loop_done) 1340 if (expect_false (loop_done))
1261 break; 1341 break;
1262 } 1342 }
1263 1343
1264 if (loop_done != 2) 1344 if (loop_done == EVUNLOOP_ONE)
1265 loop_done = 0; 1345 loop_done = EVUNLOOP_CANCEL;
1266} 1346}
1267 1347
1268void 1348void
1269ev_unloop (EV_P_ int how) 1349ev_unloop (EV_P_ int how)
1270{ 1350{
… …
1323} 1403}
1324 1404
1325/*****************************************************************************/ 1405/*****************************************************************************/
1326 1406
1327void 1407void
1328ev_io_start (EV_P_ struct ev_io *w) 1408ev_io_start (EV_P_ ev_io *w)
1329{ 1409{
1330 int fd = w->fd; 1410 int fd = w->fd;
1331 1411
1332 if (ev_is_active (w)) 1412 if (expect_false (ev_is_active (w)))
1333 return; 1413 return;
1334 1414
1335 assert (("ev_io_start called with negative fd", fd >= 0)); 1415 assert (("ev_io_start called with negative fd", fd >= 0));
1336 1416
1337 ev_start (EV_A_ (W)w, 1); 1417 ev_start (EV_A_ (W)w, 1);
… …
1340 1420
1341 fd_change (EV_A_ fd); 1421 fd_change (EV_A_ fd);
1342} 1422}
1343 1423
1344void 1424void
1345ev_io_stop (EV_P_ struct ev_io *w) 1425ev_io_stop (EV_P_ ev_io *w)
1346{ 1426{
1347 ev_clear_pending (EV_A_ (W)w); 1427 ev_clear_pending (EV_A_ (W)w);
1348 if (!ev_is_active (w)) 1428 if (expect_false (!ev_is_active (w)))
1349 return; 1429 return;
1350 1430
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1431 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352 1432
1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1433 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1355 1435
1356 fd_change (EV_A_ w->fd); 1436 fd_change (EV_A_ w->fd);
1357} 1437}
1358 1438
1359void 1439void
1360ev_timer_start (EV_P_ struct ev_timer *w) 1440ev_timer_start (EV_P_ ev_timer *w)
1361{ 1441{
1362 if (ev_is_active (w)) 1442 if (expect_false (ev_is_active (w)))
1363 return; 1443 return;
1364 1444
1365 ((WT)w)->at += mn_now; 1445 ((WT)w)->at += mn_now;
1366 1446
1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1447 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1368 1448
1369 ev_start (EV_A_ (W)w, ++timercnt); 1449 ev_start (EV_A_ (W)w, ++timercnt);
1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2); 1450 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1371 timers [timercnt - 1] = w; 1451 timers [timercnt - 1] = w;
1372 upheap ((WT *)timers, timercnt - 1); 1452 upheap ((WT *)timers, timercnt - 1);
1373 1453
1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1375} 1455}
1376 1456
1377void 1457void
1378ev_timer_stop (EV_P_ struct ev_timer *w) 1458ev_timer_stop (EV_P_ ev_timer *w)
1379{ 1459{
1380 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1381 if (!ev_is_active (w)) 1461 if (expect_false (!ev_is_active (w)))
1382 return; 1462 return;
1383 1463
1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1464 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1385 1465
1386 if (((W)w)->active < timercnt--) 1466 if (expect_true (((W)w)->active < timercnt--))
1387 { 1467 {
1388 timers [((W)w)->active - 1] = timers [timercnt]; 1468 timers [((W)w)->active - 1] = timers [timercnt];
1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1469 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1390 } 1470 }
1391 1471
… …
1393 1473
1394 ev_stop (EV_A_ (W)w); 1474 ev_stop (EV_A_ (W)w);
1395} 1475}
1396 1476
1397void 1477void
1398ev_timer_again (EV_P_ struct ev_timer *w) 1478ev_timer_again (EV_P_ ev_timer *w)
1399{ 1479{
1400 if (ev_is_active (w)) 1480 if (ev_is_active (w))
1401 { 1481 {
1402 if (w->repeat) 1482 if (w->repeat)
1403 { 1483 {
… …
1414 } 1494 }
1415} 1495}
1416 1496
1417#if EV_PERIODICS 1497#if EV_PERIODICS
1418void 1498void
1419ev_periodic_start (EV_P_ struct ev_periodic *w) 1499ev_periodic_start (EV_P_ ev_periodic *w)
1420{ 1500{
1421 if (ev_is_active (w)) 1501 if (expect_false (ev_is_active (w)))
1422 return; 1502 return;
1423 1503
1424 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1505 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1426 else if (w->interval) 1506 else if (w->interval)
… …
1429 /* this formula differs from the one in periodic_reify because we do not always round up */ 1509 /* this formula differs from the one in periodic_reify because we do not always round up */
1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1510 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1431 } 1511 }
1432 1512
1433 ev_start (EV_A_ (W)w, ++periodiccnt); 1513 ev_start (EV_A_ (W)w, ++periodiccnt);
1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1514 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1435 periodics [periodiccnt - 1] = w; 1515 periodics [periodiccnt - 1] = w;
1436 upheap ((WT *)periodics, periodiccnt - 1); 1516 upheap ((WT *)periodics, periodiccnt - 1);
1437 1517
1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1439} 1519}
1440 1520
1441void 1521void
1442ev_periodic_stop (EV_P_ struct ev_periodic *w) 1522ev_periodic_stop (EV_P_ ev_periodic *w)
1443{ 1523{
1444 ev_clear_pending (EV_A_ (W)w); 1524 ev_clear_pending (EV_A_ (W)w);
1445 if (!ev_is_active (w)) 1525 if (expect_false (!ev_is_active (w)))
1446 return; 1526 return;
1447 1527
1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1528 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1449 1529
1450 if (((W)w)->active < periodiccnt--) 1530 if (expect_true (((W)w)->active < periodiccnt--))
1451 { 1531 {
1452 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1532 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1533 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1454 } 1534 }
1455 1535
1456 ev_stop (EV_A_ (W)w); 1536 ev_stop (EV_A_ (W)w);
1457} 1537}
1458 1538
1459void 1539void
1460ev_periodic_again (EV_P_ struct ev_periodic *w) 1540ev_periodic_again (EV_P_ ev_periodic *w)
1461{ 1541{
1462 /* TODO: use adjustheap and recalculation */ 1542 /* TODO: use adjustheap and recalculation */
1463 ev_periodic_stop (EV_A_ w); 1543 ev_periodic_stop (EV_A_ w);
1464 ev_periodic_start (EV_A_ w); 1544 ev_periodic_start (EV_A_ w);
1465} 1545}
1466#endif 1546#endif
1467 1547
1468void 1548void
1469ev_idle_start (EV_P_ struct ev_idle *w) 1549ev_idle_start (EV_P_ ev_idle *w)
1470{ 1550{
1471 if (ev_is_active (w)) 1551 if (expect_false (ev_is_active (w)))
1472 return; 1552 return;
1473 1553
1474 ev_start (EV_A_ (W)w, ++idlecnt); 1554 ev_start (EV_A_ (W)w, ++idlecnt);
1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1555 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1476 idles [idlecnt - 1] = w; 1556 idles [idlecnt - 1] = w;
1477} 1557}
1478 1558
1479void 1559void
1480ev_idle_stop (EV_P_ struct ev_idle *w) 1560ev_idle_stop (EV_P_ ev_idle *w)
1481{ 1561{
1482 ev_clear_pending (EV_A_ (W)w); 1562 ev_clear_pending (EV_A_ (W)w);
1483 if (!ev_is_active (w)) 1563 if (expect_false (!ev_is_active (w)))
1484 return; 1564 return;
1485 1565
1566 {
1567 int active = ((W)w)->active;
1486 idles [((W)w)->active - 1] = idles [--idlecnt]; 1568 idles [active - 1] = idles [--idlecnt];
1569 ((W)idles [active - 1])->active = active;
1570 }
1571
1487 ev_stop (EV_A_ (W)w); 1572 ev_stop (EV_A_ (W)w);
1488} 1573}
1489 1574
1490void 1575void
1491ev_prepare_start (EV_P_ struct ev_prepare *w) 1576ev_prepare_start (EV_P_ ev_prepare *w)
1492{ 1577{
1493 if (ev_is_active (w)) 1578 if (expect_false (ev_is_active (w)))
1494 return; 1579 return;
1495 1580
1496 ev_start (EV_A_ (W)w, ++preparecnt); 1581 ev_start (EV_A_ (W)w, ++preparecnt);
1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1582 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1498 prepares [preparecnt - 1] = w; 1583 prepares [preparecnt - 1] = w;
1499} 1584}
1500 1585
1501void 1586void
1502ev_prepare_stop (EV_P_ struct ev_prepare *w) 1587ev_prepare_stop (EV_P_ ev_prepare *w)
1503{ 1588{
1504 ev_clear_pending (EV_A_ (W)w); 1589 ev_clear_pending (EV_A_ (W)w);
1505 if (!ev_is_active (w)) 1590 if (expect_false (!ev_is_active (w)))
1506 return; 1591 return;
1507 1592
1593 {
1594 int active = ((W)w)->active;
1508 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1595 prepares [active - 1] = prepares [--preparecnt];
1596 ((W)prepares [active - 1])->active = active;
1597 }
1598
1509 ev_stop (EV_A_ (W)w); 1599 ev_stop (EV_A_ (W)w);
1510} 1600}
1511 1601
1512void 1602void
1513ev_check_start (EV_P_ struct ev_check *w) 1603ev_check_start (EV_P_ ev_check *w)
1514{ 1604{
1515 if (ev_is_active (w)) 1605 if (expect_false (ev_is_active (w)))
1516 return; 1606 return;
1517 1607
1518 ev_start (EV_A_ (W)w, ++checkcnt); 1608 ev_start (EV_A_ (W)w, ++checkcnt);
1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1609 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1520 checks [checkcnt - 1] = w; 1610 checks [checkcnt - 1] = w;
1521} 1611}
1522 1612
1523void 1613void
1524ev_check_stop (EV_P_ struct ev_check *w) 1614ev_check_stop (EV_P_ ev_check *w)
1525{ 1615{
1526 ev_clear_pending (EV_A_ (W)w); 1616 ev_clear_pending (EV_A_ (W)w);
1527 if (!ev_is_active (w)) 1617 if (expect_false (!ev_is_active (w)))
1528 return; 1618 return;
1529 1619
1620 {
1621 int active = ((W)w)->active;
1530 checks [((W)w)->active - 1] = checks [--checkcnt]; 1622 checks [active - 1] = checks [--checkcnt];
1623 ((W)checks [active - 1])->active = active;
1624 }
1625
1531 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1532} 1627}
1533 1628
1534#ifndef SA_RESTART 1629#ifndef SA_RESTART
1535# define SA_RESTART 0 1630# define SA_RESTART 0
1536#endif 1631#endif
1537 1632
1538void 1633void
1539ev_signal_start (EV_P_ struct ev_signal *w) 1634ev_signal_start (EV_P_ ev_signal *w)
1540{ 1635{
1541#if EV_MULTIPLICITY 1636#if EV_MULTIPLICITY
1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1637 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1543#endif 1638#endif
1544 if (ev_is_active (w)) 1639 if (expect_false (ev_is_active (w)))
1545 return; 1640 return;
1546 1641
1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1642 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1548 1643
1549 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
… …
1563#endif 1658#endif
1564 } 1659 }
1565} 1660}
1566 1661
1567void 1662void
1568ev_signal_stop (EV_P_ struct ev_signal *w) 1663ev_signal_stop (EV_P_ ev_signal *w)
1569{ 1664{
1570 ev_clear_pending (EV_A_ (W)w); 1665 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1666 if (expect_false (!ev_is_active (w)))
1572 return; 1667 return;
1573 1668
1574 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1669 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1575 ev_stop (EV_A_ (W)w); 1670 ev_stop (EV_A_ (W)w);
1576 1671
1577 if (!signals [w->signum - 1].head) 1672 if (!signals [w->signum - 1].head)
1578 signal (w->signum, SIG_DFL); 1673 signal (w->signum, SIG_DFL);
1579} 1674}
1580 1675
1581void 1676void
1582ev_child_start (EV_P_ struct ev_child *w) 1677ev_child_start (EV_P_ ev_child *w)
1583{ 1678{
1584#if EV_MULTIPLICITY 1679#if EV_MULTIPLICITY
1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1680 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1586#endif 1681#endif
1587 if (ev_is_active (w)) 1682 if (expect_false (ev_is_active (w)))
1588 return; 1683 return;
1589 1684
1590 ev_start (EV_A_ (W)w, 1); 1685 ev_start (EV_A_ (W)w, 1);
1591 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1686 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1592} 1687}
1593 1688
1594void 1689void
1595ev_child_stop (EV_P_ struct ev_child *w) 1690ev_child_stop (EV_P_ ev_child *w)
1596{ 1691{
1597 ev_clear_pending (EV_A_ (W)w); 1692 ev_clear_pending (EV_A_ (W)w);
1598 if (!ev_is_active (w)) 1693 if (expect_false (!ev_is_active (w)))
1599 return; 1694 return;
1600 1695
1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1696 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1602 ev_stop (EV_A_ (W)w); 1697 ev_stop (EV_A_ (W)w);
1603} 1698}
1604 1699
1700#if EV_MULTIPLICITY
1701void
1702ev_embed_sweep (EV_P_ ev_embed *w)
1703{
1704 ev_loop (w->loop, EVLOOP_NONBLOCK);
1705}
1706
1707static void
1708embed_cb (EV_P_ ev_io *io, int revents)
1709{
1710 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1711
1712 if (ev_cb (w))
1713 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1714 else
1715 ev_embed_sweep (loop, w);
1716}
1717
1718void
1719ev_embed_start (EV_P_ ev_embed *w)
1720{
1721 if (expect_false (ev_is_active (w)))
1722 return;
1723
1724 {
1725 struct ev_loop *loop = w->loop;
1726 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1727 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1728 }
1729
1730 ev_set_priority (&w->io, ev_priority (w));
1731 ev_io_start (EV_A_ &w->io);
1732 ev_start (EV_A_ (W)w, 1);
1733}
1734
1735void
1736ev_embed_stop (EV_P_ ev_embed *w)
1737{
1738 ev_clear_pending (EV_A_ (W)w);
1739 if (expect_false (!ev_is_active (w)))
1740 return;
1741
1742 ev_io_stop (EV_A_ &w->io);
1743 ev_stop (EV_A_ (W)w);
1744}
1745#endif
1746
1605/*****************************************************************************/ 1747/*****************************************************************************/
1606 1748
1607struct ev_once 1749struct ev_once
1608{ 1750{
1609 struct ev_io io; 1751 ev_io io;
1610 struct ev_timer to; 1752 ev_timer to;
1611 void (*cb)(int revents, void *arg); 1753 void (*cb)(int revents, void *arg);
1612 void *arg; 1754 void *arg;
1613}; 1755};
1614 1756
1615static void 1757static void
… …
1624 1766
1625 cb (revents, arg); 1767 cb (revents, arg);
1626} 1768}
1627 1769
1628static void 1770static void
1629once_cb_io (EV_P_ struct ev_io *w, int revents) 1771once_cb_io (EV_P_ ev_io *w, int revents)
1630{ 1772{
1631 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1773 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1632} 1774}
1633 1775
1634static void 1776static void
1635once_cb_to (EV_P_ struct ev_timer *w, int revents) 1777once_cb_to (EV_P_ ev_timer *w, int revents)
1636{ 1778{
1637 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1779 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1638} 1780}
1639 1781
1640void 1782void
1641ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1783ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1642{ 1784{
1643 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1785 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1644 1786
1645 if (!once) 1787 if (expect_false (!once))
1788 {
1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1789 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1647 else 1790 return;
1648 { 1791 }
1792
1649 once->cb = cb; 1793 once->cb = cb;
1650 once->arg = arg; 1794 once->arg = arg;
1651 1795
1652 ev_init (&once->io, once_cb_io); 1796 ev_init (&once->io, once_cb_io);
1653 if (fd >= 0) 1797 if (fd >= 0)
1654 { 1798 {
1655 ev_io_set (&once->io, fd, events); 1799 ev_io_set (&once->io, fd, events);
1656 ev_io_start (EV_A_ &once->io); 1800 ev_io_start (EV_A_ &once->io);
1657 } 1801 }
1658 1802
1659 ev_init (&once->to, once_cb_to); 1803 ev_init (&once->to, once_cb_to);
1660 if (timeout >= 0.) 1804 if (timeout >= 0.)
1661 { 1805 {
1662 ev_timer_set (&once->to, timeout, 0.); 1806 ev_timer_set (&once->to, timeout, 0.);
1663 ev_timer_start (EV_A_ &once->to); 1807 ev_timer_start (EV_A_ &once->to);
1664 }
1665 } 1808 }
1666} 1809}
1667 1810
1668#ifdef __cplusplus 1811#ifdef __cplusplus
1669} 1812}

Diff Legend

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