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

Comparing libev/ev.c (file contents):
Revision 1.89 by root, Sat Nov 10 19:48:44 2007 UTC vs.
Revision 1.95 by root, Sun Nov 11 01:42:13 2007 UTC

… …
249 249
250#endif 250#endif
251 251
252/*****************************************************************************/ 252/*****************************************************************************/
253 253
254inline ev_tstamp 254ev_tstamp
255ev_time (void) 255ev_time (void)
256{ 256{
257#if EV_USE_REALTIME 257#if EV_USE_REALTIME
258 struct timespec ts; 258 struct timespec ts;
259 clock_gettime (CLOCK_REALTIME, &ts); 259 clock_gettime (CLOCK_REALTIME, &ts);
… …
804 array_free (pending, [i]); 804 array_free (pending, [i]);
805 805
806 /* have to use the microsoft-never-gets-it-right macro */ 806 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange); 807 array_free_microshit (fdchange);
808 array_free_microshit (timer); 808 array_free_microshit (timer);
809#if EV_PERIODICS
809 array_free_microshit (periodic); 810 array_free_microshit (periodic);
811#endif
810 array_free_microshit (idle); 812 array_free_microshit (idle);
811 array_free_microshit (prepare); 813 array_free_microshit (prepare);
812 array_free_microshit (check); 814 array_free_microshit (check);
813 815
814 method = 0; 816 method = 0;
… …
987 989
988 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
989 if (w->repeat) 991 if (w->repeat)
990 { 992 {
991 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 993 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
994
992 ((WT)w)->at = mn_now + w->repeat; 995 ((WT)w)->at += w->repeat;
996 if (((WT)w)->at < mn_now)
997 ((WT)w)->at = mn_now;
998
993 downheap ((WT *)timers, timercnt, 0); 999 downheap ((WT *)timers, timercnt, 0);
994 } 1000 }
995 else 1001 else
996 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1002 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
997 1003
998 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1004 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
999 } 1005 }
1000} 1006}
1001 1007
1008#if EV_PERIODICS
1002static void 1009static void
1003periodics_reify (EV_P) 1010periodics_reify (EV_P)
1004{ 1011{
1005 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1012 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1006 { 1013 {
… …
1047 1054
1048 /* now rebuild the heap */ 1055 /* now rebuild the heap */
1049 for (i = periodiccnt >> 1; i--; ) 1056 for (i = periodiccnt >> 1; i--; )
1050 downheap ((WT *)periodics, periodiccnt, i); 1057 downheap ((WT *)periodics, periodiccnt, i);
1051} 1058}
1059#endif
1052 1060
1053inline int 1061inline int
1054time_update_monotonic (EV_P) 1062time_update_monotonic (EV_P)
1055{ 1063{
1056 mn_now = get_clock (); 1064 mn_now = get_clock ();
… …
1090 ev_rt_now = ev_time (); 1098 ev_rt_now = ev_time ();
1091 mn_now = get_clock (); 1099 mn_now = get_clock ();
1092 now_floor = mn_now; 1100 now_floor = mn_now;
1093 } 1101 }
1094 1102
1103# if EV_PERIODICS
1095 periodics_reschedule (EV_A); 1104 periodics_reschedule (EV_A);
1105# endif
1096 /* no timer adjustment, as the monotonic clock doesn't jump */ 1106 /* no timer adjustment, as the monotonic clock doesn't jump */
1097 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1107 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1098 } 1108 }
1099 } 1109 }
1100 else 1110 else
… …
1102 { 1112 {
1103 ev_rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1104 1114
1105 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1115 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1106 { 1116 {
1117#if EV_PERIODICS
1107 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119#endif
1108 1120
1109 /* adjust timers. this is easy, as the offset is the same for all */ 1121 /* adjust timers. this is easy, as the offset is the same for all */
1110 for (i = 0; i < timercnt; ++i) 1122 for (i = 0; i < timercnt; ++i)
1111 ((WT)timers [i])->at += ev_rt_now - mn_now; 1123 ((WT)timers [i])->at += ev_rt_now - mn_now;
1112 } 1124 }
… …
1175 { 1187 {
1176 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1188 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1177 if (block > to) block = to; 1189 if (block > to) block = to;
1178 } 1190 }
1179 1191
1192#if EV_PERIODICS
1180 if (periodiccnt) 1193 if (periodiccnt)
1181 { 1194 {
1182 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1195 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1183 if (block > to) block = to; 1196 if (block > to) block = to;
1184 } 1197 }
1198#endif
1185 1199
1186 if (block < 0.) block = 0.; 1200 if (block < 0.) block = 0.;
1187 } 1201 }
1188 1202
1189 method_poll (EV_A_ block); 1203 method_poll (EV_A_ block);
… …
1191 /* update ev_rt_now, do magic */ 1205 /* update ev_rt_now, do magic */
1192 time_update (EV_A); 1206 time_update (EV_A);
1193 1207
1194 /* queue pending timers and reschedule them */ 1208 /* queue pending timers and reschedule them */
1195 timers_reify (EV_A); /* relative timers called last */ 1209 timers_reify (EV_A); /* relative timers called last */
1210#if EV_PERIODICS
1196 periodics_reify (EV_A); /* absolute timers called first */ 1211 periodics_reify (EV_A); /* absolute timers called first */
1212#endif
1197 1213
1198 /* queue idle watchers unless io or timers are pending */ 1214 /* queue idle watchers unless io or timers are pending */
1199 if (idlecnt && !any_pending (EV_A)) 1215 if (idlecnt && !any_pending (EV_A))
1200 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1216 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1201 1217
… …
1333 { 1349 {
1334 timers [((W)w)->active - 1] = timers [timercnt]; 1350 timers [((W)w)->active - 1] = timers [timercnt];
1335 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1336 } 1352 }
1337 1353
1338 ((WT)w)->at = w->repeat; 1354 ((WT)w)->at -= mn_now;
1339 1355
1340 ev_stop (EV_A_ (W)w); 1356 ev_stop (EV_A_ (W)w);
1341} 1357}
1342 1358
1343void 1359void
… …
1352 } 1368 }
1353 else if (w->repeat) 1369 else if (w->repeat)
1354 ev_timer_start (EV_A_ w); 1370 ev_timer_start (EV_A_ w);
1355} 1371}
1356 1372
1373#if EV_PERIODICS
1357void 1374void
1358ev_periodic_start (EV_P_ struct ev_periodic *w) 1375ev_periodic_start (EV_P_ struct ev_periodic *w)
1359{ 1376{
1360 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1361 return; 1378 return;
… …
1400{ 1417{
1401 /* TODO: use adjustheap and recalculation */ 1418 /* TODO: use adjustheap and recalculation */
1402 ev_periodic_stop (EV_A_ w); 1419 ev_periodic_stop (EV_A_ w);
1403 ev_periodic_start (EV_A_ w); 1420 ev_periodic_start (EV_A_ w);
1404} 1421}
1422#endif
1405 1423
1406void 1424void
1407ev_idle_start (EV_P_ struct ev_idle *w) 1425ev_idle_start (EV_P_ struct ev_idle *w)
1408{ 1426{
1409 if (ev_is_active (w)) 1427 if (ev_is_active (w))
… …
1460 1478
1461void 1479void
1462ev_check_stop (EV_P_ struct ev_check *w) 1480ev_check_stop (EV_P_ struct ev_check *w)
1463{ 1481{
1464 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1465 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1466 return; 1484 return;
1467 1485
1468 checks [((W)w)->active - 1] = checks [--checkcnt]; 1486 checks [((W)w)->active - 1] = checks [--checkcnt];
1469 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1470} 1488}
… …
1531 1549
1532void 1550void
1533ev_child_stop (EV_P_ struct ev_child *w) 1551ev_child_stop (EV_P_ struct ev_child *w)
1534{ 1552{
1535 ev_clear_pending (EV_A_ (W)w); 1553 ev_clear_pending (EV_A_ (W)w);
1536 if (ev_is_active (w)) 1554 if (!ev_is_active (w))
1537 return; 1555 return;
1538 1556
1539 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1557 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1540 ev_stop (EV_A_ (W)w); 1558 ev_stop (EV_A_ (W)w);
1541} 1559}

Diff Legend

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