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

Comparing libev/ev.c (file contents):
Revision 1.79 by root, Fri Nov 9 15:15:20 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)) \
… …
509 531
510 heap [k] = w; 532 heap [k] = w;
511 ((W)heap [k])->active = k + 1; 533 ((W)heap [k])->active = k + 1;
512} 534}
513 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
514/*****************************************************************************/ 548/*****************************************************************************/
515 549
516typedef struct 550typedef struct
517{ 551{
518 WL head; 552 WL head;
… …
561} 595}
562 596
563void 597void
564ev_feed_signal_event (EV_P_ int signum) 598ev_feed_signal_event (EV_P_ int signum)
565{ 599{
600 WL w;
601
566#if EV_MULTIPLICITY 602#if EV_MULTIPLICITY
567 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 603 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
568#endif 604#endif
569 605
570 --signum; 606 --signum;
… …
579} 615}
580 616
581static void 617static void
582sigcb (EV_P_ struct ev_io *iow, int revents) 618sigcb (EV_P_ struct ev_io *iow, int revents)
583{ 619{
584 WL w;
585 int signum; 620 int signum;
586 621
587#ifdef WIN32 622#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT); 623 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else 624#else
… …
591#endif 626#endif
592 gotsig = 0; 627 gotsig = 0;
593 628
594 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
595 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
596 sigevent (EV_A_ signum + 1); 631 ev_feed_signal_event (EV_A_ signum + 1);
597} 632}
598 633
599static void 634static void
600siginit (EV_P) 635siginit (EV_P)
601{ 636{
… …
713 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 748 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
714 have_monotonic = 1; 749 have_monotonic = 1;
715 } 750 }
716#endif 751#endif
717 752
718 rt_now = ev_time (); 753 ev_rt_now = ev_time ();
719 mn_now = get_clock (); 754 mn_now = get_clock ();
720 now_floor = mn_now; 755 now_floor = mn_now;
721 rtmn_diff = rt_now - mn_now; 756 rtmn_diff = ev_rt_now - mn_now;
722 757
723 if (methods == EVMETHOD_AUTO) 758 if (methods == EVMETHOD_AUTO)
724 if (!enable_secure () && getenv ("LIBEV_METHODS")) 759 if (!enable_secure () && getenv ("LIBEV_METHODS"))
725 methods = atoi (getenv ("LIBEV_METHODS")); 760 methods = atoi (getenv ("LIBEV_METHODS"));
726 else 761 else
… …
741#endif 776#endif
742#if EV_USE_SELECT 777#if EV_USE_SELECT
743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
744#endif 779#endif
745 780
746 ev_watcher_init (&sigev, sigcb); 781 ev_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI); 782 ev_set_priority (&sigev, EV_MAXPRI);
748 } 783 }
749} 784}
750 785
751void 786void
… …
773 array_free (pending, [i]); 808 array_free (pending, [i]);
774 809
775 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
776 array_free_microshit (fdchange); 811 array_free_microshit (fdchange);
777 array_free_microshit (timer); 812 array_free_microshit (timer);
813#if EV_PERIODICS
778 array_free_microshit (periodic); 814 array_free_microshit (periodic);
815#endif
779 array_free_microshit (idle); 816 array_free_microshit (idle);
780 array_free_microshit (prepare); 817 array_free_microshit (prepare);
781 array_free_microshit (check); 818 array_free_microshit (check);
782 819
783 method = 0; 820 method = 0;
… …
841} 878}
842 879
843#endif 880#endif
844 881
845#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
846struct ev_loop default_loop_struct;
847static struct ev_loop *default_loop;
848
849struct ev_loop * 883struct ev_loop *
850#else 884#else
851static int default_loop;
852
853int 885int
854#endif 886#endif
855ev_default_loop (int methods) 887ev_default_loop (int methods)
856{ 888{
857 if (sigpipe [0] == sigpipe [1]) 889 if (sigpipe [0] == sigpipe [1])
… …
943 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
944 976
945 if (p->w) 977 if (p->w)
946 { 978 {
947 p->w->pending = 0; 979 p->w->pending = 0;
948 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
949 } 981 }
950 } 982 }
951} 983}
952 984
953static void 985static void
… …
961 993
962 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
963 if (w->repeat) 995 if (w->repeat)
964 { 996 {
965 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
966 ((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
967 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
968 } 1004 }
969 else 1005 else
970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
971 1007
972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
973 } 1009 }
974} 1010}
975 1011
1012#if EV_PERIODICS
976static void 1013static void
977periodics_reify (EV_P) 1014periodics_reify (EV_P)
978{ 1015{
979 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
980 { 1017 {
981 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
982 1019
983 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
984 1021
985 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
986 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
987 { 1024 {
988 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);
989 1026
990 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));
991 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
992 } 1029 }
993 else if (w->interval) 1030 else if (w->interval)
994 { 1031 {
995 ((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;
996 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));
997 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
998 } 1035 }
999 else 1036 else
1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1001 1038
… …
1012 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
1013 { 1050 {
1014 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
1015 1052
1016 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1018 else if (w->interval) 1055 else if (w->interval)
1019 ((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;
1020 } 1057 }
1021 1058
1022 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1025} 1062}
1063#endif
1026 1064
1027inline int 1065inline int
1028time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1029{ 1067{
1030 mn_now = get_clock (); 1068 mn_now = get_clock ();
1031 1069
1032 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1033 { 1071 {
1034 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1035 return 0; 1073 return 0;
1036 } 1074 }
1037 else 1075 else
1038 { 1076 {
1039 now_floor = mn_now; 1077 now_floor = mn_now;
1040 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1041 return 1; 1079 return 1;
1042 } 1080 }
1043} 1081}
1044 1082
1045static void 1083static void
… …
1054 { 1092 {
1055 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1056 1094
1057 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 */
1058 { 1096 {
1059 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1060 1098
1061 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1062 return; /* all is well */ 1100 return; /* all is well */
1063 1101
1064 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1065 mn_now = get_clock (); 1103 mn_now = get_clock ();
1066 now_floor = mn_now; 1104 now_floor = mn_now;
1067 } 1105 }
1068 1106
1107# if EV_PERIODICS
1069 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1070 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1071 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1072 } 1112 }
1073 } 1113 }
1074 else 1114 else
1075#endif 1115#endif
1076 { 1116 {
1077 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1078 1118
1079 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))
1080 { 1120 {
1121#if EV_PERIODICS
1081 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1082 1124
1083 /* 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 */
1084 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1085 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1086 } 1128 }
1087 1129
1088 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1089 } 1131 }
1090} 1132}
1091 1133
1092void 1134void
1093ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1133 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1134 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1135 else 1177 else
1136#endif 1178#endif
1137 { 1179 {
1138 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1139 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1140 } 1182 }
1141 1183
1142 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1143 block = 0.; 1185 block = 0.;
1144 else 1186 else
… …
1149 { 1191 {
1150 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1151 if (block > to) block = to; 1193 if (block > to) block = to;
1152 } 1194 }
1153 1195
1196#if EV_PERIODICS
1154 if (periodiccnt) 1197 if (periodiccnt)
1155 { 1198 {
1156 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1157 if (block > to) block = to; 1200 if (block > to) block = to;
1158 } 1201 }
1202#endif
1159 1203
1160 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1161 } 1205 }
1162 1206
1163 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1164 1208
1165 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1166 time_update (EV_A); 1210 time_update (EV_A);
1167 1211
1168 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1169 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1170 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1171 1217
1172 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1173 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1175 1221
… …
1266{ 1312{
1267 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1268 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1269 return; 1315 return;
1270 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1271 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1272 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1273 1321
1274 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1275} 1323}
… …
1305 { 1353 {
1306 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1307 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1308 } 1356 }
1309 1357
1310 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1311 1359
1312 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1313} 1361}
1314 1362
1315void 1363void
1316ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1317{ 1365{
1318 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1319 { 1367 {
1320 if (w->repeat) 1368 if (w->repeat)
1321 {
1322 ((WT)w)->at = mn_now + w->repeat;
1323 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1324 }
1325 else 1370 else
1326 ev_timer_stop (EV_A_ w); 1371 ev_timer_stop (EV_A_ w);
1327 } 1372 }
1328 else if (w->repeat) 1373 else if (w->repeat)
1329 ev_timer_start (EV_A_ w); 1374 ev_timer_start (EV_A_ w);
1330} 1375}
1331 1376
1377#if EV_PERIODICS
1332void 1378void
1333ev_periodic_start (EV_P_ struct ev_periodic *w) 1379ev_periodic_start (EV_P_ struct ev_periodic *w)
1334{ 1380{
1335 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1336 return; 1382 return;
1337 1383
1338 if (w->reschedule_cb) 1384 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1340 else if (w->interval) 1386 else if (w->interval)
1341 { 1387 {
1342 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.));
1343 /* 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 */
1344 ((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;
1345 } 1391 }
1346 1392
1347 ev_start (EV_A_ (W)w, ++periodiccnt); 1393 ev_start (EV_A_ (W)w, ++periodiccnt);
1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1349 periodics [periodiccnt - 1] = w; 1395 periodics [periodiccnt - 1] = w;
… …
1371} 1417}
1372 1418
1373void 1419void
1374ev_periodic_again (EV_P_ struct ev_periodic *w) 1420ev_periodic_again (EV_P_ struct ev_periodic *w)
1375{ 1421{
1422 /* TODO: use adjustheap and recalculation */
1376 ev_periodic_stop (EV_A_ w); 1423 ev_periodic_stop (EV_A_ w);
1377 ev_periodic_start (EV_A_ w); 1424 ev_periodic_start (EV_A_ w);
1378} 1425}
1426#endif
1379 1427
1380void 1428void
1381ev_idle_start (EV_P_ struct ev_idle *w) 1429ev_idle_start (EV_P_ struct ev_idle *w)
1382{ 1430{
1383 if (ev_is_active (w)) 1431 if (ev_is_active (w))
… …
1434 1482
1435void 1483void
1436ev_check_stop (EV_P_ struct ev_check *w) 1484ev_check_stop (EV_P_ struct ev_check *w)
1437{ 1485{
1438 ev_clear_pending (EV_A_ (W)w); 1486 ev_clear_pending (EV_A_ (W)w);
1439 if (ev_is_active (w)) 1487 if (!ev_is_active (w))
1440 return; 1488 return;
1441 1489
1442 checks [((W)w)->active - 1] = checks [--checkcnt]; 1490 checks [((W)w)->active - 1] = checks [--checkcnt];
1443 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1444} 1492}
… …
1505 1553
1506void 1554void
1507ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1508{ 1556{
1509 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1510 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1511 return; 1559 return;
1512 1560
1513 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1514 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1515} 1563}
… …
1559 else 1607 else
1560 { 1608 {
1561 once->cb = cb; 1609 once->cb = cb;
1562 once->arg = arg; 1610 once->arg = arg;
1563 1611
1564 ev_watcher_init (&once->io, once_cb_io); 1612 ev_init (&once->io, once_cb_io);
1565 if (fd >= 0) 1613 if (fd >= 0)
1566 { 1614 {
1567 ev_io_set (&once->io, fd, events); 1615 ev_io_set (&once->io, fd, events);
1568 ev_io_start (EV_A_ &once->io); 1616 ev_io_start (EV_A_ &once->io);
1569 } 1617 }
1570 1618
1571 ev_watcher_init (&once->to, once_cb_to); 1619 ev_init (&once->to, once_cb_to);
1572 if (timeout >= 0.) 1620 if (timeout >= 0.)
1573 { 1621 {
1574 ev_timer_set (&once->to, timeout, 0.); 1622 ev_timer_set (&once->to, timeout, 0.);
1575 ev_timer_start (EV_A_ &once->to); 1623 ev_timer_start (EV_A_ &once->to);
1576 } 1624 }
1577 } 1625 }
1578} 1626}
1579 1627
1628#ifdef __cplusplus
1629}
1630#endif
1631

Diff Legend

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