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.180 by root, Tue Dec 11 22:04:55 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 657
… …
645void inline_speed 660void inline_speed
646downheap (WT *heap, int N, int k) 661downheap (WT *heap, int N, int k)
647{ 662{
648 WT w = heap [k]; 663 WT w = heap [k];
649 664
650 while (k < (N >> 1)) 665 for (;;)
651 { 666 {
652 int j = k << 1; 667 int c = (k << 1) + 1;
653 668
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 669 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 670 break;
659 671
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0;
674
675 if (w->at <= heap [c]->at)
676 break;
677
660 heap [k] = heap [j]; 678 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 679 ((W)heap [k])->active = k + 1;
680
662 k = j; 681 k = c;
663 } 682 }
664 683
665 heap [k] = w; 684 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
667} 686}
… …
749 for (signum = signalmax; signum--; ) 768 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig) 769 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1); 770 ev_feed_signal_event (EV_A_ signum + 1);
752} 771}
753 772
754void inline_size 773void inline_speed
755fd_intern (int fd) 774fd_intern (int fd)
756{ 775{
757#ifdef _WIN32 776#ifdef _WIN32
758 int arg = 1; 777 int arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 778 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1251
1233 /* first reschedule or stop timer */ 1252 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1253 if (w->reschedule_cb)
1235 { 1254 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1257 downheap ((WT *)periodics, periodiccnt, 0);
1239 } 1258 }
1240 else if (w->interval) 1259 else if (w->interval)
1241 { 1260 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap ((WT *)periodics, periodiccnt, 0);
1245 } 1265 }
1246 else 1266 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1261 ev_periodic *w = periodics [i]; 1281 ev_periodic *w = periodics [i];
1262 1282
1263 if (w->reschedule_cb) 1283 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1285 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1287 }
1268 1288
1269 /* now rebuild the heap */ 1289 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1290 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1291 downheap ((WT *)periodics, periodiccnt, i);
… …
1293 } 1313 }
1294 } 1314 }
1295} 1315}
1296#endif 1316#endif
1297 1317
1298int inline_size 1318void inline_speed
1299time_update_monotonic (EV_P) 1319time_update (EV_P_ ev_tstamp max_block)
1300{ 1320{
1321 int i;
1322
1323#if EV_USE_MONOTONIC
1324 if (expect_true (have_monotonic))
1325 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1301 mn_now = get_clock (); 1328 mn_now = get_clock ();
1302 1329
1330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1331 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1332 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1333 {
1305 ev_rt_now = rtmn_diff + mn_now; 1334 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1335 return;
1307 } 1336 }
1308 else 1337
1309 {
1310 now_floor = mn_now; 1338 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1339 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1340
1316void inline_size 1341 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1342 * on the choice of "4": one iteration isn't enough,
1318{ 1343 * in case we get preempted during the calls to
1319 int i; 1344 * ev_time and get_clock. a second call is almost guaranteed
1320 1345 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1346 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1347 * in the unlikely event of having been preempted here.
1323 { 1348 */
1324 if (time_update_monotonic (EV_A)) 1349 for (i = 4; --i; )
1325 { 1350 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1351 rtmn_diff = ev_rt_now - mn_now;
1339 1352
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1354 return; /* all is well */
1342 1355
1343 ev_rt_now = ev_time (); 1356 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1357 mn_now = get_clock ();
1345 now_floor = mn_now; 1358 now_floor = mn_now;
1346 } 1359 }
1347 1360
1348# if EV_PERIODIC_ENABLE 1361# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1350# endif 1363# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1364 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1365 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1366 }
1355 else 1367 else
1356#endif 1368#endif
1357 { 1369 {
1358 ev_rt_now = ev_time (); 1370 ev_rt_now = ev_time ();
1359 1371
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1372 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1373 {
1362#if EV_PERIODIC_ENABLE 1374#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1375 periodics_reschedule (EV_A);
1364#endif 1376#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1377 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1380 }
1370 1381
… …
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1425 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1426 call_pending (EV_A);
1416 } 1427 }
1417#endif 1428#endif
1418 1429
1419 /* queue check watchers (and execute them) */ 1430 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1431 if (expect_false (preparecnt))
1421 { 1432 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1433 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1434 call_pending (EV_A);
1424 } 1435 }
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1442 else 1453 else
1443 { 1454 {
1444 /* update time to cancel out callback processing overhead */ 1455 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1456 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1457
1455 block = MAX_BLOCKTIME; 1458 block = MAX_BLOCKTIME;
1456 1459
1457 if (timercnt) 1460 if (timercnt)
1458 { 1461 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1474 if (expect_false (block < 0.)) block = 0.;
1472 } 1475 }
1473 1476
1474 ++loop_count; 1477 ++loop_count;
1475 backend_poll (EV_A_ block); 1478 backend_poll (EV_A_ block);
1479
1480 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block);
1476 } 1482 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1483
1481 /* queue pending timers and reschedule them */ 1484 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1485 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1486#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1487 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1549ev_clear_pending (EV_P_ void *w)
1547{ 1550{
1548 W w_ = (W)w; 1551 W w_ = (W)w;
1549 int pending = w_->pending; 1552 int pending = w_->pending;
1550 1553
1551 if (!pending) 1554 if (expect_true (pending))
1555 {
1556 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1557 w_->pending = 0;
1558 p->w = 0;
1559 return p->events;
1560 }
1561 else
1552 return 0; 1562 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1563}
1560 1564
1561void inline_size 1565void inline_size
1562pri_adjust (EV_P_ W w) 1566pri_adjust (EV_P_ W w)
1563{ 1567{
… …
1582 w->active = 0; 1586 w->active = 0;
1583} 1587}
1584 1588
1585/*****************************************************************************/ 1589/*****************************************************************************/
1586 1590
1587void 1591void noinline
1588ev_io_start (EV_P_ ev_io *w) 1592ev_io_start (EV_P_ ev_io *w)
1589{ 1593{
1590 int fd = w->fd; 1594 int fd = w->fd;
1591 1595
1592 if (expect_false (ev_is_active (w))) 1596 if (expect_false (ev_is_active (w)))
… …
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1603 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1600 1604
1601 fd_change (EV_A_ fd); 1605 fd_change (EV_A_ fd);
1602} 1606}
1603 1607
1604void 1608void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1609ev_io_stop (EV_P_ ev_io *w)
1606{ 1610{
1607 clear_pending (EV_A_ (W)w); 1611 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1612 if (expect_false (!ev_is_active (w)))
1609 return; 1613 return;
… …
1614 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1615 1619
1616 fd_change (EV_A_ w->fd); 1620 fd_change (EV_A_ w->fd);
1617} 1621}
1618 1622
1619void 1623void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1624ev_timer_start (EV_P_ ev_timer *w)
1621{ 1625{
1622 if (expect_false (ev_is_active (w))) 1626 if (expect_false (ev_is_active (w)))
1623 return; 1627 return;
1624 1628
… …
1632 upheap ((WT *)timers, timercnt - 1); 1636 upheap ((WT *)timers, timercnt - 1);
1633 1637
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1639}
1636 1640
1637void 1641void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1642ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1643{
1640 clear_pending (EV_A_ (W)w); 1644 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1645 if (expect_false (!ev_is_active (w)))
1642 return; 1646 return;
… …
1656 ((WT)w)->at -= mn_now; 1660 ((WT)w)->at -= mn_now;
1657 1661
1658 ev_stop (EV_A_ (W)w); 1662 ev_stop (EV_A_ (W)w);
1659} 1663}
1660 1664
1661void 1665void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1666ev_timer_again (EV_P_ ev_timer *w)
1663{ 1667{
1664 if (ev_is_active (w)) 1668 if (ev_is_active (w))
1665 { 1669 {
1666 if (w->repeat) 1670 if (w->repeat)
… …
1677 ev_timer_start (EV_A_ w); 1681 ev_timer_start (EV_A_ w);
1678 } 1682 }
1679} 1683}
1680 1684
1681#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1682void 1686void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1687ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1688{
1685 if (expect_false (ev_is_active (w))) 1689 if (expect_false (ev_is_active (w)))
1686 return; 1690 return;
1687 1691
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1693 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1694 else if (w->interval)
1691 { 1695 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1696 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 */ 1697 /* 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; 1698 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1699 }
1700 else
1701 ((WT)w)->at = w->offset;
1696 1702
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1703 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1705 periodics [periodiccnt - 1] = w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1706 upheap ((WT *)periodics, periodiccnt - 1);
1701 1707
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1709}
1704 1710
1705void 1711void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1712ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1713{
1708 clear_pending (EV_A_ (W)w); 1714 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1715 if (expect_false (!ev_is_active (w)))
1710 return; 1716 return;
… …
1722 } 1728 }
1723 1729
1724 ev_stop (EV_A_ (W)w); 1730 ev_stop (EV_A_ (W)w);
1725} 1731}
1726 1732
1727void 1733void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1734ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1735{
1730 /* TODO: use adjustheap and recalculation */ 1736 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1737 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1738 ev_periodic_start (EV_A_ w);
… …
1735 1741
1736#ifndef SA_RESTART 1742#ifndef SA_RESTART
1737# define SA_RESTART 0 1743# define SA_RESTART 0
1738#endif 1744#endif
1739 1745
1740void 1746void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1747ev_signal_start (EV_P_ ev_signal *w)
1742{ 1748{
1743#if EV_MULTIPLICITY 1749#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1750 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1751#endif
1746 if (expect_false (ev_is_active (w))) 1752 if (expect_false (ev_is_active (w)))
1747 return; 1753 return;
1748 1754
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1756
1757 {
1758#ifndef _WIN32
1759 sigset_t full, prev;
1760 sigfillset (&full);
1761 sigprocmask (SIG_SETMASK, &full, &prev);
1762#endif
1763
1764 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1765
1766#ifndef _WIN32
1767 sigprocmask (SIG_SETMASK, &prev, 0);
1768#endif
1769 }
1770
1751 ev_start (EV_A_ (W)w, 1); 1771 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); 1772 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1754 1773
1755 if (!((WL)w)->next) 1774 if (!((WL)w)->next)
1756 { 1775 {
1757#if _WIN32 1776#if _WIN32
… …
1764 sigaction (w->signum, &sa, 0); 1783 sigaction (w->signum, &sa, 0);
1765#endif 1784#endif
1766 } 1785 }
1767} 1786}
1768 1787
1769void 1788void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1789ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1790{
1772 clear_pending (EV_A_ (W)w); 1791 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1792 if (expect_false (!ev_is_active (w)))
1774 return; 1793 return;

Diff Legend

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