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

Comparing libev/ev.c (file contents):
Revision 1.273 by root, Mon Nov 3 14:27:06 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
… …
300 320
301#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
302# include <winsock.h> 322# include <winsock.h>
303#endif 323#endif
304 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
332#endif
333
305#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
306/* 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 */
307# include <stdint.h> 336# include <stdint.h>
308# ifdef __cplusplus 337# ifdef __cplusplus
309extern "C" { 338extern "C" {
… …
719 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
721 #else 750 #else
722 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
723 #endif 752 #endif
724 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));
725 } 754 }
726#endif 755#endif
727 756
728 { 757 {
729 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
1102ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1103{ 1132{
1104 WL w; 1133 WL w;
1105 1134
1106#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1107 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));
1108#endif 1137#endif
1109 1138
1110 --signum; 1139 --signum;
1111 1140
1112 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1242 /* 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 */
1243 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1273#endif
1245#ifdef __APPLE__ 1274#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1247 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 */
1248#endif 1278#endif
1249 1279
1250 return flags; 1280 return flags;
1251} 1281}
1252 1282
… …
1505 1535
1506#if EV_VERIFY 1536#if EV_VERIFY
1507static void noinline 1537static void noinline
1508verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1509{ 1539{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1541
1512 if (w->pending) 1542 if (w->pending)
1513 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));
1514} 1544}
1515 1545
1516static void noinline 1546static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1548{
1519 int i; 1549 int i;
1520 1550
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1552 {
1523 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));
1524 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])));
1525 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]))));
1526 1556
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1558 }
1529} 1559}
1530 1560
1531static void noinline 1561static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1533{ 1563{
1534 while (cnt--) 1564 while (cnt--)
1535 { 1565 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1538 } 1568 }
1539} 1569}
1540#endif 1570#endif
1541 1571
… …
1548 1578
1549 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1550 1580
1551 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1584
1555 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1558 { 1588 {
1559 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1561 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));
1562 } 1592 }
1563 1593
1564 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1566 1596
… …
1683 { 1713 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1715
1686 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1687 { 1717 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1689 1719
1690 p->w->pending = 0; 1720 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1693 } 1723 }
… …
1724 1754
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 1756 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1728 1758
1729 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1730 1760
1731 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1732 if (w->repeat) 1762 if (w->repeat)
1733 { 1763 {
1734 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1737 1767
1738 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.));
1739 1769
1740 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1742 } 1772 }
1743 else 1773 else
… …
1756 1786
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 1788 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1760 1790
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1762 1792
1763 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1764 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1765 { 1795 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 1797
1768 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));
1769 1799
1770 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1772 } 1802 }
1773 else if (w->interval) 1803 else if (w->interval)
… …
2124 int fd = w->fd; 2154 int fd = w->fd;
2125 2155
2126 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2127 return; 2157 return;
2128 2158
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2130 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))));
2131 2161
2132 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2133 2163
2134 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2146{ 2176{
2147 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2149 return; 2179 return;
2150 2180
2151 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));
2152 2182
2153 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2154 2184
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2167 return; 2197 return;
2168 2198
2169 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2170 2200
2171 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.));
2172 2202
2173 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2174 2204
2175 ++timercnt; 2205 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2181 2211
2182 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2183 2213
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2215}
2186 2216
2187void noinline 2217void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2219{
… …
2194 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2195 2225
2196 { 2226 {
2197 int active = ev_active (w); 2227 int active = ev_active (w);
2198 2228
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2230
2201 --timercnt; 2231 --timercnt;
2202 2232
2203 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2204 { 2234 {
… …
2248 2278
2249 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2281 else if (w->interval)
2252 { 2282 {
2253 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.));
2254 /* 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 */
2255 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;
2256 } 2286 }
2257 else 2287 else
2258 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2268 2298
2269 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2270 2300
2271 /*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));*/
2272} 2302}
2273 2303
2274void noinline 2304void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2306{
… …
2281 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2282 2312
2283 { 2313 {
2284 int active = ev_active (w); 2314 int active = ev_active (w);
2285 2315
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2317
2288 --periodiccnt; 2318 --periodiccnt;
2289 2319
2290 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2321 {
… …
2314 2344
2315void noinline 2345void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2317{ 2347{
2318#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2319 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));
2320#endif 2350#endif
2321 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2322 return; 2352 return;
2323 2353
2324 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));
2325 2355
2326 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2327 2357
2328 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2329 2359
… …
2380 2410
2381void 2411void
2382ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2383{ 2413{
2384#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2385 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));
2386#endif 2416#endif
2387 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2388 return; 2418 return;
2389 2419
2390 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2449 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2450 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2451 2481
2452 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2453 2483
2454 if (!pend) 2484 if (!pend || pend == path)
2455 break; /* whoops, no '/', complain to your admin */ 2485 break;
2456 2486
2457 *pend = 0; 2487 *pend = 0;
2458 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2459 } 2489 }
2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2461 } 2491 }
2462 } 2492 }
2463 else 2493
2494 if (w->wd >= 0)
2464 { 2495 {
2465 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);
2466 2497
2467 /* now local changes will be tracked by inotify, but remote changes won't */ 2498 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */ 2499 /* unless the filesystem it known to be local, we therefore still poll */
… …
2518 2549
2519 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2520 { 2551 {
2521 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2522 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2523 w->wd = -1; 2555 w->wd = -1;
2524 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2525 } 2557 }
2526 2558
2527 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2874static void 2906static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{ 2908{
2877 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));
2878 2910
2911 ev_embed_stop (EV_A_ w);
2912
2879 { 2913 {
2880 struct ev_loop *loop = w->other; 2914 struct ev_loop *loop = w->other;
2881 2915
2882 ev_loop_fork (EV_A); 2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2883 } 2918 }
2919
2920 ev_embed_start (EV_A_ w);
2884} 2921}
2885 2922
2886#if 0 2923#if 0
2887static void 2924static void
2888embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2897 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2898 return; 2935 return;
2899 2936
2900 { 2937 {
2901 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2902 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 ()));
2903 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);
2904 } 2941 }
2905 2942
2906 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2907 2944

Diff Legend

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