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

Diff Legend

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