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.98 by root, Sun Nov 11 02:05:20 2007 UTC

… …
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# include "config.h" 37# include "config.h"
38 38
39# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
40# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
41# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
42# endif 46# endif
43 47
44# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
45# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
46# endif 50# endif
47 51
48# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
49# define EV_USE_POLL 1 53# define EV_USE_POLL 1
50# endif 54# endif
51 55
52# 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)
53# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
54# endif 58# endif
55 59
56# if HAVE_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)
57# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
58# endif 62# endif
59 63
60#endif 64#endif
61 65
… …
157typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
158typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
159 163
160static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
161 165
166#ifdef WIN32
162#include "ev_win32.c" 167# include "ev_win32.c"
168#endif
163 169
164/*****************************************************************************/ 170/*****************************************************************************/
165 171
166static void (*syserr_cb)(const char *msg); 172static void (*syserr_cb)(const char *msg);
167 173
… …
249 255
250#endif 256#endif
251 257
252/*****************************************************************************/ 258/*****************************************************************************/
253 259
254inline ev_tstamp 260ev_tstamp
255ev_time (void) 261ev_time (void)
256{ 262{
257#if EV_USE_REALTIME 263#if EV_USE_REALTIME
258 struct timespec ts; 264 struct timespec ts;
259 clock_gettime (CLOCK_REALTIME, &ts); 265 clock_gettime (CLOCK_REALTIME, &ts);
… …
804 array_free (pending, [i]); 810 array_free (pending, [i]);
805 811
806 /* have to use the microsoft-never-gets-it-right macro */ 812 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange); 813 array_free_microshit (fdchange);
808 array_free_microshit (timer); 814 array_free_microshit (timer);
815#if EV_PERIODICS
809 array_free_microshit (periodic); 816 array_free_microshit (periodic);
817#endif
810 array_free_microshit (idle); 818 array_free_microshit (idle);
811 array_free_microshit (prepare); 819 array_free_microshit (prepare);
812 array_free_microshit (check); 820 array_free_microshit (check);
813 821
814 method = 0; 822 method = 0;
… …
987 995
988 /* first reschedule or stop timer */ 996 /* first reschedule or stop timer */
989 if (w->repeat) 997 if (w->repeat)
990 { 998 {
991 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
992 ((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
993 downheap ((WT *)timers, timercnt, 0); 1005 downheap ((WT *)timers, timercnt, 0);
994 } 1006 }
995 else 1007 else
996 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1008 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
997 1009
998 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1010 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
999 } 1011 }
1000} 1012}
1001 1013
1014#if EV_PERIODICS
1002static void 1015static void
1003periodics_reify (EV_P) 1016periodics_reify (EV_P)
1004{ 1017{
1005 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1018 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1006 { 1019 {
… …
1047 1060
1048 /* now rebuild the heap */ 1061 /* now rebuild the heap */
1049 for (i = periodiccnt >> 1; i--; ) 1062 for (i = periodiccnt >> 1; i--; )
1050 downheap ((WT *)periodics, periodiccnt, i); 1063 downheap ((WT *)periodics, periodiccnt, i);
1051} 1064}
1065#endif
1052 1066
1053inline int 1067inline int
1054time_update_monotonic (EV_P) 1068time_update_monotonic (EV_P)
1055{ 1069{
1056 mn_now = get_clock (); 1070 mn_now = get_clock ();
… …
1090 ev_rt_now = ev_time (); 1104 ev_rt_now = ev_time ();
1091 mn_now = get_clock (); 1105 mn_now = get_clock ();
1092 now_floor = mn_now; 1106 now_floor = mn_now;
1093 } 1107 }
1094 1108
1109# if EV_PERIODICS
1095 periodics_reschedule (EV_A); 1110 periodics_reschedule (EV_A);
1111# endif
1096 /* no timer adjustment, as the monotonic clock doesn't jump */ 1112 /* no timer adjustment, as the monotonic clock doesn't jump */
1097 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1113 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1098 } 1114 }
1099 } 1115 }
1100 else 1116 else
… …
1102 { 1118 {
1103 ev_rt_now = ev_time (); 1119 ev_rt_now = ev_time ();
1104 1120
1105 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1121 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1106 { 1122 {
1123#if EV_PERIODICS
1107 periodics_reschedule (EV_A); 1124 periodics_reschedule (EV_A);
1125#endif
1108 1126
1109 /* 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 */
1110 for (i = 0; i < timercnt; ++i) 1128 for (i = 0; i < timercnt; ++i)
1111 ((WT)timers [i])->at += ev_rt_now - mn_now; 1129 ((WT)timers [i])->at += ev_rt_now - mn_now;
1112 } 1130 }
… …
1175 { 1193 {
1176 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1194 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1177 if (block > to) block = to; 1195 if (block > to) block = to;
1178 } 1196 }
1179 1197
1198#if EV_PERIODICS
1180 if (periodiccnt) 1199 if (periodiccnt)
1181 { 1200 {
1182 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1201 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1183 if (block > to) block = to; 1202 if (block > to) block = to;
1184 } 1203 }
1204#endif
1185 1205
1186 if (block < 0.) block = 0.; 1206 if (block < 0.) block = 0.;
1187 } 1207 }
1188 1208
1189 method_poll (EV_A_ block); 1209 method_poll (EV_A_ block);
… …
1191 /* update ev_rt_now, do magic */ 1211 /* update ev_rt_now, do magic */
1192 time_update (EV_A); 1212 time_update (EV_A);
1193 1213
1194 /* queue pending timers and reschedule them */ 1214 /* queue pending timers and reschedule them */
1195 timers_reify (EV_A); /* relative timers called last */ 1215 timers_reify (EV_A); /* relative timers called last */
1216#if EV_PERIODICS
1196 periodics_reify (EV_A); /* absolute timers called first */ 1217 periodics_reify (EV_A); /* absolute timers called first */
1218#endif
1197 1219
1198 /* queue idle watchers unless io or timers are pending */ 1220 /* queue idle watchers unless io or timers are pending */
1199 if (idlecnt && !any_pending (EV_A)) 1221 if (idlecnt && !any_pending (EV_A))
1200 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1222 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1201 1223
… …
1333 { 1355 {
1334 timers [((W)w)->active - 1] = timers [timercnt]; 1356 timers [((W)w)->active - 1] = timers [timercnt];
1335 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1357 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1336 } 1358 }
1337 1359
1338 ((WT)w)->at = w->repeat; 1360 ((WT)w)->at -= mn_now;
1339 1361
1340 ev_stop (EV_A_ (W)w); 1362 ev_stop (EV_A_ (W)w);
1341} 1363}
1342 1364
1343void 1365void
… …
1352 } 1374 }
1353 else if (w->repeat) 1375 else if (w->repeat)
1354 ev_timer_start (EV_A_ w); 1376 ev_timer_start (EV_A_ w);
1355} 1377}
1356 1378
1379#if EV_PERIODICS
1357void 1380void
1358ev_periodic_start (EV_P_ struct ev_periodic *w) 1381ev_periodic_start (EV_P_ struct ev_periodic *w)
1359{ 1382{
1360 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1361 return; 1384 return;
… …
1400{ 1423{
1401 /* TODO: use adjustheap and recalculation */ 1424 /* TODO: use adjustheap and recalculation */
1402 ev_periodic_stop (EV_A_ w); 1425 ev_periodic_stop (EV_A_ w);
1403 ev_periodic_start (EV_A_ w); 1426 ev_periodic_start (EV_A_ w);
1404} 1427}
1428#endif
1405 1429
1406void 1430void
1407ev_idle_start (EV_P_ struct ev_idle *w) 1431ev_idle_start (EV_P_ struct ev_idle *w)
1408{ 1432{
1409 if (ev_is_active (w)) 1433 if (ev_is_active (w))
… …
1460 1484
1461void 1485void
1462ev_check_stop (EV_P_ struct ev_check *w) 1486ev_check_stop (EV_P_ struct ev_check *w)
1463{ 1487{
1464 ev_clear_pending (EV_A_ (W)w); 1488 ev_clear_pending (EV_A_ (W)w);
1465 if (ev_is_active (w)) 1489 if (!ev_is_active (w))
1466 return; 1490 return;
1467 1491
1468 checks [((W)w)->active - 1] = checks [--checkcnt]; 1492 checks [((W)w)->active - 1] = checks [--checkcnt];
1469 ev_stop (EV_A_ (W)w); 1493 ev_stop (EV_A_ (W)w);
1470} 1494}
… …
1531 1555
1532void 1556void
1533ev_child_stop (EV_P_ struct ev_child *w) 1557ev_child_stop (EV_P_ struct ev_child *w)
1534{ 1558{
1535 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1536 if (ev_is_active (w)) 1560 if (!ev_is_active (w))
1537 return; 1561 return;
1538 1562
1539 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1563 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1540 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1541} 1565}

Diff Legend

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