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

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

Diff Legend

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