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

Comparing libev/ev.c (file contents):
Revision 1.431 by root, Wed May 9 16:51:33 2012 UTC vs.
Revision 1.452 by root, Mon Feb 18 03:20: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
… …
504 */ 514 */
505 515
506#ifndef ECB_H 516#ifndef ECB_H
507#define ECB_H 517#define ECB_H
508 518
519/* 16 bits major, 16 bits minor */
520#define ECB_VERSION 0x00010002
521
509#ifdef _WIN32 522#ifdef _WIN32
510 typedef signed char int8_t; 523 typedef signed char int8_t;
511 typedef unsigned char uint8_t; 524 typedef unsigned char uint8_t;
512 typedef signed short int16_t; 525 typedef signed short int16_t;
513 typedef unsigned short uint16_t; 526 typedef unsigned short uint16_t;
… …
518 typedef unsigned long long uint64_t; 531 typedef unsigned long long uint64_t;
519 #else /* _MSC_VER || __BORLANDC__ */ 532 #else /* _MSC_VER || __BORLANDC__ */
520 typedef signed __int64 int64_t; 533 typedef signed __int64 int64_t;
521 typedef unsigned __int64 uint64_t; 534 typedef unsigned __int64 uint64_t;
522 #endif 535 #endif
536 #ifdef _WIN64
537 #define ECB_PTRSIZE 8
538 typedef uint64_t uintptr_t;
539 typedef int64_t intptr_t;
540 #else
541 #define ECB_PTRSIZE 4
542 typedef uint32_t uintptr_t;
543 typedef int32_t intptr_t;
544 #endif
523#else 545#else
524 #include <inttypes.h> 546 #include <inttypes.h>
547 #if UINTMAX_MAX > 0xffffffffU
548 #define ECB_PTRSIZE 8
549 #else
550 #define ECB_PTRSIZE 4
551 #endif
525#endif 552#endif
526 553
527/* many compilers define _GNUC_ to some versions but then only implement 554/* many compilers define _GNUC_ to some versions but then only implement
528 * what their idiot authors think are the "more important" extensions, 555 * what their idiot authors think are the "more important" extensions,
529 * causing enormous grief in return for some better fake benchmark numbers. 556 * causing enormous grief in return for some better fake benchmark numbers.
… …
537 #else 564 #else
538 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 565 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
539 #endif 566 #endif
540#endif 567#endif
541 568
569#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
570#define ECB_C99 (__STDC_VERSION__ >= 199901L)
571#define ECB_C11 (__STDC_VERSION__ >= 201112L)
572#define ECB_CPP (__cplusplus+0)
573#define ECB_CPP11 (__cplusplus >= 201103L)
574
575#if ECB_CPP
576 #define ECB_EXTERN_C extern "C"
577 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
578 #define ECB_EXTERN_C_END }
579#else
580 #define ECB_EXTERN_C extern
581 #define ECB_EXTERN_C_BEG
582 #define ECB_EXTERN_C_END
583#endif
584
542/*****************************************************************************/ 585/*****************************************************************************/
543 586
544/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 587/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
545/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 588/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
546 589
547#if ECB_NO_THREADS 590#if ECB_NO_THREADS
548# define ECB_NO_SMP 1 591 #define ECB_NO_SMP 1
549#endif 592#endif
550 593
551#if ECB_NO_THREADS || ECB_NO_SMP 594#if ECB_NO_SMP
552 #define ECB_MEMORY_FENCE do { } while (0) 595 #define ECB_MEMORY_FENCE do { } while (0)
553#endif 596#endif
554 597
555#ifndef ECB_MEMORY_FENCE 598#ifndef ECB_MEMORY_FENCE
556 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 599 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
557 #if __i386 || __i386__ 600 #if __i386 || __i386__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 601 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
559 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 602 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
560 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 603 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
561 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 604 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 605 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 606 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 607 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 608 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 609 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
567 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 610 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
568 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 611 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 612 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
570 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 613 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
571 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 614 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 615 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
573 #elif __sparc || __sparc__ 616 #elif __sparc || __sparc__
574 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 617 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
575 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 618 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
576 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 619 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
577 #elif defined __s390__ || defined __s390x__ 620 #elif defined __s390__ || defined __s390x__
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 621 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
579 #elif defined __mips__ 622 #elif defined __mips__
580 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 623 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
581 #elif defined __alpha__ 624 #elif defined __alpha__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 625 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
626 #elif defined __hppa__
627 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
628 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
629 #elif defined __ia64__
630 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
583 #endif 631 #endif
584 #endif 632 #endif
585#endif 633#endif
586 634
587#ifndef ECB_MEMORY_FENCE 635#ifndef ECB_MEMORY_FENCE
636 #if ECB_GCC_VERSION(4,7)
637 /* see comment below (stdatomic.h) about the C11 memory model. */
638 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
639
640 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
641 * without risking compile time errors with other compilers. We *could*
642 * define our own ecb_clang_has_feature, but I just can't be bothered to work
643 * around this shit time and again.
644 * #elif defined __clang && __has_feature (cxx_atomic)
645 * // see comment below (stdatomic.h) about the C11 memory model.
646 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
647 */
648
588 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 649 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
589 #define ECB_MEMORY_FENCE __sync_synchronize () 650 #define ECB_MEMORY_FENCE __sync_synchronize ()
590 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
591 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
592 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 651 #elif _MSC_VER >= 1400 /* VC++ 2005 */
593 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 652 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
594 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 653 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
595 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 654 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
596 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 655 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
606 #define ECB_MEMORY_FENCE __sync () 665 #define ECB_MEMORY_FENCE __sync ()
607 #endif 666 #endif
608#endif 667#endif
609 668
610#ifndef ECB_MEMORY_FENCE 669#ifndef ECB_MEMORY_FENCE
670 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
671 /* we assume that these memory fences work on all variables/all memory accesses, */
672 /* not just C11 atomics and atomic accesses */
673 #include <stdatomic.h>
674 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
675 /* any fence other than seq_cst, which isn't very efficient for us. */
676 /* Why that is, we don't know - either the C11 memory model is quite useless */
677 /* for most usages, or gcc and clang have a bug */
678 /* I *currently* lean towards the latter, and inefficiently implement */
679 /* all three of ecb's fences as a seq_cst fence */
680 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
681 #endif
682#endif
683
684#ifndef ECB_MEMORY_FENCE
611 #if !ECB_AVOID_PTHREADS 685 #if !ECB_AVOID_PTHREADS
612 /* 686 /*
613 * if you get undefined symbol references to pthread_mutex_lock, 687 * if you get undefined symbol references to pthread_mutex_lock,
614 * or failure to find pthread.h, then you should implement 688 * or failure to find pthread.h, then you should implement
615 * the ECB_MEMORY_FENCE operations for your cpu/compiler 689 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
633 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 707 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
634#endif 708#endif
635 709
636/*****************************************************************************/ 710/*****************************************************************************/
637 711
638#define ECB_C99 (__STDC_VERSION__ >= 199901L)
639
640#if __cplusplus 712#if __cplusplus
641 #define ecb_inline static inline 713 #define ecb_inline static inline
642#elif ECB_GCC_VERSION(2,5) 714#elif ECB_GCC_VERSION(2,5)
643 #define ecb_inline static __inline__ 715 #define ecb_inline static __inline__
644#elif ECB_C99 716#elif ECB_C99
… …
682#elif ECB_GCC_VERSION(3,0) 754#elif ECB_GCC_VERSION(3,0)
683 #define ecb_decltype(x) __typeof(x) 755 #define ecb_decltype(x) __typeof(x)
684#endif 756#endif
685 757
686#define ecb_noinline ecb_attribute ((__noinline__)) 758#define ecb_noinline ecb_attribute ((__noinline__))
687#define ecb_noreturn ecb_attribute ((__noreturn__))
688#define ecb_unused ecb_attribute ((__unused__)) 759#define ecb_unused ecb_attribute ((__unused__))
689#define ecb_const ecb_attribute ((__const__)) 760#define ecb_const ecb_attribute ((__const__))
690#define ecb_pure ecb_attribute ((__pure__)) 761#define ecb_pure ecb_attribute ((__pure__))
762
763#if ECB_C11
764 #define ecb_noreturn _Noreturn
765#else
766 #define ecb_noreturn ecb_attribute ((__noreturn__))
767#endif
691 768
692#if ECB_GCC_VERSION(4,3) 769#if ECB_GCC_VERSION(4,3)
693 #define ecb_artificial ecb_attribute ((__artificial__)) 770 #define ecb_artificial ecb_attribute ((__artificial__))
694 #define ecb_hot ecb_attribute ((__hot__)) 771 #define ecb_hot ecb_attribute ((__hot__))
695 #define ecb_cold ecb_attribute ((__cold__)) 772 #define ecb_cold ecb_attribute ((__cold__))
… …
786 863
787 return r + ecb_ld32 (x); 864 return r + ecb_ld32 (x);
788 } 865 }
789#endif 866#endif
790 867
868ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
869ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
870ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
871ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
872
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 873ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
792ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 874ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
793{ 875{
794 return ( (x * 0x0802U & 0x22110U) 876 return ( (x * 0x0802U & 0x22110U)
795 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 877 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
879 ecb_inline void ecb_unreachable (void) ecb_noreturn; 961 ecb_inline void ecb_unreachable (void) ecb_noreturn;
880 ecb_inline void ecb_unreachable (void) { } 962 ecb_inline void ecb_unreachable (void) { }
881#endif 963#endif
882 964
883/* try to tell the compiler that some condition is definitely true */ 965/* try to tell the compiler that some condition is definitely true */
884#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 966#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
885 967
886ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 968ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
887ecb_inline unsigned char 969ecb_inline unsigned char
888ecb_byteorder_helper (void) 970ecb_byteorder_helper (void)
889{ 971{
890 const uint32_t u = 0x11223344; 972 /* the union code still generates code under pressure in gcc, */
891 return *(unsigned char *)&u; 973 /* but less than using pointers, and always seems to */
974 /* successfully return a constant. */
975 /* the reason why we have this horrible preprocessor mess */
976 /* is to avoid it in all cases, at least on common architectures */
977 /* or when using a recent enough gcc version (>= 4.6) */
978#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
979 return 0x44;
980#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
981 return 0x44;
982#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
983 return 0x11;
984#else
985 union
986 {
987 uint32_t i;
988 uint8_t c;
989 } u = { 0x11223344 };
990 return u.c;
991#endif
892} 992}
893 993
894ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 994ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
895ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 995ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
896ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 996ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
927 } 1027 }
928#else 1028#else
929 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1029 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
930#endif 1030#endif
931 1031
1032/*******************************************************************************/
1033/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1034
1035/* basically, everything uses "ieee pure-endian" floating point numbers */
1036/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1037#if 0 \
1038 || __i386 || __i386__ \
1039 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1040 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1041 || defined __arm__ && defined __ARM_EABI__ \
1042 || defined __s390__ || defined __s390x__ \
1043 || defined __mips__ \
1044 || defined __alpha__ \
1045 || defined __hppa__ \
1046 || defined __ia64__ \
1047 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1048 #define ECB_STDFP 1
1049 #include <string.h> /* for memcpy */
1050#else
1051 #define ECB_STDFP 0
1052 #include <math.h> /* for frexp*, ldexp* */
1053#endif
1054
1055#ifndef ECB_NO_LIBM
1056
1057 /* convert a float to ieee single/binary32 */
1058 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1059 ecb_function_ uint32_t
1060 ecb_float_to_binary32 (float x)
1061 {
1062 uint32_t r;
1063
1064 #if ECB_STDFP
1065 memcpy (&r, &x, 4);
1066 #else
1067 /* slow emulation, works for anything but -0 */
1068 uint32_t m;
1069 int e;
1070
1071 if (x == 0e0f ) return 0x00000000U;
1072 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1073 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1074 if (x != x ) return 0x7fbfffffU;
1075
1076 m = frexpf (x, &e) * 0x1000000U;
1077
1078 r = m & 0x80000000U;
1079
1080 if (r)
1081 m = -m;
1082
1083 if (e <= -126)
1084 {
1085 m &= 0xffffffU;
1086 m >>= (-125 - e);
1087 e = -126;
1088 }
1089
1090 r |= (e + 126) << 23;
1091 r |= m & 0x7fffffU;
1092 #endif
1093
1094 return r;
1095 }
1096
1097 /* converts an ieee single/binary32 to a float */
1098 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1099 ecb_function_ float
1100 ecb_binary32_to_float (uint32_t x)
1101 {
1102 float r;
1103
1104 #if ECB_STDFP
1105 memcpy (&r, &x, 4);
1106 #else
1107 /* emulation, only works for normals and subnormals and +0 */
1108 int neg = x >> 31;
1109 int e = (x >> 23) & 0xffU;
1110
1111 x &= 0x7fffffU;
1112
1113 if (e)
1114 x |= 0x800000U;
1115 else
1116 e = 1;
1117
1118 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1119 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1120
1121 r = neg ? -r : r;
1122 #endif
1123
1124 return r;
1125 }
1126
1127 /* convert a double to ieee double/binary64 */
1128 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1129 ecb_function_ uint64_t
1130 ecb_double_to_binary64 (double x)
1131 {
1132 uint64_t r;
1133
1134 #if ECB_STDFP
1135 memcpy (&r, &x, 8);
1136 #else
1137 /* slow emulation, works for anything but -0 */
1138 uint64_t m;
1139 int e;
1140
1141 if (x == 0e0 ) return 0x0000000000000000U;
1142 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1143 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1144 if (x != x ) return 0X7ff7ffffffffffffU;
1145
1146 m = frexp (x, &e) * 0x20000000000000U;
1147
1148 r = m & 0x8000000000000000;;
1149
1150 if (r)
1151 m = -m;
1152
1153 if (e <= -1022)
1154 {
1155 m &= 0x1fffffffffffffU;
1156 m >>= (-1021 - e);
1157 e = -1022;
1158 }
1159
1160 r |= ((uint64_t)(e + 1022)) << 52;
1161 r |= m & 0xfffffffffffffU;
1162 #endif
1163
1164 return r;
1165 }
1166
1167 /* converts an ieee double/binary64 to a double */
1168 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1169 ecb_function_ double
1170 ecb_binary64_to_double (uint64_t x)
1171 {
1172 double r;
1173
1174 #if ECB_STDFP
1175 memcpy (&r, &x, 8);
1176 #else
1177 /* emulation, only works for normals and subnormals and +0 */
1178 int neg = x >> 63;
1179 int e = (x >> 52) & 0x7ffU;
1180
1181 x &= 0xfffffffffffffU;
1182
1183 if (e)
1184 x |= 0x10000000000000U;
1185 else
1186 e = 1;
1187
1188 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1189 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1190
1191 r = neg ? -r : r;
1192 #endif
1193
1194 return r;
1195 }
1196
1197#endif
1198
932#endif 1199#endif
933 1200
934/* ECB.H END */ 1201/* ECB.H END */
935 1202
936#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1203#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1105#endif 1372#endif
1106 1373
1107static void (*syserr_cb)(const char *msg) EV_THROW; 1374static void (*syserr_cb)(const char *msg) EV_THROW;
1108 1375
1109void ecb_cold 1376void ecb_cold
1110ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1377ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1111{ 1378{
1112 syserr_cb = cb; 1379 syserr_cb = cb;
1113} 1380}
1114 1381
1115static void noinline ecb_cold 1382static void noinline ecb_cold
… …
1133 abort (); 1400 abort ();
1134 } 1401 }
1135} 1402}
1136 1403
1137static void * 1404static void *
1138ev_realloc_emul (void *ptr, long size) 1405ev_realloc_emul (void *ptr, long size) EV_THROW
1139{ 1406{
1140#if __GLIBC__
1141 return realloc (ptr, size);
1142#else
1143 /* some systems, notably openbsd and darwin, fail to properly 1407 /* some systems, notably openbsd and darwin, fail to properly
1144 * implement realloc (x, 0) (as required by both ansi c-89 and 1408 * implement realloc (x, 0) (as required by both ansi c-89 and
1145 * the single unix specification, so work around them here. 1409 * the single unix specification, so work around them here.
1410 * recently, also (at least) fedora and debian started breaking it,
1411 * despite documenting it otherwise.
1146 */ 1412 */
1147 1413
1148 if (size) 1414 if (size)
1149 return realloc (ptr, size); 1415 return realloc (ptr, size);
1150 1416
1151 free (ptr); 1417 free (ptr);
1152 return 0; 1418 return 0;
1153#endif
1154} 1419}
1155 1420
1156static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1421static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1157 1422
1158void ecb_cold 1423void ecb_cold
1159ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1424ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1160{ 1425{
1161 alloc = cb; 1426 alloc = cb;
1162} 1427}
1163 1428
1164inline_speed void * 1429inline_speed void *
… …
1813static void noinline ecb_cold 2078static void noinline ecb_cold
1814evpipe_init (EV_P) 2079evpipe_init (EV_P)
1815{ 2080{
1816 if (!ev_is_active (&pipe_w)) 2081 if (!ev_is_active (&pipe_w))
1817 { 2082 {
2083 int fds [2];
2084
1818# if EV_USE_EVENTFD 2085# if EV_USE_EVENTFD
2086 fds [0] = -1;
1819 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2087 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1820 if (evfd < 0 && errno == EINVAL) 2088 if (fds [1] < 0 && errno == EINVAL)
1821 evfd = eventfd (0, 0); 2089 fds [1] = eventfd (0, 0);
1822 2090
1823 if (evfd >= 0) 2091 if (fds [1] < 0)
1824 {
1825 evpipe [0] = -1;
1826 fd_intern (evfd); /* doing it twice doesn't hurt */
1827 ev_io_set (&pipe_w, evfd, EV_READ);
1828 }
1829 else
1830# endif 2092# endif
1831 { 2093 {
1832 while (pipe (evpipe)) 2094 while (pipe (fds))
1833 ev_syserr ("(libev) error creating signal/async pipe"); 2095 ev_syserr ("(libev) error creating signal/async pipe");
1834 2096
1835 fd_intern (evpipe [0]); 2097 fd_intern (fds [0]);
1836 fd_intern (evpipe [1]);
1837 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1838 } 2098 }
1839 2099
2100 fd_intern (fds [1]);
2101
2102 evpipe [0] = fds [0];
2103
2104 if (evpipe [1] < 0)
2105 evpipe [1] = fds [1]; /* first call, set write fd */
2106 else
2107 {
2108 /* on subsequent calls, do not change evpipe [1] */
2109 /* so that evpipe_write can always rely on its value. */
2110 /* this branch does not do anything sensible on windows, */
2111 /* so must not be executed on windows */
2112
2113 dup2 (fds [1], evpipe [1]);
2114 close (fds [1]);
2115 }
2116
2117 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1840 ev_io_start (EV_A_ &pipe_w); 2118 ev_io_start (EV_A_ &pipe_w);
1841 ev_unref (EV_A); /* watcher should not keep loop alive */ 2119 ev_unref (EV_A); /* watcher should not keep loop alive */
1842 } 2120 }
1843} 2121}
1844 2122
… …
1849 2127
1850 if (expect_true (*flag)) 2128 if (expect_true (*flag))
1851 return; 2129 return;
1852 2130
1853 *flag = 1; 2131 *flag = 1;
1854
1855 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 2132 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1856 2133
1857 pipe_write_skipped = 1; 2134 pipe_write_skipped = 1;
1858 2135
1859 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 2136 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1860 2137
1861 if (pipe_write_wanted) 2138 if (pipe_write_wanted)
1862 { 2139 {
1863 int old_errno; 2140 int old_errno;
1864 2141
1865 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 2142 pipe_write_skipped = 0;
2143 ECB_MEMORY_FENCE_RELEASE;
1866 2144
1867 old_errno = errno; /* save errno because write will clobber it */ 2145 old_errno = errno; /* save errno because write will clobber it */
1868 2146
1869#if EV_USE_EVENTFD 2147#if EV_USE_EVENTFD
1870 if (evfd >= 0) 2148 if (evpipe [0] < 0)
1871 { 2149 {
1872 uint64_t counter = 1; 2150 uint64_t counter = 1;
1873 write (evfd, &counter, sizeof (uint64_t)); 2151 write (evpipe [1], &counter, sizeof (uint64_t));
1874 } 2152 }
1875 else 2153 else
1876#endif 2154#endif
1877 { 2155 {
1878#ifdef _WIN32 2156#ifdef _WIN32
… …
1898 int i; 2176 int i;
1899 2177
1900 if (revents & EV_READ) 2178 if (revents & EV_READ)
1901 { 2179 {
1902#if EV_USE_EVENTFD 2180#if EV_USE_EVENTFD
1903 if (evfd >= 0) 2181 if (evpipe [0] < 0)
1904 { 2182 {
1905 uint64_t counter; 2183 uint64_t counter;
1906 read (evfd, &counter, sizeof (uint64_t)); 2184 read (evpipe [1], &counter, sizeof (uint64_t));
1907 } 2185 }
1908 else 2186 else
1909#endif 2187#endif
1910 { 2188 {
1911 char dummy[4]; 2189 char dummy[4];
1912#ifdef _WIN32 2190#ifdef _WIN32
1913 WSABUF buf; 2191 WSABUF buf;
1914 DWORD recvd; 2192 DWORD recvd;
2193 DWORD flags = 0;
1915 buf.buf = dummy; 2194 buf.buf = dummy;
1916 buf.len = sizeof (dummy); 2195 buf.len = sizeof (dummy);
1917 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 2196 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1918#else 2197#else
1919 read (evpipe [0], &dummy, sizeof (dummy)); 2198 read (evpipe [0], &dummy, sizeof (dummy));
1920#endif 2199#endif
1921 } 2200 }
1922 } 2201 }
… …
1928#if EV_SIGNAL_ENABLE 2207#if EV_SIGNAL_ENABLE
1929 if (sig_pending) 2208 if (sig_pending)
1930 { 2209 {
1931 sig_pending = 0; 2210 sig_pending = 0;
1932 2211
1933 ECB_MEMORY_FENCE_RELEASE; 2212 ECB_MEMORY_FENCE;
1934 2213
1935 for (i = EV_NSIG - 1; i--; ) 2214 for (i = EV_NSIG - 1; i--; )
1936 if (expect_false (signals [i].pending)) 2215 if (expect_false (signals [i].pending))
1937 ev_feed_signal_event (EV_A_ i + 1); 2216 ev_feed_signal_event (EV_A_ i + 1);
1938 } 2217 }
… …
1941#if EV_ASYNC_ENABLE 2220#if EV_ASYNC_ENABLE
1942 if (async_pending) 2221 if (async_pending)
1943 { 2222 {
1944 async_pending = 0; 2223 async_pending = 0;
1945 2224
1946 ECB_MEMORY_FENCE_RELEASE; 2225 ECB_MEMORY_FENCE;
1947 2226
1948 for (i = asynccnt; i--; ) 2227 for (i = asynccnt; i--; )
1949 if (asyncs [i]->sent) 2228 if (asyncs [i]->sent)
1950 { 2229 {
1951 asyncs [i]->sent = 0; 2230 asyncs [i]->sent = 0;
2231 ECB_MEMORY_FENCE_RELEASE;
1952 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2232 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1953 } 2233 }
1954 } 2234 }
1955#endif 2235#endif
1956} 2236}
… …
1959 2239
1960void 2240void
1961ev_feed_signal (int signum) EV_THROW 2241ev_feed_signal (int signum) EV_THROW
1962{ 2242{
1963#if EV_MULTIPLICITY 2243#if EV_MULTIPLICITY
2244 ECB_MEMORY_FENCE_ACQUIRE;
1964 EV_P = signals [signum - 1].loop; 2245 EV_P = signals [signum - 1].loop;
1965 2246
1966 if (!EV_A) 2247 if (!EV_A)
1967 return; 2248 return;
1968#endif 2249#endif
1969 2250
1970 if (!ev_active (&pipe_w))
1971 return;
1972
1973 signals [signum - 1].pending = 1; 2251 signals [signum - 1].pending = 1;
1974 evpipe_write (EV_A_ &sig_pending); 2252 evpipe_write (EV_A_ &sig_pending);
1975} 2253}
1976 2254
1977static void 2255static void
… …
1987void noinline 2265void noinline
1988ev_feed_signal_event (EV_P_ int signum) EV_THROW 2266ev_feed_signal_event (EV_P_ int signum) EV_THROW
1989{ 2267{
1990 WL w; 2268 WL w;
1991 2269
1992 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2270 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1993 return; 2271 return;
1994 2272
1995 --signum; 2273 --signum;
1996 2274
1997#if EV_MULTIPLICITY 2275#if EV_MULTIPLICITY
… …
2001 if (expect_false (signals [signum].loop != EV_A)) 2279 if (expect_false (signals [signum].loop != EV_A))
2002 return; 2280 return;
2003#endif 2281#endif
2004 2282
2005 signals [signum].pending = 0; 2283 signals [signum].pending = 0;
2284 ECB_MEMORY_FENCE_RELEASE;
2006 2285
2007 for (w = signals [signum].head; w; w = w->next) 2286 for (w = signals [signum].head; w; w = w->next)
2008 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2287 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2009} 2288}
2010 2289
… …
2294#if EV_ASYNC_ENABLE 2573#if EV_ASYNC_ENABLE
2295 async_pending = 0; 2574 async_pending = 0;
2296#endif 2575#endif
2297 pipe_write_skipped = 0; 2576 pipe_write_skipped = 0;
2298 pipe_write_wanted = 0; 2577 pipe_write_wanted = 0;
2578 evpipe [0] = -1;
2579 evpipe [1] = -1;
2299#if EV_USE_INOTIFY 2580#if EV_USE_INOTIFY
2300 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2581 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2301#endif 2582#endif
2302#if EV_USE_SIGNALFD 2583#if EV_USE_SIGNALFD
2303 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2584 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2354 EV_INVOKE_PENDING; 2635 EV_INVOKE_PENDING;
2355 } 2636 }
2356#endif 2637#endif
2357 2638
2358#if EV_CHILD_ENABLE 2639#if EV_CHILD_ENABLE
2359 if (ev_is_active (&childev)) 2640 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2360 { 2641 {
2361 ev_ref (EV_A); /* child watcher */ 2642 ev_ref (EV_A); /* child watcher */
2362 ev_signal_stop (EV_A_ &childev); 2643 ev_signal_stop (EV_A_ &childev);
2363 } 2644 }
2364#endif 2645#endif
… …
2366 if (ev_is_active (&pipe_w)) 2647 if (ev_is_active (&pipe_w))
2367 { 2648 {
2368 /*ev_ref (EV_A);*/ 2649 /*ev_ref (EV_A);*/
2369 /*ev_io_stop (EV_A_ &pipe_w);*/ 2650 /*ev_io_stop (EV_A_ &pipe_w);*/
2370 2651
2371#if EV_USE_EVENTFD
2372 if (evfd >= 0)
2373 close (evfd);
2374#endif
2375
2376 if (evpipe [0] >= 0)
2377 {
2378 EV_WIN32_CLOSE_FD (evpipe [0]); 2652 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2379 EV_WIN32_CLOSE_FD (evpipe [1]); 2653 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2380 }
2381 } 2654 }
2382 2655
2383#if EV_USE_SIGNALFD 2656#if EV_USE_SIGNALFD
2384 if (ev_is_active (&sigfd_w)) 2657 if (ev_is_active (&sigfd_w))
2385 close (sigfd); 2658 close (sigfd);
… …
2471#endif 2744#endif
2472#if EV_USE_INOTIFY 2745#if EV_USE_INOTIFY
2473 infy_fork (EV_A); 2746 infy_fork (EV_A);
2474#endif 2747#endif
2475 2748
2749#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2476 if (ev_is_active (&pipe_w)) 2750 if (ev_is_active (&pipe_w))
2477 { 2751 {
2478 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2752 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2479 2753
2480 ev_ref (EV_A); 2754 ev_ref (EV_A);
2481 ev_io_stop (EV_A_ &pipe_w); 2755 ev_io_stop (EV_A_ &pipe_w);
2482 2756
2483#if EV_USE_EVENTFD
2484 if (evfd >= 0)
2485 close (evfd);
2486#endif
2487
2488 if (evpipe [0] >= 0) 2757 if (evpipe [0] >= 0)
2489 {
2490 EV_WIN32_CLOSE_FD (evpipe [0]); 2758 EV_WIN32_CLOSE_FD (evpipe [0]);
2491 EV_WIN32_CLOSE_FD (evpipe [1]);
2492 }
2493 2759
2494#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2495 evpipe_init (EV_A); 2760 evpipe_init (EV_A);
2496 /* now iterate over everything, in case we missed something */ 2761 /* iterate over everything, in case we missed something before */
2497 pipecb (EV_A_ &pipe_w, EV_READ); 2762 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2498#endif
2499 } 2763 }
2764#endif
2500 2765
2501 postfork = 0; 2766 postfork = 0;
2502} 2767}
2503 2768
2504#if EV_MULTIPLICITY 2769#if EV_MULTIPLICITY
… …
2677} 2942}
2678 2943
2679void 2944void
2680ev_loop_fork (EV_P) EV_THROW 2945ev_loop_fork (EV_P) EV_THROW
2681{ 2946{
2682 postfork = 1; /* must be in line with ev_default_fork */ 2947 postfork = 1;
2683} 2948}
2684 2949
2685/*****************************************************************************/ 2950/*****************************************************************************/
2686 2951
2687void 2952void
… …
2703} 2968}
2704 2969
2705void noinline 2970void noinline
2706ev_invoke_pending (EV_P) 2971ev_invoke_pending (EV_P)
2707{ 2972{
2708 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2973 pendingpri = NUMPRI;
2974
2975 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2976 {
2977 --pendingpri;
2978
2709 while (pendingcnt [pendingpri]) 2979 while (pendingcnt [pendingpri])
2710 { 2980 {
2711 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 2981 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2712 2982
2713 p->w->pending = 0; 2983 p->w->pending = 0;
2714 EV_CB_INVOKE (p->w, p->events); 2984 EV_CB_INVOKE (p->w, p->events);
2715 EV_FREQUENT_CHECK; 2985 EV_FREQUENT_CHECK;
2716 } 2986 }
2987 }
2717} 2988}
2718 2989
2719#if EV_IDLE_ENABLE 2990#if EV_IDLE_ENABLE
2720/* make idle watchers pending. this handles the "call-idle */ 2991/* make idle watchers pending. this handles the "call-idle */
2721/* only when higher priorities are idle" logic */ 2992/* only when higher priorities are idle" logic */
… …
2811{ 3082{
2812 EV_FREQUENT_CHECK; 3083 EV_FREQUENT_CHECK;
2813 3084
2814 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 3085 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2815 { 3086 {
2816 int feed_count = 0;
2817
2818 do 3087 do
2819 { 3088 {
2820 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 3089 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2821 3090
2822 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 3091 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3081 backend_poll (EV_A_ waittime); 3350 backend_poll (EV_A_ waittime);
3082 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3351 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3083 3352
3084 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3353 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3085 3354
3355 ECB_MEMORY_FENCE_ACQUIRE;
3086 if (pipe_write_skipped) 3356 if (pipe_write_skipped)
3087 { 3357 {
3088 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3358 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3089 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3359 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3090 } 3360 }
… …
3468#if EV_MULTIPLICITY 3738#if EV_MULTIPLICITY
3469 assert (("libev: a signal must not be attached to two different loops", 3739 assert (("libev: a signal must not be attached to two different loops",
3470 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3740 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3471 3741
3472 signals [w->signum - 1].loop = EV_A; 3742 signals [w->signum - 1].loop = EV_A;
3743 ECB_MEMORY_FENCE_RELEASE;
3473#endif 3744#endif
3474 3745
3475 EV_FREQUENT_CHECK; 3746 EV_FREQUENT_CHECK;
3476 3747
3477#if EV_USE_SIGNALFD 3748#if EV_USE_SIGNALFD
… …
3632# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3903# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3633 3904
3634static void noinline 3905static void noinline
3635infy_add (EV_P_ ev_stat *w) 3906infy_add (EV_P_ ev_stat *w)
3636{ 3907{
3637 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); 3908 w->wd = inotify_add_watch (fs_fd, w->path,
3909 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3910 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3911 | IN_DONT_FOLLOW | IN_MASK_ADD);
3638 3912
3639 if (w->wd >= 0) 3913 if (w->wd >= 0)
3640 { 3914 {
3641 struct statfs sfs; 3915 struct statfs sfs;
3642 3916
… …
3646 3920
3647 if (!fs_2625) 3921 if (!fs_2625)
3648 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3922 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3649 else if (!statfs (w->path, &sfs) 3923 else if (!statfs (w->path, &sfs)
3650 && (sfs.f_type == 0x1373 /* devfs */ 3924 && (sfs.f_type == 0x1373 /* devfs */
3925 || sfs.f_type == 0x4006 /* fat */
3926 || sfs.f_type == 0x4d44 /* msdos */
3651 || sfs.f_type == 0xEF53 /* ext2/3 */ 3927 || sfs.f_type == 0xEF53 /* ext2/3 */
3928 || sfs.f_type == 0x72b6 /* jffs2 */
3929 || sfs.f_type == 0x858458f6 /* ramfs */
3930 || sfs.f_type == 0x5346544e /* ntfs */
3652 || sfs.f_type == 0x3153464a /* jfs */ 3931 || sfs.f_type == 0x3153464a /* jfs */
3932 || sfs.f_type == 0x9123683e /* btrfs */
3653 || sfs.f_type == 0x52654973 /* reiser3 */ 3933 || sfs.f_type == 0x52654973 /* reiser3 */
3654 || sfs.f_type == 0x01021994 /* tempfs */ 3934 || sfs.f_type == 0x01021994 /* tmpfs */
3655 || sfs.f_type == 0x58465342 /* xfs */)) 3935 || sfs.f_type == 0x58465342 /* xfs */))
3656 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3936 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3657 else 3937 else
3658 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3938 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3659 } 3939 }

Diff Legend

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