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

Comparing libev/ev.c (file contents):
Revision 1.401 by root, Tue Dec 20 04:08:35 2011 UTC vs.
Revision 1.406 by root, Tue Jan 24 16:37:12 2012 UTC

… …
467/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 467/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
468/* ECB.H BEGIN */ 468/* ECB.H BEGIN */
469/* 469/*
470 * libecb - http://software.schmorp.de/pkg/libecb 470 * libecb - http://software.schmorp.de/pkg/libecb
471 * 471 *
472 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de> 472 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
473 * Copyright (©) 2011 Emanuele Giaquinta 473 * Copyright (©) 2011 Emanuele Giaquinta
474 * All rights reserved. 474 * All rights reserved.
475 * 475 *
476 * Redistribution and use in source and binary forms, with or without modifica- 476 * Redistribution and use in source and binary forms, with or without modifica-
477 * tion, are permitted provided that the following conditions are met: 477 * tion, are permitted provided that the following conditions are met:
… …
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__) 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 __sparc || __sparc__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
561 #endif 565 #endif
562 #endif 566 #endif
563#endif 567#endif
564 568
565#ifndef ECB_MEMORY_FENCE 569#ifndef ECB_MEMORY_FENCE
… …
573 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 577 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
574 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 578 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
575 #elif defined(_WIN32) 579 #elif defined(_WIN32)
576 #include <WinNT.h> 580 #include <WinNT.h>
577 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 581 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
582 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
583 #include <mbarrier.h>
584 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
585 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
586 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
578 #endif 587 #endif
579#endif 588#endif
580 589
581#ifndef ECB_MEMORY_FENCE 590#ifndef ECB_MEMORY_FENCE
582 #if !ECB_AVOID_PTHREADS 591 #if !ECB_AVOID_PTHREADS
… …
757 766
758 return r + ecb_ld32 (x); 767 return r + ecb_ld32 (x);
759 } 768 }
760#endif 769#endif
761 770
771ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
772ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
773{
774 return ( (x * 0x0802U & 0x22110U)
775 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
776}
777
778ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
779ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
780{
781 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
782 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
783 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
784 x = ( x >> 8 ) | ( x << 8);
785
786 return x;
787}
788
789ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
790ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
791{
792 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
793 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
794 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
795 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
796 x = ( x >> 16 ) | ( x << 16);
797
798 return x;
799}
800
762/* popcount64 is only available on 64 bit cpus as gcc builtin */ 801/* popcount64 is only available on 64 bit cpus as gcc builtin */
763/* so for this version we are lazy */ 802/* so for this version we are lazy */
764ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 803ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
765ecb_function_ int 804ecb_function_ int
766ecb_popcount64 (uint64_t x) 805ecb_popcount64 (uint64_t x)
… …
876 915
877#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 916#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
878/* if your architecture doesn't need memory fences, e.g. because it is 917/* if your architecture doesn't need memory fences, e.g. because it is
879 * single-cpu/core, or if you use libev in a project that doesn't use libev 918 * single-cpu/core, or if you use libev in a project that doesn't use libev
880 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling 919 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
881 * libev, in which casess the memory fences become nops. 920 * libev, in which cases the memory fences become nops.
882 * alternatively, you can remove this #error and link against libpthread, 921 * alternatively, you can remove this #error and link against libpthread,
883 * which will then provide the memory fences. 922 * which will then provide the memory fences.
884 */ 923 */
885# error "memory fences not defined for your architecture, please report" 924# error "memory fences not defined for your architecture, please report"
886#endif 925#endif
… …
1193 #undef VAR 1232 #undef VAR
1194 }; 1233 };
1195 #include "ev_wrap.h" 1234 #include "ev_wrap.h"
1196 1235
1197 static struct ev_loop default_loop_struct; 1236 static struct ev_loop default_loop_struct;
1198 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a defintiino despite extern */ 1237 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1199 1238
1200#else 1239#else
1201 1240
1202 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a defintiino despite extern */ 1241 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
1203 #define VAR(name,decl) static decl; 1242 #define VAR(name,decl) static decl;
1204 #include "ev_vars.h" 1243 #include "ev_vars.h"
1205 #undef VAR 1244 #undef VAR
1206 1245
1207 static int ev_default_loop_ptr; 1246 static int ev_default_loop_ptr;
… …
2991#endif 3030#endif
2992 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3031 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2993 backend_poll (EV_A_ waittime); 3032 backend_poll (EV_A_ waittime);
2994 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3033 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2995 3034
2996 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3035 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2997 3036
2998 if (pipe_write_skipped) 3037 if (pipe_write_skipped)
2999 { 3038 {
3000 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3039 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3001 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3040 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3259 3298
3260void noinline 3299void noinline
3261ev_timer_again (EV_P_ ev_timer *w) 3300ev_timer_again (EV_P_ ev_timer *w)
3262{ 3301{
3263 EV_FREQUENT_CHECK; 3302 EV_FREQUENT_CHECK;
3303
3304 clear_pending (EV_A_ w);
3264 3305
3265 if (ev_is_active (w)) 3306 if (ev_is_active (w))
3266 { 3307 {
3267 if (w->repeat) 3308 if (w->repeat)
3268 { 3309 {

Diff Legend

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