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

Comparing libev/ev.c (file contents):
Revision 1.443 by root, Thu May 31 17:53:26 2012 UTC vs.
Revision 1.457 by root, Thu Sep 5 18:45:29 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 */
… …
599 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 627 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
600 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 628 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
601 #elif defined __s390__ || defined __s390x__ 629 #elif defined __s390__ || defined __s390x__
602 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 630 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
603 #elif defined __mips__ 631 #elif defined __mips__
632 /* GNU/Linux emulates sync on mips1 architectures, so we force it's use */
633 /* 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") 634 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
605 #elif defined __alpha__ 635 #elif defined __alpha__
606 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 636 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
607 #elif defined __hppa__ 637 #elif defined __hppa__
608 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 639 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
610 #elif defined __ia64__ 640 #elif defined __ia64__
611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 641 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
642 #elif defined __m68k__
643 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
644 #elif defined __m88k__
645 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
646 #elif defined __sh__
647 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
612 #endif 648 #endif
613 #endif 649 #endif
614#endif 650#endif
615 651
616#ifndef ECB_MEMORY_FENCE 652#ifndef ECB_MEMORY_FENCE
617 #if ECB_GCC_VERSION(4,7) 653 #if ECB_GCC_VERSION(4,7)
618 /* see comment below (stdatomic.h) about the C11 memory model. */ 654 /* see comment below (stdatomic.h) about the C11 memory model. */
619 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 655 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
656
657 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
658 * without risking compile time errors with other compilers. We *could*
659 * define our own ecb_clang_has_feature, but I just can't be bothered to work
660 * around this shit time and again.
620 #elif defined __clang && __has_feature (cxx_atomic) 661 * #elif defined __clang && __has_feature (cxx_atomic)
621 /* see comment below (stdatomic.h) about the C11 memory model. */ 662 * // see comment below (stdatomic.h) about the C11 memory model.
622 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 663 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
664 */
665
623 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 666 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
624 #define ECB_MEMORY_FENCE __sync_synchronize () 667 #define ECB_MEMORY_FENCE __sync_synchronize ()
625 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 668 #elif _MSC_VER >= 1400 /* VC++ 2005 */
626 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 669 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
627 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 670 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
… …
935 ecb_inline void ecb_unreachable (void) ecb_noreturn; 978 ecb_inline void ecb_unreachable (void) ecb_noreturn;
936 ecb_inline void ecb_unreachable (void) { } 979 ecb_inline void ecb_unreachable (void) { }
937#endif 980#endif
938 981
939/* try to tell the compiler that some condition is definitely true */ 982/* try to tell the compiler that some condition is definitely true */
940#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 983#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
941 984
942ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 985ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
943ecb_inline unsigned char 986ecb_inline unsigned char
944ecb_byteorder_helper (void) 987ecb_byteorder_helper (void)
945{ 988{
946 const uint32_t u = 0x11223344; 989 /* the union code still generates code under pressure in gcc, */
947 return *(unsigned char *)&u; 990 /* but less than using pointers, and always seems to */
991 /* successfully return a constant. */
992 /* the reason why we have this horrible preprocessor mess */
993 /* is to avoid it in all cases, at least on common architectures */
994 /* or when using a recent enough gcc version (>= 4.6) */
995#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
996 return 0x44;
997#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
998 return 0x44;
999#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1000 return 0x11;
1001#else
1002 union
1003 {
1004 uint32_t i;
1005 uint8_t c;
1006 } u = { 0x11223344 };
1007 return u.c;
1008#endif
948} 1009}
949 1010
950ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1011ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
951ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1012ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
952ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1013ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
983 } 1044 }
984#else 1045#else
985 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1046 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
986#endif 1047#endif
987 1048
1049/*******************************************************************************/
1050/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1051
1052/* basically, everything uses "ieee pure-endian" floating point numbers */
1053/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1054#if 0 \
1055 || __i386 || __i386__ \
1056 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1057 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1058 || defined __arm__ && defined __ARM_EABI__ \
1059 || defined __s390__ || defined __s390x__ \
1060 || defined __mips__ \
1061 || defined __alpha__ \
1062 || defined __hppa__ \
1063 || defined __ia64__ \
1064 || defined __m68k__ \
1065 || defined __m88k__ \
1066 || defined __sh__ \
1067 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1068 #define ECB_STDFP 1
1069 #include <string.h> /* for memcpy */
1070#else
1071 #define ECB_STDFP 0
1072 #include <math.h> /* for frexp*, ldexp* */
1073#endif
1074
1075#ifndef ECB_NO_LIBM
1076
1077 /* convert a float to ieee single/binary32 */
1078 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1079 ecb_function_ uint32_t
1080 ecb_float_to_binary32 (float x)
1081 {
1082 uint32_t r;
1083
1084 #if ECB_STDFP
1085 memcpy (&r, &x, 4);
1086 #else
1087 /* slow emulation, works for anything but -0 */
1088 uint32_t m;
1089 int e;
1090
1091 if (x == 0e0f ) return 0x00000000U;
1092 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1093 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1094 if (x != x ) return 0x7fbfffffU;
1095
1096 m = frexpf (x, &e) * 0x1000000U;
1097
1098 r = m & 0x80000000U;
1099
1100 if (r)
1101 m = -m;
1102
1103 if (e <= -126)
1104 {
1105 m &= 0xffffffU;
1106 m >>= (-125 - e);
1107 e = -126;
1108 }
1109
1110 r |= (e + 126) << 23;
1111 r |= m & 0x7fffffU;
1112 #endif
1113
1114 return r;
1115 }
1116
1117 /* converts an ieee single/binary32 to a float */
1118 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1119 ecb_function_ float
1120 ecb_binary32_to_float (uint32_t x)
1121 {
1122 float r;
1123
1124 #if ECB_STDFP
1125 memcpy (&r, &x, 4);
1126 #else
1127 /* emulation, only works for normals and subnormals and +0 */
1128 int neg = x >> 31;
1129 int e = (x >> 23) & 0xffU;
1130
1131 x &= 0x7fffffU;
1132
1133 if (e)
1134 x |= 0x800000U;
1135 else
1136 e = 1;
1137
1138 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1139 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1140
1141 r = neg ? -r : r;
1142 #endif
1143
1144 return r;
1145 }
1146
1147 /* convert a double to ieee double/binary64 */
1148 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1149 ecb_function_ uint64_t
1150 ecb_double_to_binary64 (double x)
1151 {
1152 uint64_t r;
1153
1154 #if ECB_STDFP
1155 memcpy (&r, &x, 8);
1156 #else
1157 /* slow emulation, works for anything but -0 */
1158 uint64_t m;
1159 int e;
1160
1161 if (x == 0e0 ) return 0x0000000000000000U;
1162 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1163 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1164 if (x != x ) return 0X7ff7ffffffffffffU;
1165
1166 m = frexp (x, &e) * 0x20000000000000U;
1167
1168 r = m & 0x8000000000000000;;
1169
1170 if (r)
1171 m = -m;
1172
1173 if (e <= -1022)
1174 {
1175 m &= 0x1fffffffffffffU;
1176 m >>= (-1021 - e);
1177 e = -1022;
1178 }
1179
1180 r |= ((uint64_t)(e + 1022)) << 52;
1181 r |= m & 0xfffffffffffffU;
1182 #endif
1183
1184 return r;
1185 }
1186
1187 /* converts an ieee double/binary64 to a double */
1188 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1189 ecb_function_ double
1190 ecb_binary64_to_double (uint64_t x)
1191 {
1192 double r;
1193
1194 #if ECB_STDFP
1195 memcpy (&r, &x, 8);
1196 #else
1197 /* emulation, only works for normals and subnormals and +0 */
1198 int neg = x >> 63;
1199 int e = (x >> 52) & 0x7ffU;
1200
1201 x &= 0xfffffffffffffU;
1202
1203 if (e)
1204 x |= 0x10000000000000U;
1205 else
1206 e = 1;
1207
1208 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1209 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1210
1211 r = neg ? -r : r;
1212 #endif
1213
1214 return r;
1215 }
1216
1217#endif
1218
988#endif 1219#endif
989 1220
990/* ECB.H END */ 1221/* ECB.H END */
991 1222
992#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1223#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1191} 1422}
1192 1423
1193static void * 1424static void *
1194ev_realloc_emul (void *ptr, long size) EV_THROW 1425ev_realloc_emul (void *ptr, long size) EV_THROW
1195{ 1426{
1196#if __GLIBC__
1197 return realloc (ptr, size);
1198#else
1199 /* some systems, notably openbsd and darwin, fail to properly 1427 /* some systems, notably openbsd and darwin, fail to properly
1200 * implement realloc (x, 0) (as required by both ansi c-89 and 1428 * implement realloc (x, 0) (as required by both ansi c-89 and
1201 * the single unix specification, so work around them here. 1429 * the single unix specification, so work around them here.
1430 * recently, also (at least) fedora and debian started breaking it,
1431 * despite documenting it otherwise.
1202 */ 1432 */
1203 1433
1204 if (size) 1434 if (size)
1205 return realloc (ptr, size); 1435 return realloc (ptr, size);
1206 1436
1207 free (ptr); 1437 free (ptr);
1208 return 0; 1438 return 0;
1209#endif
1210} 1439}
1211 1440
1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1441static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1213 1442
1214void ecb_cold 1443void ecb_cold
… …
1869static void noinline ecb_cold 2098static void noinline ecb_cold
1870evpipe_init (EV_P) 2099evpipe_init (EV_P)
1871{ 2100{
1872 if (!ev_is_active (&pipe_w)) 2101 if (!ev_is_active (&pipe_w))
1873 { 2102 {
2103 int fds [2];
2104
1874# if EV_USE_EVENTFD 2105# if EV_USE_EVENTFD
2106 fds [0] = -1;
1875 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2107 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1876 if (evfd < 0 && errno == EINVAL) 2108 if (fds [1] < 0 && errno == EINVAL)
1877 evfd = eventfd (0, 0); 2109 fds [1] = eventfd (0, 0);
1878 2110
1879 if (evfd >= 0) 2111 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 2112# endif
1887 { 2113 {
1888 while (pipe (evpipe)) 2114 while (pipe (fds))
1889 ev_syserr ("(libev) error creating signal/async pipe"); 2115 ev_syserr ("(libev) error creating signal/async pipe");
1890 2116
1891 fd_intern (evpipe [0]); 2117 fd_intern (fds [0]);
1892 fd_intern (evpipe [1]);
1893 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1894 } 2118 }
1895 2119
2120 evpipe [0] = fds [0];
2121
2122 if (evpipe [1] < 0)
2123 evpipe [1] = fds [1]; /* first call, set write fd */
2124 else
2125 {
2126 /* on subsequent calls, do not change evpipe [1] */
2127 /* so that evpipe_write can always rely on its value. */
2128 /* this branch does not do anything sensible on windows, */
2129 /* so must not be executed on windows */
2130
2131 dup2 (fds [1], evpipe [1]);
2132 close (fds [1]);
2133 }
2134
2135 fd_intern (evpipe [1]);
2136
2137 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1896 ev_io_start (EV_A_ &pipe_w); 2138 ev_io_start (EV_A_ &pipe_w);
1897 ev_unref (EV_A); /* watcher should not keep loop alive */ 2139 ev_unref (EV_A); /* watcher should not keep loop alive */
1898 } 2140 }
1899} 2141}
1900 2142
… …
1921 ECB_MEMORY_FENCE_RELEASE; 2163 ECB_MEMORY_FENCE_RELEASE;
1922 2164
1923 old_errno = errno; /* save errno because write will clobber it */ 2165 old_errno = errno; /* save errno because write will clobber it */
1924 2166
1925#if EV_USE_EVENTFD 2167#if EV_USE_EVENTFD
1926 if (evfd >= 0) 2168 if (evpipe [0] < 0)
1927 { 2169 {
1928 uint64_t counter = 1; 2170 uint64_t counter = 1;
1929 write (evfd, &counter, sizeof (uint64_t)); 2171 write (evpipe [1], &counter, sizeof (uint64_t));
1930 } 2172 }
1931 else 2173 else
1932#endif 2174#endif
1933 { 2175 {
1934#ifdef _WIN32 2176#ifdef _WIN32
… …
1954 int i; 2196 int i;
1955 2197
1956 if (revents & EV_READ) 2198 if (revents & EV_READ)
1957 { 2199 {
1958#if EV_USE_EVENTFD 2200#if EV_USE_EVENTFD
1959 if (evfd >= 0) 2201 if (evpipe [0] < 0)
1960 { 2202 {
1961 uint64_t counter; 2203 uint64_t counter;
1962 read (evfd, &counter, sizeof (uint64_t)); 2204 read (evpipe [1], &counter, sizeof (uint64_t));
1963 } 2205 }
1964 else 2206 else
1965#endif 2207#endif
1966 { 2208 {
1967 char dummy[4]; 2209 char dummy[4];
… …
2017 2259
2018void 2260void
2019ev_feed_signal (int signum) EV_THROW 2261ev_feed_signal (int signum) EV_THROW
2020{ 2262{
2021#if EV_MULTIPLICITY 2263#if EV_MULTIPLICITY
2264 EV_P;
2265 ECB_MEMORY_FENCE_ACQUIRE;
2022 EV_P = signals [signum - 1].loop; 2266 EV_A = signals [signum - 1].loop;
2023 2267
2024 if (!EV_A) 2268 if (!EV_A)
2025 return; 2269 return;
2026#endif 2270#endif
2027 2271
2028 if (!ev_active (&pipe_w))
2029 return;
2030
2031 signals [signum - 1].pending = 1; 2272 signals [signum - 1].pending = 1;
2032 evpipe_write (EV_A_ &sig_pending); 2273 evpipe_write (EV_A_ &sig_pending);
2033} 2274}
2034 2275
2035static void 2276static void
… …
2045void noinline 2286void noinline
2046ev_feed_signal_event (EV_P_ int signum) EV_THROW 2287ev_feed_signal_event (EV_P_ int signum) EV_THROW
2047{ 2288{
2048 WL w; 2289 WL w;
2049 2290
2050 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2291 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2051 return; 2292 return;
2052 2293
2053 --signum; 2294 --signum;
2054 2295
2055#if EV_MULTIPLICITY 2296#if EV_MULTIPLICITY
… …
2353#if EV_ASYNC_ENABLE 2594#if EV_ASYNC_ENABLE
2354 async_pending = 0; 2595 async_pending = 0;
2355#endif 2596#endif
2356 pipe_write_skipped = 0; 2597 pipe_write_skipped = 0;
2357 pipe_write_wanted = 0; 2598 pipe_write_wanted = 0;
2599 evpipe [0] = -1;
2600 evpipe [1] = -1;
2358#if EV_USE_INOTIFY 2601#if EV_USE_INOTIFY
2359 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2602 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2360#endif 2603#endif
2361#if EV_USE_SIGNALFD 2604#if EV_USE_SIGNALFD
2362 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2605 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2425 if (ev_is_active (&pipe_w)) 2668 if (ev_is_active (&pipe_w))
2426 { 2669 {
2427 /*ev_ref (EV_A);*/ 2670 /*ev_ref (EV_A);*/
2428 /*ev_io_stop (EV_A_ &pipe_w);*/ 2671 /*ev_io_stop (EV_A_ &pipe_w);*/
2429 2672
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]); 2673 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2438 EV_WIN32_CLOSE_FD (evpipe [1]); 2674 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2439 }
2440 } 2675 }
2441 2676
2442#if EV_USE_SIGNALFD 2677#if EV_USE_SIGNALFD
2443 if (ev_is_active (&sigfd_w)) 2678 if (ev_is_active (&sigfd_w))
2444 close (sigfd); 2679 close (sigfd);
… …
2530#endif 2765#endif
2531#if EV_USE_INOTIFY 2766#if EV_USE_INOTIFY
2532 infy_fork (EV_A); 2767 infy_fork (EV_A);
2533#endif 2768#endif
2534 2769
2770#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2535 if (ev_is_active (&pipe_w)) 2771 if (ev_is_active (&pipe_w))
2536 { 2772 {
2537 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2773 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2538 2774
2539 ev_ref (EV_A); 2775 ev_ref (EV_A);
2540 ev_io_stop (EV_A_ &pipe_w); 2776 ev_io_stop (EV_A_ &pipe_w);
2541 2777
2542#if EV_USE_EVENTFD
2543 if (evfd >= 0)
2544 close (evfd);
2545#endif
2546
2547 if (evpipe [0] >= 0) 2778 if (evpipe [0] >= 0)
2548 {
2549 EV_WIN32_CLOSE_FD (evpipe [0]); 2779 EV_WIN32_CLOSE_FD (evpipe [0]);
2550 EV_WIN32_CLOSE_FD (evpipe [1]);
2551 }
2552 2780
2553#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2554 evpipe_init (EV_A); 2781 evpipe_init (EV_A);
2555 /* iterate over everything, in case we missed something before */ 2782 /* iterate over everything, in case we missed something before */
2556 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 2783 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2557#endif
2558 } 2784 }
2785#endif
2559 2786
2560 postfork = 0; 2787 postfork = 0;
2561} 2788}
2562 2789
2563#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
… …
2762} 2989}
2763 2990
2764void noinline 2991void noinline
2765ev_invoke_pending (EV_P) 2992ev_invoke_pending (EV_P)
2766{ 2993{
2767 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2994 pendingpri = NUMPRI;
2995
2996 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2997 {
2998 --pendingpri;
2999
2768 while (pendingcnt [pendingpri]) 3000 while (pendingcnt [pendingpri])
2769 { 3001 {
2770 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3002 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2771 3003
2772 p->w->pending = 0; 3004 p->w->pending = 0;
2773 EV_CB_INVOKE (p->w, p->events); 3005 EV_CB_INVOKE (p->w, p->events);
2774 EV_FREQUENT_CHECK; 3006 EV_FREQUENT_CHECK;
2775 } 3007 }
3008 }
2776} 3009}
2777 3010
2778#if EV_IDLE_ENABLE 3011#if EV_IDLE_ENABLE
2779/* make idle watchers pending. this handles the "call-idle */ 3012/* make idle watchers pending. this handles the "call-idle */
2780/* only when higher priorities are idle" logic */ 3013/* only when higher priorities are idle" logic */
… …
3526#if EV_MULTIPLICITY 3759#if EV_MULTIPLICITY
3527 assert (("libev: a signal must not be attached to two different loops", 3760 assert (("libev: a signal must not be attached to two different loops",
3528 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3761 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3529 3762
3530 signals [w->signum - 1].loop = EV_A; 3763 signals [w->signum - 1].loop = EV_A;
3764 ECB_MEMORY_FENCE_RELEASE;
3531#endif 3765#endif
3532 3766
3533 EV_FREQUENT_CHECK; 3767 EV_FREQUENT_CHECK;
3534 3768
3535#if EV_USE_SIGNALFD 3769#if EV_USE_SIGNALFD
… …
3690# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3691 3925
3692static void noinline 3926static void noinline
3693infy_add (EV_P_ ev_stat *w) 3927infy_add (EV_P_ ev_stat *w)
3694{ 3928{
3695 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); 3929 w->wd = inotify_add_watch (fs_fd, w->path,
3930 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3931 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3932 | IN_DONT_FOLLOW | IN_MASK_ADD);
3696 3933
3697 if (w->wd >= 0) 3934 if (w->wd >= 0)
3698 { 3935 {
3699 struct statfs sfs; 3936 struct statfs sfs;
3700 3937
… …
3704 3941
3705 if (!fs_2625) 3942 if (!fs_2625)
3706 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3707 else if (!statfs (w->path, &sfs) 3944 else if (!statfs (w->path, &sfs)
3708 && (sfs.f_type == 0x1373 /* devfs */ 3945 && (sfs.f_type == 0x1373 /* devfs */
3946 || sfs.f_type == 0x4006 /* fat */
3947 || sfs.f_type == 0x4d44 /* msdos */
3709 || sfs.f_type == 0xEF53 /* ext2/3 */ 3948 || sfs.f_type == 0xEF53 /* ext2/3 */
3949 || sfs.f_type == 0x72b6 /* jffs2 */
3950 || sfs.f_type == 0x858458f6 /* ramfs */
3951 || sfs.f_type == 0x5346544e /* ntfs */
3710 || sfs.f_type == 0x3153464a /* jfs */ 3952 || sfs.f_type == 0x3153464a /* jfs */
3953 || sfs.f_type == 0x9123683e /* btrfs */
3711 || sfs.f_type == 0x52654973 /* reiser3 */ 3954 || sfs.f_type == 0x52654973 /* reiser3 */
3712 || sfs.f_type == 0x01021994 /* tempfs */ 3955 || sfs.f_type == 0x01021994 /* tmpfs */
3713 || sfs.f_type == 0x58465342 /* xfs */)) 3956 || sfs.f_type == 0x58465342 /* xfs */))
3714 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3957 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3715 else 3958 else
3716 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3959 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3717 } 3960 }

Diff Legend

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