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

Comparing libev/ev.c (file contents):
Revision 1.389 by root, Wed Aug 3 15:31:23 2011 UTC vs.
Revision 1.412 by root, Wed Feb 22 01:53:00 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" {) 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
189 198
190#ifndef _WIN32 199#ifndef _WIN32
191# include <sys/time.h> 200# include <sys/time.h>
192# include <sys/wait.h> 201# include <sys/wait.h>
193# include <unistd.h> 202# include <unistd.h>
… …
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 474
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 475#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 476#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468 477
469/* the following are taken from libecb */ 478/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
470/* ecb.h start */ 479/* ECB.H BEGIN */
480/*
481 * libecb - http://software.schmorp.de/pkg/libecb
482 *
483 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de>
484 * Copyright (©) 2011 Emanuele Giaquinta
485 * All rights reserved.
486 *
487 * Redistribution and use in source and binary forms, with or without modifica-
488 * tion, are permitted provided that the following conditions are met:
489 *
490 * 1. Redistributions of source code must retain the above copyright notice,
491 * this list of conditions and the following disclaimer.
492 *
493 * 2. Redistributions in binary form must reproduce the above copyright
494 * notice, this list of conditions and the following disclaimer in the
495 * documentation and/or other materials provided with the distribution.
496 *
497 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
498 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
499 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
500 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
501 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
502 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
503 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
504 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
505 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
506 * OF THE POSSIBILITY OF SUCH DAMAGE.
507 */
508
509#ifndef ECB_H
510#define ECB_H
511
512#ifdef _WIN32
513 typedef signed char int8_t;
514 typedef unsigned char uint8_t;
515 typedef signed short int16_t;
516 typedef unsigned short uint16_t;
517 typedef signed int int32_t;
518 typedef unsigned int uint32_t;
519 #if __GNUC__
520 typedef signed long long int64_t;
521 typedef unsigned long long uint64_t;
522 #else /* _MSC_VER || __BORLANDC__ */
523 typedef signed __int64 int64_t;
524 typedef unsigned __int64 uint64_t;
525 #endif
526#else
527 #include <inttypes.h>
528#endif
471 529
472/* many compilers define _GNUC_ to some versions but then only implement 530/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions, 531 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers. 532 * causing enormous grief in return for some better fake benchmark numbers.
475 * or so. 533 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have 534 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place. 535 * an issue with that they should have done it right in the first place.
478 */ 536 */
479#ifndef ECB_GCC_VERSION 537#ifndef ECB_GCC_VERSION
… …
482 #else 540 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 541 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif 542 #endif
485#endif 543#endif
486 544
545/*****************************************************************************/
546
547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
548/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
549
550#if ECB_NO_THREADS
551# define ECB_NO_SMP 1
552#endif
553
554#if ECB_NO_THREADS || ECB_NO_SMP
555 #define ECB_MEMORY_FENCE do { } while (0)
556#endif
557
558#ifndef ECB_MEMORY_FENCE
559 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
560 #if __i386 || __i386__
561 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
570 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
571 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
573 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
574 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
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")
582 #elif defined(__mips__)
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
584 #endif
585 #endif
586#endif
587
588#ifndef ECB_MEMORY_FENCE
589 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__)
590 #define ECB_MEMORY_FENCE __sync_synchronize ()
591 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
592 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
593 #elif _MSC_VER >= 1400 /* VC++ 2005 */
594 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
595 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
596 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
597 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
598 #elif defined(_WIN32)
599 #include <WinNT.h>
600 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
601 #elif __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
602 #include <mbarrier.h>
603 #define ECB_MEMORY_FENCE __machine_rw_barrier ()
604 #define ECB_MEMORY_FENCE_ACQUIRE __machine_r_barrier ()
605 #define ECB_MEMORY_FENCE_RELEASE __machine_w_barrier ()
606 #endif
607#endif
608
609#ifndef ECB_MEMORY_FENCE
610 #if !ECB_AVOID_PTHREADS
611 /*
612 * if you get undefined symbol references to pthread_mutex_lock,
613 * or failure to find pthread.h, then you should implement
614 * the ECB_MEMORY_FENCE operations for your cpu/compiler
615 * OR provide pthread.h and link against the posix thread library
616 * of your system.
617 */
618 #include <pthread.h>
619 #define ECB_NEEDS_PTHREADS 1
620 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
621
622 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
623 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
624 #endif
625#endif
626
627#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
628 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
629#endif
630
631#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
632 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
633#endif
634
635/*****************************************************************************/
636
637#define ECB_C99 (__STDC_VERSION__ >= 199901L)
638
487#if __cplusplus 639#if __cplusplus
488 #define ecb_inline static inline 640 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5) 641#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__ 642 #define ecb_inline static __inline__
491#elif ECB_C99 643#elif ECB_C99
492 #define ecb_inline static inline 644 #define ecb_inline static inline
493#else 645#else
494 #define ecb_inline static 646 #define ecb_inline static
495#endif 647#endif
496 648
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5) 649#if ECB_GCC_VERSION(3,3)
499 #if __x86 650 #define ecb_restrict __restrict__
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 651#elif ECB_C99
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 652 #define ecb_restrict restrict
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE /* better be safe than sorry */ 653#else
503 #elif __amd64 654 #define ecb_restrict
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
508 #endif 655#endif
509#endif
510 656
511#ifndef ECB_MEMORY_FENCE 657typedef int ecb_bool;
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif _MSC_VER >= 1400 /* VC++ 2005 */
517 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
518 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
519 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
520 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
521 #elif defined(_WIN32)
522 #include <WinNT.h>
523 #define ECB_MEMORY_FENCE MemoryBarrier ()
524 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
525 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
526 #endif
527#endif
528 658
529#ifndef ECB_MEMORY_FENCE 659#define ECB_CONCAT_(a, b) a ## b
530 #include <pthread.h> 660#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
661#define ECB_STRINGIFY_(a) # a
662#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
531 663
532 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER; 664#define ecb_function_ ecb_inline
533 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
534 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
535 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
536#endif
537 665
538#if ECB_GCC_VERSION(3,1) 666#if ECB_GCC_VERSION(3,1)
539 #define ecb_attribute(attrlist) __attribute__(attrlist) 667 #define ecb_attribute(attrlist) __attribute__(attrlist)
540 #define ecb_is_constant(expr) __builtin_constant_p (expr) 668 #define ecb_is_constant(expr) __builtin_constant_p (expr)
541 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 669 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
545 #define ecb_is_constant(expr) 0 673 #define ecb_is_constant(expr) 0
546 #define ecb_expect(expr,value) (expr) 674 #define ecb_expect(expr,value) (expr)
547 #define ecb_prefetch(addr,rw,locality) 675 #define ecb_prefetch(addr,rw,locality)
548#endif 676#endif
549 677
678/* no emulation for ecb_decltype */
679#if ECB_GCC_VERSION(4,5)
680 #define ecb_decltype(x) __decltype(x)
681#elif ECB_GCC_VERSION(3,0)
682 #define ecb_decltype(x) __typeof(x)
683#endif
684
550#define ecb_noinline ecb_attribute ((__noinline__)) 685#define ecb_noinline ecb_attribute ((__noinline__))
551#define ecb_noreturn ecb_attribute ((__noreturn__)) 686#define ecb_noreturn ecb_attribute ((__noreturn__))
552#define ecb_unused ecb_attribute ((__unused__)) 687#define ecb_unused ecb_attribute ((__unused__))
553#define ecb_const ecb_attribute ((__const__)) 688#define ecb_const ecb_attribute ((__const__))
554#define ecb_pure ecb_attribute ((__pure__)) 689#define ecb_pure ecb_attribute ((__pure__))
… …
566/* put around conditional expressions if you are very sure that the */ 701/* put around conditional expressions if you are very sure that the */
567/* expression is mostly true or mostly false. note that these return */ 702/* expression is mostly true or mostly false. note that these return */
568/* booleans, not the expression. */ 703/* booleans, not the expression. */
569#define ecb_expect_false(expr) ecb_expect (!!(expr), 0) 704#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
570#define ecb_expect_true(expr) ecb_expect (!!(expr), 1) 705#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
571/* ecb.h end */ 706/* for compatibility to the rest of the world */
707#define ecb_likely(expr) ecb_expect_true (expr)
708#define ecb_unlikely(expr) ecb_expect_false (expr)
709
710/* count trailing zero bits and count # of one bits */
711#if ECB_GCC_VERSION(3,4)
712 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
713 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
714 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
715 #define ecb_ctz32(x) __builtin_ctz (x)
716 #define ecb_ctz64(x) __builtin_ctzll (x)
717 #define ecb_popcount32(x) __builtin_popcount (x)
718 /* no popcountll */
719#else
720 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
721 ecb_function_ int
722 ecb_ctz32 (uint32_t x)
723 {
724 int r = 0;
725
726 x &= ~x + 1; /* this isolates the lowest bit */
727
728#if ECB_branchless_on_i386
729 r += !!(x & 0xaaaaaaaa) << 0;
730 r += !!(x & 0xcccccccc) << 1;
731 r += !!(x & 0xf0f0f0f0) << 2;
732 r += !!(x & 0xff00ff00) << 3;
733 r += !!(x & 0xffff0000) << 4;
734#else
735 if (x & 0xaaaaaaaa) r += 1;
736 if (x & 0xcccccccc) r += 2;
737 if (x & 0xf0f0f0f0) r += 4;
738 if (x & 0xff00ff00) r += 8;
739 if (x & 0xffff0000) r += 16;
740#endif
741
742 return r;
743 }
744
745 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
746 ecb_function_ int
747 ecb_ctz64 (uint64_t x)
748 {
749 int shift = x & 0xffffffffU ? 0 : 32;
750 return ecb_ctz32 (x >> shift) + shift;
751 }
752
753 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
754 ecb_function_ int
755 ecb_popcount32 (uint32_t x)
756 {
757 x -= (x >> 1) & 0x55555555;
758 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
759 x = ((x >> 4) + x) & 0x0f0f0f0f;
760 x *= 0x01010101;
761
762 return x >> 24;
763 }
764
765 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
766 ecb_function_ int ecb_ld32 (uint32_t x)
767 {
768 int r = 0;
769
770 if (x >> 16) { x >>= 16; r += 16; }
771 if (x >> 8) { x >>= 8; r += 8; }
772 if (x >> 4) { x >>= 4; r += 4; }
773 if (x >> 2) { x >>= 2; r += 2; }
774 if (x >> 1) { r += 1; }
775
776 return r;
777 }
778
779 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
780 ecb_function_ int ecb_ld64 (uint64_t x)
781 {
782 int r = 0;
783
784 if (x >> 32) { x >>= 32; r += 32; }
785
786 return r + ecb_ld32 (x);
787 }
788#endif
789
790ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
792{
793 return ( (x * 0x0802U & 0x22110U)
794 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
795}
796
797ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const;
798ecb_function_ uint16_t ecb_bitrev16 (uint16_t x)
799{
800 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
801 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
802 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
803 x = ( x >> 8 ) | ( x << 8);
804
805 return x;
806}
807
808ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const;
809ecb_function_ uint32_t ecb_bitrev32 (uint32_t x)
810{
811 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
812 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
813 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
814 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
815 x = ( x >> 16 ) | ( x << 16);
816
817 return x;
818}
819
820/* popcount64 is only available on 64 bit cpus as gcc builtin */
821/* so for this version we are lazy */
822ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
823ecb_function_ int
824ecb_popcount64 (uint64_t x)
825{
826 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
827}
828
829ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
830ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
831ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
832ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
833ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
834ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
835ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
836ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
837
838ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
839ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
840ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
841ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
842ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
843ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
844ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
845ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
846
847#if ECB_GCC_VERSION(4,3)
848 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
849 #define ecb_bswap32(x) __builtin_bswap32 (x)
850 #define ecb_bswap64(x) __builtin_bswap64 (x)
851#else
852 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
853 ecb_function_ uint16_t
854 ecb_bswap16 (uint16_t x)
855 {
856 return ecb_rotl16 (x, 8);
857 }
858
859 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
860 ecb_function_ uint32_t
861 ecb_bswap32 (uint32_t x)
862 {
863 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
864 }
865
866 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
867 ecb_function_ uint64_t
868 ecb_bswap64 (uint64_t x)
869 {
870 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
871 }
872#endif
873
874#if ECB_GCC_VERSION(4,5)
875 #define ecb_unreachable() __builtin_unreachable ()
876#else
877 /* this seems to work fine, but gcc always emits a warning for it :/ */
878 ecb_inline void ecb_unreachable (void) ecb_noreturn;
879 ecb_inline void ecb_unreachable (void) { }
880#endif
881
882/* try to tell the compiler that some condition is definitely true */
883#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
884
885ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
886ecb_inline unsigned char
887ecb_byteorder_helper (void)
888{
889 const uint32_t u = 0x11223344;
890 return *(unsigned char *)&u;
891}
892
893ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
894ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
895ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
896ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
897
898#if ECB_GCC_VERSION(3,0) || ECB_C99
899 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
900#else
901 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
902#endif
903
904#if __cplusplus
905 template<typename T>
906 static inline T ecb_div_rd (T val, T div)
907 {
908 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
909 }
910 template<typename T>
911 static inline T ecb_div_ru (T val, T div)
912 {
913 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
914 }
915#else
916 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
917 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
918#endif
919
920#if ecb_cplusplus_does_not_suck
921 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
922 template<typename T, int N>
923 static inline int ecb_array_length (const T (&arr)[N])
924 {
925 return N;
926 }
927#else
928 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
929#endif
930
931#endif
932
933/* ECB.H END */
934
935#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
936/* if your architecture doesn't need memory fences, e.g. because it is
937 * single-cpu/core, or if you use libev in a project that doesn't use libev
938 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
939 * libev, in which cases the memory fences become nops.
940 * alternatively, you can remove this #error and link against libpthread,
941 * which will then provide the memory fences.
942 */
943# error "memory fences not defined for your architecture, please report"
944#endif
945
946#ifndef ECB_MEMORY_FENCE
947# define ECB_MEMORY_FENCE do { } while (0)
948# define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
949# define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
950#endif
572 951
573#define expect_false(cond) ecb_expect_false (cond) 952#define expect_false(cond) ecb_expect_false (cond)
574#define expect_true(cond) ecb_expect_true (cond) 953#define expect_true(cond) ecb_expect_true (cond)
575#define noinline ecb_noinline 954#define noinline ecb_noinline
576 955
… …
872 #undef VAR 1251 #undef VAR
873 }; 1252 };
874 #include "ev_wrap.h" 1253 #include "ev_wrap.h"
875 1254
876 static struct ev_loop default_loop_struct; 1255 static struct ev_loop default_loop_struct;
877 struct ev_loop *ev_default_loop_ptr; 1256 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
878 1257
879#else 1258#else
880 1259
881 ev_tstamp ev_rt_now; 1260 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */
882 #define VAR(name,decl) static decl; 1261 #define VAR(name,decl) static decl;
883 #include "ev_vars.h" 1262 #include "ev_vars.h"
884 #undef VAR 1263 #undef VAR
885 1264
886 static int ev_default_loop_ptr; 1265 static int ev_default_loop_ptr;
… …
980 1359
981 do 1360 do
982 ncur <<= 1; 1361 ncur <<= 1;
983 while (cnt > ncur); 1362 while (cnt > ncur);
984 1363
985 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1364 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
986 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1365 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
987 { 1366 {
988 ncur *= elem; 1367 ncur *= elem;
989 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1368 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
990 ncur = ncur - sizeof (void *) * 4; 1369 ncur = ncur - sizeof (void *) * 4;
… …
1476 1855
1477 if (pipe_write_wanted) 1856 if (pipe_write_wanted)
1478 { 1857 {
1479 int old_errno; 1858 int old_errno;
1480 1859
1481 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */ 1860 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1482 1861
1483 old_errno = errno; /* save errno because write will clobber it */ 1862 old_errno = errno; /* save errno because write will clobber it */
1484 1863
1485#if EV_USE_EVENTFD 1864#if EV_USE_EVENTFD
1486 if (evfd >= 0) 1865 if (evfd >= 0)
… …
1494 /* win32 people keep sending patches that change this write() to send() */ 1873 /* win32 people keep sending patches that change this write() to send() */
1495 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1874 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1496 /* so when you think this write should be a send instead, please find out */ 1875 /* so when you think this write should be a send instead, please find out */
1497 /* where your send() is from - it's definitely not the microsoft send, and */ 1876 /* where your send() is from - it's definitely not the microsoft send, and */
1498 /* tell me. thank you. */ 1877 /* tell me. thank you. */
1878 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1879 /* check the ev documentation on how to use this flag */
1499 write (evpipe [1], &(evpipe [1]), 1); 1880 write (evpipe [1], &(evpipe [1]), 1);
1500 } 1881 }
1501 1882
1502 errno = old_errno; 1883 errno = old_errno;
1503 } 1884 }
… …
2670#endif 3051#endif
2671 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3052 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2672 backend_poll (EV_A_ waittime); 3053 backend_poll (EV_A_ waittime);
2673 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3054 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2674 3055
2675 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */ 3056 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2676 3057
2677 if (pipe_write_skipped) 3058 if (pipe_write_skipped)
2678 { 3059 {
2679 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3060 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2680 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3061 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
2938 3319
2939void noinline 3320void noinline
2940ev_timer_again (EV_P_ ev_timer *w) 3321ev_timer_again (EV_P_ ev_timer *w)
2941{ 3322{
2942 EV_FREQUENT_CHECK; 3323 EV_FREQUENT_CHECK;
3324
3325 clear_pending (EV_A_ (W)w);
2943 3326
2944 if (ev_is_active (w)) 3327 if (ev_is_active (w))
2945 { 3328 {
2946 if (w->repeat) 3329 if (w->repeat)
2947 { 3330 {
… …
4030 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4413 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
4031#endif 4414#endif
4032 4415
4033#if EV_IDLE_ENABLE 4416#if EV_IDLE_ENABLE
4034 if (types & EV_IDLE) 4417 if (types & EV_IDLE)
4035 for (j = NUMPRI; i--; ) 4418 for (j = NUMPRI; j--; )
4036 for (i = idlecnt [j]; i--; ) 4419 for (i = idlecnt [j]; i--; )
4037 cb (EV_A_ EV_IDLE, idles [j][i]); 4420 cb (EV_A_ EV_IDLE, idles [j][i]);
4038#endif 4421#endif
4039 4422
4040#if EV_FORK_ENABLE 4423#if EV_FORK_ENABLE
… …
4093 4476
4094#if EV_MULTIPLICITY 4477#if EV_MULTIPLICITY
4095 #include "ev_wrap.h" 4478 #include "ev_wrap.h"
4096#endif 4479#endif
4097 4480
4098EV_CPP(})
4099

Diff Legend

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