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

Comparing libev/ev.c (file contents):
Revision 1.432 by root, Mon May 14 19:09:58 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
… …
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 0x00010003
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
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
560 #endif
525#endif 561#endif
526 562
527/* many compilers define _GNUC_ to some versions but then only implement 563/* many compilers define _GNUC_ to some versions but then only implement
528 * what their idiot authors think are the "more important" extensions, 564 * what their idiot authors think are the "more important" extensions,
529 * causing enormous grief in return for some better fake benchmark numbers. 565 * causing enormous grief in return for some better fake benchmark numbers.
… …
537 #else 573 #else
538 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 574 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
539 #endif 575 #endif
540#endif 576#endif
541 577
578#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
579#define ECB_C99 (__STDC_VERSION__ >= 199901L)
580#define ECB_C11 (__STDC_VERSION__ >= 201112L)
581#define ECB_CPP (__cplusplus+0)
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
593
542/*****************************************************************************/ 594/*****************************************************************************/
543 595
544/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 596/* 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 */ 597/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
546 598
547#if ECB_NO_THREADS 599#if ECB_NO_THREADS
548# define ECB_NO_SMP 1 600 #define ECB_NO_SMP 1
549#endif 601#endif
550 602
551#if ECB_NO_THREADS || ECB_NO_SMP 603#if ECB_NO_SMP
552 #define ECB_MEMORY_FENCE do { } while (0) 604 #define ECB_MEMORY_FENCE do { } while (0)
553#endif 605#endif
554 606
555#ifndef ECB_MEMORY_FENCE 607#ifndef ECB_MEMORY_FENCE
556 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 608 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
557 #if __i386 || __i386__ 609 #if __i386 || __i386__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 610 #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 */ 611 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
560 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 612 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
561 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 613 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 614 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 615 #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 */ 616 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 617 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 618 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
567 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 619 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
568 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 620 || 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") 621 #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__ \ 622 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
571 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 623 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 624 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
573 #elif __sparc || __sparc__ 625 #elif __sparc || __sparc__
574 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 626 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
575 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 627 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
576 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 628 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
577 #elif defined __s390__ || defined __s390x__ 629 #elif defined __s390__ || defined __s390x__
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 630 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
579 #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. */
580 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 634 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
581 #elif defined __alpha__ 635 #elif defined __alpha__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 636 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
637 #elif defined __hppa__
638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
639 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
640 #elif defined __ia64__
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")
583 #endif 648 #endif
584 #endif 649 #endif
585#endif 650#endif
586 651
587#ifndef ECB_MEMORY_FENCE 652#ifndef ECB_MEMORY_FENCE
653 #if ECB_GCC_VERSION(4,7)
654 /* see comment below (stdatomic.h) about the C11 memory model. */
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.
661 * #elif defined __clang && __has_feature (cxx_atomic)
662 * // see comment below (stdatomic.h) about the C11 memory model.
663 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
664 */
665
588 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 666 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
589 #define ECB_MEMORY_FENCE __sync_synchronize () 667 #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 */ 668 #elif _MSC_VER >= 1400 /* VC++ 2005 */
593 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 669 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
594 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 670 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
595 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 671 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
596 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 672 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
606 #define ECB_MEMORY_FENCE __sync () 682 #define ECB_MEMORY_FENCE __sync ()
607 #endif 683 #endif
608#endif 684#endif
609 685
610#ifndef ECB_MEMORY_FENCE 686#ifndef ECB_MEMORY_FENCE
687 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
688 /* we assume that these memory fences work on all variables/all memory accesses, */
689 /* not just C11 atomics and atomic accesses */
690 #include <stdatomic.h>
691 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
692 /* any fence other than seq_cst, which isn't very efficient for us. */
693 /* Why that is, we don't know - either the C11 memory model is quite useless */
694 /* for most usages, or gcc and clang have a bug */
695 /* I *currently* lean towards the latter, and inefficiently implement */
696 /* all three of ecb's fences as a seq_cst fence */
697 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
698 #endif
699#endif
700
701#ifndef ECB_MEMORY_FENCE
611 #if !ECB_AVOID_PTHREADS 702 #if !ECB_AVOID_PTHREADS
612 /* 703 /*
613 * if you get undefined symbol references to pthread_mutex_lock, 704 * if you get undefined symbol references to pthread_mutex_lock,
614 * or failure to find pthread.h, then you should implement 705 * or failure to find pthread.h, then you should implement
615 * the ECB_MEMORY_FENCE operations for your cpu/compiler 706 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
633 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 724 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
634#endif 725#endif
635 726
636/*****************************************************************************/ 727/*****************************************************************************/
637 728
638#define ECB_C99 (__STDC_VERSION__ >= 199901L)
639
640#if __cplusplus 729#if __cplusplus
641 #define ecb_inline static inline 730 #define ecb_inline static inline
642#elif ECB_GCC_VERSION(2,5) 731#elif ECB_GCC_VERSION(2,5)
643 #define ecb_inline static __inline__ 732 #define ecb_inline static __inline__
644#elif ECB_C99 733#elif ECB_C99
… …
682#elif ECB_GCC_VERSION(3,0) 771#elif ECB_GCC_VERSION(3,0)
683 #define ecb_decltype(x) __typeof(x) 772 #define ecb_decltype(x) __typeof(x)
684#endif 773#endif
685 774
686#define ecb_noinline ecb_attribute ((__noinline__)) 775#define ecb_noinline ecb_attribute ((__noinline__))
687#define ecb_noreturn ecb_attribute ((__noreturn__))
688#define ecb_unused ecb_attribute ((__unused__)) 776#define ecb_unused ecb_attribute ((__unused__))
689#define ecb_const ecb_attribute ((__const__)) 777#define ecb_const ecb_attribute ((__const__))
690#define ecb_pure ecb_attribute ((__pure__)) 778#define ecb_pure ecb_attribute ((__pure__))
779
780#if ECB_C11
781 #define ecb_noreturn _Noreturn
782#else
783 #define ecb_noreturn ecb_attribute ((__noreturn__))
784#endif
691 785
692#if ECB_GCC_VERSION(4,3) 786#if ECB_GCC_VERSION(4,3)
693 #define ecb_artificial ecb_attribute ((__artificial__)) 787 #define ecb_artificial ecb_attribute ((__artificial__))
694 #define ecb_hot ecb_attribute ((__hot__)) 788 #define ecb_hot ecb_attribute ((__hot__))
695 #define ecb_cold ecb_attribute ((__cold__)) 789 #define ecb_cold ecb_attribute ((__cold__))
… …
786 880
787 return r + ecb_ld32 (x); 881 return r + ecb_ld32 (x);
788 } 882 }
789#endif 883#endif
790 884
885ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
886ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
887ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
888ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
889
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 890ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
792ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 891ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
793{ 892{
794 return ( (x * 0x0802U & 0x22110U) 893 return ( (x * 0x0802U & 0x22110U)
795 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 894 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
879 ecb_inline void ecb_unreachable (void) ecb_noreturn; 978 ecb_inline void ecb_unreachable (void) ecb_noreturn;
880 ecb_inline void ecb_unreachable (void) { } 979 ecb_inline void ecb_unreachable (void) { }
881#endif 980#endif
882 981
883/* try to tell the compiler that some condition is definitely true */ 982/* try to tell the compiler that some condition is definitely true */
884#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 983#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
885 984
886ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 985ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
887ecb_inline unsigned char 986ecb_inline unsigned char
888ecb_byteorder_helper (void) 987ecb_byteorder_helper (void)
889{ 988{
890 const uint32_t u = 0x11223344; 989 /* the union code still generates code under pressure in gcc, */
891 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
892} 1009}
893 1010
894ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1011ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
895ecb_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; }
896ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1013ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
927 } 1044 }
928#else 1045#else
929 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1046 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
930#endif 1047#endif
931 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
932#endif 1219#endif
933 1220
934/* ECB.H END */ 1221/* ECB.H END */
935 1222
936#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1223#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1105#endif 1392#endif
1106 1393
1107static void (*syserr_cb)(const char *msg) EV_THROW; 1394static void (*syserr_cb)(const char *msg) EV_THROW;
1108 1395
1109void ecb_cold 1396void ecb_cold
1110ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1397ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1111{ 1398{
1112 syserr_cb = cb; 1399 syserr_cb = cb;
1113} 1400}
1114 1401
1115static void noinline ecb_cold 1402static void noinline ecb_cold
… …
1133 abort (); 1420 abort ();
1134 } 1421 }
1135} 1422}
1136 1423
1137static void * 1424static void *
1138ev_realloc_emul (void *ptr, long size) 1425ev_realloc_emul (void *ptr, long size) EV_THROW
1139{ 1426{
1140#if __GLIBC__
1141 return realloc (ptr, size);
1142#else
1143 /* some systems, notably openbsd and darwin, fail to properly 1427 /* some systems, notably openbsd and darwin, fail to properly
1144 * 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
1145 * 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.
1146 */ 1432 */
1147 1433
1148 if (size) 1434 if (size)
1149 return realloc (ptr, size); 1435 return realloc (ptr, size);
1150 1436
1151 free (ptr); 1437 free (ptr);
1152 return 0; 1438 return 0;
1153#endif
1154} 1439}
1155 1440
1156static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1441static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1157 1442
1158void ecb_cold 1443void ecb_cold
1159ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1444ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1160{ 1445{
1161 alloc = cb; 1446 alloc = cb;
1162} 1447}
1163 1448
1164inline_speed void * 1449inline_speed void *
… …
1813static void noinline ecb_cold 2098static void noinline ecb_cold
1814evpipe_init (EV_P) 2099evpipe_init (EV_P)
1815{ 2100{
1816 if (!ev_is_active (&pipe_w)) 2101 if (!ev_is_active (&pipe_w))
1817 { 2102 {
2103 int fds [2];
2104
1818# if EV_USE_EVENTFD 2105# if EV_USE_EVENTFD
2106 fds [0] = -1;
1819 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2107 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1820 if (evfd < 0 && errno == EINVAL) 2108 if (fds [1] < 0 && errno == EINVAL)
1821 evfd = eventfd (0, 0); 2109 fds [1] = eventfd (0, 0);
1822 2110
1823 if (evfd >= 0) 2111 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 2112# endif
1831 { 2113 {
1832 while (pipe (evpipe)) 2114 while (pipe (fds))
1833 ev_syserr ("(libev) error creating signal/async pipe"); 2115 ev_syserr ("(libev) error creating signal/async pipe");
1834 2116
1835 fd_intern (evpipe [0]); 2117 fd_intern (fds [0]);
1836 fd_intern (evpipe [1]);
1837 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1838 } 2118 }
1839 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);
1840 ev_io_start (EV_A_ &pipe_w); 2138 ev_io_start (EV_A_ &pipe_w);
1841 ev_unref (EV_A); /* watcher should not keep loop alive */ 2139 ev_unref (EV_A); /* watcher should not keep loop alive */
1842 } 2140 }
1843} 2141}
1844 2142
… …
1849 2147
1850 if (expect_true (*flag)) 2148 if (expect_true (*flag))
1851 return; 2149 return;
1852 2150
1853 *flag = 1; 2151 *flag = 1;
1854
1855 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 2152 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1856 2153
1857 pipe_write_skipped = 1; 2154 pipe_write_skipped = 1;
1858 2155
1859 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 2156 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1860 2157
1861 if (pipe_write_wanted) 2158 if (pipe_write_wanted)
1862 { 2159 {
1863 int old_errno; 2160 int old_errno;
1864 2161
1865 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 2162 pipe_write_skipped = 0;
2163 ECB_MEMORY_FENCE_RELEASE;
1866 2164
1867 old_errno = errno; /* save errno because write will clobber it */ 2165 old_errno = errno; /* save errno because write will clobber it */
1868 2166
1869#if EV_USE_EVENTFD 2167#if EV_USE_EVENTFD
1870 if (evfd >= 0) 2168 if (evpipe [0] < 0)
1871 { 2169 {
1872 uint64_t counter = 1; 2170 uint64_t counter = 1;
1873 write (evfd, &counter, sizeof (uint64_t)); 2171 write (evpipe [1], &counter, sizeof (uint64_t));
1874 } 2172 }
1875 else 2173 else
1876#endif 2174#endif
1877 { 2175 {
1878#ifdef _WIN32 2176#ifdef _WIN32
… …
1898 int i; 2196 int i;
1899 2197
1900 if (revents & EV_READ) 2198 if (revents & EV_READ)
1901 { 2199 {
1902#if EV_USE_EVENTFD 2200#if EV_USE_EVENTFD
1903 if (evfd >= 0) 2201 if (evpipe [0] < 0)
1904 { 2202 {
1905 uint64_t counter; 2203 uint64_t counter;
1906 read (evfd, &counter, sizeof (uint64_t)); 2204 read (evpipe [1], &counter, sizeof (uint64_t));
1907 } 2205 }
1908 else 2206 else
1909#endif 2207#endif
1910 { 2208 {
1911 char dummy[4]; 2209 char dummy[4];
… …
1929#if EV_SIGNAL_ENABLE 2227#if EV_SIGNAL_ENABLE
1930 if (sig_pending) 2228 if (sig_pending)
1931 { 2229 {
1932 sig_pending = 0; 2230 sig_pending = 0;
1933 2231
1934 ECB_MEMORY_FENCE_RELEASE; 2232 ECB_MEMORY_FENCE;
1935 2233
1936 for (i = EV_NSIG - 1; i--; ) 2234 for (i = EV_NSIG - 1; i--; )
1937 if (expect_false (signals [i].pending)) 2235 if (expect_false (signals [i].pending))
1938 ev_feed_signal_event (EV_A_ i + 1); 2236 ev_feed_signal_event (EV_A_ i + 1);
1939 } 2237 }
… …
1942#if EV_ASYNC_ENABLE 2240#if EV_ASYNC_ENABLE
1943 if (async_pending) 2241 if (async_pending)
1944 { 2242 {
1945 async_pending = 0; 2243 async_pending = 0;
1946 2244
1947 ECB_MEMORY_FENCE_RELEASE; 2245 ECB_MEMORY_FENCE;
1948 2246
1949 for (i = asynccnt; i--; ) 2247 for (i = asynccnt; i--; )
1950 if (asyncs [i]->sent) 2248 if (asyncs [i]->sent)
1951 { 2249 {
1952 asyncs [i]->sent = 0; 2250 asyncs [i]->sent = 0;
2251 ECB_MEMORY_FENCE_RELEASE;
1953 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2252 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1954 } 2253 }
1955 } 2254 }
1956#endif 2255#endif
1957} 2256}
… …
1960 2259
1961void 2260void
1962ev_feed_signal (int signum) EV_THROW 2261ev_feed_signal (int signum) EV_THROW
1963{ 2262{
1964#if EV_MULTIPLICITY 2263#if EV_MULTIPLICITY
2264 EV_P;
2265 ECB_MEMORY_FENCE_ACQUIRE;
1965 EV_P = signals [signum - 1].loop; 2266 EV_A = signals [signum - 1].loop;
1966 2267
1967 if (!EV_A) 2268 if (!EV_A)
1968 return; 2269 return;
1969#endif 2270#endif
1970 2271
1971 if (!ev_active (&pipe_w))
1972 return;
1973
1974 signals [signum - 1].pending = 1; 2272 signals [signum - 1].pending = 1;
1975 evpipe_write (EV_A_ &sig_pending); 2273 evpipe_write (EV_A_ &sig_pending);
1976} 2274}
1977 2275
1978static void 2276static void
… …
1988void noinline 2286void noinline
1989ev_feed_signal_event (EV_P_ int signum) EV_THROW 2287ev_feed_signal_event (EV_P_ int signum) EV_THROW
1990{ 2288{
1991 WL w; 2289 WL w;
1992 2290
1993 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2291 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1994 return; 2292 return;
1995 2293
1996 --signum; 2294 --signum;
1997 2295
1998#if EV_MULTIPLICITY 2296#if EV_MULTIPLICITY
… …
2002 if (expect_false (signals [signum].loop != EV_A)) 2300 if (expect_false (signals [signum].loop != EV_A))
2003 return; 2301 return;
2004#endif 2302#endif
2005 2303
2006 signals [signum].pending = 0; 2304 signals [signum].pending = 0;
2305 ECB_MEMORY_FENCE_RELEASE;
2007 2306
2008 for (w = signals [signum].head; w; w = w->next) 2307 for (w = signals [signum].head; w; w = w->next)
2009 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2308 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2010} 2309}
2011 2310
… …
2295#if EV_ASYNC_ENABLE 2594#if EV_ASYNC_ENABLE
2296 async_pending = 0; 2595 async_pending = 0;
2297#endif 2596#endif
2298 pipe_write_skipped = 0; 2597 pipe_write_skipped = 0;
2299 pipe_write_wanted = 0; 2598 pipe_write_wanted = 0;
2599 evpipe [0] = -1;
2600 evpipe [1] = -1;
2300#if EV_USE_INOTIFY 2601#if EV_USE_INOTIFY
2301 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2602 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2302#endif 2603#endif
2303#if EV_USE_SIGNALFD 2604#if EV_USE_SIGNALFD
2304 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2605 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2355 EV_INVOKE_PENDING; 2656 EV_INVOKE_PENDING;
2356 } 2657 }
2357#endif 2658#endif
2358 2659
2359#if EV_CHILD_ENABLE 2660#if EV_CHILD_ENABLE
2360 if (ev_is_active (&childev)) 2661 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2361 { 2662 {
2362 ev_ref (EV_A); /* child watcher */ 2663 ev_ref (EV_A); /* child watcher */
2363 ev_signal_stop (EV_A_ &childev); 2664 ev_signal_stop (EV_A_ &childev);
2364 } 2665 }
2365#endif 2666#endif
… …
2367 if (ev_is_active (&pipe_w)) 2668 if (ev_is_active (&pipe_w))
2368 { 2669 {
2369 /*ev_ref (EV_A);*/ 2670 /*ev_ref (EV_A);*/
2370 /*ev_io_stop (EV_A_ &pipe_w);*/ 2671 /*ev_io_stop (EV_A_ &pipe_w);*/
2371 2672
2372#if EV_USE_EVENTFD
2373 if (evfd >= 0)
2374 close (evfd);
2375#endif
2376
2377 if (evpipe [0] >= 0)
2378 {
2379 EV_WIN32_CLOSE_FD (evpipe [0]); 2673 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2380 EV_WIN32_CLOSE_FD (evpipe [1]); 2674 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2381 }
2382 } 2675 }
2383 2676
2384#if EV_USE_SIGNALFD 2677#if EV_USE_SIGNALFD
2385 if (ev_is_active (&sigfd_w)) 2678 if (ev_is_active (&sigfd_w))
2386 close (sigfd); 2679 close (sigfd);
… …
2472#endif 2765#endif
2473#if EV_USE_INOTIFY 2766#if EV_USE_INOTIFY
2474 infy_fork (EV_A); 2767 infy_fork (EV_A);
2475#endif 2768#endif
2476 2769
2770#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2477 if (ev_is_active (&pipe_w)) 2771 if (ev_is_active (&pipe_w))
2478 { 2772 {
2479 /* 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 */
2480 2774
2481 ev_ref (EV_A); 2775 ev_ref (EV_A);
2482 ev_io_stop (EV_A_ &pipe_w); 2776 ev_io_stop (EV_A_ &pipe_w);
2483 2777
2484#if EV_USE_EVENTFD
2485 if (evfd >= 0)
2486 close (evfd);
2487#endif
2488
2489 if (evpipe [0] >= 0) 2778 if (evpipe [0] >= 0)
2490 {
2491 EV_WIN32_CLOSE_FD (evpipe [0]); 2779 EV_WIN32_CLOSE_FD (evpipe [0]);
2492 EV_WIN32_CLOSE_FD (evpipe [1]);
2493 }
2494 2780
2495#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2496 evpipe_init (EV_A); 2781 evpipe_init (EV_A);
2497 /* now iterate over everything, in case we missed something */ 2782 /* iterate over everything, in case we missed something before */
2498 pipecb (EV_A_ &pipe_w, EV_READ); 2783 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2499#endif
2500 } 2784 }
2785#endif
2501 2786
2502 postfork = 0; 2787 postfork = 0;
2503} 2788}
2504 2789
2505#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
… …
2678} 2963}
2679 2964
2680void 2965void
2681ev_loop_fork (EV_P) EV_THROW 2966ev_loop_fork (EV_P) EV_THROW
2682{ 2967{
2683 postfork = 1; /* must be in line with ev_default_fork */ 2968 postfork = 1;
2684} 2969}
2685 2970
2686/*****************************************************************************/ 2971/*****************************************************************************/
2687 2972
2688void 2973void
… …
2704} 2989}
2705 2990
2706void noinline 2991void noinline
2707ev_invoke_pending (EV_P) 2992ev_invoke_pending (EV_P)
2708{ 2993{
2709 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
2710 while (pendingcnt [pendingpri]) 3000 while (pendingcnt [pendingpri])
2711 { 3001 {
2712 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3002 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2713 3003
2714 p->w->pending = 0; 3004 p->w->pending = 0;
2715 EV_CB_INVOKE (p->w, p->events); 3005 EV_CB_INVOKE (p->w, p->events);
2716 EV_FREQUENT_CHECK; 3006 EV_FREQUENT_CHECK;
2717 } 3007 }
3008 }
2718} 3009}
2719 3010
2720#if EV_IDLE_ENABLE 3011#if EV_IDLE_ENABLE
2721/* make idle watchers pending. this handles the "call-idle */ 3012/* make idle watchers pending. this handles the "call-idle */
2722/* only when higher priorities are idle" logic */ 3013/* only when higher priorities are idle" logic */
… …
2812{ 3103{
2813 EV_FREQUENT_CHECK; 3104 EV_FREQUENT_CHECK;
2814 3105
2815 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 3106 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2816 { 3107 {
2817 int feed_count = 0;
2818
2819 do 3108 do
2820 { 3109 {
2821 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 3110 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2822 3111
2823 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 3112 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3082 backend_poll (EV_A_ waittime); 3371 backend_poll (EV_A_ waittime);
3083 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3372 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3084 3373
3085 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3374 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3086 3375
3376 ECB_MEMORY_FENCE_ACQUIRE;
3087 if (pipe_write_skipped) 3377 if (pipe_write_skipped)
3088 { 3378 {
3089 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3379 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3090 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3380 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3091 } 3381 }
… …
3469#if EV_MULTIPLICITY 3759#if EV_MULTIPLICITY
3470 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",
3471 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3761 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3472 3762
3473 signals [w->signum - 1].loop = EV_A; 3763 signals [w->signum - 1].loop = EV_A;
3764 ECB_MEMORY_FENCE_RELEASE;
3474#endif 3765#endif
3475 3766
3476 EV_FREQUENT_CHECK; 3767 EV_FREQUENT_CHECK;
3477 3768
3478#if EV_USE_SIGNALFD 3769#if EV_USE_SIGNALFD
… …
3633# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3634 3925
3635static void noinline 3926static void noinline
3636infy_add (EV_P_ ev_stat *w) 3927infy_add (EV_P_ ev_stat *w)
3637{ 3928{
3638 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);
3639 3933
3640 if (w->wd >= 0) 3934 if (w->wd >= 0)
3641 { 3935 {
3642 struct statfs sfs; 3936 struct statfs sfs;
3643 3937
… …
3647 3941
3648 if (!fs_2625) 3942 if (!fs_2625)
3649 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3650 else if (!statfs (w->path, &sfs) 3944 else if (!statfs (w->path, &sfs)
3651 && (sfs.f_type == 0x1373 /* devfs */ 3945 && (sfs.f_type == 0x1373 /* devfs */
3946 || sfs.f_type == 0x4006 /* fat */
3947 || sfs.f_type == 0x4d44 /* msdos */
3652 || 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 */
3653 || sfs.f_type == 0x3153464a /* jfs */ 3952 || sfs.f_type == 0x3153464a /* jfs */
3953 || sfs.f_type == 0x9123683e /* btrfs */
3654 || sfs.f_type == 0x52654973 /* reiser3 */ 3954 || sfs.f_type == 0x52654973 /* reiser3 */
3655 || sfs.f_type == 0x01021994 /* tempfs */ 3955 || sfs.f_type == 0x01021994 /* tmpfs */
3656 || sfs.f_type == 0x58465342 /* xfs */)) 3956 || sfs.f_type == 0x58465342 /* xfs */))
3657 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3957 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3658 else 3958 else
3659 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 */
3660 } 3960 }

Diff Legend

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