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.188 by root, Thu Dec 20 07:12:57 2007 UTC

… …
202#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
205#endif 205#endif
206 206
207#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0
210#endif
211
212#if EV_USE_INOTIFY
213# include <sys/inotify.h>
214#endif
215
207#if EV_SELECT_IS_WINSOCKET 216#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 217# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif 218#endif
218 219
219/**/ 220/**/
220 221
221/* 222/*
… …
230 231
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 235
235#if __GNUC__ >= 3 236#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
238#else 239#else
239# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
240# define noinline 241# define noinline
… …
533 { 534 {
534 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
536 ev_io *w; 537 ev_io *w;
537 538
538 int events = 0; 539 unsigned char events = 0;
539 540
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 542 events |= (unsigned char)w->events;
542 543
543#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
544 if (events) 545 if (events)
545 { 546 {
546 unsigned long argp; 547 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 550 }
550#endif 551#endif
551 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
552 anfd->reify = 0; 557 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 558 anfd->events = events;
559
560 if (o_events != events || o_reify & EV_IOFDSET)
561 backend_modify (EV_A_ fd, o_events, events);
562 }
556 } 563 }
557 564
558 fdchangecnt = 0; 565 fdchangecnt = 0;
559} 566}
560 567
561void inline_size 568void inline_size
562fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
563{ 570{
564 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
568 573
574 if (expect_true (!reify))
575 {
569 ++fdchangecnt; 576 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
572} 580}
573 581
574void inline_speed 582void inline_speed
575fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
576{ 584{
… …
627 635
628 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 637 if (anfds [fd].events)
630 { 638 {
631 anfds [fd].events = 0; 639 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 641 }
634} 642}
635 643
636/*****************************************************************************/ 644/*****************************************************************************/
637 645
… …
652 k = p; 660 k = p;
653 } 661 }
654 662
655 heap [k] = w; 663 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
657
658} 665}
659 666
660void inline_speed 667void inline_speed
661downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
662{ 669{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 801}
795 802
796/*****************************************************************************/ 803/*****************************************************************************/
797 804
798static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
799 806
800#ifndef _WIN32 807#ifndef _WIN32
801 808
802static ev_signal childev; 809static ev_signal childev;
803 810
… …
1031#if EV_IDLE_ENABLE 1038#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1039 array_free (idle, [i]);
1033#endif 1040#endif
1034 } 1041 }
1035 1042
1043 ev_free (anfds); anfdmax = 0;
1044
1036 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1046 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1047 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1049 array_free (periodic, EMPTY);
1050#endif
1051#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY);
1041#endif 1053#endif
1042 array_free (prepare, EMPTY); 1054 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1055 array_free (check, EMPTY);
1044 1056
1045 backend = 0; 1057 backend = 0;
… …
1215void inline_size 1227void inline_size
1216timers_reify (EV_P) 1228timers_reify (EV_P)
1217{ 1229{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1231 {
1220 ev_timer *w = timers [0]; 1232 ev_timer *w = (ev_timer *)timers [0];
1221 1233
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1235
1224 /* first reschedule or stop timer */ 1236 /* first reschedule or stop timer */
1225 if (w->repeat) 1237 if (w->repeat)
… …
1228 1240
1229 ((WT)w)->at += w->repeat; 1241 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1242 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1243 ((WT)w)->at = mn_now;
1232 1244
1233 downheap ((WT *)timers, timercnt, 0); 1245 downheap (timers, timercnt, 0);
1234 } 1246 }
1235 else 1247 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1249
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1255void inline_size
1244periodics_reify (EV_P) 1256periodics_reify (EV_P)
1245{ 1257{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1259 {
1248 ev_periodic *w = periodics [0]; 1260 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1261
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1263
1252 /* first reschedule or stop timer */ 1264 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1265 if (w->reschedule_cb)
1254 { 1266 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1267 ((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)); 1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1269 downheap (periodics, periodiccnt, 0);
1258 } 1270 }
1259 else if (w->interval) 1271 else if (w->interval)
1260 { 1272 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1273 ((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; 1274 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)); 1275 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); 1276 downheap (periodics, periodiccnt, 0);
1265 } 1277 }
1266 else 1278 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1280
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1288 int i;
1277 1289
1278 /* adjust periodics after time jump */ 1290 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1291 for (i = 0; i < periodiccnt; ++i)
1280 { 1292 {
1281 ev_periodic *w = periodics [i]; 1293 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1294
1283 if (w->reschedule_cb) 1295 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1297 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1299 }
1288 1300
1289 /* now rebuild the heap */ 1301 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1302 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1303 downheap (periodics, periodiccnt, i);
1292} 1304}
1293#endif 1305#endif
1294 1306
1295#if EV_IDLE_ENABLE 1307#if EV_IDLE_ENABLE
1296void inline_size 1308void inline_size
… …
1598 1610
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1611 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1612
1601 ev_start (EV_A_ (W)w, 1); 1613 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1614 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1615 wlist_add (&anfds[fd].head, (WL)w);
1604 1616
1605 fd_change (EV_A_ fd); 1617 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1618 w->events &= ~EV_IOFDSET;
1606} 1619}
1607 1620
1608void noinline 1621void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1622ev_io_stop (EV_P_ ev_io *w)
1610{ 1623{
… …
1612 if (expect_false (!ev_is_active (w))) 1625 if (expect_false (!ev_is_active (w)))
1613 return; 1626 return;
1614 1627
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1628 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1629
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1630 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1631 ev_stop (EV_A_ (W)w);
1619 1632
1620 fd_change (EV_A_ w->fd); 1633 fd_change (EV_A_ w->fd, 1);
1621} 1634}
1622 1635
1623void noinline 1636void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1637ev_timer_start (EV_P_ ev_timer *w)
1625{ 1638{
… …
1629 ((WT)w)->at += mn_now; 1642 ((WT)w)->at += mn_now;
1630 1643
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1645
1633 ev_start (EV_A_ (W)w, ++timercnt); 1646 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1648 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1649 upheap (timers, timercnt - 1);
1637 1650
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1652}
1640 1653
1641void noinline 1654void noinline
… …
1643{ 1656{
1644 clear_pending (EV_A_ (W)w); 1657 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1658 if (expect_false (!ev_is_active (w)))
1646 return; 1659 return;
1647 1660
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1662
1650 { 1663 {
1651 int active = ((W)w)->active; 1664 int active = ((W)w)->active;
1652 1665
1653 if (expect_true (--active < --timercnt)) 1666 if (expect_true (--active < --timercnt))
1654 { 1667 {
1655 timers [active] = timers [timercnt]; 1668 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1669 adjustheap (timers, timercnt, active);
1657 } 1670 }
1658 } 1671 }
1659 1672
1660 ((WT)w)->at -= mn_now; 1673 ((WT)w)->at -= mn_now;
1661 1674
… …
1668 if (ev_is_active (w)) 1681 if (ev_is_active (w))
1669 { 1682 {
1670 if (w->repeat) 1683 if (w->repeat)
1671 { 1684 {
1672 ((WT)w)->at = mn_now + w->repeat; 1685 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1686 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1687 }
1675 else 1688 else
1676 ev_timer_stop (EV_A_ w); 1689 ev_timer_stop (EV_A_ w);
1677 } 1690 }
1678 else if (w->repeat) 1691 else if (w->repeat)
… …
1699 } 1712 }
1700 else 1713 else
1701 ((WT)w)->at = w->offset; 1714 ((WT)w)->at = w->offset;
1702 1715
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1716 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1718 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1719 upheap (periodics, periodiccnt - 1);
1707 1720
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1722}
1710 1723
1711void noinline 1724void noinline
… …
1713{ 1726{
1714 clear_pending (EV_A_ (W)w); 1727 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1728 if (expect_false (!ev_is_active (w)))
1716 return; 1729 return;
1717 1730
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1732
1720 { 1733 {
1721 int active = ((W)w)->active; 1734 int active = ((W)w)->active;
1722 1735
1723 if (expect_true (--active < --periodiccnt)) 1736 if (expect_true (--active < --periodiccnt))
1724 { 1737 {
1725 periodics [active] = periodics [periodiccnt]; 1738 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1739 adjustheap (periodics, periodiccnt, active);
1727 } 1740 }
1728 } 1741 }
1729 1742
1730 ev_stop (EV_A_ (W)w); 1743 ev_stop (EV_A_ (W)w);
1731} 1744}
… …
1752 if (expect_false (ev_is_active (w))) 1765 if (expect_false (ev_is_active (w)))
1753 return; 1766 return;
1754 1767
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1756 1769
1770 {
1771#ifndef _WIN32
1772 sigset_t full, prev;
1773 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev);
1775#endif
1776
1777 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1778
1779#ifndef _WIN32
1780 sigprocmask (SIG_SETMASK, &prev, 0);
1781#endif
1782 }
1783
1757 ev_start (EV_A_ (W)w, 1); 1784 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); 1785 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 1786
1761 if (!((WL)w)->next) 1787 if (!((WL)w)->next)
1762 { 1788 {
1763#if _WIN32 1789#if _WIN32
1764 signal (w->signum, sighandler); 1790 signal (w->signum, sighandler);
… …
1777{ 1803{
1778 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1780 return; 1806 return;
1781 1807
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1808 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 1809 ev_stop (EV_A_ (W)w);
1784 1810
1785 if (!signals [w->signum - 1].head) 1811 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 1812 signal (w->signum, SIG_DFL);
1787} 1813}
… …
1794#endif 1820#endif
1795 if (expect_false (ev_is_active (w))) 1821 if (expect_false (ev_is_active (w)))
1796 return; 1822 return;
1797 1823
1798 ev_start (EV_A_ (W)w, 1); 1824 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1825 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 1826}
1801 1827
1802void 1828void
1803ev_child_stop (EV_P_ ev_child *w) 1829ev_child_stop (EV_P_ ev_child *w)
1804{ 1830{
1805 clear_pending (EV_A_ (W)w); 1831 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 1832 if (expect_false (!ev_is_active (w)))
1807 return; 1833 return;
1808 1834
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 1836 ev_stop (EV_A_ (W)w);
1811} 1837}
1812 1838
1813#if EV_STAT_ENABLE 1839#if EV_STAT_ENABLE
1814 1840
… …
2156 2182
2157#if EV_EMBED_ENABLE 2183#if EV_EMBED_ENABLE
2158void noinline 2184void noinline
2159ev_embed_sweep (EV_P_ ev_embed *w) 2185ev_embed_sweep (EV_P_ ev_embed *w)
2160{ 2186{
2161 ev_loop (w->loop, EVLOOP_NONBLOCK); 2187 ev_loop (w->other, EVLOOP_NONBLOCK);
2162} 2188}
2163 2189
2164static void 2190static void
2165embed_cb (EV_P_ ev_io *io, int revents) 2191embed_cb (EV_P_ ev_io *io, int revents)
2166{ 2192{
… …
2177{ 2203{
2178 if (expect_false (ev_is_active (w))) 2204 if (expect_false (ev_is_active (w)))
2179 return; 2205 return;
2180 2206
2181 { 2207 {
2182 struct ev_loop *loop = w->loop; 2208 struct ev_loop *loop = w->other;
2183 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2209 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2184 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2210 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2185 } 2211 }
2186 2212
2187 ev_set_priority (&w->io, ev_priority (w)); 2213 ev_set_priority (&w->io, ev_priority (w));
… …
2294 ev_timer_set (&once->to, timeout, 0.); 2320 ev_timer_set (&once->to, timeout, 0.);
2295 ev_timer_start (EV_A_ &once->to); 2321 ev_timer_start (EV_A_ &once->to);
2296 } 2322 }
2297} 2323}
2298 2324
2325#if EV_MULTIPLICITY
2326 #include "ev_wrap.h"
2327#endif
2328
2299#ifdef __cplusplus 2329#ifdef __cplusplus
2300} 2330}
2301#endif 2331#endif
2302 2332

Diff Legend

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