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

Comparing libev/ev.c (file contents):
Revision 1.179 by root, Tue Dec 11 21:04:40 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC

… …
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
… …
652 k = p; 659 k = p;
653 } 660 }
654 661
655 heap [k] = w; 662 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
657
658} 664}
659 665
660void inline_speed 666void inline_speed
661downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
662{ 668{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 800}
795 801
796/*****************************************************************************/ 802/*****************************************************************************/
797 803
798static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
799 805
800#ifndef _WIN32 806#ifndef _WIN32
801 807
802static ev_signal childev; 808static ev_signal childev;
803 809
… …
1215void inline_size 1221void inline_size
1216timers_reify (EV_P) 1222timers_reify (EV_P)
1217{ 1223{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1225 {
1220 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1221 1227
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1229
1224 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1225 if (w->repeat) 1231 if (w->repeat)
… …
1228 1234
1229 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1232 1238
1233 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1234 } 1240 }
1235 else 1241 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1243
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1249void inline_size
1244periodics_reify (EV_P) 1250periodics_reify (EV_P)
1245{ 1251{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1253 {
1248 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1255
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1257
1252 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1254 { 1260 {
1255 ((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);
1256 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));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1258 } 1264 }
1259 else if (w->interval) 1265 else if (w->interval)
1260 { 1266 {
1261 ((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;
1262 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;
1263 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));
1264 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1265 } 1271 }
1266 else 1272 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1274
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1282 int i;
1277 1283
1278 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1280 { 1286 {
1281 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1288
1283 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1291 else if (w->interval)
1286 ((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;
1287 } 1293 }
1288 1294
1289 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1292} 1298}
1293#endif 1299#endif
1294 1300
1295#if EV_IDLE_ENABLE 1301#if EV_IDLE_ENABLE
1296void inline_size 1302void inline_size
… …
1598 1604
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1606
1601 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1604 1610
1605 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1606} 1613}
1607 1614
1608void noinline 1615void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1610{ 1617{
… …
1612 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1613 return; 1620 return;
1614 1621
1615 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));
1616 1623
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1619 1626
1620 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1621} 1628}
1622 1629
1623void noinline 1630void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1625{ 1632{
… …
1629 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1630 1637
1631 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.));
1632 1639
1633 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1637 1644
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1646}
1640 1647
1641void noinline 1648void noinline
… …
1643{ 1650{
1644 clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1646 return; 1653 return;
1647 1654
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1656
1650 { 1657 {
1651 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1652 1659
1653 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1654 { 1661 {
1655 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1657 } 1664 }
1658 } 1665 }
1659 1666
1660 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1661 1668
… …
1668 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1669 { 1676 {
1670 if (w->repeat) 1677 if (w->repeat)
1671 { 1678 {
1672 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1681 }
1675 else 1682 else
1676 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1677 } 1684 }
1678 else if (w->repeat) 1685 else if (w->repeat)
… …
1699 } 1706 }
1700 else 1707 else
1701 ((WT)w)->at = w->offset; 1708 ((WT)w)->at = w->offset;
1702 1709
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1707 1714
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1716}
1710 1717
1711void noinline 1718void noinline
… …
1713{ 1720{
1714 clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1716 return; 1723 return;
1717 1724
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1726
1720 { 1727 {
1721 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1722 1729
1723 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1724 { 1731 {
1725 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1727 } 1734 }
1728 } 1735 }
1729 1736
1730 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1731} 1738}
… …
1752 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1753 return; 1760 return;
1754 1761
1755 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));
1756 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
1757 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1758 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1759 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 1780
1761 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1762 { 1782 {
1763#if _WIN32 1783#if _WIN32
1764 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1777{ 1797{
1778 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1780 return; 1800 return;
1781 1801
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1784 1804
1785 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1787} 1807}
… …
1794#endif 1814#endif
1795 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1796 return; 1816 return;
1797 1817
1798 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 1820}
1801 1821
1802void 1822void
1803ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1804{ 1824{
1805 clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1807 return; 1827 return;
1808 1828
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1811} 1831}
1812 1832
1813#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1814 1834

Diff Legend

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