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

Comparing libev/ev.c (file contents):
Revision 1.151 by root, Tue Nov 27 19:59:08 2007 UTC vs.
Revision 1.153 by root, Wed Nov 28 11:41:18 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
161#ifndef EV_PID_HASHSIZE 179#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 180# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 181# define EV_PID_HASHSIZE 1
164# else 182# else
165# define EV_PID_HASHSIZE 16 183# define EV_PID_HASHSIZE 16
166# endif 184# endif
167#endif 185#endif
168 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
169/**/ 195/**/
170 196
171#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
… …
180 206
181#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 208# include <winsock.h>
183#endif 209#endif
184 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
185/**/ 219/**/
186 220
187#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) */
188#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) */
189/*#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 */
190
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196 224
197#if __GNUC__ >= 3 225#if __GNUC__ >= 3
198# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */ 227# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL 228# if EV_MINIMAL
… …
296{ 324{
297 W w; 325 W w;
298 int events; 326 int events;
299} ANPENDING; 327} ANPENDING;
300 328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
335
301#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
302 337
303 struct ev_loop 338 struct ev_loop
304 { 339 {
305 ev_tstamp ev_rt_now; 340 ev_tstamp ev_rt_now;
… …
879 914
880 if (!(flags & 0x0000ffffUL)) 915 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 916 flags |= ev_recommended_backends ();
882 917
883 backend = 0; 918 backend = 0;
919 backend_fd = -1;
920#if EV_USE_INOTIFY
921 fs_fd = -2;
922#endif
923
884#if EV_USE_PORT 924#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 926#endif
887#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
904 944
905static void noinline 945static void noinline
906loop_destroy (EV_P) 946loop_destroy (EV_P)
907{ 947{
908 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);
909 957
910#if EV_USE_PORT 958#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 960#endif
913#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
… …
1665# endif 1713# endif
1666 1714
1667#define DEF_STAT_INTERVAL 5.0074891 1715#define DEF_STAT_INTERVAL 5.0074891
1668#define MIN_STAT_INTERVAL 0.1074891 1716#define MIN_STAT_INTERVAL 0.1074891
1669 1717
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719
1720#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE 8192
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) && strlen (w->path) < 4096)
1734 {
1735 char path [4096];
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, mask);
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 int slot;
1765 int wd = w->wd;
1766
1767 if (wd < 0)
1768 return;
1769
1770 w->wd = -2;
1771 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1772 wlist_del (&fs_hash [slot].head, (WL)w);
1773
1774 /* remove this watcher, if others are watching it, they will rearm */
1775 inotify_rm_watch (fs_fd, wd);
1776}
1777
1778static void noinline
1779infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1780{
1781 if (slot < 0)
1782 /* overflow, need to check for all hahs slots */
1783 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1784 infy_wd (EV_A_ slot, wd, ev);
1785 else
1786 {
1787 WL w_;
1788
1789 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1790 {
1791 ev_stat *w = (ev_stat *)w_;
1792 w_ = w_->next; /* lets us remove this watcher and all before it */
1793
1794 if (w->wd == wd || wd == -1)
1795 {
1796 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1797 {
1798 w->wd = -1;
1799 infy_add (EV_A_ w); /* re-add, no matter what */
1800 }
1801
1802 stat_timer_cb (EV_A_ &w->timer, 0);
1803 }
1804 }
1805 }
1806}
1807
1808static void
1809infy_cb (EV_P_ ev_io *w, int revents)
1810{
1811 char buf [EV_INOTIFY_BUFSIZE];
1812 struct inotify_event *ev = (struct inotify_event *)buf;
1813 int ofs;
1814 int len = read (fs_fd, buf, sizeof (buf));
1815
1816 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1817 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1818}
1819
1820void inline_size
1821infy_init (EV_P)
1822{
1823 if (fs_fd != -2)
1824 return;
1825
1826 fs_fd = inotify_init ();
1827
1828 if (fs_fd >= 0)
1829 {
1830 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1831 ev_set_priority (&fs_w, EV_MAXPRI);
1832 ev_io_start (EV_A_ &fs_w);
1833 }
1834}
1835
1836#endif
1837
1670void 1838void
1671ev_stat_stat (EV_P_ ev_stat *w) 1839ev_stat_stat (EV_P_ ev_stat *w)
1672{ 1840{
1673 if (lstat (w->path, &w->attr) < 0) 1841 if (lstat (w->path, &w->attr) < 0)
1674 w->attr.st_nlink = 0; 1842 w->attr.st_nlink = 0;
1675 else if (!w->attr.st_nlink) 1843 else if (!w->attr.st_nlink)
1676 w->attr.st_nlink = 1; 1844 w->attr.st_nlink = 1;
1677} 1845}
1678 1846
1679static void 1847void noinline
1680stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1848stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1681{ 1849{
1682 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1850 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1683 1851
1684 /* we copy this here each the time so that */ 1852 /* we copy this here each the time so that */
1685 /* prev has the old value when the callback gets invoked */ 1853 /* prev has the old value when the callback gets invoked */
1686 w->prev = w->attr; 1854 w->prev = w->attr;
1687 ev_stat_stat (EV_A_ w); 1855 ev_stat_stat (EV_A_ w);
1688 1856
1689 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1857 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1858 {
1859 #if EV_USE_INOTIFY
1860 infy_del (EV_A_ w);
1861 infy_add (EV_A_ w);
1862 ev_stat_stat (EV_A_ w); /* avoid race... */
1863 #endif
1864
1690 ev_feed_event (EV_A_ w, EV_STAT); 1865 ev_feed_event (EV_A_ w, EV_STAT);
1866 }
1691} 1867}
1692 1868
1693void 1869void
1694ev_stat_start (EV_P_ ev_stat *w) 1870ev_stat_start (EV_P_ ev_stat *w)
1695{ 1871{
… …
1705 if (w->interval < MIN_STAT_INTERVAL) 1881 if (w->interval < MIN_STAT_INTERVAL)
1706 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1882 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1707 1883
1708 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1884 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1709 ev_set_priority (&w->timer, ev_priority (w)); 1885 ev_set_priority (&w->timer, ev_priority (w));
1886
1887#if EV_USE_INOTIFY
1888 infy_init (EV_A);
1889
1890 if (fs_fd >= 0)
1891 infy_add (EV_A_ w);
1892 else
1893#endif
1710 ev_timer_start (EV_A_ &w->timer); 1894 ev_timer_start (EV_A_ &w->timer);
1711 1895
1712 ev_start (EV_A_ (W)w, 1); 1896 ev_start (EV_A_ (W)w, 1);
1713} 1897}
1714 1898
1715void 1899void
… …
1717{ 1901{
1718 ev_clear_pending (EV_A_ (W)w); 1902 ev_clear_pending (EV_A_ (W)w);
1719 if (expect_false (!ev_is_active (w))) 1903 if (expect_false (!ev_is_active (w)))
1720 return; 1904 return;
1721 1905
1906#if EV_USE_INOTIFY
1907 infy_del (EV_A_ w);
1908#endif
1722 ev_timer_stop (EV_A_ &w->timer); 1909 ev_timer_stop (EV_A_ &w->timer);
1723 1910
1724 ev_stop (EV_A_ (W)w); 1911 ev_stop (EV_A_ (W)w);
1725} 1912}
1726#endif 1913#endif

Diff Legend

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