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

Comparing libev/ev.c (file contents):
Revision 1.404 by root, Wed Jan 18 12:44:32 2012 UTC vs.
Revision 1.415 by root, Fri Mar 30 17:43:55 2012 UTC

… …
183# include EV_H 183# include EV_H
184#else 184#else
185# include "ev.h" 185# include "ev.h"
186#endif 186#endif
187 187
188#if EV_NO_THREADS
189# undef EV_NO_SMP
190# define EV_NO_SMP 1
191# undef ECB_NO_THREADS
192# define ECB_NO_THREADS 1
193#endif
194#if EV_NO_SMP
195# undef EV_NO_SMP
196# define ECB_NO_SMP 1
197#endif
198
188#ifndef _WIN32 199#ifndef _WIN32
189# include <sys/time.h> 200# include <sys/time.h>
190# include <sys/wait.h> 201# include <sys/wait.h>
191# include <unistd.h> 202# include <unistd.h>
192#else 203#else
… …
534/*****************************************************************************/ 545/*****************************************************************************/
535 546
536/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
537/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 548/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
538 549
550#if ECB_NO_THREADS
551# define ECB_NO_SMP 1
552#endif
553
539#if ECB_NO_THREADS || ECB_NO_SMP 554#if ECB_NO_THREADS || ECB_NO_SMP
540 #define ECB_MEMORY_FENCE do { } while (0) 555 #define ECB_MEMORY_FENCE do { } while (0)
541#endif 556#endif
542 557
543#ifndef ECB_MEMORY_FENCE 558#ifndef ECB_MEMORY_FENCE
544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 559 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
545 #if __i386 || __i386__ 560 #if __i386 || __i386__
546 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 561 #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 */ 562 #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 */ 563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
549 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
… …
552 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
555 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \ 570 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 571 || 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") 572 #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__ ) \ 573 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 574 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
560 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
561 #elif __sparc || __sparc__ 576 #elif __sparc || __sparc__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #StoreLoad | #LoadLoad | #StoreStore" : : : "memory") 577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadLoad" : : : "memory") 578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #StoreStore") 579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined(__s390__) || defined(__s390x__)
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
582 #elif defined(__mips__)
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
565 #endif 584 #endif
566 #endif 585 #endif
567#endif 586#endif
568 587
569#ifndef ECB_MEMORY_FENCE 588#ifndef ECB_MEMORY_FENCE
… …
582 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 601 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
583 #include <mbarrier.h> 602 #include <mbarrier.h>
584 #define ECB_MEMORY_FENCE __machine_rw_barrier () 603 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
585 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier () 604 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
586 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier () 605 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
606 #elif __xlC__
607 #define ECB_MEMORY_FENCE __sync ()
587 #endif 608 #endif
588#endif 609#endif
589 610
590#ifndef ECB_MEMORY_FENCE 611#ifndef ECB_MEMORY_FENCE
591 #if !ECB_AVOID_PTHREADS 612 #if !ECB_AVOID_PTHREADS
… …
854 875
855#if ECB_GCC_VERSION(4,5) 876#if ECB_GCC_VERSION(4,5)
856 #define ecb_unreachable() __builtin_unreachable () 877 #define ecb_unreachable() __builtin_unreachable ()
857#else 878#else
858 /* this seems to work fine, but gcc always emits a warning for it :/ */ 879 /* this seems to work fine, but gcc always emits a warning for it :/ */
859 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 880 ecb_inline void ecb_unreachable (void) ecb_noreturn;
860 ecb_function_ void ecb_unreachable (void) { } 881 ecb_inline void ecb_unreachable (void) { }
861#endif 882#endif
862 883
863/* try to tell the compiler that some condition is definitely true */ 884/* try to tell the compiler that some condition is definitely true */
864#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 885#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
865 886
866ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 887ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
867ecb_function_ unsigned char 888ecb_inline unsigned char
868ecb_byteorder_helper (void) 889ecb_byteorder_helper (void)
869{ 890{
870 const uint32_t u = 0x11223344; 891 const uint32_t u = 0x11223344;
871 return *(unsigned char *)&u; 892 return *(unsigned char *)&u;
872} 893}
873 894
874ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 895ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
875ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 896ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
876ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 897ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
877ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 898ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
878 899
879#if ECB_GCC_VERSION(3,0) || ECB_C99 900#if ECB_GCC_VERSION(3,0) || ECB_C99
880 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 901 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
881#else 902#else
882 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 903 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
… …
1854 /* win32 people keep sending patches that change this write() to send() */ 1875 /* win32 people keep sending patches that change this write() to send() */
1855 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1876 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1856 /* so when you think this write should be a send instead, please find out */ 1877 /* so when you think this write should be a send instead, please find out */
1857 /* where your send() is from - it's definitely not the microsoft send, and */ 1878 /* where your send() is from - it's definitely not the microsoft send, and */
1858 /* tell me. thank you. */ 1879 /* tell me. thank you. */
1880 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1881 /* check the ev documentation on how to use this flag */
1859 write (evpipe [1], &(evpipe [1]), 1); 1882 write (evpipe [1], &(evpipe [1]), 1);
1860 } 1883 }
1861 1884
1862 errno = old_errno; 1885 errno = old_errno;
1863 } 1886 }
… …
3298 3321
3299void noinline 3322void noinline
3300ev_timer_again (EV_P_ ev_timer *w) 3323ev_timer_again (EV_P_ ev_timer *w)
3301{ 3324{
3302 EV_FREQUENT_CHECK; 3325 EV_FREQUENT_CHECK;
3326
3327 clear_pending (EV_A_ (W)w);
3303 3328
3304 if (ev_is_active (w)) 3329 if (ev_is_active (w))
3305 { 3330 {
3306 if (w->repeat) 3331 if (w->repeat)
3307 { 3332 {

Diff Legend

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