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.134 by root, Fri Nov 23 19:13:33 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
… …
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 }
401
402 if (expect_false (!w_->cb))
403 return;
377 404
378 w_->pending = ++pendingcnt [ABSPRI (w_)]; 405 w_->pending = ++pendingcnt [ABSPRI (w_)];
379 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 406 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 407 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 408 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
… …
411 fd_event (EV_A_ fd, revents); 438 fd_event (EV_A_ fd, revents);
412} 439}
413 440
414/*****************************************************************************/ 441/*****************************************************************************/
415 442
416static void 443inline void
417fd_reify (EV_P) 444fd_reify (EV_P)
418{ 445{
419 int i; 446 int i;
420 447
421 for (i = 0; i < fdchangecnt; ++i) 448 for (i = 0; i < fdchangecnt; ++i)
… …
438 } 465 }
439#endif 466#endif
440 467
441 anfd->reify = 0; 468 anfd->reify = 0;
442 469
443 method_modify (EV_A_ fd, anfd->events, events); 470 backend_modify (EV_A_ fd, anfd->events, events);
444 anfd->events = events; 471 anfd->events = events;
445 } 472 }
446 473
447 fdchangecnt = 0; 474 fdchangecnt = 0;
448} 475}
449 476
450static void 477static void
451fd_change (EV_P_ int fd) 478fd_change (EV_P_ int fd)
452{ 479{
453 if (anfds [fd].reify) 480 if (expect_false (anfds [fd].reify))
454 return; 481 return;
455 482
456 anfds [fd].reify = 1; 483 anfds [fd].reify = 1;
457 484
458 ++fdchangecnt; 485 ++fdchangecnt;
… …
470 ev_io_stop (EV_A_ w); 497 ev_io_stop (EV_A_ w);
471 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 498 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
472 } 499 }
473} 500}
474 501
475static int 502inline int
476fd_valid (int fd) 503fd_valid (int fd)
477{ 504{
478#ifdef _WIN32 505#ifdef _WIN32
479 return _get_osfhandle (fd) != -1; 506 return _get_osfhandle (fd) != -1;
480#else 507#else
… …
506 fd_kill (EV_A_ fd); 533 fd_kill (EV_A_ fd);
507 return; 534 return;
508 } 535 }
509} 536}
510 537
511/* usually called after fork if method needs to re-arm all fds from scratch */ 538/* usually called after fork if backend needs to re-arm all fds from scratch */
512static void 539static void
513fd_rearm_all (EV_P) 540fd_rearm_all (EV_P)
514{ 541{
515 int fd; 542 int fd;
516 543
… …
649 for (signum = signalmax; signum--; ) 676 for (signum = signalmax; signum--; )
650 if (signals [signum].gotsig) 677 if (signals [signum].gotsig)
651 ev_feed_signal_event (EV_A_ signum + 1); 678 ev_feed_signal_event (EV_A_ signum + 1);
652} 679}
653 680
654inline void 681static void
655fd_intern (int fd) 682fd_intern (int fd)
656{ 683{
657#ifdef _WIN32 684#ifdef _WIN32
658 int arg = 1; 685 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 686 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
707 int pid, status; 734 int pid, status;
708 735
709 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 736 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
710 { 737 {
711 /* make sure we are called again until all childs have been reaped */ 738 /* make sure we are called again until all childs have been reaped */
739 /* we need to do it this way so that the callback gets called before we continue */
712 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 740 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
713 741
714 child_reap (EV_A_ sw, pid, pid, status); 742 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 */ 743 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
716 } 744 }
717} 745}
718 746
719#endif 747#endif
720 748
… …
759 || getgid () != getegid (); 787 || getgid () != getegid ();
760#endif 788#endif
761} 789}
762 790
763unsigned int 791unsigned int
764ev_method (EV_P) 792ev_supported_backends (void)
765{ 793{
766 return method; 794 unsigned int flags = 0;
795
796 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
797 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
798 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
799 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
800 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
801
802 return flags;
803}
804
805unsigned int
806ev_recommended_backends (void)
807{
808 unsigned int flags = ev_supported_backends ();
809
810#ifndef __NetBSD__
811 /* kqueue is borked on everything but netbsd apparently */
812 /* it usually doesn't work correctly on anything but sockets and pipes */
813 flags &= ~EVBACKEND_KQUEUE;
814#endif
815#ifdef __APPLE__
816 // flags &= ~EVBACKEND_KQUEUE; for documentation
817 flags &= ~EVBACKEND_POLL;
818#endif
819
820 return flags;
821}
822
823unsigned int
824ev_embeddable_backends (void)
825{
826 return EVBACKEND_EPOLL
827 | EVBACKEND_KQUEUE
828 | EVBACKEND_PORT;
829}
830
831unsigned int
832ev_backend (EV_P)
833{
834 return backend;
767} 835}
768 836
769static void 837static void
770loop_init (EV_P_ unsigned int flags) 838loop_init (EV_P_ unsigned int flags)
771{ 839{
772 if (!method) 840 if (!backend)
773 { 841 {
774#if EV_USE_MONOTONIC 842#if EV_USE_MONOTONIC
775 { 843 {
776 struct timespec ts; 844 struct timespec ts;
777 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 845 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
782 ev_rt_now = ev_time (); 850 ev_rt_now = ev_time ();
783 mn_now = get_clock (); 851 mn_now = get_clock ();
784 now_floor = mn_now; 852 now_floor = mn_now;
785 rtmn_diff = ev_rt_now - mn_now; 853 rtmn_diff = ev_rt_now - mn_now;
786 854
787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 855 if (!(flags & EVFLAG_NOENV)
856 && !enable_secure ()
857 && getenv ("LIBEV_FLAGS"))
788 flags = atoi (getenv ("LIBEV_FLAGS")); 858 flags = atoi (getenv ("LIBEV_FLAGS"));
789 859
790 if (!(flags & 0x0000ffff)) 860 if (!(flags & 0x0000ffffUL))
791 flags |= 0x0000ffff; 861 flags |= ev_recommended_backends ();
792 862
793 method = 0; 863 backend = 0;
794#if EV_USE_PORT 864#if EV_USE_PORT
795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 865 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
796#endif 866#endif
797#if EV_USE_KQUEUE 867#if EV_USE_KQUEUE
798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 868 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
799#endif 869#endif
800#if EV_USE_EPOLL 870#if EV_USE_EPOLL
801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 871 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
802#endif 872#endif
803#if EV_USE_POLL 873#if EV_USE_POLL
804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 874 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
805#endif 875#endif
806#if EV_USE_SELECT 876#if EV_USE_SELECT
807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 877 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
808#endif 878#endif
809 879
810 ev_init (&sigev, sigcb); 880 ev_init (&sigev, sigcb);
811 ev_set_priority (&sigev, EV_MAXPRI); 881 ev_set_priority (&sigev, EV_MAXPRI);
812 } 882 }
813} 883}
814 884
815void 885static void
816loop_destroy (EV_P) 886loop_destroy (EV_P)
817{ 887{
818 int i; 888 int i;
819 889
820#if EV_USE_PORT 890#if EV_USE_PORT
821 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 891 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
822#endif 892#endif
823#if EV_USE_KQUEUE 893#if EV_USE_KQUEUE
824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 894 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
825#endif 895#endif
826#if EV_USE_EPOLL 896#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 897 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
828#endif 898#endif
829#if EV_USE_POLL 899#if EV_USE_POLL
830 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 900 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
831#endif 901#endif
832#if EV_USE_SELECT 902#if EV_USE_SELECT
833 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 903 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
834#endif 904#endif
835 905
836 for (i = NUMPRI; i--; ) 906 for (i = NUMPRI; i--; )
837 array_free (pending, [i]); 907 array_free (pending, [i]);
838 908
… …
844#endif 914#endif
845 array_free (idle, EMPTY0); 915 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0); 916 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0); 917 array_free (check, EMPTY0);
848 918
849 method = 0; 919 backend = 0;
850} 920}
851 921
852static void 922static void
853loop_fork (EV_P) 923loop_fork (EV_P)
854{ 924{
855#if EV_USE_PORT 925#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A); 926 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
857#endif 927#endif
858#if EV_USE_KQUEUE 928#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 929 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
860#endif 930#endif
861#if EV_USE_EPOLL 931#if EV_USE_EPOLL
862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 932 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
863#endif 933#endif
864 934
865 if (ev_is_active (&sigev)) 935 if (ev_is_active (&sigev))
866 { 936 {
867 /* default loop */ 937 /* default loop */
… …
888 958
889 memset (loop, 0, sizeof (struct ev_loop)); 959 memset (loop, 0, sizeof (struct ev_loop));
890 960
891 loop_init (EV_A_ flags); 961 loop_init (EV_A_ flags);
892 962
893 if (ev_method (EV_A)) 963 if (ev_backend (EV_A))
894 return loop; 964 return loop;
895 965
896 return 0; 966 return 0;
897} 967}
898 968
… …
911 981
912#endif 982#endif
913 983
914#if EV_MULTIPLICITY 984#if EV_MULTIPLICITY
915struct ev_loop * 985struct ev_loop *
916ev_default_loop_ (unsigned int flags) 986ev_default_loop_init (unsigned int flags)
917#else 987#else
918int 988int
919ev_default_loop (unsigned int flags) 989ev_default_loop (unsigned int flags)
920#endif 990#endif
921{ 991{
… …
931 ev_default_loop_ptr = 1; 1001 ev_default_loop_ptr = 1;
932#endif 1002#endif
933 1003
934 loop_init (EV_A_ flags); 1004 loop_init (EV_A_ flags);
935 1005
936 if (ev_method (EV_A)) 1006 if (ev_backend (EV_A))
937 { 1007 {
938 siginit (EV_A); 1008 siginit (EV_A);
939 1009
940#ifndef _WIN32 1010#ifndef _WIN32
941 ev_signal_init (&childev, childcb, SIGCHLD); 1011 ev_signal_init (&childev, childcb, SIGCHLD);
… …
977{ 1047{
978#if EV_MULTIPLICITY 1048#if EV_MULTIPLICITY
979 struct ev_loop *loop = ev_default_loop_ptr; 1049 struct ev_loop *loop = ev_default_loop_ptr;
980#endif 1050#endif
981 1051
982 if (method) 1052 if (backend)
983 postfork = 1; 1053 postfork = 1;
984} 1054}
985 1055
986/*****************************************************************************/ 1056/*****************************************************************************/
987 1057
… …
995 return 1; 1065 return 1;
996 1066
997 return 0; 1067 return 0;
998} 1068}
999 1069
1000static void 1070inline void
1001call_pending (EV_P) 1071call_pending (EV_P)
1002{ 1072{
1003 int pri; 1073 int pri;
1004 1074
1005 for (pri = NUMPRI; pri--; ) 1075 for (pri = NUMPRI; pri--; )
1006 while (pendingcnt [pri]) 1076 while (pendingcnt [pri])
1007 { 1077 {
1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1078 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1009 1079
1010 if (p->w) 1080 if (expect_true (p->w))
1011 { 1081 {
1012 p->w->pending = 0; 1082 p->w->pending = 0;
1013 EV_CB_INVOKE (p->w, p->events); 1083 EV_CB_INVOKE (p->w, p->events);
1014 } 1084 }
1015 } 1085 }
1016} 1086}
1017 1087
1018static void 1088inline void
1019timers_reify (EV_P) 1089timers_reify (EV_P)
1020{ 1090{
1021 while (timercnt && ((WT)timers [0])->at <= mn_now) 1091 while (timercnt && ((WT)timers [0])->at <= mn_now)
1022 { 1092 {
1023 struct ev_timer *w = timers [0]; 1093 struct ev_timer *w = timers [0];
… …
1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1111 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1042 } 1112 }
1043} 1113}
1044 1114
1045#if EV_PERIODICS 1115#if EV_PERIODICS
1046static void 1116inline void
1047periodics_reify (EV_P) 1117periodics_reify (EV_P)
1048{ 1118{
1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1119 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1050 { 1120 {
1051 struct ev_periodic *w = periodics [0]; 1121 struct ev_periodic *w = periodics [0];
… …
1110 ev_rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1111 return 1; 1181 return 1;
1112 } 1182 }
1113} 1183}
1114 1184
1115static void 1185inline void
1116time_update (EV_P) 1186time_update (EV_P)
1117{ 1187{
1118 int i; 1188 int i;
1119 1189
1120#if EV_USE_MONOTONIC 1190#if EV_USE_MONOTONIC
… …
1219 { 1289 {
1220 block = MAX_BLOCKTIME; 1290 block = MAX_BLOCKTIME;
1221 1291
1222 if (timercnt) 1292 if (timercnt)
1223 { 1293 {
1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1294 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1225 if (block > to) block = to; 1295 if (block > to) block = to;
1226 } 1296 }
1227 1297
1228#if EV_PERIODICS 1298#if EV_PERIODICS
1229 if (periodiccnt) 1299 if (periodiccnt)
1230 { 1300 {
1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1301 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1232 if (block > to) block = to; 1302 if (block > to) block = to;
1233 } 1303 }
1234#endif 1304#endif
1235 1305
1236 if (block < 0.) block = 0.; 1306 if (expect_false (block < 0.)) block = 0.;
1237 } 1307 }
1238 1308
1239 method_poll (EV_A_ block); 1309 backend_poll (EV_A_ block);
1240 1310
1241 /* update ev_rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1242 time_update (EV_A); 1312 time_update (EV_A);
1243 1313
1244 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
… …
1250 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless io or timers are pending */
1251 if (idlecnt && !any_pending (EV_A)) 1321 if (idlecnt && !any_pending (EV_A))
1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1253 1323
1254 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1255 if (checkcnt) 1325 if (expect_false (checkcnt))
1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1257 1327
1258 call_pending (EV_A); 1328 call_pending (EV_A);
1259 1329
1260 if (loop_done) 1330 if (expect_false (loop_done))
1261 break; 1331 break;
1262 } 1332 }
1263 1333
1264 if (loop_done != 2) 1334 if (loop_done != 2)
1265 loop_done = 0; 1335 loop_done = 0;
… …
1327void 1397void
1328ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ struct ev_io *w)
1329{ 1399{
1330 int fd = w->fd; 1400 int fd = w->fd;
1331 1401
1332 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1333 return; 1403 return;
1334 1404
1335 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1336 1406
1337 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
… …
1343 1413
1344void 1414void
1345ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ struct ev_io *w)
1346{ 1416{
1347 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1348 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1349 return; 1419 return;
1350 1420
1351 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));
1352 1422
1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1357} 1427}
1358 1428
1359void 1429void
1360ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ struct ev_timer *w)
1361{ 1431{
1362 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1363 return; 1433 return;
1364 1434
1365 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1366 1436
1367 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.));
… …
1376 1446
1377void 1447void
1378ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ struct ev_timer *w)
1379{ 1449{
1380 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1381 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1382 return; 1452 return;
1383 1453
1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1385 1455
1386 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1387 { 1457 {
1388 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1390 } 1460 }
1391 1461
… …
1416 1486
1417#if EV_PERIODICS 1487#if EV_PERIODICS
1418void 1488void
1419ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ struct ev_periodic *w)
1420{ 1490{
1421 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1422 return; 1492 return;
1423 1493
1424 if (w->reschedule_cb) 1494 if (w->reschedule_cb)
1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1426 else if (w->interval) 1496 else if (w->interval)
… …
1440 1510
1441void 1511void
1442ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ struct ev_periodic *w)
1443{ 1513{
1444 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1445 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1446 return; 1516 return;
1447 1517
1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1449 1519
1450 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1451 { 1521 {
1452 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1454 } 1524 }
1455 1525
… …
1466#endif 1536#endif
1467 1537
1468void 1538void
1469ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ struct ev_idle *w)
1470{ 1540{
1471 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1472 return; 1542 return;
1473 1543
1474 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1545 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1476 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
… …
1478 1548
1479void 1549void
1480ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ struct ev_idle *w)
1481{ 1551{
1482 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1483 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1484 return; 1554 return;
1485 1555
1486 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1487 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1488} 1558}
1489 1559
1490void 1560void
1491ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ struct ev_prepare *w)
1492{ 1562{
1493 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1494 return; 1564 return;
1495 1565
1496 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1567 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1498 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
… …
1500 1570
1501void 1571void
1502ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ struct ev_prepare *w)
1503{ 1573{
1504 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1505 if (!ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1506 return; 1576 return;
1507 1577
1508 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1509 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1510} 1580}
1511 1581
1512void 1582void
1513ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ struct ev_check *w)
1514{ 1584{
1515 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1516 return; 1586 return;
1517 1587
1518 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1589 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1520 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
… …
1522 1592
1523void 1593void
1524ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ struct ev_check *w)
1525{ 1595{
1526 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1527 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1528 return; 1598 return;
1529 1599
1530 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1531 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1532} 1602}
… …
1539ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ struct ev_signal *w)
1540{ 1610{
1541#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1612 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1543#endif 1613#endif
1544 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1545 return; 1615 return;
1546 1616
1547 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));
1548 1618
1549 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
… …
1566 1636
1567void 1637void
1568ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ struct ev_signal *w)
1569{ 1639{
1570 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1572 return; 1642 return;
1573 1643
1574 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1575 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1576 1646
… …
1582ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ struct ev_child *w)
1583{ 1653{
1584#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1655 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1586#endif 1656#endif
1587 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1588 return; 1658 return;
1589 1659
1590 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1591 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1592} 1662}
1593 1663
1594void 1664void
1595ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ struct ev_child *w)
1596{ 1666{
1597 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1598 if (!ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1599 return; 1669 return;
1600 1670
1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1602 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1603} 1673}
1674
1675#if EV_MULTIPLICITY
1676static void
1677embed_cb (EV_P_ struct ev_io *io, int revents)
1678{
1679 struct ev_embed *w = (struct ev_embed *)(((char *)io) - offsetof (struct ev_embed, io));
1680
1681 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1682 ev_loop (w->loop, EVLOOP_NONBLOCK);
1683}
1684
1685void
1686ev_embed_start (EV_P_ struct ev_embed *w)
1687{
1688 if (expect_false (ev_is_active (w)))
1689 return;
1690
1691 {
1692 struct ev_loop *loop = w->loop;
1693 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1694 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1695 }
1696
1697 ev_io_start (EV_A_ &w->io);
1698 ev_start (EV_A_ (W)w, 1);
1699}
1700
1701void
1702ev_embed_stop (EV_P_ struct ev_embed *w)
1703{
1704 ev_clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w)))
1706 return;
1707
1708 ev_io_stop (EV_A_ &w->io);
1709 ev_stop (EV_A_ (W)w);
1710}
1711#endif
1604 1712
1605/*****************************************************************************/ 1713/*****************************************************************************/
1606 1714
1607struct ev_once 1715struct ev_once
1608{ 1716{
… …
1640void 1748void
1641ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1749ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1642{ 1750{
1643 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1751 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1644 1752
1645 if (!once) 1753 if (expect_false (!once))
1754 {
1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1755 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1647 else 1756 return;
1648 { 1757 }
1758
1649 once->cb = cb; 1759 once->cb = cb;
1650 once->arg = arg; 1760 once->arg = arg;
1651 1761
1652 ev_init (&once->io, once_cb_io); 1762 ev_init (&once->io, once_cb_io);
1653 if (fd >= 0) 1763 if (fd >= 0)
1654 { 1764 {
1655 ev_io_set (&once->io, fd, events); 1765 ev_io_set (&once->io, fd, events);
1656 ev_io_start (EV_A_ &once->io); 1766 ev_io_start (EV_A_ &once->io);
1657 } 1767 }
1658 1768
1659 ev_init (&once->to, once_cb_to); 1769 ev_init (&once->to, once_cb_to);
1660 if (timeout >= 0.) 1770 if (timeout >= 0.)
1661 { 1771 {
1662 ev_timer_set (&once->to, timeout, 0.); 1772 ev_timer_set (&once->to, timeout, 0.);
1663 ev_timer_start (EV_A_ &once->to); 1773 ev_timer_start (EV_A_ &once->to);
1664 }
1665 } 1774 }
1666} 1775}
1667 1776
1668#ifdef __cplusplus 1777#ifdef __cplusplus
1669} 1778}

Diff Legend

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