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

Comparing libev/ev.c (file contents):
Revision 1.150 by root, Tue Nov 27 19:41:52 2007 UTC vs.
Revision 1.154 by root, Wed Nov 28 11:53:37 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;
… …
852ev_backend (EV_P) 887ev_backend (EV_P)
853{ 888{
854 return backend; 889 return backend;
855} 890}
856 891
857static void 892static void noinline
858loop_init (EV_P_ unsigned int flags) 893loop_init (EV_P_ unsigned int flags)
859{ 894{
860 if (!backend) 895 if (!backend)
861 { 896 {
862#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
… …
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);
… …
900 ev_init (&sigev, sigcb); 940 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 941 ev_set_priority (&sigev, EV_MAXPRI);
902 } 942 }
903} 943}
904 944
905static void 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
… …
937 array_free (check, EMPTY0); 985 array_free (check, EMPTY0);
938 986
939 backend = 0; 987 backend = 0;
940} 988}
941 989
942static void 990void inline_size infy_fork (EV_P);
991
992void inline_size
943loop_fork (EV_P) 993loop_fork (EV_P)
944{ 994{
945#if EV_USE_PORT 995#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 996 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 997#endif
948#if EV_USE_KQUEUE 998#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 999 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1000#endif
951#if EV_USE_EPOLL 1001#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1002 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1003#endif
1004#if EV_USE_INOTIFY
1005 infy_fork (EV_A);
953#endif 1006#endif
954 1007
955 if (ev_is_active (&sigev)) 1008 if (ev_is_active (&sigev))
956 { 1009 {
957 /* default loop */ 1010 /* default loop */
… …
1097 { 1150 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1151 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1152
1100 if (expect_true (p->w)) 1153 if (expect_true (p->w))
1101 { 1154 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1155 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1156
1104 p->w->pending = 0; 1157 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1158 EV_CB_INVOKE (p->w, p->events);
1106 } 1159 }
1107 } 1160 }
… …
1112{ 1165{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1166 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1167 {
1115 ev_timer *w = timers [0]; 1168 ev_timer *w = timers [0];
1116 1169
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1170 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1171
1119 /* first reschedule or stop timer */ 1172 /* first reschedule or stop timer */
1120 if (w->repeat) 1173 if (w->repeat)
1121 { 1174 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1175 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1140{ 1193{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1194 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1195 {
1143 ev_periodic *w = periodics [0]; 1196 ev_periodic *w = periodics [0];
1144 1197
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1199
1147 /* first reschedule or stop timer */ 1200 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1201 if (w->reschedule_cb)
1149 { 1202 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1203 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1482 ev_start (EV_A_ (W)w, ++timercnt); 1535 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1536 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1537 timers [timercnt - 1] = w;
1485 upheap ((WT *)timers, timercnt - 1); 1538 upheap ((WT *)timers, timercnt - 1);
1486 1539
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1540 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1541}
1489 1542
1490void 1543void
1491ev_timer_stop (EV_P_ ev_timer *w) 1544ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1545{
… …
1494 if (expect_false (!ev_is_active (w))) 1547 if (expect_false (!ev_is_active (w)))
1495 return; 1548 return;
1496 1549
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498 1551
1552 {
1553 int active = ((W)w)->active;
1554
1499 if (expect_true (((W)w)->active < timercnt--)) 1555 if (expect_true (--active < --timercnt))
1500 { 1556 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1557 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1558 adjustheap ((WT *)timers, timercnt, active);
1503 } 1559 }
1560 }
1504 1561
1505 ((WT)w)->at -= mn_now; 1562 ((WT)w)->at -= mn_now;
1506 1563
1507 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1508} 1565}
… …
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1603 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1605 periodics [periodiccnt - 1] = w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1606 upheap ((WT *)periodics, periodiccnt - 1);
1550 1607
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1608 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1609}
1553 1610
1554void 1611void
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1612ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1613{
… …
1558 if (expect_false (!ev_is_active (w))) 1615 if (expect_false (!ev_is_active (w)))
1559 return; 1616 return;
1560 1617
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1562 1619
1620 {
1621 int active = ((W)w)->active;
1622
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1623 if (expect_true (--active < --periodiccnt))
1564 { 1624 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1625 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1626 adjustheap ((WT *)periodics, periodiccnt, active);
1567 } 1627 }
1628 }
1568 1629
1569 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1570} 1631}
1571 1632
1572void 1633void
… …
1657# endif 1718# endif
1658 1719
1659#define DEF_STAT_INTERVAL 5.0074891 1720#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1721#define MIN_STAT_INTERVAL 0.1074891
1661 1722
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724
1725#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192
1727
1728static void noinline
1729infy_add (EV_P_ ev_stat *w)
1730{
1731 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);
1732
1733 if (w->wd < 0)
1734 {
1735 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1736
1737 /* monitor some parent directory for speedup hints */
1738 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1739 {
1740 char path [4096];
1741 strcpy (path, w->path);
1742
1743 do
1744 {
1745 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1746 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1747
1748 char *pend = strrchr (path, '/');
1749
1750 if (!pend)
1751 break; /* whoops, no '/', complain to your admin */
1752
1753 *pend = 0;
1754 w->wd = inotify_add_watch (fs_fd, path, mask);
1755 }
1756 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1757 }
1758 }
1759 else
1760 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1761
1762 if (w->wd >= 0)
1763 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1764}
1765
1766static void noinline
1767infy_del (EV_P_ ev_stat *w)
1768{
1769 int slot;
1770 int wd = w->wd;
1771
1772 if (wd < 0)
1773 return;
1774
1775 w->wd = -2;
1776 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1777 wlist_del (&fs_hash [slot].head, (WL)w);
1778
1779 /* remove this watcher, if others are watching it, they will rearm */
1780 inotify_rm_watch (fs_fd, wd);
1781}
1782
1783static void noinline
1784infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1785{
1786 if (slot < 0)
1787 /* overflow, need to check for all hahs slots */
1788 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1789 infy_wd (EV_A_ slot, wd, ev);
1790 else
1791 {
1792 WL w_;
1793
1794 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1795 {
1796 ev_stat *w = (ev_stat *)w_;
1797 w_ = w_->next; /* lets us remove this watcher and all before it */
1798
1799 if (w->wd == wd || wd == -1)
1800 {
1801 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1802 {
1803 w->wd = -1;
1804 infy_add (EV_A_ w); /* re-add, no matter what */
1805 }
1806
1807 stat_timer_cb (EV_A_ &w->timer, 0);
1808 }
1809 }
1810 }
1811}
1812
1813static void
1814infy_cb (EV_P_ ev_io *w, int revents)
1815{
1816 char buf [EV_INOTIFY_BUFSIZE];
1817 struct inotify_event *ev = (struct inotify_event *)buf;
1818 int ofs;
1819 int len = read (fs_fd, buf, sizeof (buf));
1820
1821 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1822 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1823}
1824
1825void inline_size
1826infy_init (EV_P)
1827{
1828 if (fs_fd != -2)
1829 return;
1830
1831 fs_fd = inotify_init ();
1832
1833 if (fs_fd >= 0)
1834 {
1835 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1836 ev_set_priority (&fs_w, EV_MAXPRI);
1837 ev_io_start (EV_A_ &fs_w);
1838 }
1839}
1840
1841void inline_size
1842infy_fork (EV_P)
1843{
1844 int slot;
1845
1846 if (fs_fd < 0)
1847 return;
1848
1849 close (fs_fd);
1850 fs_fd = inotify_init ();
1851
1852 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1853 {
1854 WL w_ = fs_hash [slot].head;
1855 fs_hash [slot].head = 0;
1856
1857 while (w_)
1858 {
1859 ev_stat *w = (ev_stat *)w_;
1860 w_ = w_->next; /* lets us add this watcher */
1861
1862 w->wd = -1;
1863
1864 if (fs_fd >= 0)
1865 infy_add (EV_A_ w); /* re-add, no matter what */
1866 else
1867 ev_timer_start (EV_A_ &w->timer);
1868 }
1869
1870 }
1871}
1872
1873#endif
1874
1662void 1875void
1663ev_stat_stat (EV_P_ ev_stat *w) 1876ev_stat_stat (EV_P_ ev_stat *w)
1664{ 1877{
1665 if (lstat (w->path, &w->attr) < 0) 1878 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 1879 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 1880 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 1881 w->attr.st_nlink = 1;
1669} 1882}
1670 1883
1671static void 1884void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1885stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 1886{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 1888
1676 /* we copy this here each the time so that */ 1889 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 1890 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 1891 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 1892 ev_stat_stat (EV_A_ w);
1680 1893
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1894 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1895 {
1896 #if EV_USE_INOTIFY
1897 infy_del (EV_A_ w);
1898 infy_add (EV_A_ w);
1899 ev_stat_stat (EV_A_ w); /* avoid race... */
1900 #endif
1901
1682 ev_feed_event (EV_A_ w, EV_STAT); 1902 ev_feed_event (EV_A_ w, EV_STAT);
1903 }
1683} 1904}
1684 1905
1685void 1906void
1686ev_stat_start (EV_P_ ev_stat *w) 1907ev_stat_start (EV_P_ ev_stat *w)
1687{ 1908{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 1918 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1919 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 1920
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1921 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 1922 ev_set_priority (&w->timer, ev_priority (w));
1923
1924#if EV_USE_INOTIFY
1925 infy_init (EV_A);
1926
1927 if (fs_fd >= 0)
1928 infy_add (EV_A_ w);
1929 else
1930#endif
1702 ev_timer_start (EV_A_ &w->timer); 1931 ev_timer_start (EV_A_ &w->timer);
1703 1932
1704 ev_start (EV_A_ (W)w, 1); 1933 ev_start (EV_A_ (W)w, 1);
1705} 1934}
1706 1935
1707void 1936void
… …
1709{ 1938{
1710 ev_clear_pending (EV_A_ (W)w); 1939 ev_clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 1940 if (expect_false (!ev_is_active (w)))
1712 return; 1941 return;
1713 1942
1943#if EV_USE_INOTIFY
1944 infy_del (EV_A_ w);
1945#endif
1714 ev_timer_stop (EV_A_ &w->timer); 1946 ev_timer_stop (EV_A_ &w->timer);
1715 1947
1716 ev_stop (EV_A_ (W)w); 1948 ev_stop (EV_A_ (W)w);
1717} 1949}
1718#endif 1950#endif

Diff Legend

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