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

Comparing libev/ev.c (file contents):
Revision 1.148 by root, Tue Nov 27 11:11:13 2007 UTC vs.
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC

… …
94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
… …
109#include <errno.h> 117#include <errno.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
114 128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <sys/time.h> 130# include <sys/time.h>
117# include <sys/wait.h> 131# include <sys/wait.h>
118# include <unistd.h> 132# include <unistd.h>
… …
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
… …
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
177/**/ 219/**/
178 220
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#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) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#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 */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 224
190#if __GNUC__ >= 3 225#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */ 227# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL 228# if EV_MINIMAL
… …
246 perror (msg); 281 perror (msg);
247 abort (); 282 abort ();
248 } 283 }
249} 284}
250 285
251static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, size_t size) = realloc;
252 287
253void 288void
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, size_t size))
255{ 290{
256 alloc = cb; 291 alloc = cb;
257} 292}
258 293
259static void * 294inline_speed void *
260ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, size_t size)
261{ 296{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc (ptr, size);
263 298
264 if (!ptr && size) 299 if (!ptr && size)
265 { 300 {
266 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
267 abort (); 302 abort ();
268 } 303 }
269 304
270 return ptr; 305 return ptr;
271} 306}
… …
288typedef struct 323typedef struct
289{ 324{
290 W w; 325 W w;
291 int events; 326 int events;
292} ANPENDING; 327} ANPENDING;
328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
293 335
294#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
295 337
296 struct ev_loop 338 struct ev_loop
297 { 339 {
… …
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 752}
711 753
712/*****************************************************************************/ 754/*****************************************************************************/
713 755
714static ev_child *childs [PID_HASHSIZE]; 756static ev_child *childs [EV_PID_HASHSIZE];
715 757
716#ifndef _WIN32 758#ifndef _WIN32
717 759
718static ev_signal childev; 760static ev_signal childev;
719 761
720void inline_speed 762void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 764{
723 ev_child *w; 765 ev_child *w;
724 766
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
726 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
727 { 769 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
729 w->rpid = pid; 771 w->rpid = pid;
730 w->rstatus = status; 772 w->rstatus = status;
… …
751 /* make sure we are called again until all childs have been reaped */ 793 /* make sure we are called again until all childs have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 794 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 796
755 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 799 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 800}
758 801
759#endif 802#endif
760 803
761/*****************************************************************************/ 804/*****************************************************************************/
… …
844ev_backend (EV_P) 887ev_backend (EV_P)
845{ 888{
846 return backend; 889 return backend;
847} 890}
848 891
849static void 892static void noinline
850loop_init (EV_P_ unsigned int flags) 893loop_init (EV_P_ unsigned int flags)
851{ 894{
852 if (!backend) 895 if (!backend)
853 { 896 {
854#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
… …
871 914
872 if (!(flags & 0x0000ffffUL)) 915 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 916 flags |= ev_recommended_backends ();
874 917
875 backend = 0; 918 backend = 0;
919 backend_fd = -1;
920#if EV_USE_INOTIFY
921 fs_fd = -2;
922#endif
923
876#if EV_USE_PORT 924#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 926#endif
879#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
892 ev_init (&sigev, sigcb); 940 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 941 ev_set_priority (&sigev, EV_MAXPRI);
894 } 942 }
895} 943}
896 944
897static void 945static void noinline
898loop_destroy (EV_P) 946loop_destroy (EV_P)
899{ 947{
900 int i; 948 int i;
949
950#if EV_USE_INOTIFY
951 if (fs_fd >= 0)
952 close (fs_fd);
953#endif
954
955 if (backend_fd >= 0)
956 close (backend_fd);
901 957
902#if EV_USE_PORT 958#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 960#endif
905#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
… …
929 array_free (check, EMPTY0); 985 array_free (check, EMPTY0);
930 986
931 backend = 0; 987 backend = 0;
932} 988}
933 989
934static void 990void inline_size
935loop_fork (EV_P) 991loop_fork (EV_P)
936{ 992{
937#if EV_USE_PORT 993#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 994 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 995#endif
… …
1089 { 1145 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1146 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1147
1092 if (expect_true (p->w)) 1148 if (expect_true (p->w))
1093 { 1149 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1150 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1151
1096 p->w->pending = 0; 1152 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1153 EV_CB_INVOKE (p->w, p->events);
1098 } 1154 }
1099 } 1155 }
… …
1104{ 1160{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1161 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1162 {
1107 ev_timer *w = timers [0]; 1163 ev_timer *w = timers [0];
1108 1164
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1166
1111 /* first reschedule or stop timer */ 1167 /* first reschedule or stop timer */
1112 if (w->repeat) 1168 if (w->repeat)
1113 { 1169 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1170 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1132{ 1188{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1190 {
1135 ev_periodic *w = periodics [0]; 1191 ev_periodic *w = periodics [0];
1136 1192
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1194
1139 /* first reschedule or stop timer */ 1195 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1196 if (w->reschedule_cb)
1141 { 1197 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1474 ev_start (EV_A_ (W)w, ++timercnt); 1530 ev_start (EV_A_ (W)w, ++timercnt);
1475 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1476 timers [timercnt - 1] = w; 1532 timers [timercnt - 1] = w;
1477 upheap ((WT *)timers, timercnt - 1); 1533 upheap ((WT *)timers, timercnt - 1);
1478 1534
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1480} 1536}
1481 1537
1482void 1538void
1483ev_timer_stop (EV_P_ ev_timer *w) 1539ev_timer_stop (EV_P_ ev_timer *w)
1484{ 1540{
… …
1486 if (expect_false (!ev_is_active (w))) 1542 if (expect_false (!ev_is_active (w)))
1487 return; 1543 return;
1488 1544
1489 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1490 1546
1547 {
1548 int active = ((W)w)->active;
1549
1491 if (expect_true (((W)w)->active < timercnt--)) 1550 if (expect_true (--active < --timercnt))
1492 { 1551 {
1493 timers [((W)w)->active - 1] = timers [timercnt]; 1552 timers [active] = timers [timercnt];
1494 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1553 adjustheap ((WT *)timers, timercnt, active);
1495 } 1554 }
1555 }
1496 1556
1497 ((WT)w)->at -= mn_now; 1557 ((WT)w)->at -= mn_now;
1498 1558
1499 ev_stop (EV_A_ (W)w); 1559 ev_stop (EV_A_ (W)w);
1500} 1560}
… …
1538 ev_start (EV_A_ (W)w, ++periodiccnt); 1598 ev_start (EV_A_ (W)w, ++periodiccnt);
1539 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1540 periodics [periodiccnt - 1] = w; 1600 periodics [periodiccnt - 1] = w;
1541 upheap ((WT *)periodics, periodiccnt - 1); 1601 upheap ((WT *)periodics, periodiccnt - 1);
1542 1602
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1544} 1604}
1545 1605
1546void 1606void
1547ev_periodic_stop (EV_P_ ev_periodic *w) 1607ev_periodic_stop (EV_P_ ev_periodic *w)
1548{ 1608{
… …
1550 if (expect_false (!ev_is_active (w))) 1610 if (expect_false (!ev_is_active (w)))
1551 return; 1611 return;
1552 1612
1553 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1554 1614
1615 {
1616 int active = ((W)w)->active;
1617
1555 if (expect_true (((W)w)->active < periodiccnt--)) 1618 if (expect_true (--active < --periodiccnt))
1556 { 1619 {
1557 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1620 periodics [active] = periodics [periodiccnt];
1558 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1621 adjustheap ((WT *)periodics, periodiccnt, active);
1559 } 1622 }
1623 }
1560 1624
1561 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1562} 1626}
1563 1627
1564void 1628void
… …
1625#endif 1689#endif
1626 if (expect_false (ev_is_active (w))) 1690 if (expect_false (ev_is_active (w)))
1627 return; 1691 return;
1628 1692
1629 ev_start (EV_A_ (W)w, 1); 1693 ev_start (EV_A_ (W)w, 1);
1630 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631} 1695}
1632 1696
1633void 1697void
1634ev_child_stop (EV_P_ ev_child *w) 1698ev_child_stop (EV_P_ ev_child *w)
1635{ 1699{
1636 ev_clear_pending (EV_A_ (W)w); 1700 ev_clear_pending (EV_A_ (W)w);
1637 if (expect_false (!ev_is_active (w))) 1701 if (expect_false (!ev_is_active (w)))
1638 return; 1702 return;
1639 1703
1640 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1641 ev_stop (EV_A_ (W)w); 1705 ev_stop (EV_A_ (W)w);
1642} 1706}
1643 1707
1644#if EV_STAT_ENABLE 1708#if EV_STAT_ENABLE
1645 1709
… …
1649# endif 1713# endif
1650 1714
1651#define DEF_STAT_INTERVAL 5.0074891 1715#define DEF_STAT_INTERVAL 5.0074891
1652#define MIN_STAT_INTERVAL 0.1074891 1716#define MIN_STAT_INTERVAL 0.1074891
1653 1717
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719
1720#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048)
1722
1723static void noinline
1724infy_add (EV_P_ ev_stat *w)
1725{
1726 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);
1727
1728 if (w->wd < 0)
1729 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731
1732 /* monitor some parent directory for speedup hints */
1733 if (errno == ENOENT || errno == EACCES)
1734 {
1735 char path [PATH_MAX];
1736 strcpy (path, w->path);
1737
1738 do
1739 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1741 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1742
1743 char *pend = strrchr (path, '/');
1744
1745 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */
1747
1748 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD);
1750 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 }
1753 }
1754 else
1755 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1756
1757 if (w->wd >= 0)
1758 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1759}
1760
1761static void noinline
1762infy_del (EV_P_ ev_stat *w)
1763{
1764 WL w_;
1765 int slot;
1766 int wd = w->wd;
1767
1768 if (wd < 0)
1769 return;
1770
1771 w->wd = -2;
1772 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1773 wlist_del (&fs_hash [slot].head, (WL)w);
1774
1775 /* remove this watcher, if others are watching it, they will rearm */
1776 inotify_rm_watch (fs_fd, wd);
1777}
1778
1779static void noinline
1780infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1781{
1782 if (slot < 0)
1783 /* overflow, need to check for all hahs slots */
1784 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1785 infy_wd (EV_A_ slot, wd, ev);
1786 else
1787 {
1788 WL w_;
1789
1790 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1791 {
1792 ev_stat *w = (ev_stat *)w_;
1793 w_ = w_->next; /* lets us remove this watcher and all before it */
1794
1795 if (w->wd == wd || wd == -1)
1796 {
1797 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1798 {
1799 w->wd = -1;
1800 infy_add (EV_A_ w); /* re-add, no matter what */
1801 }
1802
1803 stat_timer_cb (EV_P_ &w->timer, 0);
1804 }
1805 }
1806 }
1807}
1808
1809static void
1810infy_cb (EV_P_ ev_io *w, int revents)
1811{
1812 char buf [EV_INOTIFY_BUFSIZE];
1813 struct inotify_event *ev = (struct inotify_event *)buf;
1814 int ofs;
1815 int len = read (fs_fd, buf, sizeof (buf));
1816
1817 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1818 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1819}
1820
1821void inline_size
1822infy_init (EV_P)
1823{
1824 if (fs_fd != -2)
1825 return;
1826
1827 fs_fd = inotify_init ();
1828
1829 if (fs_fd >= 0)
1830 {
1831 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1832 ev_set_priority (&fs_w, EV_MAXPRI);
1833 ev_io_start (EV_A_ &fs_w);
1834 }
1835}
1836
1837#endif
1838
1654void 1839void
1655ev_stat_stat (EV_P_ ev_stat *w) 1840ev_stat_stat (EV_P_ ev_stat *w)
1656{ 1841{
1657 if (lstat (w->path, &w->attr) < 0) 1842 if (lstat (w->path, &w->attr) < 0)
1658 w->attr.st_nlink = 0; 1843 w->attr.st_nlink = 0;
1659 else if (!w->attr.st_nlink) 1844 else if (!w->attr.st_nlink)
1660 w->attr.st_nlink = 1; 1845 w->attr.st_nlink = 1;
1661} 1846}
1662 1847
1663static void 1848void noinline
1664stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1849stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1665{ 1850{
1666 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1851 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1667 1852
1668 /* we copy this here each the time so that */ 1853 /* we copy this here each the time so that */
1669 /* prev has the old value when the callback gets invoked */ 1854 /* prev has the old value when the callback gets invoked */
1670 w->prev = w->attr; 1855 w->prev = w->attr;
1671 ev_stat_stat (EV_A_ w); 1856 ev_stat_stat (EV_A_ w);
1672 1857
1673 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1858 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1859 {
1860 #if EV_USE_INOTIFY
1861 infy_del (EV_A_ w);
1862 infy_add (EV_A_ w);
1863 ev_stat_stat (EV_A_ w); /* avoid race... */
1864 #endif
1865
1674 ev_feed_event (EV_A_ w, EV_STAT); 1866 ev_feed_event (EV_A_ w, EV_STAT);
1867 }
1675} 1868}
1676 1869
1677void 1870void
1678ev_stat_start (EV_P_ ev_stat *w) 1871ev_stat_start (EV_P_ ev_stat *w)
1679{ 1872{
… …
1689 if (w->interval < MIN_STAT_INTERVAL) 1882 if (w->interval < MIN_STAT_INTERVAL)
1690 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1883 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1691 1884
1692 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1885 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1693 ev_set_priority (&w->timer, ev_priority (w)); 1886 ev_set_priority (&w->timer, ev_priority (w));
1887
1888#if EV_USE_INOTIFY
1889 infy_init (EV_A);
1890
1891 if (fs_fd >= 0)
1892 infy_add (EV_A_ w);
1893 else
1894#endif
1694 ev_timer_start (EV_A_ &w->timer); 1895 ev_timer_start (EV_A_ &w->timer);
1695 1896
1696 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1697} 1898}
1698 1899
1699void 1900void
… …
1701{ 1902{
1702 ev_clear_pending (EV_A_ (W)w); 1903 ev_clear_pending (EV_A_ (W)w);
1703 if (expect_false (!ev_is_active (w))) 1904 if (expect_false (!ev_is_active (w)))
1704 return; 1905 return;
1705 1906
1907#if EV_USE_INOTIFY
1908 infy_del (EV_A_ w);
1909#endif
1706 ev_timer_stop (EV_A_ &w->timer); 1910 ev_timer_stop (EV_A_ &w->timer);
1707 1911
1708 ev_stop (EV_A_ (W)w); 1912 ev_stop (EV_A_ (W)w);
1709} 1913}
1710#endif 1914#endif

Diff Legend

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