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

Comparing libev/ev.c (file contents):
Revision 1.438 by root, Tue May 29 21:03:44 2012 UTC vs.
Revision 1.451 by root, Tue Jan 22 05:18:28 2013 UTC

… …
505 505
506#ifndef ECB_H 506#ifndef ECB_H
507#define ECB_H 507#define ECB_H
508 508
509/* 16 bits major, 16 bits minor */ 509/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 510#define ECB_VERSION 0x00010002
511 511
512#ifdef _WIN32 512#ifdef _WIN32
513 typedef signed char int8_t; 513 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 514 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 515 typedef signed short int16_t;
… …
530 #else 530 #else
531 #define ECB_PTRSIZE 4 531 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 532 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 533 typedef int32_t intptr_t;
534 #endif 534 #endif
535 typedef intptr_t ptrdiff_t;
536#else 535#else
537 #include <inttypes.h> 536 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 537 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 538 #define ECB_PTRSIZE 8
540 #else 539 #else
… …
559 558
560#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 559#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
561#define ECB_C99 (__STDC_VERSION__ >= 199901L) 560#define ECB_C99 (__STDC_VERSION__ >= 199901L)
562#define ECB_C11 (__STDC_VERSION__ >= 201112L) 561#define ECB_C11 (__STDC_VERSION__ >= 201112L)
563#define ECB_CPP (__cplusplus+0) 562#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP98 (__cplusplus >= 199711L)
565#define ECB_CPP11 (__cplusplus >= 201103L) 563#define ECB_CPP11 (__cplusplus >= 201103L)
564
565#if ECB_CPP
566 #define ECB_EXTERN_C extern "C"
567 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
568 #define ECB_EXTERN_C_END }
569#else
570 #define ECB_EXTERN_C extern
571 #define ECB_EXTERN_C_BEG
572 #define ECB_EXTERN_C_END
573#endif
566 574
567/*****************************************************************************/ 575/*****************************************************************************/
568 576
569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 577/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
570/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 578/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
571 579
572#if ECB_NO_THREADS 580#if ECB_NO_THREADS
573# define ECB_NO_SMP 1 581 #define ECB_NO_SMP 1
574#endif 582#endif
575 583
576#if ECB_NO_SMP 584#if ECB_NO_SMP
577 #define ECB_MEMORY_FENCE do { } while (0) 585 #define ECB_MEMORY_FENCE do { } while (0)
578#endif 586#endif
… …
614 #endif 622 #endif
615#endif 623#endif
616 624
617#ifndef ECB_MEMORY_FENCE 625#ifndef ECB_MEMORY_FENCE
618 #if ECB_GCC_VERSION(4,7) 626 #if ECB_GCC_VERSION(4,7)
619 /* see comment below about the C11 memory model. in short - avoid */ 627 /* see comment below (stdatomic.h) about the C11 memory model. */
620 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 628 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
629
630 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
631 * without risking compile time errors with other compilers. We *could*
632 * define our own ecb_clang_has_feature, but I just can't be bothered to work
633 * around this shit time and again.
621 #elif defined __clang && __has_feature (cxx_atomic) 634 * #elif defined __clang && __has_feature (cxx_atomic)
622 /* see above */ 635 * // see comment below (stdatomic.h) about the C11 memory model.
623 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 636 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
637 */
638
624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 639 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
625 #define ECB_MEMORY_FENCE __sync_synchronize () 640 #define ECB_MEMORY_FENCE __sync_synchronize ()
626 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
627 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
628 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 641 #elif _MSC_VER >= 1400 /* VC++ 2005 */
629 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 642 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
630 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 643 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
631 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 644 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
632 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 645 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
646#ifndef ECB_MEMORY_FENCE 659#ifndef ECB_MEMORY_FENCE
647 #if ECB_C11 && !defined __STDC_NO_ATOMICS__ 660 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
648 /* we assume that these memory fences work on all variables/all memory accesses, */ 661 /* we assume that these memory fences work on all variables/all memory accesses, */
649 /* not just C11 atomics and atomic accesses */ 662 /* not just C11 atomics and atomic accesses */
650 #include <stdatomic.h> 663 #include <stdatomic.h>
651 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */ 664 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
652 /* simple barrier semantics. That means we need to take out thor's hammer. */ 665 /* any fence other than seq_cst, which isn't very efficient for us. */
666 /* Why that is, we don't know - either the C11 memory model is quite useless */
667 /* for most usages, or gcc and clang have a bug */
668 /* I *currently* lean towards the latter, and inefficiently implement */
669 /* all three of ecb's fences as a seq_cst fence */
653 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 670 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
654 #endif
655 #endif 671 #endif
656#endif 672#endif
657 673
658#ifndef ECB_MEMORY_FENCE 674#ifndef ECB_MEMORY_FENCE
659 #if !ECB_AVOID_PTHREADS 675 #if !ECB_AVOID_PTHREADS
… …
935 ecb_inline void ecb_unreachable (void) ecb_noreturn; 951 ecb_inline void ecb_unreachable (void) ecb_noreturn;
936 ecb_inline void ecb_unreachable (void) { } 952 ecb_inline void ecb_unreachable (void) { }
937#endif 953#endif
938 954
939/* try to tell the compiler that some condition is definitely true */ 955/* try to tell the compiler that some condition is definitely true */
940#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 956#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
941 957
942ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 958ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
943ecb_inline unsigned char 959ecb_inline unsigned char
944ecb_byteorder_helper (void) 960ecb_byteorder_helper (void)
945{ 961{
946 const uint32_t u = 0x11223344; 962 /* the union code still generates code under pressure in gcc, */
947 return *(unsigned char *)&u; 963 /* but less than using pointers, and always seems to */
964 /* successfully return a constant. */
965 /* the reason why we have this horrible preprocessor mess */
966 /* is to avoid it in all cases, at least on common architectures */
967 /* or when using a recent enough gcc version (>= 4.6) */
968#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
969 return 0x44;
970#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
971 return 0x44;
972#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
973 return 0x11;
974#else
975 union
976 {
977 uint32_t i;
978 uint8_t c;
979 } u = { 0x11223344 };
980 return u.c;
981#endif
948} 982}
949 983
950ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 984ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
951ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 985ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
952ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 986ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
983 } 1017 }
984#else 1018#else
985 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1019 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
986#endif 1020#endif
987 1021
1022/*******************************************************************************/
1023/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1024
1025/* basically, everything uses "ieee pure-endian" floating point numbers */
1026/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1027#if 0 \
1028 || __i386 || __i386__ \
1029 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1030 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1031 || defined __arm__ && defined __ARM_EABI__ \
1032 || defined __s390__ || defined __s390x__ \
1033 || defined __mips__ \
1034 || defined __alpha__ \
1035 || defined __hppa__ \
1036 || defined __ia64__ \
1037 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1038 #define ECB_STDFP 1
1039 #include <string.h> /* for memcpy */
1040#else
1041 #define ECB_STDFP 0
1042 #include <math.h> /* for frexp*, ldexp* */
1043#endif
1044
1045#ifndef ECB_NO_LIBM
1046
1047 /* convert a float to ieee single/binary32 */
1048 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1049 ecb_function_ uint32_t
1050 ecb_float_to_binary32 (float x)
1051 {
1052 uint32_t r;
1053
1054 #if ECB_STDFP
1055 memcpy (&r, &x, 4);
1056 #else
1057 /* slow emulation, works for anything but -0 */
1058 uint32_t m;
1059 int e;
1060
1061 if (x == 0e0f ) return 0x00000000U;
1062 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1063 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1064 if (x != x ) return 0x7fbfffffU;
1065
1066 m = frexpf (x, &e) * 0x1000000U;
1067
1068 r = m & 0x80000000U;
1069
1070 if (r)
1071 m = -m;
1072
1073 if (e <= -126)
1074 {
1075 m &= 0xffffffU;
1076 m >>= (-125 - e);
1077 e = -126;
1078 }
1079
1080 r |= (e + 126) << 23;
1081 r |= m & 0x7fffffU;
1082 #endif
1083
1084 return r;
1085 }
1086
1087 /* converts an ieee single/binary32 to a float */
1088 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1089 ecb_function_ float
1090 ecb_binary32_to_float (uint32_t x)
1091 {
1092 float r;
1093
1094 #if ECB_STDFP
1095 memcpy (&r, &x, 4);
1096 #else
1097 /* emulation, only works for normals and subnormals and +0 */
1098 int neg = x >> 31;
1099 int e = (x >> 23) & 0xffU;
1100
1101 x &= 0x7fffffU;
1102
1103 if (e)
1104 x |= 0x800000U;
1105 else
1106 e = 1;
1107
1108 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1109 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1110
1111 r = neg ? -r : r;
1112 #endif
1113
1114 return r;
1115 }
1116
1117 /* convert a double to ieee double/binary64 */
1118 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1119 ecb_function_ uint64_t
1120 ecb_double_to_binary64 (double x)
1121 {
1122 uint64_t r;
1123
1124 #if ECB_STDFP
1125 memcpy (&r, &x, 8);
1126 #else
1127 /* slow emulation, works for anything but -0 */
1128 uint64_t m;
1129 int e;
1130
1131 if (x == 0e0 ) return 0x0000000000000000U;
1132 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1133 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1134 if (x != x ) return 0X7ff7ffffffffffffU;
1135
1136 m = frexp (x, &e) * 0x20000000000000U;
1137
1138 r = m & 0x8000000000000000;;
1139
1140 if (r)
1141 m = -m;
1142
1143 if (e <= -1022)
1144 {
1145 m &= 0x1fffffffffffffU;
1146 m >>= (-1021 - e);
1147 e = -1022;
1148 }
1149
1150 r |= ((uint64_t)(e + 1022)) << 52;
1151 r |= m & 0xfffffffffffffU;
1152 #endif
1153
1154 return r;
1155 }
1156
1157 /* converts an ieee double/binary64 to a double */
1158 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1159 ecb_function_ double
1160 ecb_binary64_to_double (uint64_t x)
1161 {
1162 double r;
1163
1164 #if ECB_STDFP
1165 memcpy (&r, &x, 8);
1166 #else
1167 /* emulation, only works for normals and subnormals and +0 */
1168 int neg = x >> 63;
1169 int e = (x >> 52) & 0x7ffU;
1170
1171 x &= 0xfffffffffffffU;
1172
1173 if (e)
1174 x |= 0x10000000000000U;
1175 else
1176 e = 1;
1177
1178 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1179 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1180
1181 r = neg ? -r : r;
1182 #endif
1183
1184 return r;
1185 }
1186
1187#endif
1188
988#endif 1189#endif
989 1190
990/* ECB.H END */ 1191/* ECB.H END */
991 1192
992#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1193#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1191} 1392}
1192 1393
1193static void * 1394static void *
1194ev_realloc_emul (void *ptr, long size) EV_THROW 1395ev_realloc_emul (void *ptr, long size) EV_THROW
1195{ 1396{
1196#if __GLIBC__
1197 return realloc (ptr, size);
1198#else
1199 /* some systems, notably openbsd and darwin, fail to properly 1397 /* some systems, notably openbsd and darwin, fail to properly
1200 * implement realloc (x, 0) (as required by both ansi c-89 and 1398 * implement realloc (x, 0) (as required by both ansi c-89 and
1201 * the single unix specification, so work around them here. 1399 * the single unix specification, so work around them here.
1400 * recently, also (at least) fedora and debian started breaking it,
1401 * despite documenting it otherwise.
1202 */ 1402 */
1203 1403
1204 if (size) 1404 if (size)
1205 return realloc (ptr, size); 1405 return realloc (ptr, size);
1206 1406
1207 free (ptr); 1407 free (ptr);
1208 return 0; 1408 return 0;
1209#endif
1210} 1409}
1211 1410
1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1411static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1213 1412
1214void ecb_cold 1413void ecb_cold
… …
1869static void noinline ecb_cold 2068static void noinline ecb_cold
1870evpipe_init (EV_P) 2069evpipe_init (EV_P)
1871{ 2070{
1872 if (!ev_is_active (&pipe_w)) 2071 if (!ev_is_active (&pipe_w))
1873 { 2072 {
2073 int fds [2];
2074
1874# if EV_USE_EVENTFD 2075# if EV_USE_EVENTFD
2076 fds [0] = -1;
1875 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2077 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1876 if (evfd < 0 && errno == EINVAL) 2078 if (fds [1] < 0 && errno == EINVAL)
1877 evfd = eventfd (0, 0); 2079 fds [1] = eventfd (0, 0);
1878 2080
1879 if (evfd >= 0) 2081 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 2082# endif
1887 { 2083 {
1888 while (pipe (evpipe)) 2084 while (pipe (fds))
1889 ev_syserr ("(libev) error creating signal/async pipe"); 2085 ev_syserr ("(libev) error creating signal/async pipe");
1890 2086
1891 fd_intern (evpipe [0]); 2087 fd_intern (fds [0]);
1892 fd_intern (evpipe [1]);
1893 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1894 } 2088 }
1895 2089
2090 fd_intern (fds [1]);
2091
2092 evpipe [0] = fds [0];
2093
2094 if (evpipe [1] < 0)
2095 evpipe [1] = fds [1]; /* first call, set write fd */
2096 else
2097 {
2098 /* on subsequent calls, do not change evpipe [1] */
2099 /* so that evpipe_write can always rely on its value. */
2100 /* this branch does not do anything sensible on windows, */
2101 /* so must not be executed on windows */
2102
2103 dup2 (fds [1], evpipe [1]);
2104 close (fds [1]);
2105 }
2106
2107 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1896 ev_io_start (EV_A_ &pipe_w); 2108 ev_io_start (EV_A_ &pipe_w);
1897 ev_unref (EV_A); /* watcher should not keep loop alive */ 2109 ev_unref (EV_A); /* watcher should not keep loop alive */
1898 } 2110 }
1899} 2111}
1900 2112
… …
1921 ECB_MEMORY_FENCE_RELEASE; 2133 ECB_MEMORY_FENCE_RELEASE;
1922 2134
1923 old_errno = errno; /* save errno because write will clobber it */ 2135 old_errno = errno; /* save errno because write will clobber it */
1924 2136
1925#if EV_USE_EVENTFD 2137#if EV_USE_EVENTFD
1926 if (evfd >= 0) 2138 if (evpipe [0] < 0)
1927 { 2139 {
1928 uint64_t counter = 1; 2140 uint64_t counter = 1;
1929 write (evfd, &counter, sizeof (uint64_t)); 2141 write (evpipe [1], &counter, sizeof (uint64_t));
1930 } 2142 }
1931 else 2143 else
1932#endif 2144#endif
1933 { 2145 {
1934#ifdef _WIN32 2146#ifdef _WIN32
… …
1954 int i; 2166 int i;
1955 2167
1956 if (revents & EV_READ) 2168 if (revents & EV_READ)
1957 { 2169 {
1958#if EV_USE_EVENTFD 2170#if EV_USE_EVENTFD
1959 if (evfd >= 0) 2171 if (evpipe [0] < 0)
1960 { 2172 {
1961 uint64_t counter; 2173 uint64_t counter;
1962 read (evfd, &counter, sizeof (uint64_t)); 2174 read (evpipe [1], &counter, sizeof (uint64_t));
1963 } 2175 }
1964 else 2176 else
1965#endif 2177#endif
1966 { 2178 {
1967 char dummy[4]; 2179 char dummy[4];
… …
2017 2229
2018void 2230void
2019ev_feed_signal (int signum) EV_THROW 2231ev_feed_signal (int signum) EV_THROW
2020{ 2232{
2021#if EV_MULTIPLICITY 2233#if EV_MULTIPLICITY
2234 ECB_MEMORY_FENCE_ACQUIRE;
2022 EV_P = signals [signum - 1].loop; 2235 EV_P = signals [signum - 1].loop;
2023 2236
2024 if (!EV_A) 2237 if (!EV_A)
2025 return; 2238 return;
2026#endif 2239#endif
2027 2240
2028 if (!ev_active (&pipe_w))
2029 return;
2030
2031 signals [signum - 1].pending = 1; 2241 signals [signum - 1].pending = 1;
2032 evpipe_write (EV_A_ &sig_pending); 2242 evpipe_write (EV_A_ &sig_pending);
2033} 2243}
2034 2244
2035static void 2245static void
… …
2045void noinline 2255void noinline
2046ev_feed_signal_event (EV_P_ int signum) EV_THROW 2256ev_feed_signal_event (EV_P_ int signum) EV_THROW
2047{ 2257{
2048 WL w; 2258 WL w;
2049 2259
2050 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2260 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2051 return; 2261 return;
2052 2262
2053 --signum; 2263 --signum;
2054 2264
2055#if EV_MULTIPLICITY 2265#if EV_MULTIPLICITY
… …
2353#if EV_ASYNC_ENABLE 2563#if EV_ASYNC_ENABLE
2354 async_pending = 0; 2564 async_pending = 0;
2355#endif 2565#endif
2356 pipe_write_skipped = 0; 2566 pipe_write_skipped = 0;
2357 pipe_write_wanted = 0; 2567 pipe_write_wanted = 0;
2568 evpipe [0] = -1;
2569 evpipe [1] = -1;
2358#if EV_USE_INOTIFY 2570#if EV_USE_INOTIFY
2359 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2571 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2360#endif 2572#endif
2361#if EV_USE_SIGNALFD 2573#if EV_USE_SIGNALFD
2362 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2574 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2425 if (ev_is_active (&pipe_w)) 2637 if (ev_is_active (&pipe_w))
2426 { 2638 {
2427 /*ev_ref (EV_A);*/ 2639 /*ev_ref (EV_A);*/
2428 /*ev_io_stop (EV_A_ &pipe_w);*/ 2640 /*ev_io_stop (EV_A_ &pipe_w);*/
2429 2641
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]); 2642 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2438 EV_WIN32_CLOSE_FD (evpipe [1]); 2643 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2439 }
2440 } 2644 }
2441 2645
2442#if EV_USE_SIGNALFD 2646#if EV_USE_SIGNALFD
2443 if (ev_is_active (&sigfd_w)) 2647 if (ev_is_active (&sigfd_w))
2444 close (sigfd); 2648 close (sigfd);
… …
2530#endif 2734#endif
2531#if EV_USE_INOTIFY 2735#if EV_USE_INOTIFY
2532 infy_fork (EV_A); 2736 infy_fork (EV_A);
2533#endif 2737#endif
2534 2738
2739#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2535 if (ev_is_active (&pipe_w)) 2740 if (ev_is_active (&pipe_w))
2536 { 2741 {
2537 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2742 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2538 2743
2539 ev_ref (EV_A); 2744 ev_ref (EV_A);
2540 ev_io_stop (EV_A_ &pipe_w); 2745 ev_io_stop (EV_A_ &pipe_w);
2541 2746
2542#if EV_USE_EVENTFD
2543 if (evfd >= 0)
2544 close (evfd);
2545#endif
2546
2547 if (evpipe [0] >= 0) 2747 if (evpipe [0] >= 0)
2548 {
2549 EV_WIN32_CLOSE_FD (evpipe [0]); 2748 EV_WIN32_CLOSE_FD (evpipe [0]);
2550 EV_WIN32_CLOSE_FD (evpipe [1]);
2551 }
2552 2749
2553#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2554 evpipe_init (EV_A); 2750 evpipe_init (EV_A);
2555 /* now iterate over everything, in case we missed something */ 2751 /* iterate over everything, in case we missed something before */
2556 pipecb (EV_A_ &pipe_w, EV_READ); 2752 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2557#endif
2558 } 2753 }
2754#endif
2559 2755
2560 postfork = 0; 2756 postfork = 0;
2561} 2757}
2562 2758
2563#if EV_MULTIPLICITY 2759#if EV_MULTIPLICITY
… …
2736} 2932}
2737 2933
2738void 2934void
2739ev_loop_fork (EV_P) EV_THROW 2935ev_loop_fork (EV_P) EV_THROW
2740{ 2936{
2741 postfork = 1; /* must be in line with ev_default_fork */ 2937 postfork = 1;
2742} 2938}
2743 2939
2744/*****************************************************************************/ 2940/*****************************************************************************/
2745 2941
2746void 2942void
… …
2762} 2958}
2763 2959
2764void noinline 2960void noinline
2765ev_invoke_pending (EV_P) 2961ev_invoke_pending (EV_P)
2766{ 2962{
2767 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2963 pendingpri = NUMPRI;
2964
2965 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2966 {
2967 --pendingpri;
2968
2768 while (pendingcnt [pendingpri]) 2969 while (pendingcnt [pendingpri])
2769 { 2970 {
2770 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 2971 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2771 2972
2772 p->w->pending = 0; 2973 p->w->pending = 0;
2773 EV_CB_INVOKE (p->w, p->events); 2974 EV_CB_INVOKE (p->w, p->events);
2774 EV_FREQUENT_CHECK; 2975 EV_FREQUENT_CHECK;
2775 } 2976 }
2977 }
2776} 2978}
2777 2979
2778#if EV_IDLE_ENABLE 2980#if EV_IDLE_ENABLE
2779/* make idle watchers pending. this handles the "call-idle */ 2981/* make idle watchers pending. this handles the "call-idle */
2780/* only when higher priorities are idle" logic */ 2982/* only when higher priorities are idle" logic */
… …
3138 backend_poll (EV_A_ waittime); 3340 backend_poll (EV_A_ waittime);
3139 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3341 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3140 3342
3141 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3343 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3142 3344
3345 ECB_MEMORY_FENCE_ACQUIRE;
3143 if (pipe_write_skipped) 3346 if (pipe_write_skipped)
3144 { 3347 {
3145 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3348 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3146 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3349 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3147 } 3350 }
… …
3525#if EV_MULTIPLICITY 3728#if EV_MULTIPLICITY
3526 assert (("libev: a signal must not be attached to two different loops", 3729 assert (("libev: a signal must not be attached to two different loops",
3527 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3730 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3528 3731
3529 signals [w->signum - 1].loop = EV_A; 3732 signals [w->signum - 1].loop = EV_A;
3733 ECB_MEMORY_FENCE_RELEASE;
3530#endif 3734#endif
3531 3735
3532 EV_FREQUENT_CHECK; 3736 EV_FREQUENT_CHECK;
3533 3737
3534#if EV_USE_SIGNALFD 3738#if EV_USE_SIGNALFD
… …
3689# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3690 3894
3691static void noinline 3895static void noinline
3692infy_add (EV_P_ ev_stat *w) 3896infy_add (EV_P_ ev_stat *w)
3693{ 3897{
3694 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); 3898 w->wd = inotify_add_watch (fs_fd, w->path,
3899 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3900 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3901 | IN_DONT_FOLLOW | IN_MASK_ADD);
3695 3902
3696 if (w->wd >= 0) 3903 if (w->wd >= 0)
3697 { 3904 {
3698 struct statfs sfs; 3905 struct statfs sfs;
3699 3906
… …
3703 3910
3704 if (!fs_2625) 3911 if (!fs_2625)
3705 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3912 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3706 else if (!statfs (w->path, &sfs) 3913 else if (!statfs (w->path, &sfs)
3707 && (sfs.f_type == 0x1373 /* devfs */ 3914 && (sfs.f_type == 0x1373 /* devfs */
3915 || sfs.f_type == 0x4006 /* fat */
3916 || sfs.f_type == 0x4d44 /* msdos */
3708 || sfs.f_type == 0xEF53 /* ext2/3 */ 3917 || sfs.f_type == 0xEF53 /* ext2/3 */
3918 || sfs.f_type == 0x72b6 /* jffs2 */
3919 || sfs.f_type == 0x858458f6 /* ramfs */
3920 || sfs.f_type == 0x5346544e /* ntfs */
3709 || sfs.f_type == 0x3153464a /* jfs */ 3921 || sfs.f_type == 0x3153464a /* jfs */
3922 || sfs.f_type == 0x9123683e /* btrfs */
3710 || sfs.f_type == 0x52654973 /* reiser3 */ 3923 || sfs.f_type == 0x52654973 /* reiser3 */
3711 || sfs.f_type == 0x01021994 /* tempfs */ 3924 || sfs.f_type == 0x01021994 /* tmpfs */
3712 || sfs.f_type == 0x58465342 /* xfs */)) 3925 || sfs.f_type == 0x58465342 /* xfs */))
3713 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3926 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3714 else 3927 else
3715 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3928 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3716 } 3929 }

Diff Legend

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