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

Comparing libev/ev.c (file contents):
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC vs.
Revision 1.183 by root, Wed Dec 12 05:11:56 2007 UTC

… …
221/* 221/*
222 * This is used to avoid floating point rounding problems. 222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 224 * to ensure progress, time-wise, even when rounding
225 * errors are against us. 225 * errors are against us.
226 * This value is good at least till the year 4000 226 * This value is good at least till the year 4000.
227 * and intervals up to 20 years.
228 * Better solutions welcome. 227 * Better solutions welcome.
229 */ 228 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231 230
232#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) */
… …
477 pendings [pri][w_->pending - 1].w = w_; 476 pendings [pri][w_->pending - 1].w = w_;
478 pendings [pri][w_->pending - 1].events = revents; 477 pendings [pri][w_->pending - 1].events = revents;
479 } 478 }
480} 479}
481 480
482void inline_size 481void inline_speed
483queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
484{ 483{
485 int i; 484 int i;
486 485
487 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
558 557
559 fdchangecnt = 0; 558 fdchangecnt = 0;
560} 559}
561 560
562void inline_size 561void inline_size
563fd_change (EV_P_ int fd) 562fd_change (EV_P_ int fd, int flags)
564{ 563{
565 if (expect_false (anfds [fd].reify)) 564 unsigned char reify = anfds [fd].reify;
566 return;
567
568 anfds [fd].reify = 1; 565 anfds [fd].reify |= flags | 1;
569 566
567 if (expect_true (!reify))
568 {
570 ++fdchangecnt; 569 ++fdchangecnt;
571 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
572 fdchanges [fdchangecnt - 1] = fd; 571 fdchanges [fdchangecnt - 1] = fd;
572 }
573} 573}
574 574
575void inline_speed 575void inline_speed
576fd_kill (EV_P_ int fd) 576fd_kill (EV_P_ int fd)
577{ 577{
… …
628 628
629 for (fd = 0; fd < anfdmax; ++fd) 629 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 630 if (anfds [fd].events)
631 { 631 {
632 anfds [fd].events = 0; 632 anfds [fd].events = 0;
633 fd_change (EV_A_ fd); 633 fd_change (EV_A_ fd, EV_IOFDSET);
634 } 634 }
635} 635}
636 636
637/*****************************************************************************/ 637/*****************************************************************************/
638 638
639void inline_speed 639void inline_speed
640upheap (WT *heap, int k) 640upheap (WT *heap, int k)
641{ 641{
642 WT w = heap [k]; 642 WT w = heap [k];
643 643
644 while (k && heap [k >> 1]->at > w->at) 644 while (k)
645 { 645 {
646 int p = (k - 1) >> 1;
647
648 if (heap [p]->at <= w->at)
649 break;
650
646 heap [k] = heap [k >> 1]; 651 heap [k] = heap [p];
647 ((W)heap [k])->active = k + 1; 652 ((W)heap [k])->active = k + 1;
648 k >>= 1; 653 k = p;
649 } 654 }
650 655
651 heap [k] = w; 656 heap [k] = w;
652 ((W)heap [k])->active = k + 1; 657 ((W)heap [k])->active = k + 1;
653
654} 658}
655 659
656void inline_speed 660void inline_speed
657downheap (WT *heap, int N, int k) 661downheap (WT *heap, int N, int k)
658{ 662{
659 WT w = heap [k]; 663 WT w = heap [k];
660 664
661 while (k < (N >> 1)) 665 for (;;)
662 { 666 {
663 int j = k << 1; 667 int c = (k << 1) + 1;
664 668
665 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 669 if (c >= N)
666 ++j;
667
668 if (w->at <= heap [j]->at)
669 break; 670 break;
670 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
671 heap [k] = heap [j]; 678 heap [k] = heap [c];
672 ((W)heap [k])->active = k + 1; 679 ((W)heap [k])->active = k + 1;
680
673 k = j; 681 k = c;
674 } 682 }
675 683
676 heap [k] = w; 684 heap [k] = w;
677 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
678} 686}
… …
785 ev_unref (EV_A); /* child watcher should not keep loop alive */ 793 ev_unref (EV_A); /* child watcher should not keep loop alive */
786} 794}
787 795
788/*****************************************************************************/ 796/*****************************************************************************/
789 797
790static ev_child *childs [EV_PID_HASHSIZE]; 798static WL childs [EV_PID_HASHSIZE];
791 799
792#ifndef _WIN32 800#ifndef _WIN32
793 801
794static ev_signal childev; 802static ev_signal childev;
795 803
… …
1207void inline_size 1215void inline_size
1208timers_reify (EV_P) 1216timers_reify (EV_P)
1209{ 1217{
1210 while (timercnt && ((WT)timers [0])->at <= mn_now) 1218 while (timercnt && ((WT)timers [0])->at <= mn_now)
1211 { 1219 {
1212 ev_timer *w = timers [0]; 1220 ev_timer *w = (ev_timer *)timers [0];
1213 1221
1214 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1215 1223
1216 /* first reschedule or stop timer */ 1224 /* first reschedule or stop timer */
1217 if (w->repeat) 1225 if (w->repeat)
… …
1220 1228
1221 ((WT)w)->at += w->repeat; 1229 ((WT)w)->at += w->repeat;
1222 if (((WT)w)->at < mn_now) 1230 if (((WT)w)->at < mn_now)
1223 ((WT)w)->at = mn_now; 1231 ((WT)w)->at = mn_now;
1224 1232
1225 downheap ((WT *)timers, timercnt, 0); 1233 downheap (timers, timercnt, 0);
1226 } 1234 }
1227 else 1235 else
1228 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1229 1237
1230 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1235void inline_size 1243void inline_size
1236periodics_reify (EV_P) 1244periodics_reify (EV_P)
1237{ 1245{
1238 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1239 { 1247 {
1240 ev_periodic *w = periodics [0]; 1248 ev_periodic *w = (ev_periodic *)periodics [0];
1241 1249
1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1243 1251
1244 /* first reschedule or stop timer */ 1252 /* first reschedule or stop timer */
1245 if (w->reschedule_cb) 1253 if (w->reschedule_cb)
1246 { 1254 {
1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1248 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));
1249 downheap ((WT *)periodics, periodiccnt, 0); 1257 downheap (periodics, periodiccnt, 0);
1250 } 1258 }
1251 else if (w->interval) 1259 else if (w->interval)
1252 { 1260 {
1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / 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;
1254 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));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1256 } 1265 }
1257 else 1266 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1268
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1276 int i;
1268 1277
1269 /* adjust periodics after time jump */ 1278 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1279 for (i = 0; i < periodiccnt; ++i)
1271 { 1280 {
1272 ev_periodic *w = periodics [i]; 1281 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1282
1274 if (w->reschedule_cb) 1283 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1285 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1287 }
1279 1288
1280 /* now rebuild the heap */ 1289 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1290 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1291 downheap (periodics, periodiccnt, i);
1283} 1292}
1284#endif 1293#endif
1285 1294
1286#if EV_IDLE_ENABLE 1295#if EV_IDLE_ENABLE
1287void inline_size 1296void inline_size
… …
1304 } 1313 }
1305 } 1314 }
1306} 1315}
1307#endif 1316#endif
1308 1317
1309int inline_size 1318void inline_speed
1310time_update_monotonic (EV_P) 1319time_update (EV_P_ ev_tstamp max_block)
1311{ 1320{
1321 int i;
1322
1323#if EV_USE_MONOTONIC
1324 if (expect_true (have_monotonic))
1325 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1312 mn_now = get_clock (); 1328 mn_now = get_clock ();
1313 1329
1330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1331 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1332 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1333 {
1316 ev_rt_now = rtmn_diff + mn_now; 1334 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1335 return;
1318 } 1336 }
1319 else 1337
1320 {
1321 now_floor = mn_now; 1338 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1339 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1340
1327void inline_size 1341 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1342 * on the choice of "4": one iteration isn't enough,
1329{ 1343 * in case we get preempted during the calls to
1330 int i; 1344 * ev_time and get_clock. a second call is almost guaranteed
1331 1345 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1346 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1347 * in the unlikely event of having been preempted here.
1334 { 1348 */
1335 if (time_update_monotonic (EV_A)) 1349 for (i = 4; --i; )
1336 { 1350 {
1337 ev_tstamp odiff = rtmn_diff;
1338
1339 /* loop a few times, before making important decisions.
1340 * on the choice of "4": one iteration isn't enough,
1341 * in case we get preempted during the calls to
1342 * ev_time and get_clock. a second call is almost guaranteed
1343 * to succeed in that case, though. and looping a few more times
1344 * doesn't hurt either as we only do this on time-jumps or
1345 * in the unlikely event of having been preempted here.
1346 */
1347 for (i = 4; --i; )
1348 {
1349 rtmn_diff = ev_rt_now - mn_now; 1351 rtmn_diff = ev_rt_now - mn_now;
1350 1352
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1354 return; /* all is well */
1353 1355
1354 ev_rt_now = ev_time (); 1356 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1357 mn_now = get_clock ();
1356 now_floor = mn_now; 1358 now_floor = mn_now;
1357 } 1359 }
1358 1360
1359# if EV_PERIODIC_ENABLE 1361# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1361# endif 1363# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1364 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1365 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1366 }
1366 else 1367 else
1367#endif 1368#endif
1368 { 1369 {
1369 ev_rt_now = ev_time (); 1370 ev_rt_now = ev_time ();
1370 1371
1371 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))
1372 { 1373 {
1373#if EV_PERIODIC_ENABLE 1374#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1375 periodics_reschedule (EV_A);
1375#endif 1376#endif
1376
1377 /* 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 */
1378 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1380 } 1380 }
1381 1381
… …
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1452 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1453 else 1453 else
1454 { 1454 {
1455 /* update time to cancel out callback processing overhead */ 1455 /* update time to cancel out callback processing overhead */
1456#if EV_USE_MONOTONIC
1457 if (expect_true (have_monotonic))
1458 time_update_monotonic (EV_A); 1456 time_update (EV_A_ 1e100);
1459 else
1460#endif
1461 {
1462 ev_rt_now = ev_time ();
1463 mn_now = ev_rt_now;
1464 }
1465 1457
1466 block = MAX_BLOCKTIME; 1458 block = MAX_BLOCKTIME;
1467 1459
1468 if (timercnt) 1460 if (timercnt)
1469 { 1461 {
… …
1482 if (expect_false (block < 0.)) block = 0.; 1474 if (expect_false (block < 0.)) block = 0.;
1483 } 1475 }
1484 1476
1485 ++loop_count; 1477 ++loop_count;
1486 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);
1487 } 1482 }
1488
1489 /* update ev_rt_now, do magic */
1490 time_update (EV_A);
1491 1483
1492 /* queue pending timers and reschedule them */ 1484 /* queue pending timers and reschedule them */
1493 timers_reify (EV_A); /* relative timers called last */ 1485 timers_reify (EV_A); /* relative timers called last */
1494#if EV_PERIODIC_ENABLE 1486#if EV_PERIODIC_ENABLE
1495 periodics_reify (EV_A); /* absolute timers called first */ 1487 periodics_reify (EV_A); /* absolute timers called first */
… …
1606 1598
1607 assert (("ev_io_start called with negative fd", fd >= 0)); 1599 assert (("ev_io_start called with negative fd", fd >= 0));
1608 1600
1609 ev_start (EV_A_ (W)w, 1); 1601 ev_start (EV_A_ (W)w, 1);
1610 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1611 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1603 wlist_add (&anfds[fd].head, (WL)w);
1612 1604
1613 fd_change (EV_A_ fd); 1605 fd_change (EV_A_ fd, w->events & EV_IOFDSET);
1606 w->events &= ~ EV_IOFDSET;
1614} 1607}
1615 1608
1616void noinline 1609void noinline
1617ev_io_stop (EV_P_ ev_io *w) 1610ev_io_stop (EV_P_ ev_io *w)
1618{ 1611{
… …
1620 if (expect_false (!ev_is_active (w))) 1613 if (expect_false (!ev_is_active (w)))
1621 return; 1614 return;
1622 1615
1623 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));
1624 1617
1625 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1618 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 1619 ev_stop (EV_A_ (W)w);
1627 1620
1628 fd_change (EV_A_ w->fd); 1621 fd_change (EV_A_ w->fd, 0);
1629} 1622}
1630 1623
1631void noinline 1624void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 1625ev_timer_start (EV_P_ ev_timer *w)
1633{ 1626{
… …
1637 ((WT)w)->at += mn_now; 1630 ((WT)w)->at += mn_now;
1638 1631
1639 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.));
1640 1633
1641 ev_start (EV_A_ (W)w, ++timercnt); 1634 ev_start (EV_A_ (W)w, ++timercnt);
1642 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1635 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1643 timers [timercnt - 1] = w; 1636 timers [timercnt - 1] = (WT)w;
1644 upheap ((WT *)timers, timercnt - 1); 1637 upheap (timers, timercnt - 1);
1645 1638
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1639 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1647} 1640}
1648 1641
1649void noinline 1642void noinline
… …
1651{ 1644{
1652 clear_pending (EV_A_ (W)w); 1645 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1646 if (expect_false (!ev_is_active (w)))
1654 return; 1647 return;
1655 1648
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1649 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1657 1650
1658 { 1651 {
1659 int active = ((W)w)->active; 1652 int active = ((W)w)->active;
1660 1653
1661 if (expect_true (--active < --timercnt)) 1654 if (expect_true (--active < --timercnt))
1662 { 1655 {
1663 timers [active] = timers [timercnt]; 1656 timers [active] = timers [timercnt];
1664 adjustheap ((WT *)timers, timercnt, active); 1657 adjustheap (timers, timercnt, active);
1665 } 1658 }
1666 } 1659 }
1667 1660
1668 ((WT)w)->at -= mn_now; 1661 ((WT)w)->at -= mn_now;
1669 1662
… …
1676 if (ev_is_active (w)) 1669 if (ev_is_active (w))
1677 { 1670 {
1678 if (w->repeat) 1671 if (w->repeat)
1679 { 1672 {
1680 ((WT)w)->at = mn_now + w->repeat; 1673 ((WT)w)->at = mn_now + w->repeat;
1681 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1674 adjustheap (timers, timercnt, ((W)w)->active - 1);
1682 } 1675 }
1683 else 1676 else
1684 ev_timer_stop (EV_A_ w); 1677 ev_timer_stop (EV_A_ w);
1685 } 1678 }
1686 else if (w->repeat) 1679 else if (w->repeat)
… …
1707 } 1700 }
1708 else 1701 else
1709 ((WT)w)->at = w->offset; 1702 ((WT)w)->at = w->offset;
1710 1703
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 1704 ev_start (EV_A_ (W)w, ++periodiccnt);
1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1705 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1713 periodics [periodiccnt - 1] = w; 1706 periodics [periodiccnt - 1] = (WT)w;
1714 upheap ((WT *)periodics, periodiccnt - 1); 1707 upheap (periodics, periodiccnt - 1);
1715 1708
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1709 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1717} 1710}
1718 1711
1719void noinline 1712void noinline
… …
1721{ 1714{
1722 clear_pending (EV_A_ (W)w); 1715 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 1716 if (expect_false (!ev_is_active (w)))
1724 return; 1717 return;
1725 1718
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1719 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1727 1720
1728 { 1721 {
1729 int active = ((W)w)->active; 1722 int active = ((W)w)->active;
1730 1723
1731 if (expect_true (--active < --periodiccnt)) 1724 if (expect_true (--active < --periodiccnt))
1732 { 1725 {
1733 periodics [active] = periodics [periodiccnt]; 1726 periodics [active] = periodics [periodiccnt];
1734 adjustheap ((WT *)periodics, periodiccnt, active); 1727 adjustheap (periodics, periodiccnt, active);
1735 } 1728 }
1736 } 1729 }
1737 1730
1738 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1739} 1732}
… …
1760 if (expect_false (ev_is_active (w))) 1753 if (expect_false (ev_is_active (w)))
1761 return; 1754 return;
1762 1755
1763 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));
1764 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
1765 ev_start (EV_A_ (W)w, 1); 1772 ev_start (EV_A_ (W)w, 1);
1766 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1767 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_add (&signals [w->signum - 1].head, (WL)w);
1768 1774
1769 if (!((WL)w)->next) 1775 if (!((WL)w)->next)
1770 { 1776 {
1771#if _WIN32 1777#if _WIN32
1772 signal (w->signum, sighandler); 1778 signal (w->signum, sighandler);
… …
1785{ 1791{
1786 clear_pending (EV_A_ (W)w); 1792 clear_pending (EV_A_ (W)w);
1787 if (expect_false (!ev_is_active (w))) 1793 if (expect_false (!ev_is_active (w)))
1788 return; 1794 return;
1789 1795
1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1796 wlist_del (&signals [w->signum - 1].head, (WL)w);
1791 ev_stop (EV_A_ (W)w); 1797 ev_stop (EV_A_ (W)w);
1792 1798
1793 if (!signals [w->signum - 1].head) 1799 if (!signals [w->signum - 1].head)
1794 signal (w->signum, SIG_DFL); 1800 signal (w->signum, SIG_DFL);
1795} 1801}
… …
1802#endif 1808#endif
1803 if (expect_false (ev_is_active (w))) 1809 if (expect_false (ev_is_active (w)))
1804 return; 1810 return;
1805 1811
1806 ev_start (EV_A_ (W)w, 1); 1812 ev_start (EV_A_ (W)w, 1);
1807 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1813 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1808} 1814}
1809 1815
1810void 1816void
1811ev_child_stop (EV_P_ ev_child *w) 1817ev_child_stop (EV_P_ ev_child *w)
1812{ 1818{
1813 clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1814 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1815 return; 1821 return;
1816 1822
1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1823 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1818 ev_stop (EV_A_ (W)w); 1824 ev_stop (EV_A_ (W)w);
1819} 1825}
1820 1826
1821#if EV_STAT_ENABLE 1827#if EV_STAT_ENABLE
1822 1828

Diff Legend

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