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

Comparing libev/ev.c (file contents):
Revision 1.403 by root, Wed Jan 18 12:13:14 2012 UTC vs.
Revision 1.408 by root, Fri Jan 27 22:28:49 2012 UTC

… …
539#if ECB_NO_THREADS || ECB_NO_SMP 539#if ECB_NO_THREADS || ECB_NO_SMP
540 #define ECB_MEMORY_FENCE do { } while (0) 540 #define ECB_MEMORY_FENCE do { } while (0)
541#endif 541#endif
542 542
543#ifndef ECB_MEMORY_FENCE 543#ifndef ECB_MEMORY_FENCE
544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_xC >= 0x5110 544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
545 #if __i386__ 545 #if __i386 || __i386__
546 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 546 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
547 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 547 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
548 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 548 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
549 #elif __amd64 549 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
552 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 552 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
557 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 557 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
558 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \ 558 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
560 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 560 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
561 #elif defined(__sparc) 561 #elif __sparc || __sparc__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #StoreLoad | #LoadLoad | #StoreStore" : : : "memory") 562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadLoad" : : : "memory") 563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #StoreStore") 564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
565 #elif defined(__s390__) || defined(__s390x__)
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
565 #endif 567 #endif
566 #endif 568 #endif
567#endif 569#endif
568 570
569#ifndef ECB_MEMORY_FENCE 571#ifndef ECB_MEMORY_FENCE
… …
854 856
855#if ECB_GCC_VERSION(4,5) 857#if ECB_GCC_VERSION(4,5)
856 #define ecb_unreachable() __builtin_unreachable () 858 #define ecb_unreachable() __builtin_unreachable ()
857#else 859#else
858 /* this seems to work fine, but gcc always emits a warning for it :/ */ 860 /* this seems to work fine, but gcc always emits a warning for it :/ */
859 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 861 ecb_inline void ecb_unreachable (void) ecb_noreturn;
860 ecb_function_ void ecb_unreachable (void) { } 862 ecb_inline void ecb_unreachable (void) { }
861#endif 863#endif
862 864
863/* try to tell the compiler that some condition is definitely true */ 865/* try to tell the compiler that some condition is definitely true */
864#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 866#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
865 867
866ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 868ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
867ecb_function_ unsigned char 869ecb_inline unsigned char
868ecb_byteorder_helper (void) 870ecb_byteorder_helper (void)
869{ 871{
870 const uint32_t u = 0x11223344; 872 const uint32_t u = 0x11223344;
871 return *(unsigned char *)&u; 873 return *(unsigned char *)&u;
872} 874}
873 875
874ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 876ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
875ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 877ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
876ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 878ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
877ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 879ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
878 880
879#if ECB_GCC_VERSION(3,0) || ECB_C99 881#if ECB_GCC_VERSION(3,0) || ECB_C99
880 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 882 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
881#else 883#else
882 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 884 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
… …
3298 3300
3299void noinline 3301void noinline
3300ev_timer_again (EV_P_ ev_timer *w) 3302ev_timer_again (EV_P_ ev_timer *w)
3301{ 3303{
3302 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
3305
3306 clear_pending (EV_A_ (W)w);
3303 3307
3304 if (ev_is_active (w)) 3308 if (ev_is_active (w))
3305 { 3309 {
3306 if (w->repeat) 3310 if (w->repeat)
3307 { 3311 {

Diff Legend

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