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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.98 by root, Sun Nov 11 02:05:20 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
… …
148typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
150 163
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 165
166#ifdef WIN32
153#include "ev_win32.c" 167# include "ev_win32.c"
168#endif
154 169
155/*****************************************************************************/ 170/*****************************************************************************/
156 171
157static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
158 173
… …
217 232
218#if EV_MULTIPLICITY 233#if EV_MULTIPLICITY
219 234
220 struct ev_loop 235 struct ev_loop
221 { 236 {
237 ev_tstamp ev_rt_now;
222 #define VAR(name,decl) decl; 238 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 239 #include "ev_vars.h"
224 #undef VAR 240 #undef VAR
225 }; 241 };
226 #include "ev_wrap.h" 242 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 244 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 245 static struct ev_loop *default_loop;
230 246
231#else 247#else
232 248
249 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 250 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 251 #include "ev_vars.h"
235 #undef VAR 252 #undef VAR
236 253
237 static int default_loop; 254 static int default_loop;
238 255
239#endif 256#endif
240 257
241/*****************************************************************************/ 258/*****************************************************************************/
242 259
243inline ev_tstamp 260ev_tstamp
244ev_time (void) 261ev_time (void)
245{ 262{
246#if EV_USE_REALTIME 263#if EV_USE_REALTIME
247 struct timespec ts; 264 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 265 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 284#endif
268 285
269 return ev_time (); 286 return ev_time ();
270} 287}
271 288
289#if EV_MULTIPLICITY
272ev_tstamp 290ev_tstamp
273ev_now (EV_P) 291ev_now (EV_P)
274{ 292{
275 return rt_now; 293 return ev_rt_now;
276} 294}
295#endif
277 296
278#define array_roundsize(type,n) ((n) | 4 & ~3) 297#define array_roundsize(type,n) ((n) | 4 & ~3)
279 298
280#define array_needsize(type,base,cur,cnt,init) \ 299#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 300 if (expect_false ((cnt) > cur)) \
… …
514 533
515 heap [k] = w; 534 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 535 ((W)heap [k])->active = k + 1;
517} 536}
518 537
538inline void
539adjustheap (WT *heap, int N, int k, ev_tstamp at)
540{
541 ev_tstamp old_at = heap [k]->at;
542 heap [k]->at = at;
543
544 if (old_at < at)
545 downheap (heap, N, k);
546 else
547 upheap (heap, k);
548}
549
519/*****************************************************************************/ 550/*****************************************************************************/
520 551
521typedef struct 552typedef struct
522{ 553{
523 WL head; 554 WL head;
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 750 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 751 have_monotonic = 1;
721 } 752 }
722#endif 753#endif
723 754
724 rt_now = ev_time (); 755 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 756 mn_now = get_clock ();
726 now_floor = mn_now; 757 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 758 rtmn_diff = ev_rt_now - mn_now;
728 759
729 if (methods == EVMETHOD_AUTO) 760 if (methods == EVMETHOD_AUTO)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 761 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 762 methods = atoi (getenv ("LIBEV_METHODS"));
732 else 763 else
… …
747#endif 778#endif
748#if EV_USE_SELECT 779#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
750#endif 781#endif
751 782
752 ev_watcher_init (&sigev, sigcb); 783 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 784 ev_set_priority (&sigev, EV_MAXPRI);
754 } 785 }
755} 786}
756 787
757void 788void
… …
779 array_free (pending, [i]); 810 array_free (pending, [i]);
780 811
781 /* have to use the microsoft-never-gets-it-right macro */ 812 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 813 array_free_microshit (fdchange);
783 array_free_microshit (timer); 814 array_free_microshit (timer);
815#if EV_PERIODICS
784 array_free_microshit (periodic); 816 array_free_microshit (periodic);
817#endif
785 array_free_microshit (idle); 818 array_free_microshit (idle);
786 array_free_microshit (prepare); 819 array_free_microshit (prepare);
787 array_free_microshit (check); 820 array_free_microshit (check);
788 821
789 method = 0; 822 method = 0;
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 977 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 978
946 if (p->w) 979 if (p->w)
947 { 980 {
948 p->w->pending = 0; 981 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 982 EV_CB_INVOKE (p->w, p->events);
950 } 983 }
951 } 984 }
952} 985}
953 986
954static void 987static void
… …
962 995
963 /* first reschedule or stop timer */ 996 /* first reschedule or stop timer */
964 if (w->repeat) 997 if (w->repeat)
965 { 998 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 999 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1000
967 ((WT)w)->at = mn_now + w->repeat; 1001 ((WT)w)->at += w->repeat;
1002 if (((WT)w)->at < mn_now)
1003 ((WT)w)->at = mn_now;
1004
968 downheap ((WT *)timers, timercnt, 0); 1005 downheap ((WT *)timers, timercnt, 0);
969 } 1006 }
970 else 1007 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1008 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1009
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1010 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1011 }
975} 1012}
976 1013
1014#if EV_PERIODICS
977static void 1015static void
978periodics_reify (EV_P) 1016periodics_reify (EV_P)
979{ 1017{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1018 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1019 {
982 struct ev_periodic *w = periodics [0]; 1020 struct ev_periodic *w = periodics [0];
983 1021
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1022 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1023
986 /* first reschedule or stop timer */ 1024 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1025 if (w->reschedule_cb)
988 { 1026 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1027 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990 1028
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1029 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1030 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1031 }
994 else if (w->interval) 1032 else if (w->interval)
995 { 1033 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1034 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1035 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1036 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1037 }
1000 else 1038 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1040
… …
1013 for (i = 0; i < periodiccnt; ++i) 1051 for (i = 0; i < periodiccnt; ++i)
1014 { 1052 {
1015 struct ev_periodic *w = periodics [i]; 1053 struct ev_periodic *w = periodics [i];
1016 1054
1017 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1056 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1057 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1058 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1059 }
1022 1060
1023 /* now rebuild the heap */ 1061 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1062 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1063 downheap ((WT *)periodics, periodiccnt, i);
1026} 1064}
1065#endif
1027 1066
1028inline int 1067inline int
1029time_update_monotonic (EV_P) 1068time_update_monotonic (EV_P)
1030{ 1069{
1031 mn_now = get_clock (); 1070 mn_now = get_clock ();
1032 1071
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1072 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1073 {
1035 rt_now = rtmn_diff + mn_now; 1074 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1075 return 0;
1037 } 1076 }
1038 else 1077 else
1039 { 1078 {
1040 now_floor = mn_now; 1079 now_floor = mn_now;
1041 rt_now = ev_time (); 1080 ev_rt_now = ev_time ();
1042 return 1; 1081 return 1;
1043 } 1082 }
1044} 1083}
1045 1084
1046static void 1085static void
… …
1055 { 1094 {
1056 ev_tstamp odiff = rtmn_diff; 1095 ev_tstamp odiff = rtmn_diff;
1057 1096
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1097 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1098 {
1060 rtmn_diff = rt_now - mn_now; 1099 rtmn_diff = ev_rt_now - mn_now;
1061 1100
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1101 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1102 return; /* all is well */
1064 1103
1065 rt_now = ev_time (); 1104 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1105 mn_now = get_clock ();
1067 now_floor = mn_now; 1106 now_floor = mn_now;
1068 } 1107 }
1069 1108
1109# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1110 periodics_reschedule (EV_A);
1111# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1112 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1113 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1114 }
1074 } 1115 }
1075 else 1116 else
1076#endif 1117#endif
1077 { 1118 {
1078 rt_now = ev_time (); 1119 ev_rt_now = ev_time ();
1079 1120
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1121 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1122 {
1123#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1124 periodics_reschedule (EV_A);
1125#endif
1083 1126
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1127 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1128 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1129 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1130 }
1088 1131
1089 mn_now = rt_now; 1132 mn_now = ev_rt_now;
1090 } 1133 }
1091} 1134}
1092 1135
1093void 1136void
1094ev_ref (EV_P) 1137ev_ref (EV_P)
… …
1134 if (expect_true (have_monotonic)) 1177 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1178 time_update_monotonic (EV_A);
1136 else 1179 else
1137#endif 1180#endif
1138 { 1181 {
1139 rt_now = ev_time (); 1182 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1183 mn_now = ev_rt_now;
1141 } 1184 }
1142 1185
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1186 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1187 block = 0.;
1145 else 1188 else
… …
1150 { 1193 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1194 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1195 if (block > to) block = to;
1153 } 1196 }
1154 1197
1198#if EV_PERIODICS
1155 if (periodiccnt) 1199 if (periodiccnt)
1156 { 1200 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1201 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1202 if (block > to) block = to;
1159 } 1203 }
1204#endif
1160 1205
1161 if (block < 0.) block = 0.; 1206 if (block < 0.) block = 0.;
1162 } 1207 }
1163 1208
1164 method_poll (EV_A_ block); 1209 method_poll (EV_A_ block);
1165 1210
1166 /* update rt_now, do magic */ 1211 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1212 time_update (EV_A);
1168 1213
1169 /* queue pending timers and reschedule them */ 1214 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1215 timers_reify (EV_A); /* relative timers called last */
1216#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1217 periodics_reify (EV_A); /* absolute timers called first */
1218#endif
1172 1219
1173 /* queue idle watchers unless io or timers are pending */ 1220 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1221 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1222 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1223
… …
1267{ 1314{
1268 ev_clear_pending (EV_A_ (W)w); 1315 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1316 if (!ev_is_active (w))
1270 return; 1317 return;
1271 1318
1319 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1320
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1321 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1322 ev_stop (EV_A_ (W)w);
1274 1323
1275 fd_change (EV_A_ w->fd); 1324 fd_change (EV_A_ w->fd);
1276} 1325}
… …
1306 { 1355 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1356 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1357 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1358 }
1310 1359
1311 ((WT)w)->at = w->repeat; 1360 ((WT)w)->at -= mn_now;
1312 1361
1313 ev_stop (EV_A_ (W)w); 1362 ev_stop (EV_A_ (W)w);
1314} 1363}
1315 1364
1316void 1365void
1317ev_timer_again (EV_P_ struct ev_timer *w) 1366ev_timer_again (EV_P_ struct ev_timer *w)
1318{ 1367{
1319 if (ev_is_active (w)) 1368 if (ev_is_active (w))
1320 { 1369 {
1321 if (w->repeat) 1370 if (w->repeat)
1322 {
1323 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1325 }
1326 else 1372 else
1327 ev_timer_stop (EV_A_ w); 1373 ev_timer_stop (EV_A_ w);
1328 } 1374 }
1329 else if (w->repeat) 1375 else if (w->repeat)
1330 ev_timer_start (EV_A_ w); 1376 ev_timer_start (EV_A_ w);
1331} 1377}
1332 1378
1379#if EV_PERIODICS
1333void 1380void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1381ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1382{
1336 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1337 return; 1384 return;
1338 1385
1339 if (w->reschedule_cb) 1386 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1387 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1388 else if (w->interval)
1342 { 1389 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1390 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1391 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1392 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1393 }
1347 1394
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1395 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1396 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1350 periodics [periodiccnt - 1] = w; 1397 periodics [periodiccnt - 1] = w;
… …
1372} 1419}
1373 1420
1374void 1421void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1422ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1423{
1424 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1425 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1426 ev_periodic_start (EV_A_ w);
1379} 1427}
1428#endif
1380 1429
1381void 1430void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1431ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1432{
1384 if (ev_is_active (w)) 1433 if (ev_is_active (w))
… …
1435 1484
1436void 1485void
1437ev_check_stop (EV_P_ struct ev_check *w) 1486ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1487{
1439 ev_clear_pending (EV_A_ (W)w); 1488 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1489 if (!ev_is_active (w))
1441 return; 1490 return;
1442 1491
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1492 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1493 ev_stop (EV_A_ (W)w);
1445} 1494}
… …
1506 1555
1507void 1556void
1508ev_child_stop (EV_P_ struct ev_child *w) 1557ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1558{
1510 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1560 if (!ev_is_active (w))
1512 return; 1561 return;
1513 1562
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1563 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1516} 1565}
… …
1560 else 1609 else
1561 { 1610 {
1562 once->cb = cb; 1611 once->cb = cb;
1563 once->arg = arg; 1612 once->arg = arg;
1564 1613
1565 ev_watcher_init (&once->io, once_cb_io); 1614 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1615 if (fd >= 0)
1567 { 1616 {
1568 ev_io_set (&once->io, fd, events); 1617 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1618 ev_io_start (EV_A_ &once->io);
1570 } 1619 }
1571 1620
1572 ev_watcher_init (&once->to, once_cb_to); 1621 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1622 if (timeout >= 0.)
1574 { 1623 {
1575 ev_timer_set (&once->to, timeout, 0.); 1624 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1625 ev_timer_start (EV_A_ &once->to);
1577 } 1626 }
1578 } 1627 }
1579} 1628}
1580 1629
1630#ifdef __cplusplus
1631}
1632#endif
1633

Diff Legend

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