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

Comparing libev/ev.c (file contents):
Revision 1.466 by root, Tue Mar 25 19:26:42 2014 UTC vs.
Revision 1.474 by root, Wed Feb 11 19:20:21 2015 UTC

… …
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47 47
48#if HAVE_FLOOR 48# if HAVE_FLOOR
49# ifndef EV_USE_FLOOR 49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1 50# define EV_USE_FLOOR 1
51# endif
51# endif 52# endif
52#endif
53 53
54# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
55# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
56# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
57# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
256# else 256# else
257# define EV_USE_CLOCK_SYSCALL 0 257# define EV_USE_CLOCK_SYSCALL 0
258# endif 258# endif
259#endif 259#endif
260 260
261#if !(_POSIX_TIMERS > 0)
262# ifndef EV_USE_MONOTONIC
263# define EV_USE_MONOTONIC 0
264# endif
265# ifndef EV_USE_REALTIME
266# define EV_USE_REALTIME 0
267# endif
268#endif
269
261#ifndef EV_USE_MONOTONIC 270#ifndef EV_USE_MONOTONIC
262# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 271# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
263# define EV_USE_MONOTONIC EV_FEATURE_OS 272# define EV_USE_MONOTONIC EV_FEATURE_OS
264# else 273# else
265# define EV_USE_MONOTONIC 0 274# define EV_USE_MONOTONIC 0
… …
482/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 491/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
483/* ECB.H BEGIN */ 492/* ECB.H BEGIN */
484/* 493/*
485 * libecb - http://software.schmorp.de/pkg/libecb 494 * libecb - http://software.schmorp.de/pkg/libecb
486 * 495 *
487 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de> 496 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
488 * Copyright (©) 2011 Emanuele Giaquinta 497 * Copyright (©) 2011 Emanuele Giaquinta
489 * All rights reserved. 498 * All rights reserved.
490 * 499 *
491 * Redistribution and use in source and binary forms, with or without modifica- 500 * Redistribution and use in source and binary forms, with or without modifica-
492 * tion, are permitted provided that the following conditions are met: 501 * tion, are permitted provided that the following conditions are met:
… …
506 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 515 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
507 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 516 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
508 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 517 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
509 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 518 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
510 * OF THE POSSIBILITY OF SUCH DAMAGE. 519 * OF THE POSSIBILITY OF SUCH DAMAGE.
520 *
521 * Alternatively, the contents of this file may be used under the terms of
522 * the GNU General Public License ("GPL") version 2 or any later version,
523 * in which case the provisions of the GPL are applicable instead of
524 * the above. If you wish to allow the use of your version of this file
525 * only under the terms of the GPL and not to allow others to use your
526 * version of this file under the BSD license, indicate your decision
527 * by deleting the provisions above and replace them with the notice
528 * and other provisions required by the GPL. If you do not delete the
529 * provisions above, a recipient may use your version of this file under
530 * either the BSD or the GPL.
511 */ 531 */
512 532
513#ifndef ECB_H 533#ifndef ECB_H
514#define ECB_H 534#define ECB_H
515 535
516/* 16 bits major, 16 bits minor */ 536/* 16 bits major, 16 bits minor */
517#define ECB_VERSION 0x00010003 537#define ECB_VERSION 0x00010004
518 538
519#ifdef _WIN32 539#ifdef _WIN32
520 typedef signed char int8_t; 540 typedef signed char int8_t;
521 typedef unsigned char uint8_t; 541 typedef unsigned char uint8_t;
522 typedef signed short int16_t; 542 typedef signed short int16_t;
… …
562 * causing enormous grief in return for some better fake benchmark numbers. 582 * causing enormous grief in return for some better fake benchmark numbers.
563 * or so. 583 * or so.
564 * we try to detect these and simply assume they are not gcc - if they have 584 * we try to detect these and simply assume they are not gcc - if they have
565 * an issue with that they should have done it right in the first place. 585 * an issue with that they should have done it right in the first place.
566 */ 586 */
567#ifndef ECB_GCC_VERSION
568 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 587#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
569 #define ECB_GCC_VERSION(major,minor) 0 588 #define ECB_GCC_VERSION(major,minor) 0
570 #else 589#else
571 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 590 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
572 #endif 591#endif
592
593#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
594
595#if __clang__ && defined __has_builtin
596 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
597#else
598 #define ECB_CLANG_BUILTIN(x) 0
599#endif
600
601#if __clang__ && defined __has_extension
602 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
603#else
604 #define ECB_CLANG_EXTENSION(x) 0
573#endif 605#endif
574 606
575#define ECB_CPP (__cplusplus+0) 607#define ECB_CPP (__cplusplus+0)
576#define ECB_CPP11 (__cplusplus >= 201103L) 608#define ECB_CPP11 (__cplusplus >= 201103L)
577 609
… …
661 /* see comment below (stdatomic.h) about the C11 memory model. */ 693 /* see comment below (stdatomic.h) about the C11 memory model. */
662 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 694 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
663 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE) 695 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
664 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE) 696 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
665 697
666 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 698 #elif ECB_CLANG_EXTENSION(c_atomic)
667 * without risking compile time errors with other compilers. We *could*
668 * define our own ecb_clang_has_feature, but I just can't be bothered to work
669 * around this shit time and again.
670 * #elif defined __clang && __has_feature (cxx_atomic)
671 * // see comment below (stdatomic.h) about the C11 memory model. 699 /* see comment below (stdatomic.h) about the C11 memory model. */
672 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 700 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
673 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE) 701 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
674 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE) 702 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
675 */
676 703
677 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 704 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
678 #define ECB_MEMORY_FENCE __sync_synchronize () 705 #define ECB_MEMORY_FENCE __sync_synchronize ()
679 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 706 #elif _MSC_VER >= 1500 /* VC++ 2008 */
680 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */ 707 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
… …
743 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 770 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
744#endif 771#endif
745 772
746/*****************************************************************************/ 773/*****************************************************************************/
747 774
748#if __cplusplus 775#if ECB_CPP
749 #define ecb_inline static inline 776 #define ecb_inline static inline
750#elif ECB_GCC_VERSION(2,5) 777#elif ECB_GCC_VERSION(2,5)
751 #define ecb_inline static __inline__ 778 #define ecb_inline static __inline__
752#elif ECB_C99 779#elif ECB_C99
753 #define ecb_inline static inline 780 #define ecb_inline static inline
… …
770#define ECB_STRINGIFY_(a) # a 797#define ECB_STRINGIFY_(a) # a
771#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 798#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
772 799
773#define ecb_function_ ecb_inline 800#define ecb_function_ ecb_inline
774 801
775#if ECB_GCC_VERSION(3,1) 802#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
776 #define ecb_attribute(attrlist) __attribute__(attrlist) 803 #define ecb_attribute(attrlist) __attribute__ (attrlist)
777 #define ecb_is_constant(expr) __builtin_constant_p (expr)
778 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
779 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
780#else 804#else
781 #define ecb_attribute(attrlist) 805 #define ecb_attribute(attrlist)
806#endif
782 807
808#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
809 #define ecb_is_constant(expr) __builtin_constant_p (expr)
810#else
783 /* possible C11 impl for integral types 811 /* possible C11 impl for integral types
784 typedef struct ecb_is_constant_struct ecb_is_constant_struct; 812 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
785 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */ 813 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
786 814
787 #define ecb_is_constant(expr) 0 815 #define ecb_is_constant(expr) 0
816#endif
817
818#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
819 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
820#else
788 #define ecb_expect(expr,value) (expr) 821 #define ecb_expect(expr,value) (expr)
822#endif
823
824#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
825 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
826#else
789 #define ecb_prefetch(addr,rw,locality) 827 #define ecb_prefetch(addr,rw,locality)
790#endif 828#endif
791 829
792/* no emulation for ecb_decltype */ 830/* no emulation for ecb_decltype */
793#if ECB_GCC_VERSION(4,5) 831#if ECB_CPP11
832 // older implementations might have problems with decltype(x)::type, work around it
833 template<class T> struct ecb_decltype_t { typedef T type; };
794 #define ecb_decltype(x) __decltype(x) 834 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
795#elif ECB_GCC_VERSION(3,0) 835#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
796 #define ecb_decltype(x) __typeof(x) 836 #define ecb_decltype(x) __typeof__ (x)
837#endif
838
839#if _MSC_VER >= 1300
840 #define ecb_deprecated __declspec (deprecated)
841#else
842 #define ecb_deprecated ecb_attribute ((__deprecated__))
797#endif 843#endif
798 844
799#define ecb_noinline ecb_attribute ((__noinline__)) 845#define ecb_noinline ecb_attribute ((__noinline__))
800#define ecb_unused ecb_attribute ((__unused__)) 846#define ecb_unused ecb_attribute ((__unused__))
801#define ecb_const ecb_attribute ((__const__)) 847#define ecb_const ecb_attribute ((__const__))
802#define ecb_pure ecb_attribute ((__pure__)) 848#define ecb_pure ecb_attribute ((__pure__))
803 849
804#if ECB_C11 850/* TODO http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
851#if ECB_C11 || __IBMC_NORETURN
852 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
805 #define ecb_noreturn _Noreturn 853 #define ecb_noreturn _Noreturn
806#else 854#else
807 #define ecb_noreturn ecb_attribute ((__noreturn__)) 855 #define ecb_noreturn ecb_attribute ((__noreturn__))
808#endif 856#endif
809 857
… …
825/* for compatibility to the rest of the world */ 873/* for compatibility to the rest of the world */
826#define ecb_likely(expr) ecb_expect_true (expr) 874#define ecb_likely(expr) ecb_expect_true (expr)
827#define ecb_unlikely(expr) ecb_expect_false (expr) 875#define ecb_unlikely(expr) ecb_expect_false (expr)
828 876
829/* count trailing zero bits and count # of one bits */ 877/* count trailing zero bits and count # of one bits */
830#if ECB_GCC_VERSION(3,4) 878#if ECB_GCC_VERSION(3,4) \
879 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
880 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
881 && ECB_CLANG_BUILTIN(__builtin_popcount))
831 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 882 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
832 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 883 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
833 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 884 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
834 #define ecb_ctz32(x) __builtin_ctz (x) 885 #define ecb_ctz32(x) __builtin_ctz (x)
835 #define ecb_ctz64(x) __builtin_ctzll (x) 886 #define ecb_ctz64(x) __builtin_ctzll (x)
836 #define ecb_popcount32(x) __builtin_popcount (x) 887 #define ecb_popcount32(x) __builtin_popcount (x)
837 /* no popcountll */ 888 /* no popcountll */
838#else 889#else
839 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 890 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
840 ecb_function_ int 891 ecb_function_ ecb_const int
841 ecb_ctz32 (uint32_t x) 892 ecb_ctz32 (uint32_t x)
842 { 893 {
843 int r = 0; 894 int r = 0;
844 895
845 x &= ~x + 1; /* this isolates the lowest bit */ 896 x &= ~x + 1; /* this isolates the lowest bit */
… …
859#endif 910#endif
860 911
861 return r; 912 return r;
862 } 913 }
863 914
864 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 915 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
865 ecb_function_ int 916 ecb_function_ ecb_const int
866 ecb_ctz64 (uint64_t x) 917 ecb_ctz64 (uint64_t x)
867 { 918 {
868 int shift = x & 0xffffffffU ? 0 : 32; 919 int shift = x & 0xffffffffU ? 0 : 32;
869 return ecb_ctz32 (x >> shift) + shift; 920 return ecb_ctz32 (x >> shift) + shift;
870 } 921 }
871 922
872 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 923 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
873 ecb_function_ int 924 ecb_function_ ecb_const int
874 ecb_popcount32 (uint32_t x) 925 ecb_popcount32 (uint32_t x)
875 { 926 {
876 x -= (x >> 1) & 0x55555555; 927 x -= (x >> 1) & 0x55555555;
877 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 928 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
878 x = ((x >> 4) + x) & 0x0f0f0f0f; 929 x = ((x >> 4) + x) & 0x0f0f0f0f;
879 x *= 0x01010101; 930 x *= 0x01010101;
880 931
881 return x >> 24; 932 return x >> 24;
882 } 933 }
883 934
884 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 935 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
885 ecb_function_ int ecb_ld32 (uint32_t x) 936 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
886 { 937 {
887 int r = 0; 938 int r = 0;
888 939
889 if (x >> 16) { x >>= 16; r += 16; } 940 if (x >> 16) { x >>= 16; r += 16; }
890 if (x >> 8) { x >>= 8; r += 8; } 941 if (x >> 8) { x >>= 8; r += 8; }
… …
893 if (x >> 1) { r += 1; } 944 if (x >> 1) { r += 1; }
894 945
895 return r; 946 return r;
896 } 947 }
897 948
898 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 949 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
899 ecb_function_ int ecb_ld64 (uint64_t x) 950 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
900 { 951 {
901 int r = 0; 952 int r = 0;
902 953
903 if (x >> 32) { x >>= 32; r += 32; } 954 if (x >> 32) { x >>= 32; r += 32; }
904 955
905 return r + ecb_ld32 (x); 956 return r + ecb_ld32 (x);
906 } 957 }
907#endif 958#endif
908 959
909ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 960ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
910ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 961ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
911ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 962ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
912ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 963ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
913 964
914ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 965ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
915ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 966ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
916{ 967{
917 return ( (x * 0x0802U & 0x22110U) 968 return ( (x * 0x0802U & 0x22110U)
918 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 969 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
919} 970}
920 971
921ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 972ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
922ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 973ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
923{ 974{
924 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 975 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
925 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 976 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
926 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 977 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
927 x = ( x >> 8 ) | ( x << 8); 978 x = ( x >> 8 ) | ( x << 8);
928 979
929 return x; 980 return x;
930} 981}
931 982
932ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 983ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
933ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 984ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
934{ 985{
935 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 986 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
936 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 987 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
937 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 988 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
938 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 989 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
941 return x; 992 return x;
942} 993}
943 994
944/* popcount64 is only available on 64 bit cpus as gcc builtin */ 995/* popcount64 is only available on 64 bit cpus as gcc builtin */
945/* so for this version we are lazy */ 996/* so for this version we are lazy */
946ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 997ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
947ecb_function_ int 998ecb_function_ ecb_const int
948ecb_popcount64 (uint64_t x) 999ecb_popcount64 (uint64_t x)
949{ 1000{
950 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 1001 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
951} 1002}
952 1003
953ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 1004ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
954ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 1005ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
955ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 1006ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
956ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 1007ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
957ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 1008ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
958ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 1009ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
959ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 1010ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
960ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 1011ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
961 1012
962ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 1013ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
963ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 1014ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
964ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 1015ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
965ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 1016ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
966ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 1017ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
967ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 1018ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
968ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 1019ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
969ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 1020ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
970 1021
971#if ECB_GCC_VERSION(4,3) 1022#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
972 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 1023 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
973 #define ecb_bswap32(x) __builtin_bswap32 (x) 1024 #define ecb_bswap32(x) __builtin_bswap32 (x)
974 #define ecb_bswap64(x) __builtin_bswap64 (x) 1025 #define ecb_bswap64(x) __builtin_bswap64 (x)
975#else 1026#else
976 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 1027 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
977 ecb_function_ uint16_t 1028 ecb_function_ ecb_const uint16_t
978 ecb_bswap16 (uint16_t x) 1029 ecb_bswap16 (uint16_t x)
979 { 1030 {
980 return ecb_rotl16 (x, 8); 1031 return ecb_rotl16 (x, 8);
981 } 1032 }
982 1033
983 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 1034 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
984 ecb_function_ uint32_t 1035 ecb_function_ ecb_const uint32_t
985 ecb_bswap32 (uint32_t x) 1036 ecb_bswap32 (uint32_t x)
986 { 1037 {
987 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 1038 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
988 } 1039 }
989 1040
990 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 1041 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
991 ecb_function_ uint64_t 1042 ecb_function_ ecb_const uint64_t
992 ecb_bswap64 (uint64_t x) 1043 ecb_bswap64 (uint64_t x)
993 { 1044 {
994 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 1045 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
995 } 1046 }
996#endif 1047#endif
997 1048
998#if ECB_GCC_VERSION(4,5) 1049#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
999 #define ecb_unreachable() __builtin_unreachable () 1050 #define ecb_unreachable() __builtin_unreachable ()
1000#else 1051#else
1001 /* this seems to work fine, but gcc always emits a warning for it :/ */ 1052 /* this seems to work fine, but gcc always emits a warning for it :/ */
1002 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1053 ecb_inline ecb_noreturn void ecb_unreachable (void);
1003 ecb_inline void ecb_unreachable (void) { } 1054 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
1004#endif 1055#endif
1005 1056
1006/* try to tell the compiler that some condition is definitely true */ 1057/* try to tell the compiler that some condition is definitely true */
1007#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0 1058#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
1008 1059
1009ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1060ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
1010ecb_inline unsigned char 1061ecb_inline ecb_const unsigned char
1011ecb_byteorder_helper (void) 1062ecb_byteorder_helper (void)
1012{ 1063{
1013 /* the union code still generates code under pressure in gcc, */ 1064 /* the union code still generates code under pressure in gcc, */
1014 /* but less than using pointers, and always seems to */ 1065 /* but less than using pointers, and always seems to */
1015 /* successfully return a constant. */ 1066 /* successfully return a constant. */
… …
1030 } u = { 0x11223344 }; 1081 } u = { 0x11223344 };
1031 return u.c; 1082 return u.c;
1032#endif 1083#endif
1033} 1084}
1034 1085
1035ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1086ecb_inline ecb_const ecb_bool ecb_big_endian (void);
1036ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1087ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
1037ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1088ecb_inline ecb_const ecb_bool ecb_little_endian (void);
1038ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 1089ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
1039 1090
1040#if ECB_GCC_VERSION(3,0) || ECB_C99 1091#if ECB_GCC_VERSION(3,0) || ECB_C99
1041 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 1092 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
1042#else 1093#else
1043 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 1094 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
1044#endif 1095#endif
1045 1096
1046#if __cplusplus 1097#if ECB_CPP
1047 template<typename T> 1098 template<typename T>
1048 static inline T ecb_div_rd (T val, T div) 1099 static inline T ecb_div_rd (T val, T div)
1049 { 1100 {
1050 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 1101 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
1051 } 1102 }
… …
1111 #define ECB_NAN NAN 1162 #define ECB_NAN NAN
1112 #else 1163 #else
1113 #define ECB_NAN ECB_INFINITY 1164 #define ECB_NAN ECB_INFINITY
1114 #endif 1165 #endif
1115 1166
1167 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
1168 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
1169 #else
1170 #define ecb_ldexpf(x,e) (float) ldexp ((x), (e))
1171 #endif
1172
1116 /* converts an ieee half/binary16 to a float */ 1173 /* converts an ieee half/binary16 to a float */
1117 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const; 1174 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
1118 ecb_function_ float 1175 ecb_function_ ecb_const float
1119 ecb_binary16_to_float (uint16_t x) 1176 ecb_binary16_to_float (uint16_t x)
1120 { 1177 {
1121 int e = (x >> 10) & 0x1f; 1178 int e = (x >> 10) & 0x1f;
1122 int m = x & 0x3ff; 1179 int m = x & 0x3ff;
1123 float r; 1180 float r;
1124 1181
1125 if (!e ) r = ldexpf (m , -24); 1182 if (!e ) r = ecb_ldexpf (m , -24);
1126 else if (e != 31) r = ldexpf (m + 0x400, e - 25); 1183 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
1127 else if (m ) r = ECB_NAN; 1184 else if (m ) r = ECB_NAN;
1128 else r = ECB_INFINITY; 1185 else r = ECB_INFINITY;
1129 1186
1130 return x & 0x8000 ? -r : r; 1187 return x & 0x8000 ? -r : r;
1131 } 1188 }
1132 1189
1133 /* convert a float to ieee single/binary32 */ 1190 /* convert a float to ieee single/binary32 */
1134 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 1191 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
1135 ecb_function_ uint32_t 1192 ecb_function_ ecb_const uint32_t
1136 ecb_float_to_binary32 (float x) 1193 ecb_float_to_binary32 (float x)
1137 { 1194 {
1138 uint32_t r; 1195 uint32_t r;
1139 1196
1140 #if ECB_STDFP 1197 #if ECB_STDFP
… …
1169 1226
1170 return r; 1227 return r;
1171 } 1228 }
1172 1229
1173 /* converts an ieee single/binary32 to a float */ 1230 /* converts an ieee single/binary32 to a float */
1174 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const; 1231 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
1175 ecb_function_ float 1232 ecb_function_ ecb_const float
1176 ecb_binary32_to_float (uint32_t x) 1233 ecb_binary32_to_float (uint32_t x)
1177 { 1234 {
1178 float r; 1235 float r;
1179 1236
1180 #if ECB_STDFP 1237 #if ECB_STDFP
… …
1190 x |= 0x800000U; 1247 x |= 0x800000U;
1191 else 1248 else
1192 e = 1; 1249 e = 1;
1193 1250
1194 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */ 1251 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1195 r = ldexpf (x * (0.5f / 0x800000U), e - 126); 1252 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
1196 1253
1197 r = neg ? -r : r; 1254 r = neg ? -r : r;
1198 #endif 1255 #endif
1199 1256
1200 return r; 1257 return r;
1201 } 1258 }
1202 1259
1203 /* convert a double to ieee double/binary64 */ 1260 /* convert a double to ieee double/binary64 */
1204 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const; 1261 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
1205 ecb_function_ uint64_t 1262 ecb_function_ ecb_const uint64_t
1206 ecb_double_to_binary64 (double x) 1263 ecb_double_to_binary64 (double x)
1207 { 1264 {
1208 uint64_t r; 1265 uint64_t r;
1209 1266
1210 #if ECB_STDFP 1267 #if ECB_STDFP
… …
1239 1296
1240 return r; 1297 return r;
1241 } 1298 }
1242 1299
1243 /* converts an ieee double/binary64 to a double */ 1300 /* converts an ieee double/binary64 to a double */
1244 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const; 1301 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
1245 ecb_function_ double 1302 ecb_function_ ecb_const double
1246 ecb_binary64_to_double (uint64_t x) 1303 ecb_binary64_to_double (uint64_t x)
1247 { 1304 {
1248 double r; 1305 double r;
1249 1306
1250 #if ECB_STDFP 1307 #if ECB_STDFP
… …
2586{ 2643{
2587 invoke_cb = invoke_pending_cb; 2644 invoke_cb = invoke_pending_cb;
2588} 2645}
2589 2646
2590void 2647void
2591ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW 2648ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW
2592{ 2649{
2593 release_cb = release; 2650 release_cb = release;
2594 acquire_cb = acquire; 2651 acquire_cb = acquire;
2595} 2652}
2596#endif 2653#endif

Diff Legend

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