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

Comparing libev/ev.c (file contents):
Revision 1.86 by root, Sat Nov 10 03:19:21 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
… …
244 253
245#endif 254#endif
246 255
247/*****************************************************************************/ 256/*****************************************************************************/
248 257
249inline ev_tstamp 258ev_tstamp
250ev_time (void) 259ev_time (void)
251{ 260{
252#if EV_USE_REALTIME 261#if EV_USE_REALTIME
253 struct timespec ts; 262 struct timespec ts;
254 clock_gettime (CLOCK_REALTIME, &ts); 263 clock_gettime (CLOCK_REALTIME, &ts);
… …
799 array_free (pending, [i]); 808 array_free (pending, [i]);
800 809
801 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
802 array_free_microshit (fdchange); 811 array_free_microshit (fdchange);
803 array_free_microshit (timer); 812 array_free_microshit (timer);
813#if EV_PERIODICS
804 array_free_microshit (periodic); 814 array_free_microshit (periodic);
815#endif
805 array_free_microshit (idle); 816 array_free_microshit (idle);
806 array_free_microshit (prepare); 817 array_free_microshit (prepare);
807 array_free_microshit (check); 818 array_free_microshit (check);
808 819
809 method = 0; 820 method = 0;
… …
982 993
983 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
984 if (w->repeat) 995 if (w->repeat)
985 { 996 {
986 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
987 ((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
988 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
989 } 1004 }
990 else 1005 else
991 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
992 1007
993 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
994 } 1009 }
995} 1010}
996 1011
1012#if EV_PERIODICS
997static void 1013static void
998periodics_reify (EV_P) 1014periodics_reify (EV_P)
999{ 1015{
1000 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1001 { 1017 {
… …
1042 1058
1043 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1044 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1045 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1046} 1062}
1063#endif
1047 1064
1048inline int 1065inline int
1049time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1050{ 1067{
1051 mn_now = get_clock (); 1068 mn_now = get_clock ();
… …
1085 ev_rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1086 mn_now = get_clock (); 1103 mn_now = get_clock ();
1087 now_floor = mn_now; 1104 now_floor = mn_now;
1088 } 1105 }
1089 1106
1107# if EV_PERIODICS
1090 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1091 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1092 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1093 } 1112 }
1094 } 1113 }
1095 else 1114 else
… …
1097 { 1116 {
1098 ev_rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1099 1118
1100 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1101 { 1120 {
1121#if EV_PERIODICS
1102 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1103 1124
1104 /* 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 */
1105 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1106 ((WT)timers [i])->at += ev_rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1107 } 1128 }
… …
1170 { 1191 {
1171 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1172 if (block > to) block = to; 1193 if (block > to) block = to;
1173 } 1194 }
1174 1195
1196#if EV_PERIODICS
1175 if (periodiccnt) 1197 if (periodiccnt)
1176 { 1198 {
1177 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1178 if (block > to) block = to; 1200 if (block > to) block = to;
1179 } 1201 }
1202#endif
1180 1203
1181 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1182 } 1205 }
1183 1206
1184 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
… …
1186 /* update ev_rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1187 time_update (EV_A); 1210 time_update (EV_A);
1188 1211
1189 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1190 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1191 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1192 1217
1193 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1194 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1195 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1196 1221
… …
1287{ 1312{
1288 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1290 return; 1315 return;
1291 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1292 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1294 1321
1295 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1296} 1323}
… …
1326 { 1353 {
1327 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1356 }
1330 1357
1331 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1332 1359
1333 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1334} 1361}
1335 1362
1336void 1363void
… …
1345 } 1372 }
1346 else if (w->repeat) 1373 else if (w->repeat)
1347 ev_timer_start (EV_A_ w); 1374 ev_timer_start (EV_A_ w);
1348} 1375}
1349 1376
1377#if EV_PERIODICS
1350void 1378void
1351ev_periodic_start (EV_P_ struct ev_periodic *w) 1379ev_periodic_start (EV_P_ struct ev_periodic *w)
1352{ 1380{
1353 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1354 return; 1382 return;
… …
1393{ 1421{
1394 /* TODO: use adjustheap and recalculation */ 1422 /* TODO: use adjustheap and recalculation */
1395 ev_periodic_stop (EV_A_ w); 1423 ev_periodic_stop (EV_A_ w);
1396 ev_periodic_start (EV_A_ w); 1424 ev_periodic_start (EV_A_ w);
1397} 1425}
1426#endif
1398 1427
1399void 1428void
1400ev_idle_start (EV_P_ struct ev_idle *w) 1429ev_idle_start (EV_P_ struct ev_idle *w)
1401{ 1430{
1402 if (ev_is_active (w)) 1431 if (ev_is_active (w))
… …
1453 1482
1454void 1483void
1455ev_check_stop (EV_P_ struct ev_check *w) 1484ev_check_stop (EV_P_ struct ev_check *w)
1456{ 1485{
1457 ev_clear_pending (EV_A_ (W)w); 1486 ev_clear_pending (EV_A_ (W)w);
1458 if (ev_is_active (w)) 1487 if (!ev_is_active (w))
1459 return; 1488 return;
1460 1489
1461 checks [((W)w)->active - 1] = checks [--checkcnt]; 1490 checks [((W)w)->active - 1] = checks [--checkcnt];
1462 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1463} 1492}
… …
1524 1553
1525void 1554void
1526ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1527{ 1556{
1528 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1529 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1530 return; 1559 return;
1531 1560
1532 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1533 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1534} 1563}
… …
1594 ev_timer_start (EV_A_ &once->to); 1623 ev_timer_start (EV_A_ &once->to);
1595 } 1624 }
1596 } 1625 }
1597} 1626}
1598 1627
1628#ifdef __cplusplus
1629}
1630#endif
1631

Diff Legend

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