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.173 by root, Sun Dec 9 19:42:57 2007 UTC

… …
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 222#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 */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
224 224
225#if __GNUC__ >= 3 225#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 226# 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)) 227# 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 228#else
236# define expect(expr,value) (expr) 229# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 230# define noinline
231# if __STDC_VERSION__ < 199901L
232# define inline
233# endif
240#endif 234#endif
241 235
242#define expect_false(expr) expect ((expr) != 0, 0) 236#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 237#define expect_true(expr) expect ((expr) != 0, 1)
238#define inline_size static inline
239
240#if EV_MINIMAL
241# define inline_speed static noinline
242#else
243# define inline_speed static inline
244#endif
244 245
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 246#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 247#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 248
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 249#define EMPTY /* required for microsofts broken pseudo-c compiler */
… …
417 } 418 }
418 419
419 return ncur; 420 return ncur;
420} 421}
421 422
422inline_speed void * 423static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 424array_realloc (int elem, void *base, int *cur, int cnt)
424{ 425{
425 *cur = array_nextsize (elem, *cur, cnt); 426 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 427 return ev_realloc (base, elem * *cur);
427} 428}
… …
452 453
453void noinline 454void noinline
454ev_feed_event (EV_P_ void *w, int revents) 455ev_feed_event (EV_P_ void *w, int revents)
455{ 456{
456 W w_ = (W)w; 457 W w_ = (W)w;
458 int pri = ABSPRI (w_);
457 459
458 if (expect_false (w_->pending)) 460 if (expect_false (w_->pending))
461 pendings [pri][w_->pending - 1].events |= revents;
462 else
459 { 463 {
464 w_->pending = ++pendingcnt [pri];
465 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
466 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 467 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 468 }
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} 469}
469 470
470void inline_size 471void inline_size
471queue_events (EV_P_ W *events, int eventcnt, int type) 472queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 473{
… …
507} 508}
508 509
509void 510void
510ev_feed_fd_event (EV_P_ int fd, int revents) 511ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 512{
513 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 514 fd_event (EV_A_ fd, revents);
513} 515}
514 516
515void inline_size 517void inline_size
516fd_reify (EV_P) 518fd_reify (EV_P)
517{ 519{
… …
747 for (signum = signalmax; signum--; ) 749 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 750 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 751 ev_feed_signal_event (EV_A_ signum + 1);
750} 752}
751 753
752void inline_size 754void inline_speed
753fd_intern (int fd) 755fd_intern (int fd)
754{ 756{
755#ifdef _WIN32 757#ifdef _WIN32
756 int arg = 1; 758 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1162 if (backend) 1164 if (backend)
1163 postfork = 1; 1165 postfork = 1;
1164} 1166}
1165 1167
1166/*****************************************************************************/ 1168/*****************************************************************************/
1169
1170void
1171ev_invoke (EV_P_ void *w, int revents)
1172{
1173 EV_CB_INVOKE ((W)w, revents);
1174}
1167 1175
1168void inline_speed 1176void inline_speed
1169call_pending (EV_P) 1177call_pending (EV_P)
1170{ 1178{
1171 int pri; 1179 int pri;
… …
1229 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1238 downheap ((WT *)periodics, periodiccnt, 0);
1231 } 1239 }
1232 else if (w->interval) 1240 else if (w->interval)
1233 { 1241 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1242 ((WT)w)->at = w->offset + floor ((ev_rt_now - 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)); 1243 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); 1244 downheap ((WT *)periodics, periodiccnt, 0);
1237 } 1245 }
1238 else 1246 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1253 ev_periodic *w = periodics [i]; 1261 ev_periodic *w = periodics [i];
1254 1262
1255 if (w->reschedule_cb) 1263 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1265 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1266 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1267 }
1260 1268
1261 /* now rebuild the heap */ 1269 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1270 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1271 downheap ((WT *)periodics, periodiccnt, i);
… …
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1415 call_pending (EV_A);
1408 } 1416 }
1409#endif 1417#endif
1410 1418
1411 /* queue check watchers (and execute them) */ 1419 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1420 if (expect_false (preparecnt))
1413 { 1421 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1423 call_pending (EV_A);
1416 } 1424 }
… …
1523 head = &(*head)->next; 1531 head = &(*head)->next;
1524 } 1532 }
1525} 1533}
1526 1534
1527void inline_speed 1535void inline_speed
1528ev_clear_pending (EV_P_ W w) 1536clear_pending (EV_P_ W w)
1529{ 1537{
1530 if (w->pending) 1538 if (w->pending)
1531 { 1539 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1540 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1541 w->pending = 0;
1534 } 1542 }
1543}
1544
1545int
1546ev_clear_pending (EV_P_ void *w)
1547{
1548 W w_ = (W)w;
1549 int pending = w_->pending;
1550
1551 if (expect_true (pending))
1552 {
1553 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1554 w_->pending = 0;
1555 p->w = 0;
1556 return p->events;
1557 }
1558 else
1559 return 0;
1535} 1560}
1536 1561
1537void inline_size 1562void inline_size
1538pri_adjust (EV_P_ W w) 1563pri_adjust (EV_P_ W w)
1539{ 1564{
… …
1558 w->active = 0; 1583 w->active = 0;
1559} 1584}
1560 1585
1561/*****************************************************************************/ 1586/*****************************************************************************/
1562 1587
1563void 1588void noinline
1564ev_io_start (EV_P_ ev_io *w) 1589ev_io_start (EV_P_ ev_io *w)
1565{ 1590{
1566 int fd = w->fd; 1591 int fd = w->fd;
1567 1592
1568 if (expect_false (ev_is_active (w))) 1593 if (expect_false (ev_is_active (w)))
… …
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1600 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1576 1601
1577 fd_change (EV_A_ fd); 1602 fd_change (EV_A_ fd);
1578} 1603}
1579 1604
1580void 1605void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1606ev_io_stop (EV_P_ ev_io *w)
1582{ 1607{
1583 ev_clear_pending (EV_A_ (W)w); 1608 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1609 if (expect_false (!ev_is_active (w)))
1585 return; 1610 return;
1586 1611
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1613
… …
1590 ev_stop (EV_A_ (W)w); 1615 ev_stop (EV_A_ (W)w);
1591 1616
1592 fd_change (EV_A_ w->fd); 1617 fd_change (EV_A_ w->fd);
1593} 1618}
1594 1619
1595void 1620void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1621ev_timer_start (EV_P_ ev_timer *w)
1597{ 1622{
1598 if (expect_false (ev_is_active (w))) 1623 if (expect_false (ev_is_active (w)))
1599 return; 1624 return;
1600 1625
… …
1608 upheap ((WT *)timers, timercnt - 1); 1633 upheap ((WT *)timers, timercnt - 1);
1609 1634
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1636}
1612 1637
1613void 1638void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1639ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1640{
1616 ev_clear_pending (EV_A_ (W)w); 1641 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1642 if (expect_false (!ev_is_active (w)))
1618 return; 1643 return;
1619 1644
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1621 1646
… …
1632 ((WT)w)->at -= mn_now; 1657 ((WT)w)->at -= mn_now;
1633 1658
1634 ev_stop (EV_A_ (W)w); 1659 ev_stop (EV_A_ (W)w);
1635} 1660}
1636 1661
1637void 1662void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1663ev_timer_again (EV_P_ ev_timer *w)
1639{ 1664{
1640 if (ev_is_active (w)) 1665 if (ev_is_active (w))
1641 { 1666 {
1642 if (w->repeat) 1667 if (w->repeat)
… …
1653 ev_timer_start (EV_A_ w); 1678 ev_timer_start (EV_A_ w);
1654 } 1679 }
1655} 1680}
1656 1681
1657#if EV_PERIODIC_ENABLE 1682#if EV_PERIODIC_ENABLE
1658void 1683void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1684ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1685{
1661 if (expect_false (ev_is_active (w))) 1686 if (expect_false (ev_is_active (w)))
1662 return; 1687 return;
1663 1688
… …
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1691 else if (w->interval)
1667 { 1692 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1693 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 */ 1694 /* 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; 1695 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1696 }
1697 else
1698 ((WT)w)->at = w->offset;
1672 1699
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1700 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1701 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1702 periodics [periodiccnt - 1] = w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1703 upheap ((WT *)periodics, periodiccnt - 1);
1677 1704
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1705 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1706}
1680 1707
1681void 1708void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1709ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1710{
1684 ev_clear_pending (EV_A_ (W)w); 1711 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1712 if (expect_false (!ev_is_active (w)))
1686 return; 1713 return;
1687 1714
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1715 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1689 1716
… …
1698 } 1725 }
1699 1726
1700 ev_stop (EV_A_ (W)w); 1727 ev_stop (EV_A_ (W)w);
1701} 1728}
1702 1729
1703void 1730void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1731ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1732{
1706 /* TODO: use adjustheap and recalculation */ 1733 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1734 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1735 ev_periodic_start (EV_A_ w);
… …
1711 1738
1712#ifndef SA_RESTART 1739#ifndef SA_RESTART
1713# define SA_RESTART 0 1740# define SA_RESTART 0
1714#endif 1741#endif
1715 1742
1716void 1743void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1744ev_signal_start (EV_P_ ev_signal *w)
1718{ 1745{
1719#if EV_MULTIPLICITY 1746#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1747 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1748#endif
… …
1740 sigaction (w->signum, &sa, 0); 1767 sigaction (w->signum, &sa, 0);
1741#endif 1768#endif
1742 } 1769 }
1743} 1770}
1744 1771
1745void 1772void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1773ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1774{
1748 ev_clear_pending (EV_A_ (W)w); 1775 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1776 if (expect_false (!ev_is_active (w)))
1750 return; 1777 return;
1751 1778
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1780 ev_stop (EV_A_ (W)w);
… …
1770} 1797}
1771 1798
1772void 1799void
1773ev_child_stop (EV_P_ ev_child *w) 1800ev_child_stop (EV_P_ ev_child *w)
1774{ 1801{
1775 ev_clear_pending (EV_A_ (W)w); 1802 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1803 if (expect_false (!ev_is_active (w)))
1777 return; 1804 return;
1778 1805
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1806 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1807 ev_stop (EV_A_ (W)w);
… …
2016} 2043}
2017 2044
2018void 2045void
2019ev_stat_stop (EV_P_ ev_stat *w) 2046ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2047{
2021 ev_clear_pending (EV_A_ (W)w); 2048 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2049 if (expect_false (!ev_is_active (w)))
2023 return; 2050 return;
2024 2051
2025#if EV_USE_INOTIFY 2052#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2053 infy_del (EV_A_ w);
… …
2052} 2079}
2053 2080
2054void 2081void
2055ev_idle_stop (EV_P_ ev_idle *w) 2082ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2083{
2057 ev_clear_pending (EV_A_ (W)w); 2084 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2085 if (expect_false (!ev_is_active (w)))
2059 return; 2086 return;
2060 2087
2061 { 2088 {
2062 int active = ((W)w)->active; 2089 int active = ((W)w)->active;
… …
2082} 2109}
2083 2110
2084void 2111void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2112ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2113{
2087 ev_clear_pending (EV_A_ (W)w); 2114 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2115 if (expect_false (!ev_is_active (w)))
2089 return; 2116 return;
2090 2117
2091 { 2118 {
2092 int active = ((W)w)->active; 2119 int active = ((W)w)->active;
… …
2109} 2136}
2110 2137
2111void 2138void
2112ev_check_stop (EV_P_ ev_check *w) 2139ev_check_stop (EV_P_ ev_check *w)
2113{ 2140{
2114 ev_clear_pending (EV_A_ (W)w); 2141 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
2116 return; 2143 return;
2117 2144
2118 { 2145 {
2119 int active = ((W)w)->active; 2146 int active = ((W)w)->active;
… …
2161} 2188}
2162 2189
2163void 2190void
2164ev_embed_stop (EV_P_ ev_embed *w) 2191ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2192{
2166 ev_clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
2168 return; 2195 return;
2169 2196
2170 ev_io_stop (EV_A_ &w->io); 2197 ev_io_stop (EV_A_ &w->io);
2171 2198
… …
2186} 2213}
2187 2214
2188void 2215void
2189ev_fork_stop (EV_P_ ev_fork *w) 2216ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2217{
2191 ev_clear_pending (EV_A_ (W)w); 2218 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2219 if (expect_false (!ev_is_active (w)))
2193 return; 2220 return;
2194 2221
2195 { 2222 {
2196 int active = ((W)w)->active; 2223 int active = ((W)w)->active;

Diff Legend

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