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

Comparing libev/ev.c (file contents):
Revision 1.115 by root, Wed Nov 14 04:53:21 2007 UTC vs.
Revision 1.131 by root, Fri Nov 23 05:43:45 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
62# endif 93# endif
63 94
64#endif 95#endif
65 96
66#include <math.h> 97#include <math.h>
… …
90#endif 121#endif
91 122
92/**/ 123/**/
93 124
94#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
96#endif 131#endif
97 132
98#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 135#endif
102 136
103#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
104# ifdef _WIN32 138# ifdef _WIN32
105# define EV_USE_POLL 0 139# define EV_USE_POLL 0
… …
114 148
115#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
117#endif 151#endif
118 152
119#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
121#endif 155#endif
122 156
123/**/ 157/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 158
131#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
134#endif 162#endif
… …
143#endif 171#endif
144 172
145/**/ 173/**/
146 174
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 179
152#ifdef EV_H 180#ifdef EV_H
153# include EV_H 181# include EV_H
154#else 182#else
155# include "ev.h" 183# include "ev.h"
156#endif 184#endif
157 185
158#if __GNUC__ >= 3 186#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 188# define inline static inline
161#else 189#else
162# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
163# define inline static 191# define inline static
164#endif 192#endif
165 193
… …
258 #include "ev_vars.h" 286 #include "ev_vars.h"
259 #undef VAR 287 #undef VAR
260 }; 288 };
261 #include "ev_wrap.h" 289 #include "ev_wrap.h"
262 290
263 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
264 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
265 293
266#else 294#else
267 295
268 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
269 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
270 #include "ev_vars.h" 298 #include "ev_vars.h"
271 #undef VAR 299 #undef VAR
272 300
273 static int default_loop; 301 static int ev_default_loop_ptr;
274 302
275#endif 303#endif
276 304
277/*****************************************************************************/ 305/*****************************************************************************/
278 306
… …
359void 387void
360ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
361{ 389{
362 W w_ = (W)w; 390 W w_ = (W)w;
363 391
364 if (w_->pending) 392 if (expect_false (w_->pending))
365 { 393 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 395 return;
368 } 396 }
369 397
… …
403 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
404} 432}
405 433
406/*****************************************************************************/ 434/*****************************************************************************/
407 435
408static void 436inline void
409fd_reify (EV_P) 437fd_reify (EV_P)
410{ 438{
411 int i; 439 int i;
412 440
413 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
430 } 458 }
431#endif 459#endif
432 460
433 anfd->reify = 0; 461 anfd->reify = 0;
434 462
435 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
436 anfd->events = events; 464 anfd->events = events;
437 } 465 }
438 466
439 fdchangecnt = 0; 467 fdchangecnt = 0;
440} 468}
441 469
442static void 470static void
443fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
444{ 472{
445 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
446 return; 474 return;
447 475
448 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
449 477
450 ++fdchangecnt; 478 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
463 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
464 } 492 }
465} 493}
466 494
467static int 495inline int
468fd_valid (int fd) 496fd_valid (int fd)
469{ 497{
470#ifdef _WIN32 498#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
472#else 500#else
… …
498 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
499 return; 527 return;
500 } 528 }
501} 529}
502 530
503/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
504static void 532static void
505fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
506{ 534{
507 int fd; 535 int fd;
508 536
… …
614ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
615{ 643{
616 WL w; 644 WL w;
617 645
618#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
619 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
620#endif 648#endif
621 649
622 --signum; 650 --signum;
623 651
624 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
641 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
644} 672}
645 673
646inline void 674static void
647fd_intern (int fd) 675fd_intern (int fd)
648{ 676{
649#ifdef _WIN32 677#ifdef _WIN32
650 int arg = 1; 678 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
710 738
711#endif 739#endif
712 740
713/*****************************************************************************/ 741/*****************************************************************************/
714 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
715#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 747# include "ev_kqueue.c"
717#endif 748#endif
718#if EV_USE_EPOLL 749#if EV_USE_EPOLL
719# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
748 || getgid () != getegid (); 779 || getgid () != getegid ();
749#endif 780#endif
750} 781}
751 782
752unsigned int 783unsigned int
753ev_method (EV_P) 784ev_supported_backends (void)
754{ 785{
755 return method; 786 unsigned int flags = 0;
787
788 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
789 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
790 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
791 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
792 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
793
794 return flags;
795}
796
797unsigned int
798ev_recommended_backends (void)
799{
800 unsigned int flags = ev_supported_backends ();
801
802#ifndef __NetBSD__
803 /* kqueue is borked on everything but netbsd apparently */
804 /* it usually doesn't work correctly on anything but sockets and pipes */
805 flags &= ~EVBACKEND_KQUEUE;
806#endif
807#ifdef __APPLE__
808 // flags &= ~EVBACKEND_KQUEUE; for documentation
809 flags &= ~EVBACKEND_POLL;
810#endif
811
812 return flags;
813}
814
815unsigned int
816ev_backend (EV_P)
817{
818 return backend;
756} 819}
757 820
758static void 821static void
759loop_init (EV_P_ unsigned int flags) 822loop_init (EV_P_ unsigned int flags)
760{ 823{
761 if (!method) 824 if (!backend)
762 { 825 {
763#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
764 { 827 {
765 struct timespec ts; 828 struct timespec ts;
766 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
771 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
772 mn_now = get_clock (); 835 mn_now = get_clock ();
773 now_floor = mn_now; 836 now_floor = mn_now;
774 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
775 838
776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 839 if (!(flags & EVFLAG_NOENV)
840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
777 flags = atoi (getenv ("LIBEV_FLAGS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
778 843
779 if (!(flags & 0x0000ffff)) 844 if (!(flags & 0x0000ffffUL))
780 flags |= 0x0000ffff; 845 flags |= ev_recommended_backends ();
781 846
782 method = 0; 847 backend = 0;
848#if EV_USE_PORT
849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
850#endif
783#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
785#endif 853#endif
786#if EV_USE_EPOLL 854#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
788#endif 856#endif
789#if EV_USE_POLL 857#if EV_USE_POLL
790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
791#endif 859#endif
792#if EV_USE_SELECT 860#if EV_USE_SELECT
793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
794#endif 862#endif
795 863
796 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
798 } 866 }
799} 867}
800 868
801void 869static void
802loop_destroy (EV_P) 870loop_destroy (EV_P)
803{ 871{
804 int i; 872 int i;
805 873
874#if EV_USE_PORT
875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
876#endif
806#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
808#endif 879#endif
809#if EV_USE_EPOLL 880#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
811#endif 882#endif
812#if EV_USE_POLL 883#if EV_USE_POLL
813 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
814#endif 885#endif
815#if EV_USE_SELECT 886#if EV_USE_SELECT
816 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
817#endif 888#endif
818 889
819 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
820 array_free (pending, [i]); 891 array_free (pending, [i]);
821 892
… …
827#endif 898#endif
828 array_free (idle, EMPTY0); 899 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0); 900 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0); 901 array_free (check, EMPTY0);
831 902
832 method = 0; 903 backend = 0;
833} 904}
834 905
835static void 906static void
836loop_fork (EV_P) 907loop_fork (EV_P)
837{ 908{
909#if EV_USE_PORT
910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
911#endif
912#if EV_USE_KQUEUE
913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
914#endif
838#if EV_USE_EPOLL 915#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 917#endif
844 918
845 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
846 { 920 {
847 /* default loop */ 921 /* default loop */
… …
868 942
869 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
870 944
871 loop_init (EV_A_ flags); 945 loop_init (EV_A_ flags);
872 946
873 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
874 return loop; 948 return loop;
875 949
876 return 0; 950 return 0;
877} 951}
878 952
… …
891 965
892#endif 966#endif
893 967
894#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
895struct ev_loop * 969struct ev_loop *
970ev_default_loop_init (unsigned int flags)
896#else 971#else
897int 972int
898#endif
899ev_default_loop (unsigned int flags) 973ev_default_loop (unsigned int flags)
974#endif
900{ 975{
901 if (sigpipe [0] == sigpipe [1]) 976 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 977 if (pipe (sigpipe))
903 return 0; 978 return 0;
904 979
905 if (!default_loop) 980 if (!ev_default_loop_ptr)
906 { 981 {
907#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 984#else
910 default_loop = 1; 985 ev_default_loop_ptr = 1;
911#endif 986#endif
912 987
913 loop_init (EV_A_ flags); 988 loop_init (EV_A_ flags);
914 989
915 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
916 { 991 {
917 siginit (EV_A); 992 siginit (EV_A);
918 993
919#ifndef _WIN32 994#ifndef _WIN32
920 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
922 ev_signal_start (EV_A_ &childev); 997 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 998 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 999#endif
925 } 1000 }
926 else 1001 else
927 default_loop = 0; 1002 ev_default_loop_ptr = 0;
928 } 1003 }
929 1004
930 return default_loop; 1005 return ev_default_loop_ptr;
931} 1006}
932 1007
933void 1008void
934ev_default_destroy (void) 1009ev_default_destroy (void)
935{ 1010{
936#if EV_MULTIPLICITY 1011#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 1012 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 1013#endif
939 1014
940#ifndef _WIN32 1015#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 1016 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 1017 ev_signal_stop (EV_A_ &childev);
… …
953 1028
954void 1029void
955ev_default_fork (void) 1030ev_default_fork (void)
956{ 1031{
957#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 1033 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 1034#endif
960 1035
961 if (method) 1036 if (backend)
962 postfork = 1; 1037 postfork = 1;
963} 1038}
964 1039
965/*****************************************************************************/ 1040/*****************************************************************************/
966 1041
… …
974 return 1; 1049 return 1;
975 1050
976 return 0; 1051 return 0;
977} 1052}
978 1053
979static void 1054inline void
980call_pending (EV_P) 1055call_pending (EV_P)
981{ 1056{
982 int pri; 1057 int pri;
983 1058
984 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
986 { 1061 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1063
989 if (p->w) 1064 if (expect_true (p->w))
990 { 1065 {
991 p->w->pending = 0; 1066 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
993 } 1068 }
994 } 1069 }
995} 1070}
996 1071
997static void 1072inline void
998timers_reify (EV_P) 1073timers_reify (EV_P)
999{ 1074{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1076 {
1002 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1096 }
1022} 1097}
1023 1098
1024#if EV_PERIODICS 1099#if EV_PERIODICS
1025static void 1100inline void
1026periodics_reify (EV_P) 1101periodics_reify (EV_P)
1027{ 1102{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1104 {
1030 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1090 return 1; 1165 return 1;
1091 } 1166 }
1092} 1167}
1093 1168
1094static void 1169inline void
1095time_update (EV_P) 1170time_update (EV_P)
1096{ 1171{
1097 int i; 1172 int i;
1098 1173
1099#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
… …
1198 { 1273 {
1199 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1200 1275
1201 if (timercnt) 1276 if (timercnt)
1202 { 1277 {
1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1204 if (block > to) block = to; 1279 if (block > to) block = to;
1205 } 1280 }
1206 1281
1207#if EV_PERIODICS 1282#if EV_PERIODICS
1208 if (periodiccnt) 1283 if (periodiccnt)
1209 { 1284 {
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1285 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1211 if (block > to) block = to; 1286 if (block > to) block = to;
1212 } 1287 }
1213#endif 1288#endif
1214 1289
1215 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1216 } 1291 }
1217 1292
1218 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1219 1294
1220 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1221 time_update (EV_A); 1296 time_update (EV_A);
1222 1297
1223 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1307
1233 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1309 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1311
1237 call_pending (EV_A); 1312 call_pending (EV_A);
1238 1313
1239 if (loop_done) 1314 if (expect_false (loop_done))
1240 break; 1315 break;
1241 } 1316 }
1242 1317
1243 if (loop_done != 2) 1318 if (loop_done != 2)
1244 loop_done = 0; 1319 loop_done = 0;
… …
1306void 1381void
1307ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1308{ 1383{
1309 int fd = w->fd; 1384 int fd = w->fd;
1310 1385
1311 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1312 return; 1387 return;
1313 1388
1314 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1315 1390
1316 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
… …
1322 1397
1323void 1398void
1324ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1325{ 1400{
1326 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1327 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1328 return; 1403 return;
1329 1404
1330 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1405 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1331 1406
1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1336} 1411}
1337 1412
1338void 1413void
1339ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1340{ 1415{
1341 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1342 return; 1417 return;
1343 1418
1344 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1345 1420
1346 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1421 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1355 1430
1356void 1431void
1357ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1358{ 1433{
1359 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1361 return; 1436 return;
1362 1437
1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1364 1439
1365 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1366 { 1441 {
1367 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1369 } 1444 }
1370 1445
… …
1395 1470
1396#if EV_PERIODICS 1471#if EV_PERIODICS
1397void 1472void
1398ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1399{ 1474{
1400 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1401 return; 1476 return;
1402 1477
1403 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1405 else if (w->interval) 1480 else if (w->interval)
… …
1419 1494
1420void 1495void
1421ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1422{ 1497{
1423 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1424 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1425 return; 1500 return;
1426 1501
1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1428 1503
1429 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1430 { 1505 {
1431 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1433 } 1508 }
1434 1509
… …
1445#endif 1520#endif
1446 1521
1447void 1522void
1448ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1449{ 1524{
1450 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1451 return; 1526 return;
1452 1527
1453 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1455 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
… …
1457 1532
1458void 1533void
1459ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1460{ 1535{
1461 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1462 if (!ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1463 return; 1538 return;
1464 1539
1465 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1466 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1467} 1542}
1468 1543
1469void 1544void
1470ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1471{ 1546{
1472 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1473 return; 1548 return;
1474 1549
1475 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1477 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
… …
1479 1554
1480void 1555void
1481ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1482{ 1557{
1483 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1485 return; 1560 return;
1486 1561
1487 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1488 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1489} 1564}
1490 1565
1491void 1566void
1492ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1493{ 1568{
1494 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1495 return; 1570 return;
1496 1571
1497 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1499 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
… …
1501 1576
1502void 1577void
1503ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1504{ 1579{
1505 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1506 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1507 return; 1582 return;
1508 1583
1509 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1510 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1511} 1586}
… …
1516 1591
1517void 1592void
1518ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1519{ 1594{
1520#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1521 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1522#endif 1597#endif
1523 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1524 return; 1599 return;
1525 1600
1526 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1601 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1527 1602
1528 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
… …
1545 1620
1546void 1621void
1547ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1548{ 1623{
1549 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1550 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1551 return; 1626 return;
1552 1627
1553 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1554 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1555 1630
… …
1559 1634
1560void 1635void
1561ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1562{ 1637{
1563#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1564 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1565#endif 1640#endif
1566 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1567 return; 1642 return;
1568 1643
1569 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1570 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1571} 1646}
1572 1647
1573void 1648void
1574ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1575{ 1650{
1576 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1577 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1578 return; 1653 return;
1579 1654
1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1581 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1582} 1657}
… …
1619void 1694void
1620ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1695ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1621{ 1696{
1622 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1697 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1623 1698
1624 if (!once) 1699 if (expect_false (!once))
1700 {
1625 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1626 else 1702 return;
1627 { 1703 }
1704
1628 once->cb = cb; 1705 once->cb = cb;
1629 once->arg = arg; 1706 once->arg = arg;
1630 1707
1631 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1632 if (fd >= 0) 1709 if (fd >= 0)
1633 { 1710 {
1634 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1635 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1636 } 1713 }
1637 1714
1638 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1639 if (timeout >= 0.) 1716 if (timeout >= 0.)
1640 { 1717 {
1641 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1642 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1643 }
1644 } 1720 }
1645} 1721}
1646 1722
1647#ifdef __cplusplus 1723#ifdef __cplusplus
1648} 1724}

Diff Legend

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