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.184 by root, Wed Dec 12 05:30:52 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)
… …
523 { 533 {
524 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
526 ev_io *w; 536 ev_io *w;
527 537
528 int events = 0; 538 unsigned char events = 0;
529 539
530 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
531 events |= w->events; 541 events |= (unsigned char)w->events;
532 542
533#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
534 if (events) 544 if (events)
535 { 545 {
536 unsigned long argp; 546 unsigned long argp;
537 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
538 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
539 } 549 }
540#endif 550#endif
541 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
542 anfd->reify = 0; 556 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 anfd->events = events; 557 anfd->events = events;
558
559 if (o_events != events || o_reify & EV_IOFDSET)
560 backend_modify (EV_A_ fd, o_events, events);
561 }
546 } 562 }
547 563
548 fdchangecnt = 0; 564 fdchangecnt = 0;
549} 565}
550 566
551void inline_size 567void inline_size
552fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
553{ 569{
554 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
558 572
573 if (expect_true (!reify))
574 {
559 ++fdchangecnt; 575 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
562} 579}
563 580
564void inline_speed 581void inline_speed
565fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
566{ 583{
… …
617 634
618 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 636 if (anfds [fd].events)
620 { 637 {
621 anfds [fd].events = 0; 638 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 640 }
624} 641}
625 642
626/*****************************************************************************/ 643/*****************************************************************************/
627 644
628void inline_speed 645void inline_speed
629upheap (WT *heap, int k) 646upheap (WT *heap, int k)
630{ 647{
631 WT w = heap [k]; 648 WT w = heap [k];
632 649
633 while (k && heap [k >> 1]->at > w->at) 650 while (k)
634 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
635 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
637 k >>= 1; 659 k = p;
638 } 660 }
639 661
640 heap [k] = w; 662 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
642
643} 664}
644 665
645void inline_speed 666void inline_speed
646downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
647{ 668{
648 WT w = heap [k]; 669 WT w = heap [k];
649 670
650 while (k < (N >> 1)) 671 for (;;)
651 { 672 {
652 int j = k << 1; 673 int c = (k << 1) + 1;
653 674
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 676 break;
659 677
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0;
680
681 if (w->at <= heap [c]->at)
682 break;
683
660 heap [k] = heap [j]; 684 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
662 k = j; 687 k = c;
663 } 688 }
664 689
665 heap [k] = w; 690 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
667} 692}
… …
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 800}
776 801
777/*****************************************************************************/ 802/*****************************************************************************/
778 803
779static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
780 805
781#ifndef _WIN32 806#ifndef _WIN32
782 807
783static ev_signal childev; 808static ev_signal childev;
784 809
… …
1196void inline_size 1221void inline_size
1197timers_reify (EV_P) 1222timers_reify (EV_P)
1198{ 1223{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1225 {
1201 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1202 1227
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1229
1205 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1206 if (w->repeat) 1231 if (w->repeat)
… …
1209 1234
1210 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1213 1238
1214 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1215 } 1240 }
1216 else 1241 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1243
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1249void inline_size
1225periodics_reify (EV_P) 1250periodics_reify (EV_P)
1226{ 1251{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1253 {
1229 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1255
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1257
1233 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1235 { 1260 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1261 ((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)); 1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1239 } 1264 }
1240 else if (w->interval) 1265 else if (w->interval)
1241 { 1266 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 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)); 1269 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); 1270 downheap (periodics, periodiccnt, 0);
1245 } 1271 }
1246 else 1272 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1274
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1282 int i;
1257 1283
1258 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1260 { 1286 {
1261 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1288
1263 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1291 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1293 }
1268 1294
1269 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1272} 1298}
1273#endif 1299#endif
1274 1300
1275#if EV_IDLE_ENABLE 1301#if EV_IDLE_ENABLE
1276void inline_size 1302void inline_size
… …
1293 } 1319 }
1294 } 1320 }
1295} 1321}
1296#endif 1322#endif
1297 1323
1298int inline_size 1324void inline_speed
1299time_update_monotonic (EV_P) 1325time_update (EV_P_ ev_tstamp max_block)
1300{ 1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1301 mn_now = get_clock (); 1334 mn_now = get_clock ();
1302 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1339 {
1305 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1341 return;
1307 } 1342 }
1308 else 1343
1309 {
1310 now_floor = mn_now; 1344 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1346
1316void inline_size 1347 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1318{ 1349 * in case we get preempted during the calls to
1319 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1320 1351 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1323 { 1354 */
1324 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1325 { 1356 {
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; 1357 rtmn_diff = ev_rt_now - mn_now;
1339 1358
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1360 return; /* all is well */
1342 1361
1343 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1363 mn_now = get_clock ();
1345 now_floor = mn_now; 1364 now_floor = mn_now;
1346 } 1365 }
1347 1366
1348# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1350# endif 1369# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1372 }
1355 else 1373 else
1356#endif 1374#endif
1357 { 1375 {
1358 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1359 1377
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1378 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1379 {
1362#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1364#endif 1382#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1383 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1386 }
1370 1387
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1442 else 1459 else
1443 { 1460 {
1444 /* update time to cancel out callback processing overhead */ 1461 /* 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); 1462 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1463
1455 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1456 1465
1457 if (timercnt) 1466 if (timercnt)
1458 { 1467 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1472 } 1481 }
1473 1482
1474 ++loop_count; 1483 ++loop_count;
1475 backend_poll (EV_A_ block); 1484 backend_poll (EV_A_ block);
1485
1486 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block);
1476 } 1488 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1489
1481 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1555ev_clear_pending (EV_P_ void *w)
1547{ 1556{
1548 W w_ = (W)w; 1557 W w_ = (W)w;
1549 int pending = w_->pending; 1558 int pending = w_->pending;
1550 1559
1551 if (!pending) 1560 if (expect_true (pending))
1561 {
1562 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1563 w_->pending = 0;
1564 p->w = 0;
1565 return p->events;
1566 }
1567 else
1552 return 0; 1568 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} 1569}
1560 1570
1561void inline_size 1571void inline_size
1562pri_adjust (EV_P_ W w) 1572pri_adjust (EV_P_ W w)
1563{ 1573{
… …
1594 1604
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1606
1597 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1600 1610
1601 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1602} 1613}
1603 1614
1604void noinline 1615void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1606{ 1617{
… …
1608 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1609 return; 1620 return;
1610 1621
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1623
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1615 1626
1616 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1617} 1628}
1618 1629
1619void noinline 1630void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1621{ 1632{
… …
1625 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1626 1637
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1639
1629 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1633 1644
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1646}
1636 1647
1637void noinline 1648void noinline
… …
1639{ 1650{
1640 clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1642 return; 1653 return;
1643 1654
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1656
1646 { 1657 {
1647 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1648 1659
1649 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1650 { 1661 {
1651 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1653 } 1664 }
1654 } 1665 }
1655 1666
1656 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1657 1668
… …
1664 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1665 { 1676 {
1666 if (w->repeat) 1677 if (w->repeat)
1667 { 1678 {
1668 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1681 }
1671 else 1682 else
1672 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1673 } 1684 }
1674 else if (w->repeat) 1685 else if (w->repeat)
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1701 else if (w->interval)
1691 { 1702 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1703 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 */ 1704 /* 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; 1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1696 1709
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1701 1714
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1716}
1704 1717
1705void noinline 1718void noinline
… …
1707{ 1720{
1708 clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1710 return; 1723 return;
1711 1724
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1726
1714 { 1727 {
1715 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1716 1729
1717 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1718 { 1731 {
1719 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1721 } 1734 }
1722 } 1735 }
1723 1736
1724 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1725} 1738}
… …
1746 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1747 return; 1760 return;
1748 1761
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1763
1764 {
1765#ifndef _WIN32
1766 sigset_t full, prev;
1767 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev);
1769#endif
1770
1771 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1772
1773#ifndef _WIN32
1774 sigprocmask (SIG_SETMASK, &prev, 0);
1775#endif
1776 }
1777
1751 ev_start (EV_A_ (W)w, 1); 1778 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); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1780
1755 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1756 { 1782 {
1757#if _WIN32 1783#if _WIN32
1758 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1771{ 1797{
1772 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1774 return; 1800 return;
1775 1801
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1778 1804
1779 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1781} 1807}
… …
1788#endif 1814#endif
1789 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1790 return; 1816 return;
1791 1817
1792 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1820}
1795 1821
1796void 1822void
1797ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1798{ 1824{
1799 clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1801 return; 1827 return;
1802 1828
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1805} 1831}
1806 1832
1807#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1808 1834

Diff Legend

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