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

Comparing libev/ev.c (file contents):
Revision 1.308 by root, Sun Jul 19 20:39:54 2009 UTC vs.
Revision 1.324 by root, Sat Jan 23 20:15:57 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
… …
386# include <stdint.h> 387# include <stdint.h>
387# ifndef EFD_NONBLOCK 388# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 389# define EFD_NONBLOCK O_NONBLOCK
389# endif 390# endif
390# ifndef EFD_CLOEXEC 391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
392# endif 397# endif
393# ifdef __cplusplus 398# ifdef __cplusplus
394extern "C" { 399extern "C" {
395# endif 400# endif
396int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
… …
398} 403}
399# endif 404# endif
400#endif 405#endif
401 406
402#if EV_USE_SIGNALFD 407#if EV_USE_SIGNALFD
403# include <sys/signalfd.h> 408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
404#endif 412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
405 435
406/**/ 436/**/
407 437
408#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
421 */ 451 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 453
424#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
428#if __GNUC__ >= 4 457#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
431#else 460#else
… …
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif 500#endif
472 501
473#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
475#endif 514#endif
476 515
477#ifdef _WIN32 516#ifdef _WIN32
478# include "ev_win32.c" 517# include "ev_win32.c"
479#endif 518#endif
… …
872 911
873#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
874 if (events) 913 if (events)
875 { 914 {
876 unsigned long arg; 915 unsigned long arg;
877 #ifdef EV_FD_TO_WIN32_HANDLE
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
883 } 918 }
884#endif 919#endif
885 920
886 { 921 {
… …
929/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
930inline_size int 965inline_size int
931fd_valid (int fd) 966fd_valid (int fd)
932{ 967{
933#ifdef _WIN32 968#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 970#else
936 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
937#endif 972#endif
938} 973}
939 974
… …
1057 1092
1058 for (;;) 1093 for (;;)
1059 { 1094 {
1060 int c = k << 1; 1095 int c = k << 1;
1061 1096
1062 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
1063 break; 1098 break;
1064 1099
1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1066 ? 1 : 0; 1101 ? 1 : 0;
1067 1102
… …
1103 1138
1104/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1105inline_size void 1140inline_size void
1106adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1107{ 1142{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1109 upheap (heap, k); 1144 upheap (heap, k);
1110 else 1145 else
1111 downheap (heap, N, k); 1146 downheap (heap, N, k);
1112} 1147}
1113 1148
… …
1144inline_speed void 1179inline_speed void
1145fd_intern (int fd) 1180fd_intern (int fd)
1146{ 1181{
1147#ifdef _WIN32 1182#ifdef _WIN32
1148 unsigned long arg = 1; 1183 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1150#else 1185#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif 1188#endif
1154} 1189}
… …
1259{ 1294{
1260#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop; 1296 EV_P = signals [signum - 1].loop;
1262#endif 1297#endif
1263 1298
1264#if _WIN32 1299#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1266#endif 1301#endif
1267 1302
1268 signals [signum - 1].pending = 1; 1303 signals [signum - 1].pending = 1;
1269 evpipe_write (EV_A_ &sig_pending); 1304 evpipe_write (EV_A_ &sig_pending);
… …
1570#endif 1605#endif
1571#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1608#endif
1574#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1611#endif
1577 1612
1578 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1580 1615
… …
1617 close (evfd); 1652 close (evfd);
1618#endif 1653#endif
1619 1654
1620 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1621 { 1656 {
1622 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1659 }
1625 } 1660 }
1626 1661
1627#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1664 close (sigfd);
1634 }
1635#endif 1665#endif
1636 1666
1637#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1639 close (fs_fd); 1669 close (fs_fd);
… …
1724 close (evfd); 1754 close (evfd);
1725#endif 1755#endif
1726 1756
1727 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1728 { 1758 {
1729 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1761 }
1732 1762
1733 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2127 ANHE_at_cache (*he); 2157 ANHE_at_cache (*he);
2128 } 2158 }
2129} 2159}
2130 2160
2131/* fetch new monotonic and realtime times from the kernel */ 2161/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2162/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2163inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
2135{ 2165{
2136#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
… …
2717 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2720# endif 2750# endif
2721 { 2751 {
2722# if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2723 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2724# else 2756# else
2725 struct sigaction sa; 2757 struct sigaction sa;
2726 2758
2727 evpipe_init (EV_A); 2759 evpipe_init (EV_A);
… …
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2791#endif
2760#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2793 if (sigfd >= 0)
2762 { 2794 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2765 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2803 }
2769 else 2804 else
2770#endif 2805#endif
2771 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2772 } 2807 }
… …
2825static void noinline 2860static void noinline
2826infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2827{ 2862{
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); 2863 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 2864
2830 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2835 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 2895 {
2840 char path [4096]; 2896 char path [4096];
… …
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 2913 }
2858 } 2914 }
2859 2915
2860 if (w->wd >= 0) 2916 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2863 2918
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2880 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 2923}
2882 2924
2883static void noinline 2925static void noinline
2884infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2885{ 2927{
… …
2961 return; 3003 return;
2962 3004
2963 fs_2625 = 1; 3005 fs_2625 = 1;
2964} 3006}
2965 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2966inline_size void 3019inline_size void
2967infy_init (EV_P) 3020infy_init (EV_P)
2968{ 3021{
2969 if (fs_fd != -2) 3022 if (fs_fd != -2)
2970 return; 3023 return;
2971 3024
2972 fs_fd = -1; 3025 fs_fd = -1;
2973 3026
2974 check_2625 (EV_A); 3027 check_2625 (EV_A);
2975 3028
2976 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2977 3030
2978 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2979 { 3032 {
3033 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2983 } 3038 }
2984} 3039}
2985 3040
2986inline_size void 3041inline_size void
2987infy_fork (EV_P) 3042infy_fork (EV_P)
… …
2989 int slot; 3044 int slot;
2990 3045
2991 if (fs_fd < 0) 3046 if (fs_fd < 0)
2992 return; 3047 return;
2993 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3051 close (fs_fd);
2995 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
2996 3061
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2998 { 3063 {
2999 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
3007 w->wd = -1; 3072 w->wd = -1;
3008 3073
3009 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
3013 } 3083 }
3014 } 3084 }
3015} 3085}
3016 3086
3017#endif 3087#endif
… …
3034static void noinline 3104static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3106{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3108
3039 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
3043 3111
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3113 if (
3046 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
3058 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3060 { 3133 {
3061 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3087 3160
3088 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3090 else 3163 else
3091#endif 3164#endif
3165 {
3092 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3093 3169
3094 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3095 3171
3096 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3097} 3173}
… …
3106 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3107 3183
3108#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3110#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3112 3193
3113 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3114 3195
3115 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3116} 3197}

Diff Legend

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