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

Comparing libev/ev.c (file contents):
Revision 1.399 by root, Mon Sep 26 12:32:21 2011 UTC vs.
Revision 1.410 by root, Sat Feb 4 17:57: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
… …
467/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 478/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
468/* ECB.H BEGIN */ 479/* ECB.H BEGIN */
469/* 480/*
470 * libecb - http://software.schmorp.de/pkg/libecb 481 * libecb - http://software.schmorp.de/pkg/libecb
471 * 482 *
472 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de> 483 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
473 * Copyright (©) 2011 Emanuele Giaquinta 484 * Copyright (©) 2011 Emanuele Giaquinta
474 * All rights reserved. 485 * All rights reserved.
475 * 486 *
476 * Redistribution and use in source and binary forms, with or without modifica- 487 * Redistribution and use in source and binary forms, with or without modifica-
477 * tion, are permitted provided that the following conditions are met: 488 * tion, are permitted provided that the following conditions are met:
… …
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__) 559 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
545 #if __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 564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 566 #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 */ 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")
… …
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")
576 #elif __sparc || __sparc__
577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory")
578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
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")
561 #endif 582 #endif
562 #endif 583 #endif
563#endif 584#endif
564 585
565#ifndef ECB_MEMORY_FENCE 586#ifndef ECB_MEMORY_FENCE
… …
573 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 594 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
574 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 595 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
575 #elif defined(_WIN32) 596 #elif defined(_WIN32)
576 #include <WinNT.h> 597 #include <WinNT.h>
577 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */ 598 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
599 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
600 #include <mbarrier.h>
601 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
602 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
603 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
578 #endif 604 #endif
579#endif 605#endif
580 606
581#ifndef ECB_MEMORY_FENCE 607#ifndef ECB_MEMORY_FENCE
582 #if !ECB_AVOID_PTHREADS 608 #if !ECB_AVOID_PTHREADS
… …
757 783
758 return r + ecb_ld32 (x); 784 return r + ecb_ld32 (x);
759 } 785 }
760#endif 786#endif
761 787
788ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
789ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
790{
791 return ( (x * 0x0802U & 0x22110U)
792 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
793}
794
795ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
796ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
797{
798 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
799 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
800 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
801 x = ( x >> 8 ) | ( x << 8);
802
803 return x;
804}
805
806ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
807ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
808{
809 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
810 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
811 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
812 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
813 x = ( x >> 16 ) | ( x << 16);
814
815 return x;
816}
817
762/* popcount64 is only available on 64 bit cpus as gcc builtin */ 818/* popcount64 is only available on 64 bit cpus as gcc builtin */
763/* so for this version we are lazy */ 819/* so for this version we are lazy */
764ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 820ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
765ecb_function_ int 821ecb_function_ int
766ecb_popcount64 (uint64_t x) 822ecb_popcount64 (uint64_t x)
… …
815 871
816#if ECB_GCC_VERSION(4,5) 872#if ECB_GCC_VERSION(4,5)
817 #define ecb_unreachable() __builtin_unreachable () 873 #define ecb_unreachable() __builtin_unreachable ()
818#else 874#else
819 /* this seems to work fine, but gcc always emits a warning for it :/ */ 875 /* this seems to work fine, but gcc always emits a warning for it :/ */
820 ecb_function_ void ecb_unreachable (void) ecb_noreturn; 876 ecb_inline void ecb_unreachable (void) ecb_noreturn;
821 ecb_function_ void ecb_unreachable (void) { } 877 ecb_inline void ecb_unreachable (void) { }
822#endif 878#endif
823 879
824/* try to tell the compiler that some condition is definitely true */ 880/* try to tell the compiler that some condition is definitely true */
825#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 881#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
826 882
827ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const; 883ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
828ecb_function_ unsigned char 884ecb_inline unsigned char
829ecb_byteorder_helper (void) 885ecb_byteorder_helper (void)
830{ 886{
831 const uint32_t u = 0x11223344; 887 const uint32_t u = 0x11223344;
832 return *(unsigned char *)&u; 888 return *(unsigned char *)&u;
833} 889}
834 890
835ecb_function_ ecb_bool ecb_big_endian (void) ecb_const; 891ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
836ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 892ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
837ecb_function_ ecb_bool ecb_little_endian (void) ecb_const; 893ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
838ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 894ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
839 895
840#if ECB_GCC_VERSION(3,0) || ECB_C99 896#if ECB_GCC_VERSION(3,0) || ECB_C99
841 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 897 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
842#else 898#else
843 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 899 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
… …
876 932
877#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 933#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
878/* if your architecture doesn't need memory fences, e.g. because it is 934/* 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 935 * 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 936 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
881 * libev, in which casess the memory fences become nops. 937 * libev, in which cases the memory fences become nops.
882 * alternatively, you can remove this #error and link against libpthread, 938 * alternatively, you can remove this #error and link against libpthread,
883 * which will then provide the memory fences. 939 * which will then provide the memory fences.
884 */ 940 */
885# error "memory fences not defined for your architecture, please report" 941# error "memory fences not defined for your architecture, please report"
886#endif 942#endif
… …
1193 #undef VAR 1249 #undef VAR
1194 }; 1250 };
1195 #include "ev_wrap.h" 1251 #include "ev_wrap.h"
1196 1252
1197 static struct ev_loop default_loop_struct; 1253 static struct ev_loop default_loop_struct;
1198 struct ev_loop *ev_default_loop_ptr; 1254 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1199 1255
1200#else 1256#else
1201 1257
1202 ev_tstamp ev_rt_now; 1258 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; 1259 #define VAR(name,decl) static decl;
1204 #include "ev_vars.h" 1260 #include "ev_vars.h"
1205 #undef VAR 1261 #undef VAR
1206 1262
1207 static int ev_default_loop_ptr; 1263 static int ev_default_loop_ptr;
… …
1301 1357
1302 do 1358 do
1303 ncur <<= 1; 1359 ncur <<= 1;
1304 while (cnt > ncur); 1360 while (cnt > ncur);
1305 1361
1306 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1362 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
1307 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1363 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
1308 { 1364 {
1309 ncur *= elem; 1365 ncur *= elem;
1310 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1366 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
1311 ncur = ncur - sizeof (void *) * 4; 1367 ncur = ncur - sizeof (void *) * 4;
… …
2991#endif 3047#endif
2992 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3048 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2993 backend_poll (EV_A_ waittime); 3049 backend_poll (EV_A_ waittime);
2994 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3050 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2995 3051
2996 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3052 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2997 3053
2998 if (pipe_write_skipped) 3054 if (pipe_write_skipped)
2999 { 3055 {
3000 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3056 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); 3057 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3259 3315
3260void noinline 3316void noinline
3261ev_timer_again (EV_P_ ev_timer *w) 3317ev_timer_again (EV_P_ ev_timer *w)
3262{ 3318{
3263 EV_FREQUENT_CHECK; 3319 EV_FREQUENT_CHECK;
3320
3321 clear_pending (EV_A_ (W)w);
3264 3322
3265 if (ev_is_active (w)) 3323 if (ev_is_active (w))
3266 { 3324 {
3267 if (w->repeat) 3325 if (w->repeat)
3268 { 3326 {

Diff Legend

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