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

Comparing libev/ev.c (file contents):
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC vs.
Revision 1.181 by root, Wed Dec 12 00:17:08 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
… …
418 } 428 }
419 429
420 return ncur; 430 return ncur;
421} 431}
422 432
423inline_speed void * 433static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt) 434array_realloc (int elem, void *base, int *cur, int cnt)
425{ 435{
426 *cur = array_nextsize (elem, *cur, cnt); 436 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur); 437 return ev_realloc (base, elem * *cur);
428} 438}
… …
453 463
454void noinline 464void noinline
455ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
456{ 466{
457 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
458 469
459 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
460 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
461 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
462 return;
463 } 478 }
464
465 w_->pending = ++pendingcnt [ABSPRI (w_)];
466 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
467 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
468 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
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)
… …
628void inline_speed 638void inline_speed
629upheap (WT *heap, int k) 639upheap (WT *heap, int k)
630{ 640{
631 WT w = heap [k]; 641 WT w = heap [k];
632 642
633 while (k && heap [k >> 1]->at > w->at) 643 while (k)
634 { 644 {
645 int p = (k - 1) >> 1;
646
647 if (heap [p]->at <= w->at)
648 break;
649
635 heap [k] = heap [k >> 1]; 650 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 651 ((W)heap [k])->active = k + 1;
637 k >>= 1; 652 k = p;
638 } 653 }
639 654
640 heap [k] = w; 655 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 656 ((W)heap [k])->active = k + 1;
642
643} 657}
644 658
645void inline_speed 659void inline_speed
646downheap (WT *heap, int N, int k) 660downheap (WT *heap, int N, int k)
647{ 661{
648 WT w = heap [k]; 662 WT w = heap [k];
649 663
650 while (k < (N >> 1)) 664 for (;;)
651 { 665 {
652 int j = k << 1; 666 int c = (k << 1) + 1;
653 667
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 668 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 669 break;
659 670
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0;
673
674 if (w->at <= heap [c]->at)
675 break;
676
660 heap [k] = heap [j]; 677 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 678 ((W)heap [k])->active = k + 1;
679
662 k = j; 680 k = c;
663 } 681 }
664 682
665 heap [k] = w; 683 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 684 ((W)heap [k])->active = k + 1;
667} 685}
… …
749 for (signum = signalmax; signum--; ) 767 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig) 768 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1); 769 ev_feed_signal_event (EV_A_ signum + 1);
752} 770}
753 771
754void inline_size 772void inline_speed
755fd_intern (int fd) 773fd_intern (int fd)
756{ 774{
757#ifdef _WIN32 775#ifdef _WIN32
758 int arg = 1; 776 int arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1196void inline_size 1214void inline_size
1197timers_reify (EV_P) 1215timers_reify (EV_P)
1198{ 1216{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1218 {
1201 ev_timer *w = timers [0]; 1219 ev_timer *w = (ev_timer *)timers [0];
1202 1220
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1222
1205 /* first reschedule or stop timer */ 1223 /* first reschedule or stop timer */
1206 if (w->repeat) 1224 if (w->repeat)
… …
1209 1227
1210 ((WT)w)->at += w->repeat; 1228 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1229 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1230 ((WT)w)->at = mn_now;
1213 1231
1214 downheap ((WT *)timers, timercnt, 0); 1232 downheap (timers, timercnt, 0);
1215 } 1233 }
1216 else 1234 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1236
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1242void inline_size
1225periodics_reify (EV_P) 1243periodics_reify (EV_P)
1226{ 1244{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1246 {
1229 ev_periodic *w = periodics [0]; 1247 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1248
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1250
1233 /* first reschedule or stop timer */ 1251 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1252 if (w->reschedule_cb)
1235 { 1253 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1254 ((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)); 1255 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1256 downheap (periodics, periodiccnt, 0);
1239 } 1257 }
1240 else if (w->interval) 1258 else if (w->interval)
1241 { 1259 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 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)); 1262 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); 1263 downheap (periodics, periodiccnt, 0);
1245 } 1264 }
1246 else 1265 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1267
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1275 int i;
1257 1276
1258 /* adjust periodics after time jump */ 1277 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1278 for (i = 0; i < periodiccnt; ++i)
1260 { 1279 {
1261 ev_periodic *w = periodics [i]; 1280 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1281
1263 if (w->reschedule_cb) 1282 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1284 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1285 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1286 }
1268 1287
1269 /* now rebuild the heap */ 1288 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1289 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1290 downheap (periodics, periodiccnt, i);
1272} 1291}
1273#endif 1292#endif
1274 1293
1275#if EV_IDLE_ENABLE 1294#if EV_IDLE_ENABLE
1276void inline_size 1295void inline_size
… …
1293 } 1312 }
1294 } 1313 }
1295} 1314}
1296#endif 1315#endif
1297 1316
1298int inline_size 1317void inline_speed
1299time_update_monotonic (EV_P) 1318time_update (EV_P_ ev_tstamp max_block)
1300{ 1319{
1320 int i;
1321
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1301 mn_now = get_clock (); 1327 mn_now = get_clock ();
1302 1328
1329 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1330 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1331 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1332 {
1305 ev_rt_now = rtmn_diff + mn_now; 1333 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1334 return;
1307 } 1335 }
1308 else 1336
1309 {
1310 now_floor = mn_now; 1337 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1338 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1339
1316void inline_size 1340 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1341 * on the choice of "4": one iteration isn't enough,
1318{ 1342 * in case we get preempted during the calls to
1319 int i; 1343 * ev_time and get_clock. a second call is almost guaranteed
1320 1344 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1345 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1346 * in the unlikely event of having been preempted here.
1323 { 1347 */
1324 if (time_update_monotonic (EV_A)) 1348 for (i = 4; --i; )
1325 { 1349 {
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; 1350 rtmn_diff = ev_rt_now - mn_now;
1339 1351
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1353 return; /* all is well */
1342 1354
1343 ev_rt_now = ev_time (); 1355 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1356 mn_now = get_clock ();
1345 now_floor = mn_now; 1357 now_floor = mn_now;
1346 } 1358 }
1347 1359
1348# if EV_PERIODIC_ENABLE 1360# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1361 periodics_reschedule (EV_A);
1350# endif 1362# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1363 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1364 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1365 }
1355 else 1366 else
1356#endif 1367#endif
1357 { 1368 {
1358 ev_rt_now = ev_time (); 1369 ev_rt_now = ev_time ();
1359 1370
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1371 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1372 {
1362#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1364#endif 1375#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1376 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1379 }
1370 1380
… …
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1425 call_pending (EV_A);
1416 } 1426 }
1417#endif 1427#endif
1418 1428
1419 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1421 { 1431 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1433 call_pending (EV_A);
1424 } 1434 }
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1442 else 1452 else
1443 { 1453 {
1444 /* update time to cancel out callback processing overhead */ 1454 /* 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); 1455 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1456
1455 block = MAX_BLOCKTIME; 1457 block = MAX_BLOCKTIME;
1456 1458
1457 if (timercnt) 1459 if (timercnt)
1458 { 1460 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1473 if (expect_false (block < 0.)) block = 0.;
1472 } 1474 }
1473 1475
1474 ++loop_count; 1476 ++loop_count;
1475 backend_poll (EV_A_ block); 1477 backend_poll (EV_A_ block);
1478
1479 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block);
1476 } 1481 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1482
1481 /* queue pending timers and reschedule them */ 1483 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1484 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1485#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1486 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1548ev_clear_pending (EV_P_ void *w)
1547{ 1549{
1548 W w_ = (W)w; 1550 W w_ = (W)w;
1549 int pending = w_->pending; 1551 int pending = w_->pending;
1550 1552
1551 if (!pending) 1553 if (expect_true (pending))
1554 {
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 w_->pending = 0;
1557 p->w = 0;
1558 return p->events;
1559 }
1560 else
1552 return 0; 1561 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} 1562}
1560 1563
1561void inline_size 1564void inline_size
1562pri_adjust (EV_P_ W w) 1565pri_adjust (EV_P_ W w)
1563{ 1566{
… …
1582 w->active = 0; 1585 w->active = 0;
1583} 1586}
1584 1587
1585/*****************************************************************************/ 1588/*****************************************************************************/
1586 1589
1587void 1590void noinline
1588ev_io_start (EV_P_ ev_io *w) 1591ev_io_start (EV_P_ ev_io *w)
1589{ 1592{
1590 int fd = w->fd; 1593 int fd = w->fd;
1591 1594
1592 if (expect_false (ev_is_active (w))) 1595 if (expect_false (ev_is_active (w)))
… …
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1602 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1600 1603
1601 fd_change (EV_A_ fd); 1604 fd_change (EV_A_ fd);
1602} 1605}
1603 1606
1604void 1607void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1608ev_io_stop (EV_P_ ev_io *w)
1606{ 1609{
1607 clear_pending (EV_A_ (W)w); 1610 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1611 if (expect_false (!ev_is_active (w)))
1609 return; 1612 return;
… …
1614 ev_stop (EV_A_ (W)w); 1617 ev_stop (EV_A_ (W)w);
1615 1618
1616 fd_change (EV_A_ w->fd); 1619 fd_change (EV_A_ w->fd);
1617} 1620}
1618 1621
1619void 1622void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1623ev_timer_start (EV_P_ ev_timer *w)
1621{ 1624{
1622 if (expect_false (ev_is_active (w))) 1625 if (expect_false (ev_is_active (w)))
1623 return; 1626 return;
1624 1627
1625 ((WT)w)->at += mn_now; 1628 ((WT)w)->at += mn_now;
1626 1629
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1630 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1631
1629 ev_start (EV_A_ (W)w, ++timercnt); 1632 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1634 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1635 upheap (timers, timercnt - 1);
1633 1636
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1638}
1636 1639
1637void 1640void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1641ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1642{
1640 clear_pending (EV_A_ (W)w); 1643 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1644 if (expect_false (!ev_is_active (w)))
1642 return; 1645 return;
1643 1646
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1648
1646 { 1649 {
1647 int active = ((W)w)->active; 1650 int active = ((W)w)->active;
1648 1651
1649 if (expect_true (--active < --timercnt)) 1652 if (expect_true (--active < --timercnt))
1650 { 1653 {
1651 timers [active] = timers [timercnt]; 1654 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1655 adjustheap (timers, timercnt, active);
1653 } 1656 }
1654 } 1657 }
1655 1658
1656 ((WT)w)->at -= mn_now; 1659 ((WT)w)->at -= mn_now;
1657 1660
1658 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1659} 1662}
1660 1663
1661void 1664void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1665ev_timer_again (EV_P_ ev_timer *w)
1663{ 1666{
1664 if (ev_is_active (w)) 1667 if (ev_is_active (w))
1665 { 1668 {
1666 if (w->repeat) 1669 if (w->repeat)
1667 { 1670 {
1668 ((WT)w)->at = mn_now + w->repeat; 1671 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1672 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1673 }
1671 else 1674 else
1672 ev_timer_stop (EV_A_ w); 1675 ev_timer_stop (EV_A_ w);
1673 } 1676 }
1674 else if (w->repeat) 1677 else if (w->repeat)
… …
1677 ev_timer_start (EV_A_ w); 1680 ev_timer_start (EV_A_ w);
1678 } 1681 }
1679} 1682}
1680 1683
1681#if EV_PERIODIC_ENABLE 1684#if EV_PERIODIC_ENABLE
1682void 1685void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1686ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1687{
1685 if (expect_false (ev_is_active (w))) 1688 if (expect_false (ev_is_active (w)))
1686 return; 1689 return;
1687 1690
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1693 else if (w->interval)
1691 { 1694 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1695 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 */ 1696 /* 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; 1697 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1698 }
1699 else
1700 ((WT)w)->at = w->offset;
1696 1701
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1702 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1704 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1705 upheap (periodics, periodiccnt - 1);
1701 1706
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1708}
1704 1709
1705void 1710void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1711ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1712{
1708 clear_pending (EV_A_ (W)w); 1713 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1714 if (expect_false (!ev_is_active (w)))
1710 return; 1715 return;
1711 1716
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1718
1714 { 1719 {
1715 int active = ((W)w)->active; 1720 int active = ((W)w)->active;
1716 1721
1717 if (expect_true (--active < --periodiccnt)) 1722 if (expect_true (--active < --periodiccnt))
1718 { 1723 {
1719 periodics [active] = periodics [periodiccnt]; 1724 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1725 adjustheap (periodics, periodiccnt, active);
1721 } 1726 }
1722 } 1727 }
1723 1728
1724 ev_stop (EV_A_ (W)w); 1729 ev_stop (EV_A_ (W)w);
1725} 1730}
1726 1731
1727void 1732void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1733ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1734{
1730 /* TODO: use adjustheap and recalculation */ 1735 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1736 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1737 ev_periodic_start (EV_A_ w);
… …
1735 1740
1736#ifndef SA_RESTART 1741#ifndef SA_RESTART
1737# define SA_RESTART 0 1742# define SA_RESTART 0
1738#endif 1743#endif
1739 1744
1740void 1745void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1746ev_signal_start (EV_P_ ev_signal *w)
1742{ 1747{
1743#if EV_MULTIPLICITY 1748#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1749 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1750#endif
1746 if (expect_false (ev_is_active (w))) 1751 if (expect_false (ev_is_active (w)))
1747 return; 1752 return;
1748 1753
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1755
1756 {
1757#ifndef _WIN32
1758 sigset_t full, prev;
1759 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev);
1761#endif
1762
1763 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1764
1765#ifndef _WIN32
1766 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif
1768 }
1769
1751 ev_start (EV_A_ (W)w, 1); 1770 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); 1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1754 1772
1755 if (!((WL)w)->next) 1773 if (!((WL)w)->next)
1756 { 1774 {
1757#if _WIN32 1775#if _WIN32
… …
1764 sigaction (w->signum, &sa, 0); 1782 sigaction (w->signum, &sa, 0);
1765#endif 1783#endif
1766 } 1784 }
1767} 1785}
1768 1786
1769void 1787void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1788ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1789{
1772 clear_pending (EV_A_ (W)w); 1790 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1791 if (expect_false (!ev_is_active (w)))
1774 return; 1792 return;

Diff Legend

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