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.96 by root, Sun Nov 11 01:50:36 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
35# define EV_USE_MONOTONIC 1 40# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1 41# define EV_USE_REALTIME 1
37# endif 42# endif
38 43
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 44# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 45# define EV_USE_SELECT 1
41# endif 46# endif
42 47
43# if HAVE_POLL && HAVE_POLL_H 48# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 49# define EV_USE_POLL 1
45# endif 50# endif
46 51
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 53# define EV_USE_EPOLL 1
49# endif 54# endif
50 55
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 57# define EV_USE_KQUEUE 1
53# endif 58# endif
54 59
55#endif 60#endif
56 61
… …
221 226
222#if EV_MULTIPLICITY 227#if EV_MULTIPLICITY
223 228
224 struct ev_loop 229 struct ev_loop
225 { 230 {
231 ev_tstamp ev_rt_now;
226 #define VAR(name,decl) decl; 232 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 233 #include "ev_vars.h"
228 #undef VAR 234 #undef VAR
229 }; 235 };
230 #include "ev_wrap.h" 236 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 238 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 239 static struct ev_loop *default_loop;
234 240
235#else 241#else
236 242
243 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 244 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 245 #include "ev_vars.h"
239 #undef VAR 246 #undef VAR
240 247
241 static int default_loop; 248 static int default_loop;
242 249
243#endif 250#endif
244 251
245/*****************************************************************************/ 252/*****************************************************************************/
246 253
247inline ev_tstamp 254ev_tstamp
248ev_time (void) 255ev_time (void)
249{ 256{
250#if EV_USE_REALTIME 257#if EV_USE_REALTIME
251 struct timespec ts; 258 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 259 clock_gettime (CLOCK_REALTIME, &ts);
… …
797 array_free (pending, [i]); 804 array_free (pending, [i]);
798 805
799 /* have to use the microsoft-never-gets-it-right macro */ 806 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 807 array_free_microshit (fdchange);
801 array_free_microshit (timer); 808 array_free_microshit (timer);
809#if EV_PERIODICS
802 array_free_microshit (periodic); 810 array_free_microshit (periodic);
811#endif
803 array_free_microshit (idle); 812 array_free_microshit (idle);
804 array_free_microshit (prepare); 813 array_free_microshit (prepare);
805 array_free_microshit (check); 814 array_free_microshit (check);
806 815
807 method = 0; 816 method = 0;
… …
980 989
981 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
982 if (w->repeat) 991 if (w->repeat)
983 { 992 {
984 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
985 ((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
986 downheap ((WT *)timers, timercnt, 0); 999 downheap ((WT *)timers, timercnt, 0);
987 } 1000 }
988 else 1001 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1002 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1003
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1004 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1005 }
993} 1006}
994 1007
1008#if EV_PERIODICS
995static void 1009static void
996periodics_reify (EV_P) 1010periodics_reify (EV_P)
997{ 1011{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1012 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1013 {
… …
1040 1054
1041 /* now rebuild the heap */ 1055 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1056 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1057 downheap ((WT *)periodics, periodiccnt, i);
1044} 1058}
1059#endif
1045 1060
1046inline int 1061inline int
1047time_update_monotonic (EV_P) 1062time_update_monotonic (EV_P)
1048{ 1063{
1049 mn_now = get_clock (); 1064 mn_now = get_clock ();
… …
1083 ev_rt_now = ev_time (); 1098 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1099 mn_now = get_clock ();
1085 now_floor = mn_now; 1100 now_floor = mn_now;
1086 } 1101 }
1087 1102
1103# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1104 periodics_reschedule (EV_A);
1105# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1106 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1107 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1108 }
1092 } 1109 }
1093 else 1110 else
… …
1095 { 1112 {
1096 ev_rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1097 1114
1098 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))
1099 { 1116 {
1117#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119#endif
1101 1120
1102 /* 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 */
1103 for (i = 0; i < timercnt; ++i) 1122 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1123 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1124 }
… …
1168 { 1187 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1188 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170 if (block > to) block = to; 1189 if (block > to) block = to;
1171 } 1190 }
1172 1191
1192#if EV_PERIODICS
1173 if (periodiccnt) 1193 if (periodiccnt)
1174 { 1194 {
1175 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;
1176 if (block > to) block = to; 1196 if (block > to) block = to;
1177 } 1197 }
1198#endif
1178 1199
1179 if (block < 0.) block = 0.; 1200 if (block < 0.) block = 0.;
1180 } 1201 }
1181 1202
1182 method_poll (EV_A_ block); 1203 method_poll (EV_A_ block);
… …
1184 /* update ev_rt_now, do magic */ 1205 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1206 time_update (EV_A);
1186 1207
1187 /* queue pending timers and reschedule them */ 1208 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1209 timers_reify (EV_A); /* relative timers called last */
1210#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1211 periodics_reify (EV_A); /* absolute timers called first */
1212#endif
1190 1213
1191 /* queue idle watchers unless io or timers are pending */ 1214 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1215 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1216 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1217
… …
1285{ 1308{
1286 ev_clear_pending (EV_A_ (W)w); 1309 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1310 if (!ev_is_active (w))
1288 return; 1311 return;
1289 1312
1313 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1314
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1315 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1316 ev_stop (EV_A_ (W)w);
1292 1317
1293 fd_change (EV_A_ w->fd); 1318 fd_change (EV_A_ w->fd);
1294} 1319}
… …
1324 { 1349 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1350 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1352 }
1328 1353
1329 ((WT)w)->at = w->repeat; 1354 ((WT)w)->at -= mn_now;
1330 1355
1331 ev_stop (EV_A_ (W)w); 1356 ev_stop (EV_A_ (W)w);
1332} 1357}
1333 1358
1334void 1359void
… …
1343 } 1368 }
1344 else if (w->repeat) 1369 else if (w->repeat)
1345 ev_timer_start (EV_A_ w); 1370 ev_timer_start (EV_A_ w);
1346} 1371}
1347 1372
1373#if EV_PERIODICS
1348void 1374void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1375ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1376{
1351 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1352 return; 1378 return;
… …
1391{ 1417{
1392 /* TODO: use adjustheap and recalculation */ 1418 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1419 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1420 ev_periodic_start (EV_A_ w);
1395} 1421}
1422#endif
1396 1423
1397void 1424void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1425ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1426{
1400 if (ev_is_active (w)) 1427 if (ev_is_active (w))
… …
1451 1478
1452void 1479void
1453ev_check_stop (EV_P_ struct ev_check *w) 1480ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1481{
1455 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1457 return; 1484 return;
1458 1485
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1486 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1461} 1488}
… …
1522 1549
1523void 1550void
1524ev_child_stop (EV_P_ struct ev_child *w) 1551ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1552{
1526 ev_clear_pending (EV_A_ (W)w); 1553 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1554 if (!ev_is_active (w))
1528 return; 1555 return;
1529 1556
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1557 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1558 ev_stop (EV_A_ (W)w);
1532} 1559}
… …
1592 ev_timer_start (EV_A_ &once->to); 1619 ev_timer_start (EV_A_ &once->to);
1593 } 1620 }
1594 } 1621 }
1595} 1622}
1596 1623
1624#ifdef __cplusplus
1625}
1626#endif
1627

Diff Legend

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