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

Comparing libev/ev.c (file contents):
Revision 1.265 by root, Thu Oct 23 04:56:49 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
… …
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
291# include <sys/utsname.h> 311# include <sys/utsname.h>
312# include <sys/statfs.h>
292# include <sys/inotify.h> 313# include <sys/inotify.h>
293/* 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 */
294# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
297# endif 318# endif
298#endif 319#endif
299 320
300#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
301# 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
302#endif 332#endif
303 333
304#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
305/* 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 */
306# include <stdint.h> 336# include <stdint.h>
… …
388{ 418{
389 syserr_cb = cb; 419 syserr_cb = cb;
390} 420}
391 421
392static void noinline 422static void noinline
393syserr (const char *msg) 423ev_syserr (const char *msg)
394{ 424{
395 if (!msg) 425 if (!msg)
396 msg = "(libev) system error"; 426 msg = "(libev) system error";
397 427
398 if (syserr_cb) 428 if (syserr_cb)
… …
450{ 480{
451 WL head; 481 WL head;
452 unsigned char events; 482 unsigned char events;
453 unsigned char reify; 483 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */ 485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
456#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 490 SOCKET handle;
458#endif 491#endif
459} ANFD; 492} ANFD;
460 493
… …
715 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
717 #else 750 #else
718 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
719 #endif 752 #endif
720 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));
721 } 754 }
722#endif 755#endif
723 756
724 { 757 {
725 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
806 839
807 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 841 if (anfds [fd].events)
809 { 842 {
810 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
811 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
812 } 846 }
813} 847}
814 848
815/*****************************************************************************/ 849/*****************************************************************************/
… …
997 } 1031 }
998 else 1032 else
999#endif 1033#endif
1000 { 1034 {
1001 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1002 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1003 1037
1004 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1005 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1006 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1007 } 1041 }
… …
1097ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1098{ 1132{
1099 WL w; 1133 WL w;
1100 1134
1101#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1102 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));
1103#endif 1137#endif
1104 1138
1105 --signum; 1139 --signum;
1106 1140
1107 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1236 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1237 /* 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 */
1238 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1239#endif 1273#endif
1240#ifdef __APPLE__ 1274#ifdef __APPLE__
1241 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1242 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 */
1243#endif 1278#endif
1244 1279
1245 return flags; 1280 return flags;
1246} 1281}
1247 1282
… …
1500 1535
1501#if EV_VERIFY 1536#if EV_VERIFY
1502static void noinline 1537static void noinline
1503verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1504{ 1539{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506 1541
1507 if (w->pending) 1542 if (w->pending)
1508 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));
1509} 1544}
1510 1545
1511static void noinline 1546static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1513{ 1548{
1514 int i; 1549 int i;
1515 1550
1516 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1517 { 1552 {
1518 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));
1519 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])));
1520 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]))));
1521 1556
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 } 1558 }
1524} 1559}
1525 1560
1526static void noinline 1561static void noinline
1527array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1528{ 1563{
1529 while (cnt--) 1564 while (cnt--)
1530 { 1565 {
1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1533 } 1568 }
1534} 1569}
1535#endif 1570#endif
1536 1571
… …
1543 1578
1544 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1545 1580
1546 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1549 1584
1550 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1553 { 1588 {
1554 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1556 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));
1557 } 1592 }
1558 1593
1559 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1560 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1561 1596
… …
1638{ 1673{
1639#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1640 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1641#endif 1676#endif
1642 1677
1678 ev_default_loop_ptr = 0;
1679
1643#ifndef _WIN32 1680#ifndef _WIN32
1644 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1645 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1646#endif 1683#endif
1647 1684
… …
1653{ 1690{
1654#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1655 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1656#endif 1693#endif
1657 1694
1658 if (backend)
1659 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1660} 1696}
1661 1697
1662/*****************************************************************************/ 1698/*****************************************************************************/
1663 1699
1664void 1700void
… …
1677 { 1713 {
1678 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1679 1715
1680 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1681 { 1717 {
1682 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1683 1719
1684 p->w->pending = 0; 1720 p->w->pending = 0;
1685 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1686 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1687 } 1723 }
… …
1718 1754
1719 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1720 { 1756 {
1721 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1722 1758
1723 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1724 1760
1725 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1726 if (w->repeat) 1762 if (w->repeat)
1727 { 1763 {
1728 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1729 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1730 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1731 1767
1732 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.));
1733 1769
1734 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1735 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1736 } 1772 }
1737 else 1773 else
… …
1750 1786
1751 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1752 { 1788 {
1753 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1754 1790
1755 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1756 1792
1757 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1758 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1759 { 1795 {
1760 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1761 1797
1762 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));
1763 1799
1764 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1765 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1766 } 1802 }
1767 else if (w->interval) 1803 else if (w->interval)
… …
2118 int fd = w->fd; 2154 int fd = w->fd;
2119 2155
2120 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2121 return; 2157 return;
2122 2158
2123 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2124 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2160 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2125 2161
2126 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2127 2163
2128 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2140{ 2176{
2141 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2142 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2143 return; 2179 return;
2144 2180
2145 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));
2146 2182
2147 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2148 2184
2149 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2150 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2160 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2161 return; 2197 return;
2162 2198
2163 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2164 2200
2165 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.));
2166 2202
2167 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2168 2204
2169 ++timercnt; 2205 ++timercnt;
2170 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2173 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2174 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2175 2211
2176 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2177 2213
2178 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2179} 2215}
2180 2216
2181void noinline 2217void noinline
2182ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2183{ 2219{
… …
2188 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2189 2225
2190 { 2226 {
2191 int active = ev_active (w); 2227 int active = ev_active (w);
2192 2228
2193 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2194 2230
2195 --timercnt; 2231 --timercnt;
2196 2232
2197 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2198 { 2234 {
… …
2242 2278
2243 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2244 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2245 else if (w->interval) 2281 else if (w->interval)
2246 { 2282 {
2247 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.));
2248 /* 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 */
2249 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;
2250 } 2286 }
2251 else 2287 else
2252 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2260 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2261 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2262 2298
2263 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2264 2300
2265 /*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));*/
2266} 2302}
2267 2303
2268void noinline 2304void noinline
2269ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2270{ 2306{
… …
2275 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2276 2312
2277 { 2313 {
2278 int active = ev_active (w); 2314 int active = ev_active (w);
2279 2315
2280 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2281 2317
2282 --periodiccnt; 2318 --periodiccnt;
2283 2319
2284 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2285 { 2321 {
… …
2308 2344
2309void noinline 2345void noinline
2310ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2311{ 2347{
2312#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2313 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));
2314#endif 2350#endif
2315 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2316 return; 2352 return;
2317 2353
2318 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));
2319 2355
2320 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2321 2357
2322 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2323 2359
… …
2374 2410
2375void 2411void
2376ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2377{ 2413{
2378#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2379 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));
2380#endif 2416#endif
2381 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2382 return; 2418 return;
2383 2419
2384 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2409# ifdef _WIN32 2445# ifdef _WIN32
2410# undef lstat 2446# undef lstat
2411# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2412# endif 2448# endif
2413 2449
2414#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 */
2415#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2416 2453
2417static 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);
2418 2455
2419#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2420# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2424{ 2461{
2425 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);
2426 2463
2427 if (w->wd < 0) 2464 if (w->wd < 0)
2428 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2429 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 */
2430 2468
2431 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2432 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2433 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2434 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2435 { 2473 {
2436 char path [4096]; 2474 char path [4096];
2437 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2441 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2442 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2443 2481
2444 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2445 2483
2446 if (!pend) 2484 if (!pend || pend == path)
2447 break; /* whoops, no '/', complain to your admin */ 2485 break;
2448 2486
2449 *pend = 0; 2487 *pend = 0;
2450 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2451 } 2489 }
2452 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2453 } 2491 }
2454 } 2492 }
2455 else
2456 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2457 2493
2458 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2459 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 }
2460} 2515}
2461 2516
2462static void noinline 2517static void noinline
2463infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2464{ 2519{
… …
2494 2549
2495 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2496 { 2551 {
2497 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2498 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2499 w->wd = -1; 2555 w->wd = -1;
2500 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2501 } 2557 }
2502 2558
2503 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2517 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)
2518 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2519} 2575}
2520 2576
2521void inline_size 2577void inline_size
2522infy_init (EV_P) 2578check_2625 (EV_P)
2523{ 2579{
2524 if (fs_fd != -2)
2525 return;
2526
2527 /* kernels < 2.6.25 are borked 2580 /* kernels < 2.6.25 are borked
2528 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2529 */ 2582 */
2530 {
2531 struct utsname buf; 2583 struct utsname buf;
2532 int major, minor, micro; 2584 int major, minor, micro;
2533 2585
2534 fs_fd = -1;
2535
2536 if (uname (&buf)) 2586 if (uname (&buf))
2537 return; 2587 return;
2538 2588
2539 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2540 return; 2590 return;
2541 2591
2542 if (major < 2 2592 if (major < 2
2543 || (major == 2 && minor < 6) 2593 || (major == 2 && minor < 6)
2544 || (major == 2 && minor == 6 && micro < 25)) 2594 || (major == 2 && minor == 6 && micro < 25))
2545 return; 2595 return;
2546 } 2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
2601infy_init (EV_P)
2602{
2603 if (fs_fd != -2)
2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2547 2609
2548 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2549 2611
2550 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2551 { 2613 {
… …
2579 w->wd = -1; 2641 w->wd = -1;
2580 2642
2581 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2582 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2583 else 2645 else
2584 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2585 } 2647 }
2586 } 2648 }
2587} 2649}
2588 2650
2589#endif 2651#endif
… …
2644ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2645{ 2707{
2646 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2647 return; 2709 return;
2648 2710
2649 /* since we use memcmp, we need to clear any padding data etc. */
2650 memset (&w->prev, 0, sizeof (ev_statdata));
2651 memset (&w->attr, 0, sizeof (ev_statdata));
2652
2653 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2654 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2655 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2656 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2657 2715
2658 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);
2659 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2660 2718
2661#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2662 infy_init (EV_A); 2720 infy_init (EV_A);
2663 2721
2664 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2665 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2666 else 2724 else
2667#endif 2725#endif
2668 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2669 2727
2670 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2671 2729
2672 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2673} 2731}
… …
2848static void 2906static void
2849embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2850{ 2908{
2851 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));
2852 2910
2911 ev_embed_stop (EV_A_ w);
2912
2853 { 2913 {
2854 struct ev_loop *loop = w->other; 2914 struct ev_loop *loop = w->other;
2855 2915
2856 ev_loop_fork (EV_A); 2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2857 } 2918 }
2919
2920 ev_embed_start (EV_A_ w);
2858} 2921}
2859 2922
2860#if 0 2923#if 0
2861static void 2924static void
2862embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2871 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2872 return; 2935 return;
2873 2936
2874 { 2937 {
2875 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2876 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 ()));
2877 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);
2878 } 2941 }
2879 2942
2880 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2881 2944

Diff Legend

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