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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 136#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 137#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 139
140#ifdef EV_H
141# include EV_H
142#else
131#include "ev.h" 143# include "ev.h"
144#endif
132 145
133#if __GNUC__ >= 3 146#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 147# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 148# define inline inline
136#else 149#else
… …
215 int events; 228 int events;
216} ANPENDING; 229} ANPENDING;
217 230
218#if EV_MULTIPLICITY 231#if EV_MULTIPLICITY
219 232
220struct ev_loop 233 struct ev_loop
221{ 234 {
235 ev_tstamp ev_rt_now;
222# define VAR(name,decl) decl; 236 #define VAR(name,decl) decl;
223# include "ev_vars.h" 237 #include "ev_vars.h"
224};
225# undef VAR 238 #undef VAR
239 };
226# include "ev_wrap.h" 240 #include "ev_wrap.h"
241
242 struct ev_loop default_loop_struct;
243 static struct ev_loop *default_loop;
227 244
228#else 245#else
229 246
247 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 248 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 249 #include "ev_vars.h"
232# undef VAR 250 #undef VAR
251
252 static int default_loop;
233 253
234#endif 254#endif
235 255
236/*****************************************************************************/ 256/*****************************************************************************/
237 257
238inline ev_tstamp 258ev_tstamp
239ev_time (void) 259ev_time (void)
240{ 260{
241#if EV_USE_REALTIME 261#if EV_USE_REALTIME
242 struct timespec ts; 262 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 263 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 282#endif
263 283
264 return ev_time (); 284 return ev_time ();
265} 285}
266 286
287#if EV_MULTIPLICITY
267ev_tstamp 288ev_tstamp
268ev_now (EV_P) 289ev_now (EV_P)
269{ 290{
270 return rt_now; 291 return ev_rt_now;
271} 292}
293#endif
272 294
273#define array_roundsize(type,n) ((n) | 4 & ~3) 295#define array_roundsize(type,n) ((n) | 4 & ~3)
274 296
275#define array_needsize(type,base,cur,cnt,init) \ 297#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 298 if (expect_false ((cnt) > cur)) \
… …
342 364
343 for (i = 0; i < eventcnt; ++i) 365 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 366 ev_feed_event (EV_A_ events [i], type);
345} 367}
346 368
347static void 369inline void
348fd_event (EV_P_ int fd, int events) 370fd_event (EV_P_ int fd, int revents)
349{ 371{
350 ANFD *anfd = anfds + fd; 372 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 373 struct ev_io *w;
352 374
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 376 {
355 int ev = w->events & events; 377 int ev = w->events & revents;
356 378
357 if (ev) 379 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 380 ev_feed_event (EV_A_ (W)w, ev);
359 } 381 }
382}
383
384void
385ev_feed_fd_event (EV_P_ int fd, int revents)
386{
387 fd_event (EV_A_ fd, revents);
360} 388}
361 389
362/*****************************************************************************/ 390/*****************************************************************************/
363 391
364static void 392static void
… …
503 531
504 heap [k] = w; 532 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 533 ((W)heap [k])->active = k + 1;
506} 534}
507 535
536inline void
537adjustheap (WT *heap, int N, int k, ev_tstamp at)
538{
539 ev_tstamp old_at = heap [k]->at;
540 heap [k]->at = at;
541
542 if (old_at < at)
543 downheap (heap, N, k);
544 else
545 upheap (heap, k);
546}
547
508/*****************************************************************************/ 548/*****************************************************************************/
509 549
510typedef struct 550typedef struct
511{ 551{
512 WL head; 552 WL head;
… …
552#endif 592#endif
553 errno = old_errno; 593 errno = old_errno;
554 } 594 }
555} 595}
556 596
597void
598ev_feed_signal_event (EV_P_ int signum)
599{
600 WL w;
601
602#if EV_MULTIPLICITY
603 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
604#endif
605
606 --signum;
607
608 if (signum < 0 || signum >= signalmax)
609 return;
610
611 signals [signum].gotsig = 0;
612
613 for (w = signals [signum].head; w; w = w->next)
614 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
615}
616
557static void 617static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 618sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 619{
560 WL w;
561 int signum; 620 int signum;
562 621
563#ifdef WIN32 622#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT); 623 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else 624#else
… …
567#endif 626#endif
568 gotsig = 0; 627 gotsig = 0;
569 628
570 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
572 { 631 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0;
574
575 for (w = signals [signum].head; w; w = w->next)
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
577 }
578} 632}
579 633
580static void 634static void
581siginit (EV_P) 635siginit (EV_P)
582{ 636{
… …
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 748 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 749 have_monotonic = 1;
696 } 750 }
697#endif 751#endif
698 752
699 rt_now = ev_time (); 753 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 754 mn_now = get_clock ();
701 now_floor = mn_now; 755 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 756 rtmn_diff = ev_rt_now - mn_now;
703 757
704 if (methods == EVMETHOD_AUTO) 758 if (methods == EVMETHOD_AUTO)
705 if (!enable_secure () && getenv ("LIBEV_METHODS")) 759 if (!enable_secure () && getenv ("LIBEV_METHODS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 760 methods = atoi (getenv ("LIBEV_METHODS"));
707 else 761 else
… …
722#endif 776#endif
723#if EV_USE_SELECT 777#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
725#endif 779#endif
726 780
727 ev_watcher_init (&sigev, sigcb); 781 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 782 ev_set_priority (&sigev, EV_MAXPRI);
729 } 783 }
730} 784}
731 785
732void 786void
… …
754 array_free (pending, [i]); 808 array_free (pending, [i]);
755 809
756 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 811 array_free_microshit (fdchange);
758 array_free_microshit (timer); 812 array_free_microshit (timer);
813#if EV_PERIODICS
759 array_free_microshit (periodic); 814 array_free_microshit (periodic);
815#endif
760 array_free_microshit (idle); 816 array_free_microshit (idle);
761 array_free_microshit (prepare); 817 array_free_microshit (prepare);
762 array_free_microshit (check); 818 array_free_microshit (check);
763 819
764 method = 0; 820 method = 0;
… …
822} 878}
823 879
824#endif 880#endif
825 881
826#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 883struct ev_loop *
831#else 884#else
832static int default_loop;
833
834int 885int
835#endif 886#endif
836ev_default_loop (int methods) 887ev_default_loop (int methods)
837{ 888{
838 if (sigpipe [0] == sigpipe [1]) 889 if (sigpipe [0] == sigpipe [1])
… …
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 976
926 if (p->w) 977 if (p->w)
927 { 978 {
928 p->w->pending = 0; 979 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
930 } 981 }
931 } 982 }
932} 983}
933 984
934static void 985static void
… …
942 993
943 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
944 if (w->repeat) 995 if (w->repeat)
945 { 996 {
946 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
947 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
948 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
949 } 1004 }
950 else 1005 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1007
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1009 }
955} 1010}
956 1011
1012#if EV_PERIODICS
957static void 1013static void
958periodics_reify (EV_P) 1014periodics_reify (EV_P)
959{ 1015{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1017 {
962 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
963 1019
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1021
966 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
968 { 1024 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
970 1026
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1029 }
974 else if (w->interval) 1030 else if (w->interval)
975 { 1031 {
976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1032 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1033 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
978 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1035 }
980 else 1036 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1038
… …
993 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
994 { 1050 {
995 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
996 1052
997 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1055 else if (w->interval)
1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1001 } 1057 }
1002 1058
1003 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1006} 1062}
1063#endif
1007 1064
1008inline int 1065inline int
1009time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1010{ 1067{
1011 mn_now = get_clock (); 1068 mn_now = get_clock ();
1012 1069
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1071 {
1015 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1073 return 0;
1017 } 1074 }
1018 else 1075 else
1019 { 1076 {
1020 now_floor = mn_now; 1077 now_floor = mn_now;
1021 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1022 return 1; 1079 return 1;
1023 } 1080 }
1024} 1081}
1025 1082
1026static void 1083static void
… …
1035 { 1092 {
1036 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1037 1094
1038 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1039 { 1096 {
1040 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1041 1098
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1100 return; /* all is well */
1044 1101
1045 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1103 mn_now = get_clock ();
1047 now_floor = mn_now; 1104 now_floor = mn_now;
1048 } 1105 }
1049 1106
1107# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1112 }
1054 } 1113 }
1055 else 1114 else
1056#endif 1115#endif
1057 { 1116 {
1058 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1059 1118
1060 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1061 { 1120 {
1121#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1063 1124
1064 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1065 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1128 }
1068 1129
1069 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1070 } 1131 }
1071} 1132}
1072 1133
1073void 1134void
1074ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1114 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1116 else 1177 else
1117#endif 1178#endif
1118 { 1179 {
1119 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1121 } 1182 }
1122 1183
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1185 block = 0.;
1125 else 1186 else
… …
1130 { 1191 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1193 if (block > to) block = to;
1133 } 1194 }
1134 1195
1196#if EV_PERIODICS
1135 if (periodiccnt) 1197 if (periodiccnt)
1136 { 1198 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1200 if (block > to) block = to;
1139 } 1201 }
1202#endif
1140 1203
1141 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1142 } 1205 }
1143 1206
1144 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1145 1208
1146 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1210 time_update (EV_A);
1148 1211
1149 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1152 1217
1153 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1221
… …
1247{ 1312{
1248 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1250 return; 1315 return;
1251 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1254 1321
1255 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1256} 1323}
… …
1286 { 1353 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1356 }
1290 1357
1291 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1292 1359
1293 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1294} 1361}
1295 1362
1296void 1363void
1297ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1298{ 1365{
1299 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1300 { 1367 {
1301 if (w->repeat) 1368 if (w->repeat)
1302 {
1303 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1305 }
1306 else 1370 else
1307 ev_timer_stop (EV_A_ w); 1371 ev_timer_stop (EV_A_ w);
1308 } 1372 }
1309 else if (w->repeat) 1373 else if (w->repeat)
1310 ev_timer_start (EV_A_ w); 1374 ev_timer_start (EV_A_ w);
1311} 1375}
1312 1376
1377#if EV_PERIODICS
1313void 1378void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1379ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1380{
1316 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1317 return; 1382 return;
1318 1383
1319 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1386 else if (w->interval)
1322 { 1387 {
1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1388 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1324 /* this formula differs from the one in periodic_reify because we do not always round up */ 1389 /* this formula differs from the one in periodic_reify because we do not always round up */
1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1390 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 } 1391 }
1327 1392
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1393 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1330 periodics [periodiccnt - 1] = w; 1395 periodics [periodiccnt - 1] = w;
… …
1352} 1417}
1353 1418
1354void 1419void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1420ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1421{
1422 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1423 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1424 ev_periodic_start (EV_A_ w);
1359} 1425}
1426#endif
1360 1427
1361void 1428void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1429ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1430{
1364 if (ev_is_active (w)) 1431 if (ev_is_active (w))
… …
1415 1482
1416void 1483void
1417ev_check_stop (EV_P_ struct ev_check *w) 1484ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1485{
1419 ev_clear_pending (EV_A_ (W)w); 1486 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1487 if (!ev_is_active (w))
1421 return; 1488 return;
1422 1489
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1490 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1425} 1492}
… …
1486 1553
1487void 1554void
1488ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1556{
1490 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1492 return; 1559 return;
1493 1560
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1496} 1563}
… …
1540 else 1607 else
1541 { 1608 {
1542 once->cb = cb; 1609 once->cb = cb;
1543 once->arg = arg; 1610 once->arg = arg;
1544 1611
1545 ev_watcher_init (&once->io, once_cb_io); 1612 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1613 if (fd >= 0)
1547 { 1614 {
1548 ev_io_set (&once->io, fd, events); 1615 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1616 ev_io_start (EV_A_ &once->io);
1550 } 1617 }
1551 1618
1552 ev_watcher_init (&once->to, once_cb_to); 1619 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1620 if (timeout >= 0.)
1554 { 1621 {
1555 ev_timer_set (&once->to, timeout, 0.); 1622 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1623 ev_timer_start (EV_A_ &once->to);
1557 } 1624 }
1558 } 1625 }
1559} 1626}
1560 1627
1628#ifdef __cplusplus
1629}
1630#endif
1631

Diff Legend

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