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

Comparing libev/ev.c (file contents):
Revision 1.449 by root, Sun Sep 23 21:21:58 2012 UTC vs.
Revision 1.460 by root, Tue Oct 29 12:53:38 2013 UTC

… …
241#elif defined SIGARRAYSIZE 241#elif defined SIGARRAYSIZE
242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
243#elif defined _sys_nsig 243#elif defined _sys_nsig
244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
245#else 245#else
246# error "unable to find value for NSIG, please report" 246# define EV_NSIG (8 * sizeof (sigset_t) + 1)
247/* to make it compile regardless, just remove the above line, */
248/* but consider reporting it, too! :) */
249# define EV_NSIG 65
250#endif 247#endif
251 248
252#ifndef EV_USE_FLOOR 249#ifndef EV_USE_FLOOR
253# define EV_USE_FLOOR 0 250# define EV_USE_FLOOR 0
254#endif 251#endif
255 252
256#ifndef EV_USE_CLOCK_SYSCALL 253#ifndef EV_USE_CLOCK_SYSCALL
257# if __linux && __GLIBC__ >= 2 254# if __linux && __GLIBC__ == 2 && __GLIBC_MINOR__ < 17
258# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 255# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
259# else 256# else
260# define EV_USE_CLOCK_SYSCALL 0 257# define EV_USE_CLOCK_SYSCALL 0
261# endif 258# endif
262#endif 259#endif
… …
355# define EV_USE_4HEAP EV_FEATURE_DATA 352# define EV_USE_4HEAP EV_FEATURE_DATA
356#endif 353#endif
357 354
358#ifndef EV_HEAP_CACHE_AT 355#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 356# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
357#endif
358
359#ifdef ANDROID
360/* supposedly, android doesn't typedef fd_mask */
361# undef EV_USE_SELECT
362# define EV_USE_SELECT 0
363/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
364# undef EV_USE_CLOCK_SYSCALL
365# define EV_USE_CLOCK_SYSCALL 0
366#endif
367
368/* aix's poll.h seems to cause lots of trouble */
369#ifdef _AIX
370/* AIX has a completely broken poll.h header */
371# undef EV_USE_POLL
372# define EV_USE_POLL 0
360#endif 373#endif
361 374
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 375/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
363/* which makes programs even slower. might work on other unices, too. */ 376/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 377#if EV_USE_CLOCK_SYSCALL
… …
372# define EV_USE_CLOCK_SYSCALL 0 385# define EV_USE_CLOCK_SYSCALL 0
373# endif 386# endif
374#endif 387#endif
375 388
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 389/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377
378#ifdef _AIX
379/* AIX has a completely broken poll.h header */
380# undef EV_USE_POLL
381# define EV_USE_POLL 0
382#endif
383 390
384#ifndef CLOCK_MONOTONIC 391#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 392# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 393# define EV_USE_MONOTONIC 0
387#endif 394#endif
… …
505 512
506#ifndef ECB_H 513#ifndef ECB_H
507#define ECB_H 514#define ECB_H
508 515
509/* 16 bits major, 16 bits minor */ 516/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 517#define ECB_VERSION 0x00010003
511 518
512#ifdef _WIN32 519#ifdef _WIN32
513 typedef signed char int8_t; 520 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 521 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 522 typedef signed short int16_t;
… …
530 #else 537 #else
531 #define ECB_PTRSIZE 4 538 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 539 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 540 typedef int32_t intptr_t;
534 #endif 541 #endif
535 typedef intptr_t ptrdiff_t;
536#else 542#else
537 #include <inttypes.h> 543 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 544 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 545 #define ECB_PTRSIZE 8
540 #else 546 #else
541 #define ECB_PTRSIZE 4 547 #define ECB_PTRSIZE 4
548 #endif
549#endif
550
551/* work around x32 idiocy by defining proper macros */
552#if __x86_64 || _M_AMD64
553 #if _ILP32
554 #define ECB_AMD64_X32 1
555 #else
556 #define ECB_AMD64 1
542 #endif 557 #endif
543#endif 558#endif
544 559
545/* many compilers define _GNUC_ to some versions but then only implement 560/* many compilers define _GNUC_ to some versions but then only implement
546 * what their idiot authors think are the "more important" extensions, 561 * what their idiot authors think are the "more important" extensions,
… …
560#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 575#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
561#define ECB_C99 (__STDC_VERSION__ >= 199901L) 576#define ECB_C99 (__STDC_VERSION__ >= 199901L)
562#define ECB_C11 (__STDC_VERSION__ >= 201112L) 577#define ECB_C11 (__STDC_VERSION__ >= 201112L)
563#define ECB_CPP (__cplusplus+0) 578#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP11 (__cplusplus >= 201103L) 579#define ECB_CPP11 (__cplusplus >= 201103L)
580
581#if ECB_CPP
582 #define ECB_EXTERN_C extern "C"
583 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
584 #define ECB_EXTERN_C_END }
585#else
586 #define ECB_EXTERN_C extern
587 #define ECB_EXTERN_C_BEG
588 #define ECB_EXTERN_C_END
589#endif
565 590
566/*****************************************************************************/ 591/*****************************************************************************/
567 592
568/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 593/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
569/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 594/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
… …
599 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 624 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
600 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 625 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
601 #elif defined __s390__ || defined __s390x__ 626 #elif defined __s390__ || defined __s390x__
602 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 627 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
603 #elif defined __mips__ 628 #elif defined __mips__
629 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
630 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
604 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 631 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
605 #elif defined __alpha__ 632 #elif defined __alpha__
606 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 633 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
607 #elif defined __hppa__ 634 #elif defined __hppa__
608 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 635 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 636 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
610 #elif defined __ia64__ 637 #elif defined __ia64__
611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
639 #elif defined __m68k__
640 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
641 #elif defined __m88k__
642 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
643 #elif defined __sh__
644 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
612 #endif 645 #endif
613 #endif 646 #endif
614#endif 647#endif
615 648
616#ifndef ECB_MEMORY_FENCE 649#ifndef ECB_MEMORY_FENCE
617 #if ECB_GCC_VERSION(4,7) 650 #if ECB_GCC_VERSION(4,7)
618 /* see comment below (stdatomic.h) about the C11 memory model. */ 651 /* see comment below (stdatomic.h) about the C11 memory model. */
619 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 652 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
653
654 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
655 * without risking compile time errors with other compilers. We *could*
656 * define our own ecb_clang_has_feature, but I just can't be bothered to work
657 * around this shit time and again.
620 #elif defined __clang && __has_feature (cxx_atomic) 658 * #elif defined __clang && __has_feature (cxx_atomic)
621 /* see comment below (stdatomic.h) about the C11 memory model. */ 659 * // see comment below (stdatomic.h) about the C11 memory model.
622 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 660 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
661 */
662
623 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 663 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
624 #define ECB_MEMORY_FENCE __sync_synchronize () 664 #define ECB_MEMORY_FENCE __sync_synchronize ()
625 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 665 #elif _MSC_VER >= 1400 /* VC++ 2005 */
626 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 666 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
627 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 667 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
… …
935 ecb_inline void ecb_unreachable (void) ecb_noreturn; 975 ecb_inline void ecb_unreachable (void) ecb_noreturn;
936 ecb_inline void ecb_unreachable (void) { } 976 ecb_inline void ecb_unreachable (void) { }
937#endif 977#endif
938 978
939/* try to tell the compiler that some condition is definitely true */ 979/* try to tell the compiler that some condition is definitely true */
940#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 980#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
941 981
942ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 982ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
943ecb_inline unsigned char 983ecb_inline unsigned char
944ecb_byteorder_helper (void) 984ecb_byteorder_helper (void)
945{ 985{
946 const uint32_t u = 0x11223344; 986 /* the union code still generates code under pressure in gcc, */
947 return *(unsigned char *)&u; 987 /* but less than using pointers, and always seems to */
988 /* successfully return a constant. */
989 /* the reason why we have this horrible preprocessor mess */
990 /* is to avoid it in all cases, at least on common architectures */
991 /* or when using a recent enough gcc version (>= 4.6) */
992#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
993 return 0x44;
994#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
995 return 0x44;
996#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
997 return 0x11;
998#else
999 union
1000 {
1001 uint32_t i;
1002 uint8_t c;
1003 } u = { 0x11223344 };
1004 return u.c;
1005#endif
948} 1006}
949 1007
950ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1008ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
951ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1009ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
952ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1010ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
981 { 1039 {
982 return N; 1040 return N;
983 } 1041 }
984#else 1042#else
985 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1043 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
1044#endif
1045
1046/*******************************************************************************/
1047/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1048
1049/* basically, everything uses "ieee pure-endian" floating point numbers */
1050/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1051#if 0 \
1052 || __i386 || __i386__ \
1053 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1054 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1055 || defined __arm__ && defined __ARM_EABI__ \
1056 || defined __s390__ || defined __s390x__ \
1057 || defined __mips__ \
1058 || defined __alpha__ \
1059 || defined __hppa__ \
1060 || defined __ia64__ \
1061 || defined __m68k__ \
1062 || defined __m88k__ \
1063 || defined __sh__ \
1064 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1065 #define ECB_STDFP 1
1066 #include <string.h> /* for memcpy */
1067#else
1068 #define ECB_STDFP 0
1069#endif
1070
1071#ifndef ECB_NO_LIBM
1072
1073 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1074
1075 #ifdef NEN
1076 #define ECB_NAN NAN
1077 #else
1078 #define ECB_NAN INFINITY
1079 #endif
1080
1081 /* converts an ieee half/binary16 to a float */
1082 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
1083 ecb_function_ float
1084 ecb_binary16_to_float (uint16_t x)
1085 {
1086 int e = (x >> 10) & 0x1f;
1087 int m = x & 0x3ff;
1088 float r;
1089
1090 if (!e ) r = ldexpf (m , -24);
1091 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
1092 else if (m ) r = ECB_NAN;
1093 else r = INFINITY;
1094
1095 return x & 0x8000 ? -r : r;
1096 }
1097
1098 /* convert a float to ieee single/binary32 */
1099 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1100 ecb_function_ uint32_t
1101 ecb_float_to_binary32 (float x)
1102 {
1103 uint32_t r;
1104
1105 #if ECB_STDFP
1106 memcpy (&r, &x, 4);
1107 #else
1108 /* slow emulation, works for anything but -0 */
1109 uint32_t m;
1110 int e;
1111
1112 if (x == 0e0f ) return 0x00000000U;
1113 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1114 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1115 if (x != x ) return 0x7fbfffffU;
1116
1117 m = frexpf (x, &e) * 0x1000000U;
1118
1119 r = m & 0x80000000U;
1120
1121 if (r)
1122 m = -m;
1123
1124 if (e <= -126)
1125 {
1126 m &= 0xffffffU;
1127 m >>= (-125 - e);
1128 e = -126;
1129 }
1130
1131 r |= (e + 126) << 23;
1132 r |= m & 0x7fffffU;
1133 #endif
1134
1135 return r;
1136 }
1137
1138 /* converts an ieee single/binary32 to a float */
1139 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1140 ecb_function_ float
1141 ecb_binary32_to_float (uint32_t x)
1142 {
1143 float r;
1144
1145 #if ECB_STDFP
1146 memcpy (&r, &x, 4);
1147 #else
1148 /* emulation, only works for normals and subnormals and +0 */
1149 int neg = x >> 31;
1150 int e = (x >> 23) & 0xffU;
1151
1152 x &= 0x7fffffU;
1153
1154 if (e)
1155 x |= 0x800000U;
1156 else
1157 e = 1;
1158
1159 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1160 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1161
1162 r = neg ? -r : r;
1163 #endif
1164
1165 return r;
1166 }
1167
1168 /* convert a double to ieee double/binary64 */
1169 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1170 ecb_function_ uint64_t
1171 ecb_double_to_binary64 (double x)
1172 {
1173 uint64_t r;
1174
1175 #if ECB_STDFP
1176 memcpy (&r, &x, 8);
1177 #else
1178 /* slow emulation, works for anything but -0 */
1179 uint64_t m;
1180 int e;
1181
1182 if (x == 0e0 ) return 0x0000000000000000U;
1183 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1184 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1185 if (x != x ) return 0X7ff7ffffffffffffU;
1186
1187 m = frexp (x, &e) * 0x20000000000000U;
1188
1189 r = m & 0x8000000000000000;;
1190
1191 if (r)
1192 m = -m;
1193
1194 if (e <= -1022)
1195 {
1196 m &= 0x1fffffffffffffU;
1197 m >>= (-1021 - e);
1198 e = -1022;
1199 }
1200
1201 r |= ((uint64_t)(e + 1022)) << 52;
1202 r |= m & 0xfffffffffffffU;
1203 #endif
1204
1205 return r;
1206 }
1207
1208 /* converts an ieee double/binary64 to a double */
1209 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1210 ecb_function_ double
1211 ecb_binary64_to_double (uint64_t x)
1212 {
1213 double r;
1214
1215 #if ECB_STDFP
1216 memcpy (&r, &x, 8);
1217 #else
1218 /* emulation, only works for normals and subnormals and +0 */
1219 int neg = x >> 63;
1220 int e = (x >> 52) & 0x7ffU;
1221
1222 x &= 0xfffffffffffffU;
1223
1224 if (e)
1225 x |= 0x10000000000000U;
1226 else
1227 e = 1;
1228
1229 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1230 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1231
1232 r = neg ? -r : r;
1233 #endif
1234
1235 return r;
1236 }
1237
986#endif 1238#endif
987 1239
988#endif 1240#endif
989 1241
990/* ECB.H END */ 1242/* ECB.H END */
… …
1884 ev_syserr ("(libev) error creating signal/async pipe"); 2136 ev_syserr ("(libev) error creating signal/async pipe");
1885 2137
1886 fd_intern (fds [0]); 2138 fd_intern (fds [0]);
1887 } 2139 }
1888 2140
1889 fd_intern (fds [1]);
1890
1891 evpipe [0] = fds [0]; 2141 evpipe [0] = fds [0];
1892 2142
1893 if (evpipe [1] < 0) 2143 if (evpipe [1] < 0)
1894 evpipe [1] = fds [1]; /* first call, set write fd */ 2144 evpipe [1] = fds [1]; /* first call, set write fd */
1895 else 2145 else
… …
1900 /* so must not be executed on windows */ 2150 /* so must not be executed on windows */
1901 2151
1902 dup2 (fds [1], evpipe [1]); 2152 dup2 (fds [1], evpipe [1]);
1903 close (fds [1]); 2153 close (fds [1]);
1904 } 2154 }
2155
2156 fd_intern (evpipe [1]);
1905 2157
1906 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ); 2158 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1907 ev_io_start (EV_A_ &pipe_w); 2159 ev_io_start (EV_A_ &pipe_w);
1908 ev_unref (EV_A); /* watcher should not keep loop alive */ 2160 ev_unref (EV_A); /* watcher should not keep loop alive */
1909 } 2161 }
… …
2028 2280
2029void 2281void
2030ev_feed_signal (int signum) EV_THROW 2282ev_feed_signal (int signum) EV_THROW
2031{ 2283{
2032#if EV_MULTIPLICITY 2284#if EV_MULTIPLICITY
2285 EV_P;
2033 ECB_MEMORY_FENCE_ACQUIRE; 2286 ECB_MEMORY_FENCE_ACQUIRE;
2034 EV_P = signals [signum - 1].loop; 2287 EV_A = signals [signum - 1].loop;
2035 2288
2036 if (!EV_A) 2289 if (!EV_A)
2037 return; 2290 return;
2038#endif 2291#endif
2039 2292
… …
3692# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3945# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3693 3946
3694static void noinline 3947static void noinline
3695infy_add (EV_P_ ev_stat *w) 3948infy_add (EV_P_ ev_stat *w)
3696{ 3949{
3697 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); 3950 w->wd = inotify_add_watch (fs_fd, w->path,
3951 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3952 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3953 | IN_DONT_FOLLOW | IN_MASK_ADD);
3698 3954
3699 if (w->wd >= 0) 3955 if (w->wd >= 0)
3700 { 3956 {
3701 struct statfs sfs; 3957 struct statfs sfs;
3702 3958
… …
3706 3962
3707 if (!fs_2625) 3963 if (!fs_2625)
3708 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3964 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3709 else if (!statfs (w->path, &sfs) 3965 else if (!statfs (w->path, &sfs)
3710 && (sfs.f_type == 0x1373 /* devfs */ 3966 && (sfs.f_type == 0x1373 /* devfs */
3967 || sfs.f_type == 0x4006 /* fat */
3968 || sfs.f_type == 0x4d44 /* msdos */
3711 || sfs.f_type == 0xEF53 /* ext2/3 */ 3969 || sfs.f_type == 0xEF53 /* ext2/3 */
3970 || sfs.f_type == 0x72b6 /* jffs2 */
3971 || sfs.f_type == 0x858458f6 /* ramfs */
3972 || sfs.f_type == 0x5346544e /* ntfs */
3712 || sfs.f_type == 0x3153464a /* jfs */ 3973 || sfs.f_type == 0x3153464a /* jfs */
3974 || sfs.f_type == 0x9123683e /* btrfs */
3713 || sfs.f_type == 0x52654973 /* reiser3 */ 3975 || sfs.f_type == 0x52654973 /* reiser3 */
3714 || sfs.f_type == 0x01021994 /* tempfs */ 3976 || sfs.f_type == 0x01021994 /* tmpfs */
3715 || sfs.f_type == 0x58465342 /* xfs */)) 3977 || sfs.f_type == 0x58465342 /* xfs */))
3716 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3978 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3717 else 3979 else
3718 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3980 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3719 } 3981 }

Diff Legend

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