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

Comparing libev/ev.c (file contents):
Revision 1.310 by root, Sun Jul 26 04:43:03 2009 UTC vs.
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC

… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
… …
302# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
303# endif 304# endif
304#endif 305#endif
305 306
306#ifndef EV_USE_SIGNALFD 307#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 309# define EV_USE_SIGNALFD 1
309# else 310# else
310# define EV_USE_SIGNALFD 0 311# define EV_USE_SIGNALFD 0
311# endif 312# endif
312#endif 313#endif
… …
343# endif 344# endif
344#endif 345#endif
345 346
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
348#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
351#endif 358#endif
352 359
… …
386# include <stdint.h> 393# include <stdint.h>
387# ifndef EFD_NONBLOCK 394# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 395# define EFD_NONBLOCK O_NONBLOCK
389# endif 396# endif
390# ifndef EFD_CLOEXEC 397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
392# endif 403# endif
393# ifdef __cplusplus 404# ifdef __cplusplus
394extern "C" { 405extern "C" {
395# endif 406# endif
396int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
… …
398} 409}
399# endif 410# endif
400#endif 411#endif
401 412
402#if EV_USE_SIGNALFD 413#if EV_USE_SIGNALFD
403# include <sys/signalfd.h> 414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
404#endif 418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
405 441
406/**/ 442/**/
407 443
408#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
421 */ 457 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 459
424#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
425#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
427 462
428#if __GNUC__ >= 4 463#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
431#else 466#else
… …
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif 506#endif
472 507
473#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
510#endif
511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
475#endif 520#endif
476 521
477#ifdef _WIN32 522#ifdef _WIN32
478# include "ev_win32.c" 523# include "ev_win32.c"
479#endif 524#endif
… …
872 917
873#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
874 if (events) 919 if (events)
875 { 920 {
876 unsigned long arg; 921 unsigned long arg;
877 #ifdef EV_FD_TO_WIN32_HANDLE
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
879 #else
880 anfd->handle = _get_osfhandle (fd);
881 #endif
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
883 } 924 }
884#endif 925#endif
885 926
886 { 927 {
… …
929/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
930inline_size int 971inline_size int
931fd_valid (int fd) 972fd_valid (int fd)
932{ 973{
933#ifdef _WIN32 974#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 976#else
936 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
937#endif 978#endif
938} 979}
939 980
… …
1144inline_speed void 1185inline_speed void
1145fd_intern (int fd) 1186fd_intern (int fd)
1146{ 1187{
1147#ifdef _WIN32 1188#ifdef _WIN32
1148 unsigned long arg = 1; 1189 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1150#else 1191#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif 1194#endif
1154} 1195}
… …
1259{ 1300{
1260#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop; 1302 EV_P = signals [signum - 1].loop;
1262#endif 1303#endif
1263 1304
1264#if _WIN32 1305#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1266#endif 1307#endif
1267 1308
1268 signals [signum - 1].pending = 1; 1309 signals [signum - 1].pending = 1;
1269 evpipe_write (EV_A_ &sig_pending); 1310 evpipe_write (EV_A_ &sig_pending);
… …
1570#endif 1611#endif
1571#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1614#endif
1574#if EV_USE_SIGNALFD 1615#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1617#endif
1577 1618
1578 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1580 1621
… …
1617 close (evfd); 1658 close (evfd);
1618#endif 1659#endif
1619 1660
1620 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1621 { 1662 {
1622 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1665 }
1625 } 1666 }
1626 1667
1627#if EV_USE_SIGNALFD 1668#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1669 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1670 close (sigfd);
1634 }
1635#endif 1671#endif
1636 1672
1637#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1639 close (fs_fd); 1675 close (fs_fd);
… …
1724 close (evfd); 1760 close (evfd);
1725#endif 1761#endif
1726 1762
1727 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1728 { 1764 {
1729 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1767 }
1732 1768
1733 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2127 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2128 } 2164 }
2129} 2165}
2130 2166
2131/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2169inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2135{ 2171{
2136#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
… …
2717 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2754# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2755 if (sigfd < 0) /*TODO*/
2720# endif 2756# endif
2721 { 2757 {
2722# if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2723 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2724# else 2762# else
2725 struct sigaction sa; 2763 struct sigaction sa;
2726 2764
2727 evpipe_init (EV_A); 2765 evpipe_init (EV_A);
… …
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2797#endif
2760#if EV_USE_SIGNALFD 2798#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2799 if (sigfd >= 0)
2762 { 2800 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2805 sigdelset (&sigfd_set, w->signum);
2806
2765 signalfd (sigfd, &sigfd_set, 0); 2807 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2809 }
2769 else 2810 else
2770#endif 2811#endif
2771 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2772 } 2813 }
… …
2825static void noinline 2866static void noinline
2826infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2827{ 2868{
2828 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); 2869 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);
2829 2870
2830 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 2896
2835 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 2901 {
2840 char path [4096]; 2902 char path [4096];
… …
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 2919 }
2858 } 2920 }
2859 2921
2860 if (w->wd >= 0) 2922 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2863 2924
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2880 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 2929}
2882 2930
2883static void noinline 2931static void noinline
2884infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2885{ 2933{
… …
2961 return; 3009 return;
2962 3010
2963 fs_2625 = 1; 3011 fs_2625 = 1;
2964} 3012}
2965 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2966inline_size void 3025inline_size void
2967infy_init (EV_P) 3026infy_init (EV_P)
2968{ 3027{
2969 if (fs_fd != -2) 3028 if (fs_fd != -2)
2970 return; 3029 return;
2971 3030
2972 fs_fd = -1; 3031 fs_fd = -1;
2973 3032
2974 check_2625 (EV_A); 3033 check_2625 (EV_A);
2975 3034
2976 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2977 3036
2978 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2979 { 3038 {
3039 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2983 } 3044 }
2984} 3045}
2985 3046
2986inline_size void 3047inline_size void
2987infy_fork (EV_P) 3048infy_fork (EV_P)
… …
2989 int slot; 3050 int slot;
2990 3051
2991 if (fs_fd < 0) 3052 if (fs_fd < 0)
2992 return; 3053 return;
2993 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3057 close (fs_fd);
2995 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2996 3067
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2998 { 3069 {
2999 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
3007 w->wd = -1; 3078 w->wd = -1;
3008 3079
3009 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
3013 } 3089 }
3014 } 3090 }
3015} 3091}
3016 3092
3017#endif 3093#endif
… …
3034static void noinline 3110static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3112{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3114
3039 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
3043 3117
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3119 if (
3046 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
3058 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
3060 { 3139 {
3061 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
3087 3166
3088 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
3090 else 3169 else
3091#endif 3170#endif
3171 {
3092 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
3093 3175
3094 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3095 3177
3096 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
3097} 3179}
… …
3106 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
3107 3189
3108#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
3110#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
3112 3199
3113 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3114 3201
3115 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
3116} 3203}

Diff Legend

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