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

Comparing libev/ev.c (file contents):
Revision 1.446 by root, Mon Jun 11 12:50:50 2012 UTC vs.
Revision 1.454 by root, Fri Mar 1 11:13:22 2013 UTC

… …
357 357
358#ifndef EV_HEAP_CACHE_AT 358#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
360#endif 360#endif
361 361
362#ifdef ANDROID
363/* supposedly, android doesn't typedef fd_mask */
364# undef EV_USE_SELECT
365# define EV_USE_SELECT 0
366/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
367# undef EV_USE_CLOCK_SYSCALL
368# define EV_USE_CLOCK_SYSCALL 0
369#endif
370
371/* aix's poll.h seems to cause lots of trouble */
372#ifdef _AIX
373/* AIX has a completely broken poll.h header */
374# undef EV_USE_POLL
375# define EV_USE_POLL 0
376#endif
377
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 378/* 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. */ 379/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 380#if EV_USE_CLOCK_SYSCALL
365# include <sys/syscall.h> 381# include <sys/syscall.h>
366# ifdef SYS_clock_gettime 382# ifdef SYS_clock_gettime
… …
372# define EV_USE_CLOCK_SYSCALL 0 388# define EV_USE_CLOCK_SYSCALL 0
373# endif 389# endif
374#endif 390#endif
375 391
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 392/* 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 393
384#ifndef CLOCK_MONOTONIC 394#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 395# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 396# define EV_USE_MONOTONIC 0
387#endif 397#endif
… …
505 515
506#ifndef ECB_H 516#ifndef ECB_H
507#define ECB_H 517#define ECB_H
508 518
509/* 16 bits major, 16 bits minor */ 519/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 520#define ECB_VERSION 0x00010003
511 521
512#ifdef _WIN32 522#ifdef _WIN32
513 typedef signed char int8_t; 523 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 524 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 525 typedef signed short int16_t;
… …
530 #else 540 #else
531 #define ECB_PTRSIZE 4 541 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 542 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 543 typedef int32_t intptr_t;
534 #endif 544 #endif
535 typedef intptr_t ptrdiff_t;
536#else 545#else
537 #include <inttypes.h> 546 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 547 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 548 #define ECB_PTRSIZE 8
540 #else 549 #else
541 #define ECB_PTRSIZE 4 550 #define ECB_PTRSIZE 4
551 #endif
552#endif
553
554/* work around x32 idiocy by defining proper macros */
555#if __x86_64 || _M_AMD64
556 #if __ILP32
557 #define ECB_AMD64_X32 1
558 #else
559 #define ECB_AMD64 1
542 #endif 560 #endif
543#endif 561#endif
544 562
545/* many compilers define _GNUC_ to some versions but then only implement 563/* many compilers define _GNUC_ to some versions but then only implement
546 * what their idiot authors think are the "more important" extensions, 564 * 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 */ 578#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
561#define ECB_C99 (__STDC_VERSION__ >= 199901L) 579#define ECB_C99 (__STDC_VERSION__ >= 199901L)
562#define ECB_C11 (__STDC_VERSION__ >= 201112L) 580#define ECB_C11 (__STDC_VERSION__ >= 201112L)
563#define ECB_CPP (__cplusplus+0) 581#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP11 (__cplusplus >= 201103L) 582#define ECB_CPP11 (__cplusplus >= 201103L)
583
584#if ECB_CPP
585 #define ECB_EXTERN_C extern "C"
586 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
587 #define ECB_EXTERN_C_END }
588#else
589 #define ECB_EXTERN_C extern
590 #define ECB_EXTERN_C_BEG
591 #define ECB_EXTERN_C_END
592#endif
565 593
566/*****************************************************************************/ 594/*****************************************************************************/
567 595
568/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 596/* 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 */ 597/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
… …
615 643
616#ifndef ECB_MEMORY_FENCE 644#ifndef ECB_MEMORY_FENCE
617 #if ECB_GCC_VERSION(4,7) 645 #if ECB_GCC_VERSION(4,7)
618 /* see comment below (stdatomic.h) about the C11 memory model. */ 646 /* see comment below (stdatomic.h) about the C11 memory model. */
619 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 647 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
648
649 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
650 * without risking compile time errors with other compilers. We *could*
651 * define our own ecb_clang_has_feature, but I just can't be bothered to work
652 * around this shit time and again.
620 #elif defined __clang && __has_feature (cxx_atomic) 653 * #elif defined __clang && __has_feature (cxx_atomic)
621 /* see comment below (stdatomic.h) about the C11 memory model. */ 654 * // see comment below (stdatomic.h) about the C11 memory model.
622 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 655 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
656 */
657
623 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 658 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
624 #define ECB_MEMORY_FENCE __sync_synchronize () 659 #define ECB_MEMORY_FENCE __sync_synchronize ()
625 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 660 #elif _MSC_VER >= 1400 /* VC++ 2005 */
626 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 661 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
627 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 662 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
… …
935 ecb_inline void ecb_unreachable (void) ecb_noreturn; 970 ecb_inline void ecb_unreachable (void) ecb_noreturn;
936 ecb_inline void ecb_unreachable (void) { } 971 ecb_inline void ecb_unreachable (void) { }
937#endif 972#endif
938 973
939/* try to tell the compiler that some condition is definitely true */ 974/* try to tell the compiler that some condition is definitely true */
940#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 975#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
941 976
942ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 977ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
943ecb_inline unsigned char 978ecb_inline unsigned char
944ecb_byteorder_helper (void) 979ecb_byteorder_helper (void)
945{ 980{
946 const uint32_t u = 0x11223344; 981 /* the union code still generates code under pressure in gcc, */
947 return *(unsigned char *)&u; 982 /* but less than using pointers, and always seems to */
983 /* successfully return a constant. */
984 /* the reason why we have this horrible preprocessor mess */
985 /* is to avoid it in all cases, at least on common architectures */
986 /* or when using a recent enough gcc version (>= 4.6) */
987#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
988 return 0x44;
989#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
990 return 0x44;
991#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
992 return 0x11;
993#else
994 union
995 {
996 uint32_t i;
997 uint8_t c;
998 } u = { 0x11223344 };
999 return u.c;
1000#endif
948} 1001}
949 1002
950ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1003ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
951ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1004ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
952ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1005ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
983 } 1036 }
984#else 1037#else
985 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1038 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
986#endif 1039#endif
987 1040
1041/*******************************************************************************/
1042/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1043
1044/* basically, everything uses "ieee pure-endian" floating point numbers */
1045/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1046#if 0 \
1047 || __i386 || __i386__ \
1048 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1049 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1050 || defined __arm__ && defined __ARM_EABI__ \
1051 || defined __s390__ || defined __s390x__ \
1052 || defined __mips__ \
1053 || defined __alpha__ \
1054 || defined __hppa__ \
1055 || defined __ia64__ \
1056 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1057 #define ECB_STDFP 1
1058 #include <string.h> /* for memcpy */
1059#else
1060 #define ECB_STDFP 0
1061 #include <math.h> /* for frexp*, ldexp* */
1062#endif
1063
1064#ifndef ECB_NO_LIBM
1065
1066 /* convert a float to ieee single/binary32 */
1067 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1068 ecb_function_ uint32_t
1069 ecb_float_to_binary32 (float x)
1070 {
1071 uint32_t r;
1072
1073 #if ECB_STDFP
1074 memcpy (&r, &x, 4);
1075 #else
1076 /* slow emulation, works for anything but -0 */
1077 uint32_t m;
1078 int e;
1079
1080 if (x == 0e0f ) return 0x00000000U;
1081 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1082 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1083 if (x != x ) return 0x7fbfffffU;
1084
1085 m = frexpf (x, &e) * 0x1000000U;
1086
1087 r = m & 0x80000000U;
1088
1089 if (r)
1090 m = -m;
1091
1092 if (e <= -126)
1093 {
1094 m &= 0xffffffU;
1095 m >>= (-125 - e);
1096 e = -126;
1097 }
1098
1099 r |= (e + 126) << 23;
1100 r |= m & 0x7fffffU;
1101 #endif
1102
1103 return r;
1104 }
1105
1106 /* converts an ieee single/binary32 to a float */
1107 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1108 ecb_function_ float
1109 ecb_binary32_to_float (uint32_t x)
1110 {
1111 float r;
1112
1113 #if ECB_STDFP
1114 memcpy (&r, &x, 4);
1115 #else
1116 /* emulation, only works for normals and subnormals and +0 */
1117 int neg = x >> 31;
1118 int e = (x >> 23) & 0xffU;
1119
1120 x &= 0x7fffffU;
1121
1122 if (e)
1123 x |= 0x800000U;
1124 else
1125 e = 1;
1126
1127 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1128 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1129
1130 r = neg ? -r : r;
1131 #endif
1132
1133 return r;
1134 }
1135
1136 /* convert a double to ieee double/binary64 */
1137 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1138 ecb_function_ uint64_t
1139 ecb_double_to_binary64 (double x)
1140 {
1141 uint64_t r;
1142
1143 #if ECB_STDFP
1144 memcpy (&r, &x, 8);
1145 #else
1146 /* slow emulation, works for anything but -0 */
1147 uint64_t m;
1148 int e;
1149
1150 if (x == 0e0 ) return 0x0000000000000000U;
1151 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1152 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1153 if (x != x ) return 0X7ff7ffffffffffffU;
1154
1155 m = frexp (x, &e) * 0x20000000000000U;
1156
1157 r = m & 0x8000000000000000;;
1158
1159 if (r)
1160 m = -m;
1161
1162 if (e <= -1022)
1163 {
1164 m &= 0x1fffffffffffffU;
1165 m >>= (-1021 - e);
1166 e = -1022;
1167 }
1168
1169 r |= ((uint64_t)(e + 1022)) << 52;
1170 r |= m & 0xfffffffffffffU;
1171 #endif
1172
1173 return r;
1174 }
1175
1176 /* converts an ieee double/binary64 to a double */
1177 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1178 ecb_function_ double
1179 ecb_binary64_to_double (uint64_t x)
1180 {
1181 double r;
1182
1183 #if ECB_STDFP
1184 memcpy (&r, &x, 8);
1185 #else
1186 /* emulation, only works for normals and subnormals and +0 */
1187 int neg = x >> 63;
1188 int e = (x >> 52) & 0x7ffU;
1189
1190 x &= 0xfffffffffffffU;
1191
1192 if (e)
1193 x |= 0x10000000000000U;
1194 else
1195 e = 1;
1196
1197 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1198 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1199
1200 r = neg ? -r : r;
1201 #endif
1202
1203 return r;
1204 }
1205
1206#endif
1207
988#endif 1208#endif
989 1209
990/* ECB.H END */ 1210/* ECB.H END */
991 1211
992#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1212#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1191} 1411}
1192 1412
1193static void * 1413static void *
1194ev_realloc_emul (void *ptr, long size) EV_THROW 1414ev_realloc_emul (void *ptr, long size) EV_THROW
1195{ 1415{
1196#if __GLIBC__
1197 return realloc (ptr, size);
1198#else
1199 /* some systems, notably openbsd and darwin, fail to properly 1416 /* some systems, notably openbsd and darwin, fail to properly
1200 * implement realloc (x, 0) (as required by both ansi c-89 and 1417 * implement realloc (x, 0) (as required by both ansi c-89 and
1201 * the single unix specification, so work around them here. 1418 * the single unix specification, so work around them here.
1419 * recently, also (at least) fedora and debian started breaking it,
1420 * despite documenting it otherwise.
1202 */ 1421 */
1203 1422
1204 if (size) 1423 if (size)
1205 return realloc (ptr, size); 1424 return realloc (ptr, size);
1206 1425
1207 free (ptr); 1426 free (ptr);
1208 return 0; 1427 return 0;
1209#endif
1210} 1428}
1211 1429
1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1430static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1213 1431
1214void ecb_cold 1432void ecb_cold
… …
1869static void noinline ecb_cold 2087static void noinline ecb_cold
1870evpipe_init (EV_P) 2088evpipe_init (EV_P)
1871{ 2089{
1872 if (!ev_is_active (&pipe_w)) 2090 if (!ev_is_active (&pipe_w))
1873 { 2091 {
2092 int fds [2];
2093
1874# if EV_USE_EVENTFD 2094# if EV_USE_EVENTFD
2095 fds [0] = -1;
1875 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2096 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1876 if (evfd < 0 && errno == EINVAL) 2097 if (fds [1] < 0 && errno == EINVAL)
1877 evfd = eventfd (0, 0); 2098 fds [1] = eventfd (0, 0);
1878 2099
1879 if (evfd >= 0) 2100 if (fds [1] < 0)
1880 {
1881 evpipe [0] = -1;
1882 fd_intern (evfd); /* doing it twice doesn't hurt */
1883 ev_io_set (&pipe_w, evfd, EV_READ);
1884 }
1885 else
1886# endif 2101# endif
1887 { 2102 {
1888 while (pipe (evpipe)) 2103 while (pipe (fds))
1889 ev_syserr ("(libev) error creating signal/async pipe"); 2104 ev_syserr ("(libev) error creating signal/async pipe");
1890 2105
1891 fd_intern (evpipe [0]); 2106 fd_intern (fds [0]);
1892 fd_intern (evpipe [1]);
1893 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1894 } 2107 }
1895 2108
2109 fd_intern (fds [1]);
2110
2111 evpipe [0] = fds [0];
2112
2113 if (evpipe [1] < 0)
2114 evpipe [1] = fds [1]; /* first call, set write fd */
2115 else
2116 {
2117 /* on subsequent calls, do not change evpipe [1] */
2118 /* so that evpipe_write can always rely on its value. */
2119 /* this branch does not do anything sensible on windows, */
2120 /* so must not be executed on windows */
2121
2122 dup2 (fds [1], evpipe [1]);
2123 close (fds [1]);
2124 }
2125
2126 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1896 ev_io_start (EV_A_ &pipe_w); 2127 ev_io_start (EV_A_ &pipe_w);
1897 ev_unref (EV_A); /* watcher should not keep loop alive */ 2128 ev_unref (EV_A); /* watcher should not keep loop alive */
1898 } 2129 }
1899} 2130}
1900 2131
… …
1921 ECB_MEMORY_FENCE_RELEASE; 2152 ECB_MEMORY_FENCE_RELEASE;
1922 2153
1923 old_errno = errno; /* save errno because write will clobber it */ 2154 old_errno = errno; /* save errno because write will clobber it */
1924 2155
1925#if EV_USE_EVENTFD 2156#if EV_USE_EVENTFD
1926 if (evfd >= 0) 2157 if (evpipe [0] < 0)
1927 { 2158 {
1928 uint64_t counter = 1; 2159 uint64_t counter = 1;
1929 write (evfd, &counter, sizeof (uint64_t)); 2160 write (evpipe [1], &counter, sizeof (uint64_t));
1930 } 2161 }
1931 else 2162 else
1932#endif 2163#endif
1933 { 2164 {
1934#ifdef _WIN32 2165#ifdef _WIN32
… …
1954 int i; 2185 int i;
1955 2186
1956 if (revents & EV_READ) 2187 if (revents & EV_READ)
1957 { 2188 {
1958#if EV_USE_EVENTFD 2189#if EV_USE_EVENTFD
1959 if (evfd >= 0) 2190 if (evpipe [0] < 0)
1960 { 2191 {
1961 uint64_t counter; 2192 uint64_t counter;
1962 read (evfd, &counter, sizeof (uint64_t)); 2193 read (evpipe [1], &counter, sizeof (uint64_t));
1963 } 2194 }
1964 else 2195 else
1965#endif 2196#endif
1966 { 2197 {
1967 char dummy[4]; 2198 char dummy[4];
… …
2017 2248
2018void 2249void
2019ev_feed_signal (int signum) EV_THROW 2250ev_feed_signal (int signum) EV_THROW
2020{ 2251{
2021#if EV_MULTIPLICITY 2252#if EV_MULTIPLICITY
2253 EV_P;
2254 ECB_MEMORY_FENCE_ACQUIRE;
2022 EV_P = signals [signum - 1].loop; 2255 EV_A = signals [signum - 1].loop;
2023 2256
2024 if (!EV_A) 2257 if (!EV_A)
2025 return; 2258 return;
2026#endif 2259#endif
2027
2028 if (!ev_active (&pipe_w))
2029 return;
2030 2260
2031 signals [signum - 1].pending = 1; 2261 signals [signum - 1].pending = 1;
2032 evpipe_write (EV_A_ &sig_pending); 2262 evpipe_write (EV_A_ &sig_pending);
2033} 2263}
2034 2264
… …
2353#if EV_ASYNC_ENABLE 2583#if EV_ASYNC_ENABLE
2354 async_pending = 0; 2584 async_pending = 0;
2355#endif 2585#endif
2356 pipe_write_skipped = 0; 2586 pipe_write_skipped = 0;
2357 pipe_write_wanted = 0; 2587 pipe_write_wanted = 0;
2588 evpipe [0] = -1;
2589 evpipe [1] = -1;
2358#if EV_USE_INOTIFY 2590#if EV_USE_INOTIFY
2359 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2591 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2360#endif 2592#endif
2361#if EV_USE_SIGNALFD 2593#if EV_USE_SIGNALFD
2362 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2594 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2425 if (ev_is_active (&pipe_w)) 2657 if (ev_is_active (&pipe_w))
2426 { 2658 {
2427 /*ev_ref (EV_A);*/ 2659 /*ev_ref (EV_A);*/
2428 /*ev_io_stop (EV_A_ &pipe_w);*/ 2660 /*ev_io_stop (EV_A_ &pipe_w);*/
2429 2661
2430#if EV_USE_EVENTFD
2431 if (evfd >= 0)
2432 close (evfd);
2433#endif
2434
2435 if (evpipe [0] >= 0)
2436 {
2437 EV_WIN32_CLOSE_FD (evpipe [0]); 2662 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2438 EV_WIN32_CLOSE_FD (evpipe [1]); 2663 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2439 }
2440 } 2664 }
2441 2665
2442#if EV_USE_SIGNALFD 2666#if EV_USE_SIGNALFD
2443 if (ev_is_active (&sigfd_w)) 2667 if (ev_is_active (&sigfd_w))
2444 close (sigfd); 2668 close (sigfd);
… …
2530#endif 2754#endif
2531#if EV_USE_INOTIFY 2755#if EV_USE_INOTIFY
2532 infy_fork (EV_A); 2756 infy_fork (EV_A);
2533#endif 2757#endif
2534 2758
2759#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2535 if (ev_is_active (&pipe_w)) 2760 if (ev_is_active (&pipe_w))
2536 { 2761 {
2537 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2762 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2538 2763
2539 ev_ref (EV_A); 2764 ev_ref (EV_A);
2540 ev_io_stop (EV_A_ &pipe_w); 2765 ev_io_stop (EV_A_ &pipe_w);
2541 2766
2542#if EV_USE_EVENTFD
2543 if (evfd >= 0)
2544 close (evfd);
2545#endif
2546
2547 if (evpipe [0] >= 0) 2767 if (evpipe [0] >= 0)
2548 {
2549 EV_WIN32_CLOSE_FD (evpipe [0]); 2768 EV_WIN32_CLOSE_FD (evpipe [0]);
2550 EV_WIN32_CLOSE_FD (evpipe [1]);
2551 }
2552 2769
2553#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2554 evpipe_init (EV_A); 2770 evpipe_init (EV_A);
2555 /* iterate over everything, in case we missed something before */ 2771 /* iterate over everything, in case we missed something before */
2556 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 2772 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2557#endif
2558 } 2773 }
2774#endif
2559 2775
2560 postfork = 0; 2776 postfork = 0;
2561} 2777}
2562 2778
2563#if EV_MULTIPLICITY 2779#if EV_MULTIPLICITY
… …
3532#if EV_MULTIPLICITY 3748#if EV_MULTIPLICITY
3533 assert (("libev: a signal must not be attached to two different loops", 3749 assert (("libev: a signal must not be attached to two different loops",
3534 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3750 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3535 3751
3536 signals [w->signum - 1].loop = EV_A; 3752 signals [w->signum - 1].loop = EV_A;
3753 ECB_MEMORY_FENCE_RELEASE;
3537#endif 3754#endif
3538 3755
3539 EV_FREQUENT_CHECK; 3756 EV_FREQUENT_CHECK;
3540 3757
3541#if EV_USE_SIGNALFD 3758#if EV_USE_SIGNALFD
… …
3696# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3913# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3697 3914
3698static void noinline 3915static void noinline
3699infy_add (EV_P_ ev_stat *w) 3916infy_add (EV_P_ ev_stat *w)
3700{ 3917{
3701 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); 3918 w->wd = inotify_add_watch (fs_fd, w->path,
3919 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3920 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3921 | IN_DONT_FOLLOW | IN_MASK_ADD);
3702 3922
3703 if (w->wd >= 0) 3923 if (w->wd >= 0)
3704 { 3924 {
3705 struct statfs sfs; 3925 struct statfs sfs;
3706 3926
… …
3710 3930
3711 if (!fs_2625) 3931 if (!fs_2625)
3712 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3932 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3713 else if (!statfs (w->path, &sfs) 3933 else if (!statfs (w->path, &sfs)
3714 && (sfs.f_type == 0x1373 /* devfs */ 3934 && (sfs.f_type == 0x1373 /* devfs */
3935 || sfs.f_type == 0x4006 /* fat */
3936 || sfs.f_type == 0x4d44 /* msdos */
3715 || sfs.f_type == 0xEF53 /* ext2/3 */ 3937 || sfs.f_type == 0xEF53 /* ext2/3 */
3938 || sfs.f_type == 0x72b6 /* jffs2 */
3939 || sfs.f_type == 0x858458f6 /* ramfs */
3940 || sfs.f_type == 0x5346544e /* ntfs */
3716 || sfs.f_type == 0x3153464a /* jfs */ 3941 || sfs.f_type == 0x3153464a /* jfs */
3942 || sfs.f_type == 0x9123683e /* btrfs */
3717 || sfs.f_type == 0x52654973 /* reiser3 */ 3943 || sfs.f_type == 0x52654973 /* reiser3 */
3718 || sfs.f_type == 0x01021994 /* tempfs */ 3944 || sfs.f_type == 0x01021994 /* tmpfs */
3719 || sfs.f_type == 0x58465342 /* xfs */)) 3945 || sfs.f_type == 0x58465342 /* xfs */))
3720 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3946 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3721 else 3947 else
3722 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3948 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3723 } 3949 }

Diff Legend

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