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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.278 by root, Tue Jan 6 19:46:56 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 306# include <sys/select.h>
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
291# include <sys/inotify.h> 313# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
296# endif 318# endif
297#endif 319#endif
298 320
299#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
300# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
301#endif 332#endif
302 333
303#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
304/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
305# include <stdint.h> 336# include <stdint.h>
… …
387{ 418{
388 syserr_cb = cb; 419 syserr_cb = cb;
389} 420}
390 421
391static void noinline 422static void noinline
392syserr (const char *msg) 423ev_syserr (const char *msg)
393{ 424{
394 if (!msg) 425 if (!msg)
395 msg = "(libev) system error"; 426 msg = "(libev) system error";
396 427
397 if (syserr_cb) 428 if (syserr_cb)
… …
448typedef struct 479typedef struct
449{ 480{
450 WL head; 481 WL head;
451 unsigned char events; 482 unsigned char events;
452 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
453#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 490 SOCKET handle;
455#endif 491#endif
456} ANFD; 492} ANFD;
457 493
… …
610{ 646{
611 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
613} 649}
614 650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
653
615#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
617 { \ 656 { \
618 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
619 (base) = (type *)array_realloc \ 658 (base) = (type *)array_realloc \
… …
661 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
663} 702}
664 703
665/*****************************************************************************/ 704/*****************************************************************************/
666
667void inline_size
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679 705
680void inline_speed 706void inline_speed
681fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
682{ 708{
683 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
722 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else 750 #else
725 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
726 #endif 752 #endif
727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 753 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
728 } 754 }
729#endif 755#endif
730 756
731 { 757 {
732 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
813 839
814 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 841 if (anfds [fd].events)
816 { 842 {
817 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
819 } 846 }
820} 847}
821 848
822/*****************************************************************************/ 849/*****************************************************************************/
… …
974static ANSIG *signals; 1001static ANSIG *signals;
975static int signalmax; 1002static int signalmax;
976 1003
977static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
978 1005
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990
991/*****************************************************************************/ 1006/*****************************************************************************/
992 1007
993void inline_speed 1008void inline_speed
994fd_intern (int fd) 1009fd_intern (int fd)
995{ 1010{
… …
1016 } 1031 }
1017 else 1032 else
1018#endif 1033#endif
1019 { 1034 {
1020 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1022 1037
1023 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1026 } 1041 }
… …
1116ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1117{ 1132{
1118 WL w; 1133 WL w;
1119 1134
1120#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1121 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1136 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1122#endif 1137#endif
1123 1138
1124 --signum; 1139 --signum;
1125 1140
1126 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1256 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
1257 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1273#endif
1259#ifdef __APPLE__ 1274#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1261 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1277 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1262#endif 1278#endif
1263 1279
1264 return flags; 1280 return flags;
1265} 1281}
1266 1282
… …
1519 1535
1520#if EV_VERIFY 1536#if EV_VERIFY
1521static void noinline 1537static void noinline
1522verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1523{ 1539{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1541
1526 if (w->pending) 1542 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1543 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528} 1544}
1529 1545
1530static void noinline 1546static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1548{
1533 int i; 1549 int i;
1534 1550
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1552 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1553 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1554 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1555 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540 1556
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1558 }
1543} 1559}
1544 1560
1545static void noinline 1561static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1547{ 1563{
1548 while (cnt--) 1564 while (cnt--)
1549 { 1565 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1552 } 1568 }
1553} 1569}
1554#endif 1570#endif
1555 1571
… …
1562 1578
1563 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1564 1580
1565 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1584
1569 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1572 { 1588 {
1573 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1591 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 } 1592 }
1577 1593
1578 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1580 1596
… …
1657{ 1673{
1658#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1676#endif
1661 1677
1678 ev_default_loop_ptr = 0;
1679
1662#ifndef _WIN32 1680#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1665#endif 1683#endif
1666 1684
… …
1672{ 1690{
1673#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1675#endif 1693#endif
1676 1694
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1696}
1680 1697
1681/*****************************************************************************/ 1698/*****************************************************************************/
1682 1699
1683void 1700void
… …
1696 { 1713 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1715
1699 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1700 { 1717 {
1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1702 1719
1703 p->w->pending = 0; 1720 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1706 } 1723 }
… …
1737 1754
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 1756 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1741 1758
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1743 1760
1744 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1745 if (w->repeat) 1762 if (w->repeat)
1746 { 1763 {
1747 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1750 1767
1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1768 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1752 1769
1753 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1754 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1755 } 1772 }
1756 else 1773 else
… …
1769 1786
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 1788 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1773 1790
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1775 1792
1776 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1777 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1778 { 1795 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 1797
1781 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1798 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1782 1799
1783 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1784 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1785 } 1802 }
1786 else if (w->interval) 1803 else if (w->interval)
… …
2137 int fd = w->fd; 2154 int fd = w->fd;
2138 2155
2139 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2140 return; 2157 return;
2141 2158
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2160 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2143 2161
2144 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2145 2163
2146 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
2149 2167
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2152 2170
… …
2158{ 2176{
2159 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2161 return; 2179 return;
2162 2180
2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2181 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2164 2182
2165 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2166 2184
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2179 return; 2197 return;
2180 2198
2181 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2182 2200
2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2201 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2184 2202
2185 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2186 2204
2187 ++timercnt; 2205 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2193 2211
2194 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2195 2213
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2215}
2198 2216
2199void noinline 2217void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2219{
… …
2206 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2207 2225
2208 { 2226 {
2209 int active = ev_active (w); 2227 int active = ev_active (w);
2210 2228
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2230
2213 --timercnt; 2231 --timercnt;
2214 2232
2215 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2216 { 2234 {
… …
2260 2278
2261 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2281 else if (w->interval)
2264 { 2282 {
2265 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2283 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2266 /* this formula differs from the one in periodic_reify because we do not always round up */ 2284 /* this formula differs from the one in periodic_reify because we do not always round up */
2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2285 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2268 } 2286 }
2269 else 2287 else
2270 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2280 2298
2281 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2282 2300
2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2301 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2284} 2302}
2285 2303
2286void noinline 2304void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2306{
… …
2293 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2294 2312
2295 { 2313 {
2296 int active = ev_active (w); 2314 int active = ev_active (w);
2297 2315
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2317
2300 --periodiccnt; 2318 --periodiccnt;
2301 2319
2302 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2321 {
… …
2326 2344
2327void noinline 2345void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2329{ 2347{
2330#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2349 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif 2350#endif
2333 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2334 return; 2352 return;
2335 2353
2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2354 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2337 2355
2338 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2339 2357
2340 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2341 2359
… …
2344 sigset_t full, prev; 2362 sigset_t full, prev;
2345 sigfillset (&full); 2363 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2365#endif
2348 2366
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2368
2351#ifndef _WIN32 2369#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2371#endif
2354 } 2372 }
… …
2392 2410
2393void 2411void
2394ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2395{ 2413{
2396#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2415 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2398#endif 2416#endif
2399 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2400 return; 2418 return;
2401 2419
2402 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2445# ifdef _WIN32
2428# undef lstat 2446# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2430# endif 2448# endif
2431 2449
2432#define DEF_STAT_INTERVAL 5.0074891 2450#define DEF_STAT_INTERVAL 5.0074891
2451#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2434 2453
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2454static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2455
2437#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2461{
2443 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2462 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2444 2463
2445 if (w->wd < 0) 2464 if (w->wd < 0)
2446 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2467 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2468
2449 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2473 {
2454 char path [4096]; 2474 char path [4096];
2455 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2481
2462 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2463 2483
2464 if (!pend) 2484 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2485 break;
2466 2486
2467 *pend = 0; 2487 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2489 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2491 }
2472 } 2492 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2493
2476 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2496 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2497
2498 /* now local changes will be tracked by inotify, but remote changes won't */
2499 /* unless the filesystem it known to be local, we therefore still poll */
2500 /* also do poll on <2.6.25, but with normal frequency */
2501 struct statfs sfs;
2502
2503 if (fs_2625 && !statfs (w->path, &sfs))
2504 if (sfs.f_type == 0x1373 /* devfs */
2505 || sfs.f_type == 0xEF53 /* ext2/3 */
2506 || sfs.f_type == 0x3153464a /* jfs */
2507 || sfs.f_type == 0x52654973 /* reiser3 */
2508 || sfs.f_type == 0x01021994 /* tempfs */
2509 || sfs.f_type == 0x58465342 /* xfs */)
2510 return;
2511
2512 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2513 ev_timer_again (EV_A_ &w->timer);
2514 }
2478} 2515}
2479 2516
2480static void noinline 2517static void noinline
2481infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2482{ 2519{
… …
2496 2533
2497static void noinline 2534static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2535infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2536{
2500 if (slot < 0) 2537 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2538 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2539 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2540 infy_wd (EV_A_ slot, wd, ev);
2504 else 2541 else
2505 { 2542 {
2506 WL w_; 2543 WL w_;
… …
2512 2549
2513 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2514 { 2551 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2555 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2557 }
2520 2558
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2573 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2575}
2538 2576
2539void inline_size 2577void inline_size
2578check_2625 (EV_P)
2579{
2580 /* kernels < 2.6.25 are borked
2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2582 */
2583 struct utsname buf;
2584 int major, minor, micro;
2585
2586 if (uname (&buf))
2587 return;
2588
2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2590 return;
2591
2592 if (major < 2
2593 || (major == 2 && minor < 6)
2594 || (major == 2 && minor == 6 && micro < 25))
2595 return;
2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
2540infy_init (EV_P) 2601infy_init (EV_P)
2541{ 2602{
2542 if (fs_fd != -2) 2603 if (fs_fd != -2)
2543 return; 2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2544 2609
2545 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2546 2611
2547 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2548 { 2613 {
… …
2576 w->wd = -1; 2641 w->wd = -1;
2577 2642
2578 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2645 else
2581 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2582 } 2647 }
2583
2584 } 2648 }
2585} 2649}
2586 2650
2587#endif 2651#endif
2588 2652
… …
2624 || w->prev.st_atime != w->attr.st_atime 2688 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2689 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2690 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2691 ) {
2628 #if EV_USE_INOTIFY 2692 #if EV_USE_INOTIFY
2693 if (fs_fd >= 0)
2694 {
2629 infy_del (EV_A_ w); 2695 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2696 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2697 ev_stat_stat (EV_A_ w); /* avoid race... */
2698 }
2632 #endif 2699 #endif
2633 2700
2634 ev_feed_event (EV_A_ w, EV_STAT); 2701 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2702 }
2636} 2703}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2640{ 2707{
2641 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2642 return; 2709 return;
2643 2710
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2649 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 2715
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2716 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2655 2718
2656#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2657 infy_init (EV_A); 2720 infy_init (EV_A);
2658 2721
2659 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2661 else 2724 else
2662#endif 2725#endif
2663 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2664 2727
2665 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2666 2729
2667 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2668} 2731}
… …
2843static void 2906static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 2908{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2909 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 2910
2911 ev_embed_stop (EV_A_ w);
2912
2848 { 2913 {
2849 struct ev_loop *loop = w->other; 2914 struct ev_loop *loop = w->other;
2850 2915
2851 ev_loop_fork (EV_A); 2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 2918 }
2919
2920 ev_embed_start (EV_A_ w);
2853} 2921}
2854 2922
2855#if 0 2923#if 0
2856static void 2924static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2866 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2867 return; 2935 return;
2868 2936
2869 { 2937 {
2870 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2871 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2939 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2940 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2873 } 2941 }
2874 2942
2875 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2876 2944

Diff Legend

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