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

Comparing libev/ev.c (file contents):
Revision 1.165 by root, Fri Dec 7 18:09:38 2007 UTC vs.
Revision 1.176 by root, Tue Dec 11 04:31: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 * and intervals up to 20 years.
228 * Better solutions welcome.
229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231
221#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) */
222#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 235
225#if __GNUC__ >= 3 236#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 239#else
236# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 241# define noinline
242# if __STDC_VERSION__ < 199901L
243# define inline
244# endif
240#endif 245#endif
241 246
242#define expect_false(expr) expect ((expr) != 0, 0) 247#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 248#define expect_true(expr) expect ((expr) != 0, 1)
249#define inline_size static inline
250
251#if EV_MINIMAL
252# define inline_speed static noinline
253#else
254# define inline_speed static inline
255#endif
244 256
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 257#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 258#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 259
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 260#define EMPTY /* required for microsofts broken pseudo-c compiler */
… …
417 } 429 }
418 430
419 return ncur; 431 return ncur;
420} 432}
421 433
422inline_speed void * 434static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 435array_realloc (int elem, void *base, int *cur, int cnt)
424{ 436{
425 *cur = array_nextsize (elem, *cur, cnt); 437 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 438 return ev_realloc (base, elem * *cur);
427} 439}
… …
452 464
453void noinline 465void noinline
454ev_feed_event (EV_P_ void *w, int revents) 466ev_feed_event (EV_P_ void *w, int revents)
455{ 467{
456 W w_ = (W)w; 468 W w_ = (W)w;
469 int pri = ABSPRI (w_);
457 470
458 if (expect_false (w_->pending)) 471 if (expect_false (w_->pending))
472 pendings [pri][w_->pending - 1].events |= revents;
473 else
459 { 474 {
475 w_->pending = ++pendingcnt [pri];
476 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
477 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 478 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 479 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 480}
469 481
470void inline_size 482void inline_size
471queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 484{
… …
507} 519}
508 520
509void 521void
510ev_feed_fd_event (EV_P_ int fd, int revents) 522ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 523{
524 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 525 fd_event (EV_A_ fd, revents);
513} 526}
514 527
515void inline_size 528void inline_size
516fd_reify (EV_P) 529fd_reify (EV_P)
517{ 530{
… …
747 for (signum = signalmax; signum--; ) 760 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 761 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 762 ev_feed_signal_event (EV_A_ signum + 1);
750} 763}
751 764
752void inline_size 765void inline_speed
753fd_intern (int fd) 766fd_intern (int fd)
754{ 767{
755#ifdef _WIN32 768#ifdef _WIN32
756 int arg = 1; 769 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 770 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1163 postfork = 1; 1176 postfork = 1;
1164} 1177}
1165 1178
1166/*****************************************************************************/ 1179/*****************************************************************************/
1167 1180
1181void
1182ev_invoke (EV_P_ void *w, int revents)
1183{
1184 EV_CB_INVOKE ((W)w, revents);
1185}
1186
1168void inline_speed 1187void inline_speed
1169call_pending (EV_P) 1188call_pending (EV_P)
1170{ 1189{
1171 int pri; 1190 int pri;
1172 1191
… …
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1243
1225 /* first reschedule or stop timer */ 1244 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1245 if (w->reschedule_cb)
1227 { 1246 {
1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1229 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1249 downheap ((WT *)periodics, periodiccnt, 0);
1231 } 1250 }
1232 else if (w->interval) 1251 else if (w->interval)
1233 { 1252 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval;
1235 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1237 } 1256 }
1238 else 1257 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1253 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1254 1273
1255 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1276 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1278 }
1260 1279
1261 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
… …
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1425 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1426 call_pending (EV_A);
1408 } 1427 }
1409#endif 1428#endif
1410 1429
1411 /* queue check watchers (and execute them) */ 1430 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1431 if (expect_false (preparecnt))
1413 { 1432 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1433 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1434 call_pending (EV_A);
1416 } 1435 }
… …
1523 head = &(*head)->next; 1542 head = &(*head)->next;
1524 } 1543 }
1525} 1544}
1526 1545
1527void inline_speed 1546void inline_speed
1528ev_clear_pending (EV_P_ W w) 1547clear_pending (EV_P_ W w)
1529{ 1548{
1530 if (w->pending) 1549 if (w->pending)
1531 { 1550 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1551 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1552 w->pending = 0;
1534 } 1553 }
1554}
1555
1556int
1557ev_clear_pending (EV_P_ void *w)
1558{
1559 W w_ = (W)w;
1560 int pending = w_->pending;
1561
1562 if (expect_true (pending))
1563 {
1564 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1565 w_->pending = 0;
1566 p->w = 0;
1567 return p->events;
1568 }
1569 else
1570 return 0;
1535} 1571}
1536 1572
1537void inline_size 1573void inline_size
1538pri_adjust (EV_P_ W w) 1574pri_adjust (EV_P_ W w)
1539{ 1575{
… …
1558 w->active = 0; 1594 w->active = 0;
1559} 1595}
1560 1596
1561/*****************************************************************************/ 1597/*****************************************************************************/
1562 1598
1563void 1599void noinline
1564ev_io_start (EV_P_ ev_io *w) 1600ev_io_start (EV_P_ ev_io *w)
1565{ 1601{
1566 int fd = w->fd; 1602 int fd = w->fd;
1567 1603
1568 if (expect_false (ev_is_active (w))) 1604 if (expect_false (ev_is_active (w)))
… …
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1611 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1576 1612
1577 fd_change (EV_A_ fd); 1613 fd_change (EV_A_ fd);
1578} 1614}
1579 1615
1580void 1616void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1582{ 1618{
1583 ev_clear_pending (EV_A_ (W)w); 1619 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1585 return; 1621 return;
1586 1622
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1624
… …
1590 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1591 1627
1592 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd);
1593} 1629}
1594 1630
1595void 1631void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1597{ 1633{
1598 if (expect_false (ev_is_active (w))) 1634 if (expect_false (ev_is_active (w)))
1599 return; 1635 return;
1600 1636
… …
1608 upheap ((WT *)timers, timercnt - 1); 1644 upheap ((WT *)timers, timercnt - 1);
1609 1645
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1647}
1612 1648
1613void 1649void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1650ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1651{
1616 ev_clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1618 return; 1654 return;
1619 1655
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1621 1657
… …
1632 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1633 1669
1634 ev_stop (EV_A_ (W)w); 1670 ev_stop (EV_A_ (W)w);
1635} 1671}
1636 1672
1637void 1673void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1674ev_timer_again (EV_P_ ev_timer *w)
1639{ 1675{
1640 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1641 { 1677 {
1642 if (w->repeat) 1678 if (w->repeat)
… …
1653 ev_timer_start (EV_A_ w); 1689 ev_timer_start (EV_A_ w);
1654 } 1690 }
1655} 1691}
1656 1692
1657#if EV_PERIODIC_ENABLE 1693#if EV_PERIODIC_ENABLE
1658void 1694void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1695ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1696{
1661 if (expect_false (ev_is_active (w))) 1697 if (expect_false (ev_is_active (w)))
1662 return; 1698 return;
1663 1699
… …
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1702 else if (w->interval)
1667 { 1703 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1704 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1669 /* this formula differs from the one in periodic_reify because we do not always round up */ 1705 /* this formula differs from the one in periodic_reify because we do not always round up */
1670 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1706 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1707 }
1708 else
1709 ((WT)w)->at = w->offset;
1672 1710
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap ((WT *)periodics, periodiccnt - 1);
1677 1715
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1717}
1680 1718
1681void 1719void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1720ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1721{
1684 ev_clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1686 return; 1724 return;
1687 1725
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1689 1727
… …
1698 } 1736 }
1699 1737
1700 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1701} 1739}
1702 1740
1703void 1741void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1742ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1743{
1706 /* TODO: use adjustheap and recalculation */ 1744 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1745 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1746 ev_periodic_start (EV_A_ w);
… …
1711 1749
1712#ifndef SA_RESTART 1750#ifndef SA_RESTART
1713# define SA_RESTART 0 1751# define SA_RESTART 0
1714#endif 1752#endif
1715 1753
1716void 1754void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1755ev_signal_start (EV_P_ ev_signal *w)
1718{ 1756{
1719#if EV_MULTIPLICITY 1757#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1758 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1759#endif
… …
1740 sigaction (w->signum, &sa, 0); 1778 sigaction (w->signum, &sa, 0);
1741#endif 1779#endif
1742 } 1780 }
1743} 1781}
1744 1782
1745void 1783void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1784ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1785{
1748 ev_clear_pending (EV_A_ (W)w); 1786 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1787 if (expect_false (!ev_is_active (w)))
1750 return; 1788 return;
1751 1789
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1791 ev_stop (EV_A_ (W)w);
… …
1770} 1808}
1771 1809
1772void 1810void
1773ev_child_stop (EV_P_ ev_child *w) 1811ev_child_stop (EV_P_ ev_child *w)
1774{ 1812{
1775 ev_clear_pending (EV_A_ (W)w); 1813 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1814 if (expect_false (!ev_is_active (w)))
1777 return; 1815 return;
1778 1816
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1818 ev_stop (EV_A_ (W)w);
… …
2016} 2054}
2017 2055
2018void 2056void
2019ev_stat_stop (EV_P_ ev_stat *w) 2057ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2058{
2021 ev_clear_pending (EV_A_ (W)w); 2059 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2060 if (expect_false (!ev_is_active (w)))
2023 return; 2061 return;
2024 2062
2025#if EV_USE_INOTIFY 2063#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2064 infy_del (EV_A_ w);
… …
2052} 2090}
2053 2091
2054void 2092void
2055ev_idle_stop (EV_P_ ev_idle *w) 2093ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2094{
2057 ev_clear_pending (EV_A_ (W)w); 2095 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2096 if (expect_false (!ev_is_active (w)))
2059 return; 2097 return;
2060 2098
2061 { 2099 {
2062 int active = ((W)w)->active; 2100 int active = ((W)w)->active;
… …
2082} 2120}
2083 2121
2084void 2122void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2123ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2124{
2087 ev_clear_pending (EV_A_ (W)w); 2125 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2126 if (expect_false (!ev_is_active (w)))
2089 return; 2127 return;
2090 2128
2091 { 2129 {
2092 int active = ((W)w)->active; 2130 int active = ((W)w)->active;
… …
2109} 2147}
2110 2148
2111void 2149void
2112ev_check_stop (EV_P_ ev_check *w) 2150ev_check_stop (EV_P_ ev_check *w)
2113{ 2151{
2114 ev_clear_pending (EV_A_ (W)w); 2152 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2153 if (expect_false (!ev_is_active (w)))
2116 return; 2154 return;
2117 2155
2118 { 2156 {
2119 int active = ((W)w)->active; 2157 int active = ((W)w)->active;
… …
2161} 2199}
2162 2200
2163void 2201void
2164ev_embed_stop (EV_P_ ev_embed *w) 2202ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2203{
2166 ev_clear_pending (EV_A_ (W)w); 2204 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2205 if (expect_false (!ev_is_active (w)))
2168 return; 2206 return;
2169 2207
2170 ev_io_stop (EV_A_ &w->io); 2208 ev_io_stop (EV_A_ &w->io);
2171 2209
… …
2186} 2224}
2187 2225
2188void 2226void
2189ev_fork_stop (EV_P_ ev_fork *w) 2227ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2228{
2191 ev_clear_pending (EV_A_ (W)w); 2229 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2230 if (expect_false (!ev_is_active (w)))
2193 return; 2231 return;
2194 2232
2195 { 2233 {
2196 int active = ((W)w)->active; 2234 int active = ((W)w)->active;

Diff Legend

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