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

Comparing libev/ev.c (file contents):
Revision 1.395 by root, Wed Aug 24 16:08:17 2011 UTC vs.
Revision 1.408 by root, Fri Jan 27 22:28:49 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
188EV_CPP(extern "C" {)
189
190#ifndef _WIN32 188#ifndef _WIN32
191# include <sys/time.h> 189# include <sys/time.h>
192# include <sys/wait.h> 190# include <sys/wait.h>
193# include <unistd.h> 191# include <unistd.h>
194#else 192#else
… …
469/* 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 */
470/* ECB.H BEGIN */ 468/* ECB.H BEGIN */
471/* 469/*
472 * libecb - http://software.schmorp.de/pkg/libecb 470 * libecb - http://software.schmorp.de/pkg/libecb
473 * 471 *
474 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de> 472 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
475 * Copyright (©) 2011 Emanuele Giaquinta 473 * Copyright (©) 2011 Emanuele Giaquinta
476 * All rights reserved. 474 * All rights reserved.
477 * 475 *
478 * 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-
479 * tion, are permitted provided that the following conditions are met: 477 * tion, are permitted provided that the following conditions are met:
… …
541#if ECB_NO_THREADS || ECB_NO_SMP 539#if ECB_NO_THREADS || ECB_NO_SMP
542 #define ECB_MEMORY_FENCE do { } while (0) 540 #define ECB_MEMORY_FENCE do { } while (0)
543#endif 541#endif
544 542
545#ifndef ECB_MEMORY_FENCE 543#ifndef ECB_MEMORY_FENCE
546 #if ECB_GCC_VERSION(2,5) 544 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
547 #if __i386__ 545 #if __i386 || __i386__
548 #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")
549 #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 */
550 #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 */
551 #elif __amd64 549 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
552 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
553 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
554 #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 */
555 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 553 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
556 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
558 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) 556 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
559 #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")
560 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \ 558 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
561 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ ) 559 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
562 #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")
565 #elif defined(__s390__) || defined(__s390x__)
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
563 #endif 567 #endif
564 #endif 568 #endif
565#endif 569#endif
566 570
567#ifndef ECB_MEMORY_FENCE 571#ifndef ECB_MEMORY_FENCE
568 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) 572 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__)
569 #define ECB_MEMORY_FENCE __sync_synchronize () 573 #define ECB_MEMORY_FENCE __sync_synchronize ()
570 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 574 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
571 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 575 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
572 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 576 #elif _MSC_VER >= 1400 /* VC++ 2005 */
573 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 577 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
… …
575 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 579 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
576 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 580 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
577 #elif defined(_WIN32) 581 #elif defined(_WIN32)
578 #include <WinNT.h> 582 #include <WinNT.h>
579 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 583 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
584 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
585 #include <mbarrier.h>
586 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
587 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
588 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
580 #endif 589 #endif
581#endif 590#endif
582 591
583#ifndef ECB_MEMORY_FENCE 592#ifndef ECB_MEMORY_FENCE
584 #if !ECB_AVOID_PTHREADS 593 #if !ECB_AVOID_PTHREADS
… …
759 768
760 return r + ecb_ld32 (x); 769 return r + ecb_ld32 (x);
761 } 770 }
762#endif 771#endif
763 772
773ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
774ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
775{
776 return ( (x * 0x0802U & 0x22110U)
777 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
778}
779
780ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
781ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
782{
783 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
784 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
785 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
786 x = ( x >> 8 ) | ( x << 8);
787
788 return x;
789}
790
791ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
792ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
793{
794 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
795 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
796 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
797 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
798 x = ( x >> 16 ) | ( x << 16);
799
800 return x;
801}
802
764/* popcount64 is only available on 64 bit cpus as gcc builtin */ 803/* popcount64 is only available on 64 bit cpus as gcc builtin */
765/* so for this version we are lazy */ 804/* so for this version we are lazy */
766ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 805ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
767ecb_function_ int 806ecb_function_ int
768ecb_popcount64 (uint64_t x) 807ecb_popcount64 (uint64_t x)
… …
817 856
818#if ECB_GCC_VERSION(4,5) 857#if ECB_GCC_VERSION(4,5)
819 #define ecb_unreachable() __builtin_unreachable () 858 #define ecb_unreachable() __builtin_unreachable ()
820#else 859#else
821 /* 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 :/ */
822 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 861 ecb_inline void ecb_unreachable (void) ecb_noreturn;
823 ecb_function_ void ecb_unreachable (void) { } 862 ecb_inline void ecb_unreachable (void) { }
824#endif 863#endif
825 864
826/* try to tell the compiler that some condition is definitely true */ 865/* try to tell the compiler that some condition is definitely true */
827#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 866#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
828 867
829ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 868ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
830ecb_function_ unsigned char 869ecb_inline unsigned char
831ecb_byteorder_helper (void) 870ecb_byteorder_helper (void)
832{ 871{
833 const uint32_t u = 0x11223344; 872 const uint32_t u = 0x11223344;
834 return *(unsigned char *)&u; 873 return *(unsigned char *)&u;
835} 874}
836 875
837ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 876ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
838ecb_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; }
839ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 878ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
840ecb_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; }
841 880
842#if ECB_GCC_VERSION(3,0) || ECB_C99 881#if ECB_GCC_VERSION(3,0) || ECB_C99
843 #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))
844#else 883#else
845 #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)))
885#endif
886
887#if __cplusplus
888 template<typename T>
889 static inline T ecb_div_rd (T val, T div)
890 {
891 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
892 }
893 template<typename T>
894 static inline T ecb_div_ru (T val, T div)
895 {
896 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
897 }
898#else
899 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
900 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
846#endif 901#endif
847 902
848#if ecb_cplusplus_does_not_suck 903#if ecb_cplusplus_does_not_suck
849 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */ 904 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
850 template<typename T, int N> 905 template<typename T, int N>
… …
859#endif 914#endif
860 915
861/* ECB.H END */ 916/* ECB.H END */
862 917
863#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 918#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
919/* if your architecture doesn't need memory fences, e.g. because it is
920 * single-cpu/core, or if you use libev in a project that doesn't use libev
921 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
922 * libev, in which cases the memory fences become nops.
923 * alternatively, you can remove this #error and link against libpthread,
924 * which will then provide the memory fences.
925 */
926# error "memory fences not defined for your architecture, please report"
927#endif
928
864# undef ECB_MEMORY_FENCE 929#ifndef ECB_MEMORY_FENCE
865# undef ECB_MEMORY_FENCE_ACQUIRE 930# define ECB_MEMORY_FENCE do { } while (0)
866# undef ECB_MEMORY_FENCE_RELEASE 931# define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
932# define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
867#endif 933#endif
868 934
869#define expect_false(cond) ecb_expect_false (cond) 935#define expect_false(cond) ecb_expect_false (cond)
870#define expect_true(cond) ecb_expect_true (cond) 936#define expect_true(cond) ecb_expect_true (cond)
871#define noinline ecb_noinline 937#define noinline ecb_noinline
… …
1168 #undef VAR 1234 #undef VAR
1169 }; 1235 };
1170 #include "ev_wrap.h" 1236 #include "ev_wrap.h"
1171 1237
1172 static struct ev_loop default_loop_struct; 1238 static struct ev_loop default_loop_struct;
1173 struct ev_loop *ev_default_loop_ptr; 1239 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1174 1240
1175#else 1241#else
1176 1242
1177 ev_tstamp ev_rt_now; 1243 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
1178 #define VAR(name,decl) static decl; 1244 #define VAR(name,decl) static decl;
1179 #include "ev_vars.h" 1245 #include "ev_vars.h"
1180 #undef VAR 1246 #undef VAR
1181 1247
1182 static int ev_default_loop_ptr; 1248 static int ev_default_loop_ptr;
… …
1276 1342
1277 do 1343 do
1278 ncur <<= 1; 1344 ncur <<= 1;
1279 while (cnt > ncur); 1345 while (cnt > ncur);
1280 1346
1281 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1347 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
1282 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1348 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
1283 { 1349 {
1284 ncur *= elem; 1350 ncur *= elem;
1285 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1351 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
1286 ncur = ncur - sizeof (void *) * 4; 1352 ncur = ncur - sizeof (void *) * 4;
… …
2966#endif 3032#endif
2967 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3033 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2968 backend_poll (EV_A_ waittime); 3034 backend_poll (EV_A_ waittime);
2969 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3035 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2970 3036
2971 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3037 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2972 3038
2973 if (pipe_write_skipped) 3039 if (pipe_write_skipped)
2974 { 3040 {
2975 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3041 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2976 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3042 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3234 3300
3235void noinline 3301void noinline
3236ev_timer_again (EV_P_ ev_timer *w) 3302ev_timer_again (EV_P_ ev_timer *w)
3237{ 3303{
3238 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
3305
3306 clear_pending (EV_A_ (W)w);
3239 3307
3240 if (ev_is_active (w)) 3308 if (ev_is_active (w))
3241 { 3309 {
3242 if (w->repeat) 3310 if (w->repeat)
3243 { 3311 {
… …
4389 4457
4390#if EV_MULTIPLICITY 4458#if EV_MULTIPLICITY
4391 #include "ev_wrap.h" 4459 #include "ev_wrap.h"
4392#endif 4460#endif
4393 4461
4394EV_CPP(})
4395

Diff Legend

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