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.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
62# endif 85# endif
63 86
64# if HAVE_PORT_H && HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
66# endif 93# endif
67 94
68#endif 95#endif
69 96
70#include <math.h> 97#include <math.h>
… …
94#endif 121#endif
95 122
96/**/ 123/**/
97 124
98#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
99# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
100#endif 127#endif
101 128
102#ifndef EV_USE_REALTIME 129#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1 130# define EV_USE_REALTIME 0
104#endif 131#endif
105 132
106#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
107# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
109#endif 135#endif
110 136
111#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
112# ifdef _WIN32 138# ifdef _WIN32
113# define EV_USE_POLL 0 139# define EV_USE_POLL 0
… …
128# define EV_USE_PORT 0 154# define EV_USE_PORT 0
129#endif 155#endif
130 156
131/**/ 157/**/
132 158
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 159#ifndef CLOCK_MONOTONIC
140# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
141# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
142#endif 162#endif
143 163
… …
151#endif 171#endif
152 172
153/**/ 173/**/
154 174
155#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) */
156#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) */
157#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 */
158/*#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 */
159 179
160#ifdef EV_H 180#ifdef EV_H
161# include EV_H 181# include EV_H
162#else 182#else
163# include "ev.h" 183# include "ev.h"
164#endif 184#endif
165 185
166#if __GNUC__ >= 3 186#if __GNUC__ >= 3
167# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
168# define inline inline 188# define inline static inline
169#else 189#else
170# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
171# define inline static 191# define inline static
172#endif 192#endif
173 193
… …
367void 387void
368ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
369{ 389{
370 W w_ = (W)w; 390 W w_ = (W)w;
371 391
372 if (w_->pending) 392 if (expect_false (w_->pending))
373 { 393 {
374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
375 return; 395 return;
376 } 396 }
377 397
… …
411 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
412} 432}
413 433
414/*****************************************************************************/ 434/*****************************************************************************/
415 435
416static void 436inline void
417fd_reify (EV_P) 437fd_reify (EV_P)
418{ 438{
419 int i; 439 int i;
420 440
421 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
438 } 458 }
439#endif 459#endif
440 460
441 anfd->reify = 0; 461 anfd->reify = 0;
442 462
443 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
444 anfd->events = events; 464 anfd->events = events;
445 } 465 }
446 466
447 fdchangecnt = 0; 467 fdchangecnt = 0;
448} 468}
449 469
450static void 470static void
451fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
452{ 472{
453 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
454 return; 474 return;
455 475
456 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
457 477
458 ++fdchangecnt; 478 ++fdchangecnt;
… …
470 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
471 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);
472 } 492 }
473} 493}
474 494
475static int 495inline int
476fd_valid (int fd) 496fd_valid (int fd)
477{ 497{
478#ifdef _WIN32 498#ifdef _WIN32
479 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
480#else 500#else
… …
506 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
507 return; 527 return;
508 } 528 }
509} 529}
510 530
511/* 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 */
512static void 532static void
513fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
514{ 534{
515 int fd; 535 int fd;
516 536
… …
649 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
650 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
651 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
652} 672}
653 673
654inline void 674static void
655fd_intern (int fd) 675fd_intern (int fd)
656{ 676{
657#ifdef _WIN32 677#ifdef _WIN32
658 int arg = 1; 678 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
759 || getgid () != getegid (); 779 || getgid () != getegid ();
760#endif 780#endif
761} 781}
762 782
763unsigned int 783unsigned int
764ev_method (EV_P) 784ev_supported_backends (void)
765{ 785{
766 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;
767} 819}
768 820
769static void 821static void
770loop_init (EV_P_ unsigned int flags) 822loop_init (EV_P_ unsigned int flags)
771{ 823{
772 if (!method) 824 if (!backend)
773 { 825 {
774#if EV_USE_MONOTONIC 826#if EV_USE_MONOTONIC
775 { 827 {
776 struct timespec ts; 828 struct timespec ts;
777 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 829 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
782 ev_rt_now = ev_time (); 834 ev_rt_now = ev_time ();
783 mn_now = get_clock (); 835 mn_now = get_clock ();
784 now_floor = mn_now; 836 now_floor = mn_now;
785 rtmn_diff = ev_rt_now - mn_now; 837 rtmn_diff = ev_rt_now - mn_now;
786 838
787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 839 if (!(flags & EVFLAG_NOENV)
840 && !enable_secure ()
841 && getenv ("LIBEV_FLAGS"))
788 flags = atoi (getenv ("LIBEV_FLAGS")); 842 flags = atoi (getenv ("LIBEV_FLAGS"));
789 843
790 if (!(flags & 0x0000ffff)) 844 if (!(flags & 0x0000ffffUL))
791 flags |= 0x0000ffff; 845 flags |= ev_recommended_backends ();
792 846
793 method = 0; 847 backend = 0;
794#if EV_USE_PORT 848#if EV_USE_PORT
795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 849 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
796#endif 850#endif
797#if EV_USE_KQUEUE 851#if EV_USE_KQUEUE
798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 852 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
799#endif 853#endif
800#if EV_USE_EPOLL 854#if EV_USE_EPOLL
801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 855 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
802#endif 856#endif
803#if EV_USE_POLL 857#if EV_USE_POLL
804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 858 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
805#endif 859#endif
806#if EV_USE_SELECT 860#if EV_USE_SELECT
807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 861 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
808#endif 862#endif
809 863
810 ev_init (&sigev, sigcb); 864 ev_init (&sigev, sigcb);
811 ev_set_priority (&sigev, EV_MAXPRI); 865 ev_set_priority (&sigev, EV_MAXPRI);
812 } 866 }
813} 867}
814 868
815void 869static void
816loop_destroy (EV_P) 870loop_destroy (EV_P)
817{ 871{
818 int i; 872 int i;
819 873
820#if EV_USE_PORT 874#if EV_USE_PORT
821 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 875 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
822#endif 876#endif
823#if EV_USE_KQUEUE 877#if EV_USE_KQUEUE
824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 878 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
825#endif 879#endif
826#if EV_USE_EPOLL 880#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 881 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
828#endif 882#endif
829#if EV_USE_POLL 883#if EV_USE_POLL
830 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 884 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
831#endif 885#endif
832#if EV_USE_SELECT 886#if EV_USE_SELECT
833 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 887 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
834#endif 888#endif
835 889
836 for (i = NUMPRI; i--; ) 890 for (i = NUMPRI; i--; )
837 array_free (pending, [i]); 891 array_free (pending, [i]);
838 892
… …
844#endif 898#endif
845 array_free (idle, EMPTY0); 899 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0); 900 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0); 901 array_free (check, EMPTY0);
848 902
849 method = 0; 903 backend = 0;
850} 904}
851 905
852static void 906static void
853loop_fork (EV_P) 907loop_fork (EV_P)
854{ 908{
855#if EV_USE_PORT 909#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A); 910 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
857#endif 911#endif
858#if EV_USE_KQUEUE 912#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 913 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
860#endif 914#endif
861#if EV_USE_EPOLL 915#if EV_USE_EPOLL
862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 916 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
863#endif 917#endif
864 918
865 if (ev_is_active (&sigev)) 919 if (ev_is_active (&sigev))
866 { 920 {
867 /* default loop */ 921 /* default loop */
… …
888 942
889 memset (loop, 0, sizeof (struct ev_loop)); 943 memset (loop, 0, sizeof (struct ev_loop));
890 944
891 loop_init (EV_A_ flags); 945 loop_init (EV_A_ flags);
892 946
893 if (ev_method (EV_A)) 947 if (ev_backend (EV_A))
894 return loop; 948 return loop;
895 949
896 return 0; 950 return 0;
897} 951}
898 952
… …
911 965
912#endif 966#endif
913 967
914#if EV_MULTIPLICITY 968#if EV_MULTIPLICITY
915struct ev_loop * 969struct ev_loop *
916ev_default_loop_ (unsigned int flags) 970ev_default_loop_init (unsigned int flags)
917#else 971#else
918int 972int
919ev_default_loop (unsigned int flags) 973ev_default_loop (unsigned int flags)
920#endif 974#endif
921{ 975{
… …
931 ev_default_loop_ptr = 1; 985 ev_default_loop_ptr = 1;
932#endif 986#endif
933 987
934 loop_init (EV_A_ flags); 988 loop_init (EV_A_ flags);
935 989
936 if (ev_method (EV_A)) 990 if (ev_backend (EV_A))
937 { 991 {
938 siginit (EV_A); 992 siginit (EV_A);
939 993
940#ifndef _WIN32 994#ifndef _WIN32
941 ev_signal_init (&childev, childcb, SIGCHLD); 995 ev_signal_init (&childev, childcb, SIGCHLD);
… …
977{ 1031{
978#if EV_MULTIPLICITY 1032#if EV_MULTIPLICITY
979 struct ev_loop *loop = ev_default_loop_ptr; 1033 struct ev_loop *loop = ev_default_loop_ptr;
980#endif 1034#endif
981 1035
982 if (method) 1036 if (backend)
983 postfork = 1; 1037 postfork = 1;
984} 1038}
985 1039
986/*****************************************************************************/ 1040/*****************************************************************************/
987 1041
… …
995 return 1; 1049 return 1;
996 1050
997 return 0; 1051 return 0;
998} 1052}
999 1053
1000static void 1054inline void
1001call_pending (EV_P) 1055call_pending (EV_P)
1002{ 1056{
1003 int pri; 1057 int pri;
1004 1058
1005 for (pri = NUMPRI; pri--; ) 1059 for (pri = NUMPRI; pri--; )
1006 while (pendingcnt [pri]) 1060 while (pendingcnt [pri])
1007 { 1061 {
1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1062 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1009 1063
1010 if (p->w) 1064 if (expect_true (p->w))
1011 { 1065 {
1012 p->w->pending = 0; 1066 p->w->pending = 0;
1013 EV_CB_INVOKE (p->w, p->events); 1067 EV_CB_INVOKE (p->w, p->events);
1014 } 1068 }
1015 } 1069 }
1016} 1070}
1017 1071
1018static void 1072inline void
1019timers_reify (EV_P) 1073timers_reify (EV_P)
1020{ 1074{
1021 while (timercnt && ((WT)timers [0])->at <= mn_now) 1075 while (timercnt && ((WT)timers [0])->at <= mn_now)
1022 { 1076 {
1023 struct ev_timer *w = timers [0]; 1077 struct ev_timer *w = timers [0];
… …
1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1095 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1042 } 1096 }
1043} 1097}
1044 1098
1045#if EV_PERIODICS 1099#if EV_PERIODICS
1046static void 1100inline void
1047periodics_reify (EV_P) 1101periodics_reify (EV_P)
1048{ 1102{
1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1103 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1050 { 1104 {
1051 struct ev_periodic *w = periodics [0]; 1105 struct ev_periodic *w = periodics [0];
… …
1110 ev_rt_now = ev_time (); 1164 ev_rt_now = ev_time ();
1111 return 1; 1165 return 1;
1112 } 1166 }
1113} 1167}
1114 1168
1115static void 1169inline void
1116time_update (EV_P) 1170time_update (EV_P)
1117{ 1171{
1118 int i; 1172 int i;
1119 1173
1120#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
… …
1219 { 1273 {
1220 block = MAX_BLOCKTIME; 1274 block = MAX_BLOCKTIME;
1221 1275
1222 if (timercnt) 1276 if (timercnt)
1223 { 1277 {
1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1278 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1225 if (block > to) block = to; 1279 if (block > to) block = to;
1226 } 1280 }
1227 1281
1228#if EV_PERIODICS 1282#if EV_PERIODICS
1229 if (periodiccnt) 1283 if (periodiccnt)
1230 { 1284 {
1231 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;
1232 if (block > to) block = to; 1286 if (block > to) block = to;
1233 } 1287 }
1234#endif 1288#endif
1235 1289
1236 if (block < 0.) block = 0.; 1290 if (expect_false (block < 0.)) block = 0.;
1237 } 1291 }
1238 1292
1239 method_poll (EV_A_ block); 1293 backend_poll (EV_A_ block);
1240 1294
1241 /* update ev_rt_now, do magic */ 1295 /* update ev_rt_now, do magic */
1242 time_update (EV_A); 1296 time_update (EV_A);
1243 1297
1244 /* queue pending timers and reschedule them */ 1298 /* queue pending timers and reschedule them */
… …
1250 /* queue idle watchers unless io or timers are pending */ 1304 /* queue idle watchers unless io or timers are pending */
1251 if (idlecnt && !any_pending (EV_A)) 1305 if (idlecnt && !any_pending (EV_A))
1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1306 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1253 1307
1254 /* queue check watchers, to be executed first */ 1308 /* queue check watchers, to be executed first */
1255 if (checkcnt) 1309 if (expect_false (checkcnt))
1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1310 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1257 1311
1258 call_pending (EV_A); 1312 call_pending (EV_A);
1259 1313
1260 if (loop_done) 1314 if (expect_false (loop_done))
1261 break; 1315 break;
1262 } 1316 }
1263 1317
1264 if (loop_done != 2) 1318 if (loop_done != 2)
1265 loop_done = 0; 1319 loop_done = 0;
… …
1327void 1381void
1328ev_io_start (EV_P_ struct ev_io *w) 1382ev_io_start (EV_P_ struct ev_io *w)
1329{ 1383{
1330 int fd = w->fd; 1384 int fd = w->fd;
1331 1385
1332 if (ev_is_active (w)) 1386 if (expect_false (ev_is_active (w)))
1333 return; 1387 return;
1334 1388
1335 assert (("ev_io_start called with negative fd", fd >= 0)); 1389 assert (("ev_io_start called with negative fd", fd >= 0));
1336 1390
1337 ev_start (EV_A_ (W)w, 1); 1391 ev_start (EV_A_ (W)w, 1);
… …
1343 1397
1344void 1398void
1345ev_io_stop (EV_P_ struct ev_io *w) 1399ev_io_stop (EV_P_ struct ev_io *w)
1346{ 1400{
1347 ev_clear_pending (EV_A_ (W)w); 1401 ev_clear_pending (EV_A_ (W)w);
1348 if (!ev_is_active (w)) 1402 if (expect_false (!ev_is_active (w)))
1349 return; 1403 return;
1350 1404
1351 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));
1352 1406
1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1407 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1357} 1411}
1358 1412
1359void 1413void
1360ev_timer_start (EV_P_ struct ev_timer *w) 1414ev_timer_start (EV_P_ struct ev_timer *w)
1361{ 1415{
1362 if (ev_is_active (w)) 1416 if (expect_false (ev_is_active (w)))
1363 return; 1417 return;
1364 1418
1365 ((WT)w)->at += mn_now; 1419 ((WT)w)->at += mn_now;
1366 1420
1367 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.));
… …
1376 1430
1377void 1431void
1378ev_timer_stop (EV_P_ struct ev_timer *w) 1432ev_timer_stop (EV_P_ struct ev_timer *w)
1379{ 1433{
1380 ev_clear_pending (EV_A_ (W)w); 1434 ev_clear_pending (EV_A_ (W)w);
1381 if (!ev_is_active (w)) 1435 if (expect_false (!ev_is_active (w)))
1382 return; 1436 return;
1383 1437
1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1438 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1385 1439
1386 if (((W)w)->active < timercnt--) 1440 if (expect_true (((W)w)->active < timercnt--))
1387 { 1441 {
1388 timers [((W)w)->active - 1] = timers [timercnt]; 1442 timers [((W)w)->active - 1] = timers [timercnt];
1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1443 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1390 } 1444 }
1391 1445
… …
1416 1470
1417#if EV_PERIODICS 1471#if EV_PERIODICS
1418void 1472void
1419ev_periodic_start (EV_P_ struct ev_periodic *w) 1473ev_periodic_start (EV_P_ struct ev_periodic *w)
1420{ 1474{
1421 if (ev_is_active (w)) 1475 if (expect_false (ev_is_active (w)))
1422 return; 1476 return;
1423 1477
1424 if (w->reschedule_cb) 1478 if (w->reschedule_cb)
1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1479 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1426 else if (w->interval) 1480 else if (w->interval)
… …
1440 1494
1441void 1495void
1442ev_periodic_stop (EV_P_ struct ev_periodic *w) 1496ev_periodic_stop (EV_P_ struct ev_periodic *w)
1443{ 1497{
1444 ev_clear_pending (EV_A_ (W)w); 1498 ev_clear_pending (EV_A_ (W)w);
1445 if (!ev_is_active (w)) 1499 if (expect_false (!ev_is_active (w)))
1446 return; 1500 return;
1447 1501
1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1502 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1449 1503
1450 if (((W)w)->active < periodiccnt--) 1504 if (expect_true (((W)w)->active < periodiccnt--))
1451 { 1505 {
1452 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1506 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1507 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1454 } 1508 }
1455 1509
… …
1466#endif 1520#endif
1467 1521
1468void 1522void
1469ev_idle_start (EV_P_ struct ev_idle *w) 1523ev_idle_start (EV_P_ struct ev_idle *w)
1470{ 1524{
1471 if (ev_is_active (w)) 1525 if (expect_false (ev_is_active (w)))
1472 return; 1526 return;
1473 1527
1474 ev_start (EV_A_ (W)w, ++idlecnt); 1528 ev_start (EV_A_ (W)w, ++idlecnt);
1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1529 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1476 idles [idlecnt - 1] = w; 1530 idles [idlecnt - 1] = w;
… …
1478 1532
1479void 1533void
1480ev_idle_stop (EV_P_ struct ev_idle *w) 1534ev_idle_stop (EV_P_ struct ev_idle *w)
1481{ 1535{
1482 ev_clear_pending (EV_A_ (W)w); 1536 ev_clear_pending (EV_A_ (W)w);
1483 if (!ev_is_active (w)) 1537 if (expect_false (!ev_is_active (w)))
1484 return; 1538 return;
1485 1539
1486 idles [((W)w)->active - 1] = idles [--idlecnt]; 1540 idles [((W)w)->active - 1] = idles [--idlecnt];
1487 ev_stop (EV_A_ (W)w); 1541 ev_stop (EV_A_ (W)w);
1488} 1542}
1489 1543
1490void 1544void
1491ev_prepare_start (EV_P_ struct ev_prepare *w) 1545ev_prepare_start (EV_P_ struct ev_prepare *w)
1492{ 1546{
1493 if (ev_is_active (w)) 1547 if (expect_false (ev_is_active (w)))
1494 return; 1548 return;
1495 1549
1496 ev_start (EV_A_ (W)w, ++preparecnt); 1550 ev_start (EV_A_ (W)w, ++preparecnt);
1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1551 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1498 prepares [preparecnt - 1] = w; 1552 prepares [preparecnt - 1] = w;
… …
1500 1554
1501void 1555void
1502ev_prepare_stop (EV_P_ struct ev_prepare *w) 1556ev_prepare_stop (EV_P_ struct ev_prepare *w)
1503{ 1557{
1504 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1505 if (!ev_is_active (w)) 1559 if (expect_false (!ev_is_active (w)))
1506 return; 1560 return;
1507 1561
1508 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1562 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1509 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1510} 1564}
1511 1565
1512void 1566void
1513ev_check_start (EV_P_ struct ev_check *w) 1567ev_check_start (EV_P_ struct ev_check *w)
1514{ 1568{
1515 if (ev_is_active (w)) 1569 if (expect_false (ev_is_active (w)))
1516 return; 1570 return;
1517 1571
1518 ev_start (EV_A_ (W)w, ++checkcnt); 1572 ev_start (EV_A_ (W)w, ++checkcnt);
1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1573 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1520 checks [checkcnt - 1] = w; 1574 checks [checkcnt - 1] = w;
… …
1522 1576
1523void 1577void
1524ev_check_stop (EV_P_ struct ev_check *w) 1578ev_check_stop (EV_P_ struct ev_check *w)
1525{ 1579{
1526 ev_clear_pending (EV_A_ (W)w); 1580 ev_clear_pending (EV_A_ (W)w);
1527 if (!ev_is_active (w)) 1581 if (expect_false (!ev_is_active (w)))
1528 return; 1582 return;
1529 1583
1530 checks [((W)w)->active - 1] = checks [--checkcnt]; 1584 checks [((W)w)->active - 1] = checks [--checkcnt];
1531 ev_stop (EV_A_ (W)w); 1585 ev_stop (EV_A_ (W)w);
1532} 1586}
… …
1539ev_signal_start (EV_P_ struct ev_signal *w) 1593ev_signal_start (EV_P_ struct ev_signal *w)
1540{ 1594{
1541#if EV_MULTIPLICITY 1595#if EV_MULTIPLICITY
1542 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));
1543#endif 1597#endif
1544 if (ev_is_active (w)) 1598 if (expect_false (ev_is_active (w)))
1545 return; 1599 return;
1546 1600
1547 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));
1548 1602
1549 ev_start (EV_A_ (W)w, 1); 1603 ev_start (EV_A_ (W)w, 1);
… …
1566 1620
1567void 1621void
1568ev_signal_stop (EV_P_ struct ev_signal *w) 1622ev_signal_stop (EV_P_ struct ev_signal *w)
1569{ 1623{
1570 ev_clear_pending (EV_A_ (W)w); 1624 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1625 if (expect_false (!ev_is_active (w)))
1572 return; 1626 return;
1573 1627
1574 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1628 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1575 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1576 1630
… …
1582ev_child_start (EV_P_ struct ev_child *w) 1636ev_child_start (EV_P_ struct ev_child *w)
1583{ 1637{
1584#if EV_MULTIPLICITY 1638#if EV_MULTIPLICITY
1585 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));
1586#endif 1640#endif
1587 if (ev_is_active (w)) 1641 if (expect_false (ev_is_active (w)))
1588 return; 1642 return;
1589 1643
1590 ev_start (EV_A_ (W)w, 1); 1644 ev_start (EV_A_ (W)w, 1);
1591 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1645 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1592} 1646}
1593 1647
1594void 1648void
1595ev_child_stop (EV_P_ struct ev_child *w) 1649ev_child_stop (EV_P_ struct ev_child *w)
1596{ 1650{
1597 ev_clear_pending (EV_A_ (W)w); 1651 ev_clear_pending (EV_A_ (W)w);
1598 if (!ev_is_active (w)) 1652 if (expect_false (!ev_is_active (w)))
1599 return; 1653 return;
1600 1654
1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1655 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1602 ev_stop (EV_A_ (W)w); 1656 ev_stop (EV_A_ (W)w);
1603} 1657}
… …
1640void 1694void
1641ev_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)
1642{ 1696{
1643 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));
1644 1698
1645 if (!once) 1699 if (expect_false (!once))
1700 {
1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1701 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1647 else 1702 return;
1648 { 1703 }
1704
1649 once->cb = cb; 1705 once->cb = cb;
1650 once->arg = arg; 1706 once->arg = arg;
1651 1707
1652 ev_init (&once->io, once_cb_io); 1708 ev_init (&once->io, once_cb_io);
1653 if (fd >= 0) 1709 if (fd >= 0)
1654 { 1710 {
1655 ev_io_set (&once->io, fd, events); 1711 ev_io_set (&once->io, fd, events);
1656 ev_io_start (EV_A_ &once->io); 1712 ev_io_start (EV_A_ &once->io);
1657 } 1713 }
1658 1714
1659 ev_init (&once->to, once_cb_to); 1715 ev_init (&once->to, once_cb_to);
1660 if (timeout >= 0.) 1716 if (timeout >= 0.)
1661 { 1717 {
1662 ev_timer_set (&once->to, timeout, 0.); 1718 ev_timer_set (&once->to, timeout, 0.);
1663 ev_timer_start (EV_A_ &once->to); 1719 ev_timer_start (EV_A_ &once->to);
1664 }
1665 } 1720 }
1666} 1721}
1667 1722
1668#ifdef __cplusplus 1723#ifdef __cplusplus
1669} 1724}

Diff Legend

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