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.157 by root, Wed Nov 28 20:58:32 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
… …
253 perror (msg); 281 perror (msg);
254 abort (); 282 abort ();
255 } 283 }
256} 284}
257 285
258static void *(*alloc)(void *ptr, size_t size) = realloc; 286static void *(*alloc)(void *ptr, long size);
259 287
260void 288void
261ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 290{
263 alloc = cb; 291 alloc = cb;
264} 292}
265 293
266inline_speed void * 294inline_speed void *
267ev_realloc (void *ptr, size_t size) 295ev_realloc (void *ptr, long size)
268{ 296{
269 ptr = alloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 298
271 if (!ptr && size) 299 if (!ptr && size)
272 { 300 {
273 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 302 abort ();
275 } 303 }
276 304
277 return ptr; 305 return ptr;
278} 306}
… …
295typedef struct 323typedef struct
296{ 324{
297 W w; 325 W w;
298 int events; 326 int events;
299} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
300 335
301#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
302 337
303 struct ev_loop 338 struct ev_loop
304 { 339 {
… …
554static void noinline 589static void noinline
555fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
556{ 591{
557 int fd; 592 int fd;
558 593
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 594 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 595 if (anfds [fd].events)
562 { 596 {
563 anfds [fd].events = 0; 597 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 598 fd_change (EV_A_ fd);
… …
852ev_backend (EV_P) 886ev_backend (EV_P)
853{ 887{
854 return backend; 888 return backend;
855} 889}
856 890
857static void 891static void noinline
858loop_init (EV_P_ unsigned int flags) 892loop_init (EV_P_ unsigned int flags)
859{ 893{
860 if (!backend) 894 if (!backend)
861 { 895 {
862#if EV_USE_MONOTONIC 896#if EV_USE_MONOTONIC
… …
879 913
880 if (!(flags & 0x0000ffffUL)) 914 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 915 flags |= ev_recommended_backends ();
882 916
883 backend = 0; 917 backend = 0;
918 backend_fd = -1;
919#if EV_USE_INOTIFY
920 fs_fd = -2;
921#endif
922
884#if EV_USE_PORT 923#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 924 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 925#endif
887#if EV_USE_KQUEUE 926#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 927 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
900 ev_init (&sigev, sigcb); 939 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 940 ev_set_priority (&sigev, EV_MAXPRI);
902 } 941 }
903} 942}
904 943
905static void 944static void noinline
906loop_destroy (EV_P) 945loop_destroy (EV_P)
907{ 946{
908 int i; 947 int i;
948
949#if EV_USE_INOTIFY
950 if (fs_fd >= 0)
951 close (fs_fd);
952#endif
953
954 if (backend_fd >= 0)
955 close (backend_fd);
909 956
910#if EV_USE_PORT 957#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 958 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 959#endif
913#if EV_USE_KQUEUE 960#if EV_USE_KQUEUE
… …
937 array_free (check, EMPTY0); 984 array_free (check, EMPTY0);
938 985
939 backend = 0; 986 backend = 0;
940} 987}
941 988
942static void 989void inline_size infy_fork (EV_P);
990
991void inline_size
943loop_fork (EV_P) 992loop_fork (EV_P)
944{ 993{
945#if EV_USE_PORT 994#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 995 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 996#endif
948#if EV_USE_KQUEUE 997#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 998 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 999#endif
951#if EV_USE_EPOLL 1000#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1001 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1002#endif
1003#if EV_USE_INOTIFY
1004 infy_fork (EV_A);
953#endif 1005#endif
954 1006
955 if (ev_is_active (&sigev)) 1007 if (ev_is_active (&sigev))
956 { 1008 {
957 /* default loop */ 1009 /* default loop */
… …
1097 { 1149 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1150 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1151
1100 if (expect_true (p->w)) 1152 if (expect_true (p->w))
1101 { 1153 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1154 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1155
1104 p->w->pending = 0; 1156 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1157 EV_CB_INVOKE (p->w, p->events);
1106 } 1158 }
1107 } 1159 }
… …
1112{ 1164{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1165 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1166 {
1115 ev_timer *w = timers [0]; 1167 ev_timer *w = timers [0];
1116 1168
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1169 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1170
1119 /* first reschedule or stop timer */ 1171 /* first reschedule or stop timer */
1120 if (w->repeat) 1172 if (w->repeat)
1121 { 1173 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1174 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1140{ 1192{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1193 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1194 {
1143 ev_periodic *w = periodics [0]; 1195 ev_periodic *w = periodics [0];
1144 1196
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1198
1147 /* first reschedule or stop timer */ 1199 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1200 if (w->reschedule_cb)
1149 { 1201 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1202 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1217 ev_tstamp odiff = rtmn_diff; 1269 ev_tstamp odiff = rtmn_diff;
1218 1270
1219 /* loop a few times, before making important decisions. 1271 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough, 1272 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to 1273 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed 1274 * ev_time and get_clock. a second call is almost guaranteed
1223 * to succeed in that case, though. and looping a few more times 1275 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or 1276 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here. 1277 * in the unlikely event of having been preempted here.
1226 */ 1278 */
1227 for (i = 4; --i; ) 1279 for (i = 4; --i; )
1228 { 1280 {
1229 rtmn_diff = ev_rt_now - mn_now; 1281 rtmn_diff = ev_rt_now - mn_now;
1230 1282
… …
1252 { 1304 {
1253#if EV_PERIODIC_ENABLE 1305#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1306 periodics_reschedule (EV_A);
1255#endif 1307#endif
1256 1308
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1309 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1310 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1311 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1312 }
1261 1313
1262 mn_now = ev_rt_now; 1314 mn_now = ev_rt_now;
… …
1284 ? EVUNLOOP_ONE 1336 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1337 : EVUNLOOP_CANCEL;
1286 1338
1287 while (activecnt) 1339 while (activecnt)
1288 { 1340 {
1289 /* we might have forked, so reify kernel state if necessary */
1290 #if EV_FORK_ENABLE 1341#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1343 if (expect_false (postfork))
1292 if (forkcnt) 1344 if (forkcnt)
1293 { 1345 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1347 call_pending (EV_A);
1296 } 1348 }
1297 #endif 1349#endif
1298 1350
1299 /* queue check watchers (and execute them) */ 1351 /* queue check watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1352 if (expect_false (preparecnt))
1301 { 1353 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1310 /* update fd-related kernel structures */ 1362 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1363 fd_reify (EV_A);
1312 1364
1313 /* calculate blocking time */ 1365 /* calculate blocking time */
1314 { 1366 {
1315 double block; 1367 ev_tstamp block;
1316 1368
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1369 if (flags & EVLOOP_NONBLOCK || idlecnt)
1318 block = 0.; /* do not block at all */ 1370 block = 0.; /* do not block at all */
1319 else 1371 else
1320 { 1372 {
… …
1482 ev_start (EV_A_ (W)w, ++timercnt); 1534 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1535 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1536 timers [timercnt - 1] = w;
1485 upheap ((WT *)timers, timercnt - 1); 1537 upheap ((WT *)timers, timercnt - 1);
1486 1538
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1540}
1489 1541
1490void 1542void
1491ev_timer_stop (EV_P_ ev_timer *w) 1543ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1544{
… …
1494 if (expect_false (!ev_is_active (w))) 1546 if (expect_false (!ev_is_active (w)))
1495 return; 1547 return;
1496 1548
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498 1550
1551 {
1552 int active = ((W)w)->active;
1553
1499 if (expect_true (((W)w)->active < timercnt--)) 1554 if (expect_true (--active < --timercnt))
1500 { 1555 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1556 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1557 adjustheap ((WT *)timers, timercnt, active);
1503 } 1558 }
1559 }
1504 1560
1505 ((WT)w)->at -= mn_now; 1561 ((WT)w)->at -= mn_now;
1506 1562
1507 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1508} 1564}
… …
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1602 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1604 periodics [periodiccnt - 1] = w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1605 upheap ((WT *)periodics, periodiccnt - 1);
1550 1606
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1608}
1553 1609
1554void 1610void
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1611ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1612{
… …
1558 if (expect_false (!ev_is_active (w))) 1614 if (expect_false (!ev_is_active (w)))
1559 return; 1615 return;
1560 1616
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1562 1618
1619 {
1620 int active = ((W)w)->active;
1621
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1622 if (expect_true (--active < --periodiccnt))
1564 { 1623 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1624 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1625 adjustheap ((WT *)periodics, periodiccnt, active);
1567 } 1626 }
1627 }
1568 1628
1569 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1570} 1630}
1571 1631
1572void 1632void
… …
1657# endif 1717# endif
1658 1718
1659#define DEF_STAT_INTERVAL 5.0074891 1719#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1720#define MIN_STAT_INTERVAL 0.1074891
1661 1721
1722static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1723
1724#if EV_USE_INOTIFY
1725# define EV_INOTIFY_BUFSIZE 8192
1726
1727static void noinline
1728infy_add (EV_P_ ev_stat *w)
1729{
1730 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);
1731
1732 if (w->wd < 0)
1733 {
1734 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1735
1736 /* monitor some parent directory for speedup hints */
1737 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1738 {
1739 char path [4096];
1740 strcpy (path, w->path);
1741
1742 do
1743 {
1744 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1745 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1746
1747 char *pend = strrchr (path, '/');
1748
1749 if (!pend)
1750 break; /* whoops, no '/', complain to your admin */
1751
1752 *pend = 0;
1753 w->wd = inotify_add_watch (fs_fd, path, mask);
1754 }
1755 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1756 }
1757 }
1758 else
1759 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1760
1761 if (w->wd >= 0)
1762 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1763}
1764
1765static void noinline
1766infy_del (EV_P_ ev_stat *w)
1767{
1768 int slot;
1769 int wd = w->wd;
1770
1771 if (wd < 0)
1772 return;
1773
1774 w->wd = -2;
1775 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1776 wlist_del (&fs_hash [slot].head, (WL)w);
1777
1778 /* remove this watcher, if others are watching it, they will rearm */
1779 inotify_rm_watch (fs_fd, wd);
1780}
1781
1782static void noinline
1783infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1784{
1785 if (slot < 0)
1786 /* overflow, need to check for all hahs slots */
1787 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1788 infy_wd (EV_A_ slot, wd, ev);
1789 else
1790 {
1791 WL w_;
1792
1793 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1794 {
1795 ev_stat *w = (ev_stat *)w_;
1796 w_ = w_->next; /* lets us remove this watcher and all before it */
1797
1798 if (w->wd == wd || wd == -1)
1799 {
1800 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1801 {
1802 w->wd = -1;
1803 infy_add (EV_A_ w); /* re-add, no matter what */
1804 }
1805
1806 stat_timer_cb (EV_A_ &w->timer, 0);
1807 }
1808 }
1809 }
1810}
1811
1812static void
1813infy_cb (EV_P_ ev_io *w, int revents)
1814{
1815 char buf [EV_INOTIFY_BUFSIZE];
1816 struct inotify_event *ev = (struct inotify_event *)buf;
1817 int ofs;
1818 int len = read (fs_fd, buf, sizeof (buf));
1819
1820 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1821 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1822}
1823
1824void inline_size
1825infy_init (EV_P)
1826{
1827 if (fs_fd != -2)
1828 return;
1829
1830 fs_fd = inotify_init ();
1831
1832 if (fs_fd >= 0)
1833 {
1834 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1835 ev_set_priority (&fs_w, EV_MAXPRI);
1836 ev_io_start (EV_A_ &fs_w);
1837 }
1838}
1839
1840void inline_size
1841infy_fork (EV_P)
1842{
1843 int slot;
1844
1845 if (fs_fd < 0)
1846 return;
1847
1848 close (fs_fd);
1849 fs_fd = inotify_init ();
1850
1851 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1852 {
1853 WL w_ = fs_hash [slot].head;
1854 fs_hash [slot].head = 0;
1855
1856 while (w_)
1857 {
1858 ev_stat *w = (ev_stat *)w_;
1859 w_ = w_->next; /* lets us add this watcher */
1860
1861 w->wd = -1;
1862
1863 if (fs_fd >= 0)
1864 infy_add (EV_A_ w); /* re-add, no matter what */
1865 else
1866 ev_timer_start (EV_A_ &w->timer);
1867 }
1868
1869 }
1870}
1871
1872#endif
1873
1662void 1874void
1663ev_stat_stat (EV_P_ ev_stat *w) 1875ev_stat_stat (EV_P_ ev_stat *w)
1664{ 1876{
1665 if (lstat (w->path, &w->attr) < 0) 1877 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 1878 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 1879 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 1880 w->attr.st_nlink = 1;
1669} 1881}
1670 1882
1671static void 1883static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1884stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 1885{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1886 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 1887
1676 /* we copy this here each the time so that */ 1888 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 1889 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 1890 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 1891 ev_stat_stat (EV_A_ w);
1680 1892
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1893 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1894 if (
1895 w->prev.st_dev != w->attr.st_dev
1896 || w->prev.st_ino != w->attr.st_ino
1897 || w->prev.st_mode != w->attr.st_mode
1898 || w->prev.st_nlink != w->attr.st_nlink
1899 || w->prev.st_uid != w->attr.st_uid
1900 || w->prev.st_gid != w->attr.st_gid
1901 || w->prev.st_rdev != w->attr.st_rdev
1902 || w->prev.st_size != w->attr.st_size
1903 || w->prev.st_atime != w->attr.st_atime
1904 || w->prev.st_mtime != w->attr.st_mtime
1905 || w->prev.st_ctime != w->attr.st_ctime
1906 ) {
1907 #if EV_USE_INOTIFY
1908 infy_del (EV_A_ w);
1909 infy_add (EV_A_ w);
1910 ev_stat_stat (EV_A_ w); /* avoid race... */
1911 #endif
1912
1682 ev_feed_event (EV_A_ w, EV_STAT); 1913 ev_feed_event (EV_A_ w, EV_STAT);
1914 }
1683} 1915}
1684 1916
1685void 1917void
1686ev_stat_start (EV_P_ ev_stat *w) 1918ev_stat_start (EV_P_ ev_stat *w)
1687{ 1919{
… …
1697 if (w->interval < MIN_STAT_INTERVAL) 1929 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 1930 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 1931
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 1932 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 1933 ev_set_priority (&w->timer, ev_priority (w));
1934
1935#if EV_USE_INOTIFY
1936 infy_init (EV_A);
1937
1938 if (fs_fd >= 0)
1939 infy_add (EV_A_ w);
1940 else
1941#endif
1702 ev_timer_start (EV_A_ &w->timer); 1942 ev_timer_start (EV_A_ &w->timer);
1703 1943
1704 ev_start (EV_A_ (W)w, 1); 1944 ev_start (EV_A_ (W)w, 1);
1705} 1945}
1706 1946
1707void 1947void
… …
1709{ 1949{
1710 ev_clear_pending (EV_A_ (W)w); 1950 ev_clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 1951 if (expect_false (!ev_is_active (w)))
1712 return; 1952 return;
1713 1953
1954#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w);
1956#endif
1714 ev_timer_stop (EV_A_ &w->timer); 1957 ev_timer_stop (EV_A_ &w->timer);
1715 1958
1716 ev_stop (EV_A_ (W)w); 1959 ev_stop (EV_A_ (W)w);
1717} 1960}
1718#endif 1961#endif

Diff Legend

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