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

Comparing libev/ev.c (file contents):
Revision 1.116 by root, Thu Nov 15 09:19:42 2007 UTC vs.
Revision 1.130 by root, Fri Nov 23 05:13:48 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
… …
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
… …
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_recommended_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 *
896ev_default_loop_ (unsigned int flags) 970ev_default_loop_init (unsigned int flags)
897#else 971#else
898int 972int
899ev_default_loop (unsigned int flags) 973ev_default_loop (unsigned int flags)
900#endif 974#endif
901{ 975{
… …
906 if (!ev_default_loop_ptr) 980 if (!ev_default_loop_ptr)
907 { 981 {
908#if EV_MULTIPLICITY 982#if EV_MULTIPLICITY
909 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 983 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
910#else 984#else
911 ev_default_default_loop_ptr = 1; 985 ev_default_loop_ptr = 1;
912#endif 986#endif
913 987
914 loop_init (EV_A_ flags); 988 loop_init (EV_A_ flags);
915 989
916 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
917 { 991 {
918 siginit (EV_A); 992 siginit (EV_A);
919 993
920#ifndef _WIN32 994#ifndef _WIN32
921 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
957{ 1031{
958#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
959 struct ev_loop *loop = ev_default_loop_ptr; 1033 struct ev_loop *loop = ev_default_loop_ptr;
960#endif 1034#endif
961 1035
962 if (method) 1036 if (backend)
963 postfork = 1; 1037 postfork = 1;
964} 1038}
965 1039
966/*****************************************************************************/ 1040/*****************************************************************************/
967 1041
… …
975 return 1; 1049 return 1;
976 1050
977 return 0; 1051 return 0;
978} 1052}
979 1053
980static void 1054inline void
981call_pending (EV_P) 1055call_pending (EV_P)
982{ 1056{
983 int pri; 1057 int pri;
984 1058
985 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
986 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
987 { 1061 {
988 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
989 1063
990 if (p->w) 1064 if (expect_true (p->w))
991 { 1065 {
992 p->w->pending = 0; 1066 p->w->pending = 0;
993 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
994 } 1068 }
995 } 1069 }
996} 1070}
997 1071
998static void 1072inline void
999timers_reify (EV_P) 1073timers_reify (EV_P)
1000{ 1074{
1001 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
1002 { 1076 {
1003 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
… …
1021 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1022 } 1096 }
1023} 1097}
1024 1098
1025#if EV_PERIODICS 1099#if EV_PERIODICS
1026static void 1100inline void
1027periodics_reify (EV_P) 1101periodics_reify (EV_P)
1028{ 1102{
1029 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1030 { 1104 {
1031 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
… …
1090 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1091 return 1; 1165 return 1;
1092 } 1166 }
1093} 1167}
1094 1168
1095static void 1169inline void
1096time_update (EV_P) 1170time_update (EV_P)
1097{ 1171{
1098 int i; 1172 int i;
1099 1173
1100#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
… …
1199 { 1273 {
1200 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1201 1275
1202 if (timercnt) 1276 if (timercnt)
1203 { 1277 {
1204 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1205 if (block > to) block = to; 1279 if (block > to) block = to;
1206 } 1280 }
1207 1281
1208#if EV_PERIODICS 1282#if EV_PERIODICS
1209 if (periodiccnt) 1283 if (periodiccnt)
1210 { 1284 {
1211 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;
1212 if (block > to) block = to; 1286 if (block > to) block = to;
1213 } 1287 }
1214#endif 1288#endif
1215 1289
1216 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1217 } 1291 }
1218 1292
1219 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1220 1294
1221 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1222 time_update (EV_A); 1296 time_update (EV_A);
1223 1297
1224 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
… …
1230 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1231 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1232 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1233 1307
1234 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1235 if (checkcnt) 1309 if (expect_false (checkcnt))
1236 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1237 1311
1238 call_pending (EV_A); 1312 call_pending (EV_A);
1239 1313
1240 if (loop_done) 1314 if (expect_false (loop_done))
1241 break; 1315 break;
1242 } 1316 }
1243 1317
1244 if (loop_done != 2) 1318 if (loop_done != 2)
1245 loop_done = 0; 1319 loop_done = 0;
… …
1307void 1381void
1308ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1309{ 1383{
1310 int fd = w->fd; 1384 int fd = w->fd;
1311 1385
1312 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1313 return; 1387 return;
1314 1388
1315 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1316 1390
1317 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
… …
1323 1397
1324void 1398void
1325ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1326{ 1400{
1327 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1328 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1329 return; 1403 return;
1330 1404
1331 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));
1332 1406
1333 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1337} 1411}
1338 1412
1339void 1413void
1340ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1341{ 1415{
1342 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1343 return; 1417 return;
1344 1418
1345 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1346 1420
1347 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.));
… …
1356 1430
1357void 1431void
1358ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1359{ 1433{
1360 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1361 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1362 return; 1436 return;
1363 1437
1364 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1365 1439
1366 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1367 { 1441 {
1368 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 } 1444 }
1371 1445
… …
1396 1470
1397#if EV_PERIODICS 1471#if EV_PERIODICS
1398void 1472void
1399ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1400{ 1474{
1401 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1402 return; 1476 return;
1403 1477
1404 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1405 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1406 else if (w->interval) 1480 else if (w->interval)
… …
1420 1494
1421void 1495void
1422ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1423{ 1497{
1424 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1425 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1426 return; 1500 return;
1427 1501
1428 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1429 1503
1430 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1431 { 1505 {
1432 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1433 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1434 } 1508 }
1435 1509
… …
1446#endif 1520#endif
1447 1521
1448void 1522void
1449ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1450{ 1524{
1451 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1452 return; 1526 return;
1453 1527
1454 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1455 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1456 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
… …
1458 1532
1459void 1533void
1460ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1461{ 1535{
1462 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1463 if (!ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1464 return; 1538 return;
1465 1539
1466 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1467 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1468} 1542}
1469 1543
1470void 1544void
1471ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1472{ 1546{
1473 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1474 return; 1548 return;
1475 1549
1476 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1477 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1478 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
… …
1480 1554
1481void 1555void
1482ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1483{ 1557{
1484 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1485 if (!ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1486 return; 1560 return;
1487 1561
1488 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1489 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1490} 1564}
1491 1565
1492void 1566void
1493ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1494{ 1568{
1495 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1496 return; 1570 return;
1497 1571
1498 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1499 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1500 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
… …
1502 1576
1503void 1577void
1504ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1505{ 1579{
1506 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1507 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1508 return; 1582 return;
1509 1583
1510 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1511 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1512} 1586}
… …
1519ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1520{ 1594{
1521#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1522 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1596 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1523#endif 1597#endif
1524 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1525 return; 1599 return;
1526 1600
1527 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));
1528 1602
1529 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
… …
1546 1620
1547void 1621void
1548ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1549{ 1623{
1550 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1551 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1552 return; 1626 return;
1553 1627
1554 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1555 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1556 1630
… …
1562ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1563{ 1637{
1564#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1565 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1639 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1566#endif 1640#endif
1567 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1568 return; 1642 return;
1569 1643
1570 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1571 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1572} 1646}
1573 1647
1574void 1648void
1575ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1576{ 1650{
1577 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1578 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1579 return; 1653 return;
1580 1654
1581 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1582 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1583} 1657}
… …
1620void 1694void
1621ev_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)
1622{ 1696{
1623 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));
1624 1698
1625 if (!once) 1699 if (expect_false (!once))
1700 {
1626 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1627 else 1702 return;
1628 { 1703 }
1704
1629 once->cb = cb; 1705 once->cb = cb;
1630 once->arg = arg; 1706 once->arg = arg;
1631 1707
1632 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1633 if (fd >= 0) 1709 if (fd >= 0)
1634 { 1710 {
1635 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1636 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1637 } 1713 }
1638 1714
1639 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1640 if (timeout >= 0.) 1716 if (timeout >= 0.)
1641 { 1717 {
1642 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1643 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1644 }
1645 } 1720 }
1646} 1721}
1647 1722
1648#ifdef __cplusplus 1723#ifdef __cplusplus
1649} 1724}

Diff Legend

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