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

Comparing libev/ev.c (file contents):
Revision 1.171 by root, Sun Dec 9 02:12:43 2007 UTC vs.
Revision 1.183 by root, Wed Dec 12 05:11:56 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
230
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
228#else 238#else
… …
466 pendings [pri][w_->pending - 1].w = w_; 476 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 477 pendings [pri][w_->pending - 1].events = revents;
468 } 478 }
469} 479}
470 480
471void inline_size 481void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 483{
474 int i; 484 int i;
475 485
476 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
547 557
548 fdchangecnt = 0; 558 fdchangecnt = 0;
549} 559}
550 560
551void inline_size 561void inline_size
552fd_change (EV_P_ int fd) 562fd_change (EV_P_ int fd, int flags)
553{ 563{
554 if (expect_false (anfds [fd].reify)) 564 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 565 anfds [fd].reify |= flags | 1;
558 566
567 if (expect_true (!reify))
568 {
559 ++fdchangecnt; 569 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 571 fdchanges [fdchangecnt - 1] = fd;
572 }
562} 573}
563 574
564void inline_speed 575void inline_speed
565fd_kill (EV_P_ int fd) 576fd_kill (EV_P_ int fd)
566{ 577{
… …
617 628
618 for (fd = 0; fd < anfdmax; ++fd) 629 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 630 if (anfds [fd].events)
620 { 631 {
621 anfds [fd].events = 0; 632 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 633 fd_change (EV_A_ fd, EV_IOFDSET);
623 } 634 }
624} 635}
625 636
626/*****************************************************************************/ 637/*****************************************************************************/
627 638
628void inline_speed 639void inline_speed
629upheap (WT *heap, int k) 640upheap (WT *heap, int k)
630{ 641{
631 WT w = heap [k]; 642 WT w = heap [k];
632 643
633 while (k && heap [k >> 1]->at > w->at) 644 while (k)
634 { 645 {
646 int p = (k - 1) >> 1;
647
648 if (heap [p]->at <= w->at)
649 break;
650
635 heap [k] = heap [k >> 1]; 651 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 652 ((W)heap [k])->active = k + 1;
637 k >>= 1; 653 k = p;
638 } 654 }
639 655
640 heap [k] = w; 656 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 657 ((W)heap [k])->active = k + 1;
642
643} 658}
644 659
645void inline_speed 660void inline_speed
646downheap (WT *heap, int N, int k) 661downheap (WT *heap, int N, int k)
647{ 662{
648 WT w = heap [k]; 663 WT w = heap [k];
649 664
650 while (k < (N >> 1)) 665 for (;;)
651 { 666 {
652 int j = k << 1; 667 int c = (k << 1) + 1;
653 668
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 669 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 670 break;
659 671
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0;
674
675 if (w->at <= heap [c]->at)
676 break;
677
660 heap [k] = heap [j]; 678 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 679 ((W)heap [k])->active = k + 1;
680
662 k = j; 681 k = c;
663 } 682 }
664 683
665 heap [k] = w; 684 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
667} 686}
… …
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 793 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 794}
776 795
777/*****************************************************************************/ 796/*****************************************************************************/
778 797
779static ev_child *childs [EV_PID_HASHSIZE]; 798static WL childs [EV_PID_HASHSIZE];
780 799
781#ifndef _WIN32 800#ifndef _WIN32
782 801
783static ev_signal childev; 802static ev_signal childev;
784 803
… …
1196void inline_size 1215void inline_size
1197timers_reify (EV_P) 1216timers_reify (EV_P)
1198{ 1217{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1218 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1219 {
1201 ev_timer *w = timers [0]; 1220 ev_timer *w = (ev_timer *)timers [0];
1202 1221
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1223
1205 /* first reschedule or stop timer */ 1224 /* first reschedule or stop timer */
1206 if (w->repeat) 1225 if (w->repeat)
… …
1209 1228
1210 ((WT)w)->at += w->repeat; 1229 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1230 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1231 ((WT)w)->at = mn_now;
1213 1232
1214 downheap ((WT *)timers, timercnt, 0); 1233 downheap (timers, timercnt, 0);
1215 } 1234 }
1216 else 1235 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1237
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1243void inline_size
1225periodics_reify (EV_P) 1244periodics_reify (EV_P)
1226{ 1245{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1247 {
1229 ev_periodic *w = periodics [0]; 1248 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1249
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1251
1233 /* first reschedule or stop timer */ 1252 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1253 if (w->reschedule_cb)
1235 { 1254 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1257 downheap (periodics, periodiccnt, 0);
1239 } 1258 }
1240 else if (w->interval) 1259 else if (w->interval)
1241 { 1260 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1245 } 1265 }
1246 else 1266 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1268
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1276 int i;
1257 1277
1258 /* adjust periodics after time jump */ 1278 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1279 for (i = 0; i < periodiccnt; ++i)
1260 { 1280 {
1261 ev_periodic *w = periodics [i]; 1281 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1282
1263 if (w->reschedule_cb) 1283 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1285 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1287 }
1268 1288
1269 /* now rebuild the heap */ 1289 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1290 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1291 downheap (periodics, periodiccnt, i);
1272} 1292}
1273#endif 1293#endif
1274 1294
1275#if EV_IDLE_ENABLE 1295#if EV_IDLE_ENABLE
1276void inline_size 1296void inline_size
… …
1293 } 1313 }
1294 } 1314 }
1295} 1315}
1296#endif 1316#endif
1297 1317
1298int inline_size 1318void inline_speed
1299time_update_monotonic (EV_P) 1319time_update (EV_P_ ev_tstamp max_block)
1300{ 1320{
1321 int i;
1322
1323#if EV_USE_MONOTONIC
1324 if (expect_true (have_monotonic))
1325 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1301 mn_now = get_clock (); 1328 mn_now = get_clock ();
1302 1329
1330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1331 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1332 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1333 {
1305 ev_rt_now = rtmn_diff + mn_now; 1334 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1335 return;
1307 } 1336 }
1308 else 1337
1309 {
1310 now_floor = mn_now; 1338 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1339 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1340
1316void inline_size 1341 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1342 * on the choice of "4": one iteration isn't enough,
1318{ 1343 * in case we get preempted during the calls to
1319 int i; 1344 * ev_time and get_clock. a second call is almost guaranteed
1320 1345 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1346 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1347 * in the unlikely event of having been preempted here.
1323 { 1348 */
1324 if (time_update_monotonic (EV_A)) 1349 for (i = 4; --i; )
1325 { 1350 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1351 rtmn_diff = ev_rt_now - mn_now;
1339 1352
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1354 return; /* all is well */
1342 1355
1343 ev_rt_now = ev_time (); 1356 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1357 mn_now = get_clock ();
1345 now_floor = mn_now; 1358 now_floor = mn_now;
1346 } 1359 }
1347 1360
1348# if EV_PERIODIC_ENABLE 1361# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1350# endif 1363# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1364 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1365 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1366 }
1355 else 1367 else
1356#endif 1368#endif
1357 { 1369 {
1358 ev_rt_now = ev_time (); 1370 ev_rt_now = ev_time ();
1359 1371
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1372 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1373 {
1362#if EV_PERIODIC_ENABLE 1374#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1375 periodics_reschedule (EV_A);
1364#endif 1376#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1377 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1380 }
1370 1381
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1442 else 1453 else
1443 { 1454 {
1444 /* update time to cancel out callback processing overhead */ 1455 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1456 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1457
1455 block = MAX_BLOCKTIME; 1458 block = MAX_BLOCKTIME;
1456 1459
1457 if (timercnt) 1460 if (timercnt)
1458 { 1461 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1474 if (expect_false (block < 0.)) block = 0.;
1472 } 1475 }
1473 1476
1474 ++loop_count; 1477 ++loop_count;
1475 backend_poll (EV_A_ block); 1478 backend_poll (EV_A_ block);
1479
1480 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block);
1476 } 1482 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1483
1481 /* queue pending timers and reschedule them */ 1484 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1485 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1486#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1487 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1549ev_clear_pending (EV_P_ void *w)
1547{ 1550{
1548 W w_ = (W)w; 1551 W w_ = (W)w;
1549 int pending = w_->pending; 1552 int pending = w_->pending;
1550 1553
1551 if (!pending) 1554 if (expect_true (pending))
1555 {
1556 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1557 w_->pending = 0;
1558 p->w = 0;
1559 return p->events;
1560 }
1561 else
1552 return 0; 1562 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1563}
1560 1564
1561void inline_size 1565void inline_size
1562pri_adjust (EV_P_ W w) 1566pri_adjust (EV_P_ W w)
1563{ 1567{
… …
1594 1598
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1599 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1600
1597 ev_start (EV_A_ (W)w, 1); 1601 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1603 wlist_add (&anfds[fd].head, (WL)w);
1600 1604
1601 fd_change (EV_A_ fd); 1605 fd_change (EV_A_ fd, w->events & EV_IOFDSET);
1606 w->events &= ~ EV_IOFDSET;
1602} 1607}
1603 1608
1604void noinline 1609void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1610ev_io_stop (EV_P_ ev_io *w)
1606{ 1611{
… …
1608 if (expect_false (!ev_is_active (w))) 1613 if (expect_false (!ev_is_active (w)))
1609 return; 1614 return;
1610 1615
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1616 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1617
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1618 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1619 ev_stop (EV_A_ (W)w);
1615 1620
1616 fd_change (EV_A_ w->fd); 1621 fd_change (EV_A_ w->fd, 0);
1617} 1622}
1618 1623
1619void noinline 1624void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1625ev_timer_start (EV_P_ ev_timer *w)
1621{ 1626{
… …
1625 ((WT)w)->at += mn_now; 1630 ((WT)w)->at += mn_now;
1626 1631
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1632 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1633
1629 ev_start (EV_A_ (W)w, ++timercnt); 1634 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1635 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1636 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1637 upheap (timers, timercnt - 1);
1633 1638
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1639 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1640}
1636 1641
1637void noinline 1642void noinline
… …
1639{ 1644{
1640 clear_pending (EV_A_ (W)w); 1645 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1646 if (expect_false (!ev_is_active (w)))
1642 return; 1647 return;
1643 1648
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1649 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1650
1646 { 1651 {
1647 int active = ((W)w)->active; 1652 int active = ((W)w)->active;
1648 1653
1649 if (expect_true (--active < --timercnt)) 1654 if (expect_true (--active < --timercnt))
1650 { 1655 {
1651 timers [active] = timers [timercnt]; 1656 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1657 adjustheap (timers, timercnt, active);
1653 } 1658 }
1654 } 1659 }
1655 1660
1656 ((WT)w)->at -= mn_now; 1661 ((WT)w)->at -= mn_now;
1657 1662
… …
1664 if (ev_is_active (w)) 1669 if (ev_is_active (w))
1665 { 1670 {
1666 if (w->repeat) 1671 if (w->repeat)
1667 { 1672 {
1668 ((WT)w)->at = mn_now + w->repeat; 1673 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1674 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1675 }
1671 else 1676 else
1672 ev_timer_stop (EV_A_ w); 1677 ev_timer_stop (EV_A_ w);
1673 } 1678 }
1674 else if (w->repeat) 1679 else if (w->repeat)
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1694 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1695 else if (w->interval)
1691 { 1696 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1697 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1693 /* this formula differs from the one in periodic_reify because we do not always round up */ 1698 /* this formula differs from the one in periodic_reify because we do not always round up */
1694 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1699 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1700 }
1701 else
1702 ((WT)w)->at = w->offset;
1696 1703
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1704 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1705 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1706 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1707 upheap (periodics, periodiccnt - 1);
1701 1708
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1709 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1710}
1704 1711
1705void noinline 1712void noinline
… …
1707{ 1714{
1708 clear_pending (EV_A_ (W)w); 1715 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1716 if (expect_false (!ev_is_active (w)))
1710 return; 1717 return;
1711 1718
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1719 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1720
1714 { 1721 {
1715 int active = ((W)w)->active; 1722 int active = ((W)w)->active;
1716 1723
1717 if (expect_true (--active < --periodiccnt)) 1724 if (expect_true (--active < --periodiccnt))
1718 { 1725 {
1719 periodics [active] = periodics [periodiccnt]; 1726 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1727 adjustheap (periodics, periodiccnt, active);
1721 } 1728 }
1722 } 1729 }
1723 1730
1724 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1725} 1732}
… …
1746 if (expect_false (ev_is_active (w))) 1753 if (expect_false (ev_is_active (w)))
1747 return; 1754 return;
1748 1755
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1756 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1757
1758 {
1759#ifndef _WIN32
1760 sigset_t full, prev;
1761 sigfillset (&full);
1762 sigprocmask (SIG_SETMASK, &full, &prev);
1763#endif
1764
1765 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1766
1767#ifndef _WIN32
1768 sigprocmask (SIG_SETMASK, &prev, 0);
1769#endif
1770 }
1771
1751 ev_start (EV_A_ (W)w, 1); 1772 ev_start (EV_A_ (W)w, 1);
1752 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1753 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1774
1755 if (!((WL)w)->next) 1775 if (!((WL)w)->next)
1756 { 1776 {
1757#if _WIN32 1777#if _WIN32
1758 signal (w->signum, sighandler); 1778 signal (w->signum, sighandler);
… …
1771{ 1791{
1772 clear_pending (EV_A_ (W)w); 1792 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1793 if (expect_false (!ev_is_active (w)))
1774 return; 1794 return;
1775 1795
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1796 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1797 ev_stop (EV_A_ (W)w);
1778 1798
1779 if (!signals [w->signum - 1].head) 1799 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1800 signal (w->signum, SIG_DFL);
1781} 1801}
… …
1788#endif 1808#endif
1789 if (expect_false (ev_is_active (w))) 1809 if (expect_false (ev_is_active (w)))
1790 return; 1810 return;
1791 1811
1792 ev_start (EV_A_ (W)w, 1); 1812 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1813 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1814}
1795 1815
1796void 1816void
1797ev_child_stop (EV_P_ ev_child *w) 1817ev_child_stop (EV_P_ ev_child *w)
1798{ 1818{
1799 clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1801 return; 1821 return;
1802 1822
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1823 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1824 ev_stop (EV_A_ (W)w);
1805} 1825}
1806 1826
1807#if EV_STAT_ENABLE 1827#if EV_STAT_ENABLE
1808 1828

Diff Legend

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