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.102 by root, Sun Nov 11 17:56:11 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_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;
238 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 239 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 240 #include "ev_vars.h"
228 #undef VAR 241 #undef VAR
229 }; 242 };
230 #include "ev_wrap.h" 243 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 245 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 246 static struct ev_loop *default_loop;
234 247
235#else 248#else
236 249
250 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 251 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 252 #include "ev_vars.h"
239 #undef VAR 253 #undef VAR
240 254
241 static int default_loop; 255 static int default_loop;
242 256
243#endif 257#endif
244 258
245/*****************************************************************************/ 259/*****************************************************************************/
246 260
247inline ev_tstamp 261ev_tstamp
248ev_time (void) 262ev_time (void)
249{ 263{
250#if EV_USE_REALTIME 264#if EV_USE_REALTIME
251 struct timespec ts; 265 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 266 clock_gettime (CLOCK_REALTIME, &ts);
… …
521 heap [k] = w; 535 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 536 ((W)heap [k])->active = k + 1;
523} 537}
524 538
525inline void 539inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 540adjustheap (WT *heap, int N, int k)
527{ 541{
528 ev_tstamp old_at = heap [k]->at; 542 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 543 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 544}
536 545
537/*****************************************************************************/ 546/*****************************************************************************/
538 547
539typedef struct 548typedef struct
… …
797 array_free (pending, [i]); 806 array_free (pending, [i]);
798 807
799 /* have to use the microsoft-never-gets-it-right macro */ 808 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 809 array_free_microshit (fdchange);
801 array_free_microshit (timer); 810 array_free_microshit (timer);
811#if EV_PERIODICS
802 array_free_microshit (periodic); 812 array_free_microshit (periodic);
813#endif
803 array_free_microshit (idle); 814 array_free_microshit (idle);
804 array_free_microshit (prepare); 815 array_free_microshit (prepare);
805 array_free_microshit (check); 816 array_free_microshit (check);
806 817
807 method = 0; 818 method = 0;
… …
980 991
981 /* first reschedule or stop timer */ 992 /* first reschedule or stop timer */
982 if (w->repeat) 993 if (w->repeat)
983 { 994 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 995 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
996
985 ((WT)w)->at = mn_now + w->repeat; 997 ((WT)w)->at += w->repeat;
998 if (((WT)w)->at < mn_now)
999 ((WT)w)->at = mn_now;
1000
986 downheap ((WT *)timers, timercnt, 0); 1001 downheap ((WT *)timers, timercnt, 0);
987 } 1002 }
988 else 1003 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1004 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1005
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1006 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1007 }
993} 1008}
994 1009
1010#if EV_PERIODICS
995static void 1011static void
996periodics_reify (EV_P) 1012periodics_reify (EV_P)
997{ 1013{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1014 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1015 {
… …
1040 1056
1041 /* now rebuild the heap */ 1057 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1058 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1059 downheap ((WT *)periodics, periodiccnt, i);
1044} 1060}
1061#endif
1045 1062
1046inline int 1063inline int
1047time_update_monotonic (EV_P) 1064time_update_monotonic (EV_P)
1048{ 1065{
1049 mn_now = get_clock (); 1066 mn_now = get_clock ();
… …
1083 ev_rt_now = ev_time (); 1100 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1101 mn_now = get_clock ();
1085 now_floor = mn_now; 1102 now_floor = mn_now;
1086 } 1103 }
1087 1104
1105# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1106 periodics_reschedule (EV_A);
1107# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1108 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1109 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1110 }
1092 } 1111 }
1093 else 1112 else
… …
1095 { 1114 {
1096 ev_rt_now = ev_time (); 1115 ev_rt_now = ev_time ();
1097 1116
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1117 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1118 {
1119#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1120 periodics_reschedule (EV_A);
1121#endif
1101 1122
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1123 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1124 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1125 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1126 }
… …
1168 { 1189 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1190 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170 if (block > to) block = to; 1191 if (block > to) block = to;
1171 } 1192 }
1172 1193
1194#if EV_PERIODICS
1173 if (periodiccnt) 1195 if (periodiccnt)
1174 { 1196 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1197 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1176 if (block > to) block = to; 1198 if (block > to) block = to;
1177 } 1199 }
1200#endif
1178 1201
1179 if (block < 0.) block = 0.; 1202 if (block < 0.) block = 0.;
1180 } 1203 }
1181 1204
1182 method_poll (EV_A_ block); 1205 method_poll (EV_A_ block);
… …
1184 /* update ev_rt_now, do magic */ 1207 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1208 time_update (EV_A);
1186 1209
1187 /* queue pending timers and reschedule them */ 1210 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1211 timers_reify (EV_A); /* relative timers called last */
1212#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1213 periodics_reify (EV_A); /* absolute timers called first */
1214#endif
1190 1215
1191 /* queue idle watchers unless io or timers are pending */ 1216 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1217 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1218 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1219
… …
1285{ 1310{
1286 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1288 return; 1313 return;
1289 1314
1315 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1316
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1317 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1318 ev_stop (EV_A_ (W)w);
1292 1319
1293 fd_change (EV_A_ w->fd); 1320 fd_change (EV_A_ w->fd);
1294} 1321}
… …
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1348 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322 1349
1323 if (((W)w)->active < timercnt--) 1350 if (((W)w)->active < timercnt--)
1324 { 1351 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1352 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1354 }
1328 1355
1329 ((WT)w)->at = w->repeat; 1356 ((WT)w)->at -= mn_now;
1330 1357
1331 ev_stop (EV_A_ (W)w); 1358 ev_stop (EV_A_ (W)w);
1332} 1359}
1333 1360
1334void 1361void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1362ev_timer_again (EV_P_ struct ev_timer *w)
1336{ 1363{
1337 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1338 { 1365 {
1339 if (w->repeat) 1366 if (w->repeat)
1367 {
1368 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 }
1341 else 1371 else
1342 ev_timer_stop (EV_A_ w); 1372 ev_timer_stop (EV_A_ w);
1343 } 1373 }
1344 else if (w->repeat) 1374 else if (w->repeat)
1345 ev_timer_start (EV_A_ w); 1375 ev_timer_start (EV_A_ w);
1346} 1376}
1347 1377
1378#if EV_PERIODICS
1348void 1379void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1380ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1381{
1351 if (ev_is_active (w)) 1382 if (ev_is_active (w))
1352 return; 1383 return;
… …
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1409 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379 1410
1380 if (((W)w)->active < periodiccnt--) 1411 if (((W)w)->active < periodiccnt--)
1381 { 1412 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1413 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1414 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384 } 1415 }
1385 1416
1386 ev_stop (EV_A_ (W)w); 1417 ev_stop (EV_A_ (W)w);
1387} 1418}
1388 1419
… …
1391{ 1422{
1392 /* TODO: use adjustheap and recalculation */ 1423 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1424 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1425 ev_periodic_start (EV_A_ w);
1395} 1426}
1427#endif
1396 1428
1397void 1429void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1430ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1431{
1400 if (ev_is_active (w)) 1432 if (ev_is_active (w))
… …
1407 1439
1408void 1440void
1409ev_idle_stop (EV_P_ struct ev_idle *w) 1441ev_idle_stop (EV_P_ struct ev_idle *w)
1410{ 1442{
1411 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w)) 1444 if (!ev_is_active (w))
1413 return; 1445 return;
1414 1446
1415 idles [((W)w)->active - 1] = idles [--idlecnt]; 1447 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w); 1448 ev_stop (EV_A_ (W)w);
1417} 1449}
… …
1429 1461
1430void 1462void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w) 1463ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{ 1464{
1433 ev_clear_pending (EV_A_ (W)w); 1465 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w)) 1466 if (!ev_is_active (w))
1435 return; 1467 return;
1436 1468
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1469 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w); 1470 ev_stop (EV_A_ (W)w);
1439} 1471}
… …
1451 1483
1452void 1484void
1453ev_check_stop (EV_P_ struct ev_check *w) 1485ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1486{
1455 ev_clear_pending (EV_A_ (W)w); 1487 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1488 if (!ev_is_active (w))
1457 return; 1489 return;
1458 1490
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1491 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1492 ev_stop (EV_A_ (W)w);
1461} 1493}
… …
1522 1554
1523void 1555void
1524ev_child_stop (EV_P_ struct ev_child *w) 1556ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1557{
1526 ev_clear_pending (EV_A_ (W)w); 1558 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1559 if (!ev_is_active (w))
1528 return; 1560 return;
1529 1561
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1562 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1532} 1564}
… …
1592 ev_timer_start (EV_A_ &once->to); 1624 ev_timer_start (EV_A_ &once->to);
1593 } 1625 }
1594 } 1626 }
1595} 1627}
1596 1628
1629#ifdef __cplusplus
1630}
1631#endif
1632

Diff Legend

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