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

Comparing libev/ev.c (file contents):
Revision 1.177 by root, Tue Dec 11 15:06:50 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC

… …
476 pendings [pri][w_->pending - 1].w = w_; 476 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 477 pendings [pri][w_->pending - 1].events = revents;
478 } 478 }
479} 479}
480 480
481void inline_size 481void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 483{
484 int i; 484 int i;
485 485
486 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
533 { 533 {
534 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
536 ev_io *w; 536 ev_io *w;
537 537
538 int events = 0; 538 unsigned char events = 0;
539 539
540 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)
541 events |= w->events; 541 events |= (unsigned char)w->events;
542 542
543#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
544 if (events) 544 if (events)
545 { 545 {
546 unsigned long argp; 546 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
548 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));
549 } 549 }
550#endif 550#endif
551 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
552 anfd->reify = 0; 556 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 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 }
556 } 562 }
557 563
558 fdchangecnt = 0; 564 fdchangecnt = 0;
559} 565}
560 566
561void inline_size 567void inline_size
562fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
563{ 569{
564 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
568 572
573 if (expect_true (!reify))
574 {
569 ++fdchangecnt; 575 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
572} 579}
573 580
574void inline_speed 581void inline_speed
575fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
576{ 583{
… …
627 634
628 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 636 if (anfds [fd].events)
630 { 637 {
631 anfds [fd].events = 0; 638 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 640 }
634} 641}
635 642
636/*****************************************************************************/ 643/*****************************************************************************/
637 644
638void inline_speed 645void inline_speed
639upheap (WT *heap, int k) 646upheap (WT *heap, int k)
640{ 647{
641 WT w = heap [k]; 648 WT w = heap [k];
642 649
643 while (k && heap [k >> 1]->at > w->at) 650 while (k)
644 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
645 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
647 k >>= 1; 659 k = p;
648 } 660 }
649 661
650 heap [k] = w; 662 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
652
653} 664}
654 665
655void inline_speed 666void inline_speed
656downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
657{ 668{
658 WT w = heap [k]; 669 WT w = heap [k];
659 670
660 while (k < (N >> 1)) 671 for (;;)
661 { 672 {
662 int j = k << 1; 673 int c = (k << 1) + 1;
663 674
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 676 break;
669 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
670 heap [k] = heap [j]; 684 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
672 k = j; 687 k = c;
673 } 688 }
674 689
675 heap [k] = w; 690 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
677} 692}
… …
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 800}
786 801
787/*****************************************************************************/ 802/*****************************************************************************/
788 803
789static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
790 805
791#ifndef _WIN32 806#ifndef _WIN32
792 807
793static ev_signal childev; 808static ev_signal childev;
794 809
… …
1206void inline_size 1221void inline_size
1207timers_reify (EV_P) 1222timers_reify (EV_P)
1208{ 1223{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1225 {
1211 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1212 1227
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1229
1215 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1216 if (w->repeat) 1231 if (w->repeat)
… …
1219 1234
1220 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1223 1238
1224 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1225 } 1240 }
1226 else 1241 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1243
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1249void inline_size
1235periodics_reify (EV_P) 1250periodics_reify (EV_P)
1236{ 1251{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1253 {
1239 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1255
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1257
1243 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1245 { 1260 {
1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1247 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));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1249 } 1264 }
1250 else if (w->interval) 1265 else if (w->interval)
1251 { 1266 {
1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1268 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)); 1269 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); 1270 downheap (periodics, periodiccnt, 0);
1256 } 1271 }
1257 else 1272 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1274
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1282 int i;
1268 1283
1269 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1271 { 1286 {
1272 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1288
1274 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1291 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1293 }
1279 1294
1280 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1283} 1298}
1284#endif 1299#endif
1285 1300
1286#if EV_IDLE_ENABLE 1301#if EV_IDLE_ENABLE
1287void inline_size 1302void inline_size
… …
1304 } 1319 }
1305 } 1320 }
1306} 1321}
1307#endif 1322#endif
1308 1323
1309int inline_size 1324void inline_speed
1310time_update_monotonic (EV_P) 1325time_update (EV_P_ ev_tstamp max_block)
1311{ 1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1312 mn_now = get_clock (); 1334 mn_now = get_clock ();
1313 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1339 {
1316 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1341 return;
1318 } 1342 }
1319 else 1343
1320 {
1321 now_floor = mn_now; 1344 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1346
1327void inline_size 1347 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1329{ 1349 * in case we get preempted during the calls to
1330 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1331 1351 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1334 { 1354 */
1335 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1336 { 1356 {
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; 1357 rtmn_diff = ev_rt_now - mn_now;
1350 1358
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1360 return; /* all is well */
1353 1361
1354 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1363 mn_now = get_clock ();
1356 now_floor = mn_now; 1364 now_floor = mn_now;
1357 } 1365 }
1358 1366
1359# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1361# endif 1369# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1372 }
1366 else 1373 else
1367#endif 1374#endif
1368 { 1375 {
1369 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1370 1377
1371 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))
1372 { 1379 {
1373#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1375#endif 1382#endif
1376 /* 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 */
… …
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1451 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1452 else 1459 else
1453 { 1460 {
1454 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1455#if EV_USE_MONOTONIC
1456 if (expect_true (have_monotonic))
1457 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1458 else
1459#endif
1460 {
1461 ev_rt_now = ev_time ();
1462 mn_now = ev_rt_now;
1463 }
1464 1463
1465 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1466 1465
1467 if (timercnt) 1466 if (timercnt)
1468 { 1467 {
… …
1481 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1482 } 1481 }
1483 1482
1484 ++loop_count; 1483 ++loop_count;
1485 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);
1486 } 1488 }
1487
1488 /* update ev_rt_now, do magic */
1489 time_update (EV_A);
1490 1489
1491 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1492 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1493#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1494 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
… …
1605 1604
1606 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1607 1606
1608 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1610 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1611 1610
1612 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1613} 1613}
1614 1614
1615void noinline 1615void noinline
1616ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1617{ 1617{
… …
1619 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1620 return; 1620 return;
1621 1621
1622 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));
1623 1623
1624 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1625 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1626 1626
1627 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1628} 1628}
1629 1629
1630void noinline 1630void noinline
1631ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1632{ 1632{
… …
1636 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1637 1637
1638 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.));
1639 1639
1640 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1641 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1642 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1643 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1644 1644
1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1646} 1646}
1647 1647
1648void noinline 1648void noinline
… …
1650{ 1650{
1651 clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1652 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1653 return; 1653 return;
1654 1654
1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1656 1656
1657 { 1657 {
1658 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1659 1659
1660 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1661 { 1661 {
1662 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1663 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1664 } 1664 }
1665 } 1665 }
1666 1666
1667 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1668 1668
… …
1675 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1676 { 1676 {
1677 if (w->repeat) 1677 if (w->repeat)
1678 { 1678 {
1679 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1680 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1681 } 1681 }
1682 else 1682 else
1683 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1684 } 1684 }
1685 else if (w->repeat) 1685 else if (w->repeat)
… …
1706 } 1706 }
1707 else 1707 else
1708 ((WT)w)->at = w->offset; 1708 ((WT)w)->at = w->offset;
1709 1709
1710 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1711 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1712 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1713 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1714 1714
1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1716} 1716}
1717 1717
1718void noinline 1718void noinline
… …
1720{ 1720{
1721 clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1723 return; 1723 return;
1724 1724
1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1726 1726
1727 { 1727 {
1728 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1729 1729
1730 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1731 { 1731 {
1732 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1733 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1734 } 1734 }
1735 } 1735 }
1736 1736
1737 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1738} 1738}
… …
1759 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1760 return; 1760 return;
1761 1761
1762 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));
1763 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
1764 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1765 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1766 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1767 1780
1768 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1769 { 1782 {
1770#if _WIN32 1783#if _WIN32
1771 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1784{ 1797{
1785 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1786 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1787 return; 1800 return;
1788 1801
1789 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1790 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1791 1804
1792 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1793 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1794} 1807}
… …
1801#endif 1814#endif
1802 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1803 return; 1816 return;
1804 1817
1805 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1806 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1807} 1820}
1808 1821
1809void 1822void
1810ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1811{ 1824{
1812 clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1813 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1814 return; 1827 return;
1815 1828
1816 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1817 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1818} 1831}
1819 1832
1820#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1821 1834

Diff Legend

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