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

Diff Legend

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