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

Comparing libev/ev.c (file contents):
Revision 1.463 by root, Thu Jan 16 11:51:05 2014 UTC vs.
Revision 1.464 by root, Fri Mar 21 16:41:04 2014 UTC

… …
482/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 482/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
483/* ECB.H BEGIN */ 483/* ECB.H BEGIN */
484/* 484/*
485 * libecb - http://software.schmorp.de/pkg/libecb 485 * libecb - http://software.schmorp.de/pkg/libecb
486 * 486 *
487 * Copyright (©) 2009-2013 Marc Alexander Lehmann <libecb@schmorp.de> 487 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de>
488 * Copyright (©) 2011 Emanuele Giaquinta 488 * Copyright (©) 2011 Emanuele Giaquinta
489 * All rights reserved. 489 * All rights reserved.
490 * 490 *
491 * Redistribution and use in source and binary forms, with or without modifica- 491 * Redistribution and use in source and binary forms, with or without modifica-
492 * tion, are permitted provided that the following conditions are met: 492 * tion, are permitted provided that the following conditions are met:
… …
570 #else 570 #else
571 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 571 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
572 #endif 572 #endif
573#endif 573#endif
574 574
575#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
576#define ECB_C99 (__STDC_VERSION__ >= 199901L)
577#define ECB_C11 (__STDC_VERSION__ >= 201112L)
578#define ECB_CPP (__cplusplus+0) 575#define ECB_CPP (__cplusplus+0)
579#define ECB_CPP11 (__cplusplus >= 201103L) 576#define ECB_CPP11 (__cplusplus >= 201103L)
577
578#if ECB_CPP
579 #define ECB_C 0
580 #define ECB_STDC_VERSION 0
581#else
582 #define ECB_C 1
583 #define ECB_STDC_VERSION __STDC_VERSION__
584#endif
585
586#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
587#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
580 588
581#if ECB_CPP 589#if ECB_CPP
582 #define ECB_EXTERN_C extern "C" 590 #define ECB_EXTERN_C extern "C"
583 #define ECB_EXTERN_C_BEG ECB_EXTERN_C { 591 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
584 #define ECB_EXTERN_C_END } 592 #define ECB_EXTERN_C_END }
… …
617 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 625 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
618 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 626 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
619 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 627 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
620 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 628 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
621 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 629 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
630 #elif __aarch64__
631 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
622 #elif (__sparc || __sparc__) && !__sparcv8 632 #elif (__sparc || __sparc__) && !__sparcv8
623 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 633 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
624 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 634 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
625 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 635 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
626 #elif defined __s390__ || defined __s390x__ 636 #elif defined __s390__ || defined __s390x__
… …
648 658
649#ifndef ECB_MEMORY_FENCE 659#ifndef ECB_MEMORY_FENCE
650 #if ECB_GCC_VERSION(4,7) 660 #if ECB_GCC_VERSION(4,7)
651 /* see comment below (stdatomic.h) about the C11 memory model. */ 661 /* see comment below (stdatomic.h) about the C11 memory model. */
652 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 662 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
663 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
664 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
653 665
654 /* The __has_feature syntax from clang is so misdesigned that we cannot use it 666 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
655 * without risking compile time errors with other compilers. We *could* 667 * without risking compile time errors with other compilers. We *could*
656 * define our own ecb_clang_has_feature, but I just can't be bothered to work 668 * define our own ecb_clang_has_feature, but I just can't be bothered to work
657 * around this shit time and again. 669 * around this shit time and again.
658 * #elif defined __clang && __has_feature (cxx_atomic) 670 * #elif defined __clang && __has_feature (cxx_atomic)
659 * // see comment below (stdatomic.h) about the C11 memory model. 671 * // see comment below (stdatomic.h) about the C11 memory model.
660 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 672 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
673 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
674 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
661 */ 675 */
662 676
663 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 677 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
664 #define ECB_MEMORY_FENCE __sync_synchronize () 678 #define ECB_MEMORY_FENCE __sync_synchronize ()
665 #elif _MSC_VER >= 1500 /* VC++ 2008 */ 679 #elif _MSC_VER >= 1500 /* VC++ 2008 */
… …
695 /* any fence other than seq_cst, which isn't very efficient for us. */ 709 /* any fence other than seq_cst, which isn't very efficient for us. */
696 /* Why that is, we don't know - either the C11 memory model is quite useless */ 710 /* Why that is, we don't know - either the C11 memory model is quite useless */
697 /* for most usages, or gcc and clang have a bug */ 711 /* for most usages, or gcc and clang have a bug */
698 /* I *currently* lean towards the latter, and inefficiently implement */ 712 /* I *currently* lean towards the latter, and inefficiently implement */
699 /* all three of ecb's fences as a seq_cst fence */ 713 /* all three of ecb's fences as a seq_cst fence */
714 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
715 /* for all __atomic_thread_fence's except seq_cst */
700 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 716 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
701 #endif 717 #endif
702#endif 718#endif
703 719
704#ifndef ECB_MEMORY_FENCE 720#ifndef ECB_MEMORY_FENCE
… …
761 #define ecb_is_constant(expr) __builtin_constant_p (expr) 777 #define ecb_is_constant(expr) __builtin_constant_p (expr)
762 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 778 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
763 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 779 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
764#else 780#else
765 #define ecb_attribute(attrlist) 781 #define ecb_attribute(attrlist)
782
783 /* possible C11 impl for integral types
784 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)) */
786
766 #define ecb_is_constant(expr) 0 787 #define ecb_is_constant(expr) 0
767 #define ecb_expect(expr,value) (expr) 788 #define ecb_expect(expr,value) (expr)
768 #define ecb_prefetch(addr,rw,locality) 789 #define ecb_prefetch(addr,rw,locality)
769#endif 790#endif
770 791
… …
1065 || defined __hppa__ \ 1086 || defined __hppa__ \
1066 || defined __ia64__ \ 1087 || defined __ia64__ \
1067 || defined __m68k__ \ 1088 || defined __m68k__ \
1068 || defined __m88k__ \ 1089 || defined __m88k__ \
1069 || defined __sh__ \ 1090 || defined __sh__ \
1070 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 1091 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
1092 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__))
1071 #define ECB_STDFP 1 1093 #define ECB_STDFP 1
1072 #include <string.h> /* for memcpy */ 1094 #include <string.h> /* for memcpy */
1073#else 1095#else
1074 #define ECB_STDFP 0 1096 #define ECB_STDFP 0
1075#endif 1097#endif

Diff Legend

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