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

Comparing libev/ev.c (file contents):
Revision 1.378 by root, Mon Jun 13 09:52:36 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
478/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
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;
469#if __GNUC__ >= 4 519 #if __GNUC__
470# define expect(expr,value) __builtin_expect ((expr),(value)) 520 typedef signed long long int64_t;
471# define noinline __attribute__ ((noinline)) 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
472#else 526#else
473# define expect(expr,value) (expr) 527 #include <inttypes.h>
474# define noinline
475# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
476# define inline
477# endif 528#endif
529
530/* many compilers define _GNUC_ to some versions but then only implement
531 * what their idiot authors think are the "more important" extensions,
532 * causing enormous grief in return for some better fake benchmark numbers.
533 * or so.
534 * we try to detect these and simply assume they are not gcc - if they have
535 * an issue with that they should have done it right in the first place.
536 */
537#ifndef ECB_GCC_VERSION
538 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
539 #define ECB_GCC_VERSION(major,minor) 0
540 #else
541 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
478#endif 542 #endif
543#endif
479 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
639#if __cplusplus
640 #define ecb_inline static inline
641#elif ECB_GCC_VERSION(2,5)
642 #define ecb_inline static __inline__
643#elif ECB_C99
644 #define ecb_inline static inline
645#else
646 #define ecb_inline static
647#endif
648
649#if ECB_GCC_VERSION(3,3)
650 #define ecb_restrict __restrict__
651#elif ECB_C99
652 #define ecb_restrict restrict
653#else
654 #define ecb_restrict
655#endif
656
657typedef int ecb_bool;
658
659#define ECB_CONCAT_(a, b) a ## b
660#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
661#define ECB_STRINGIFY_(a) # a
662#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
663
664#define ecb_function_ ecb_inline
665
666#if ECB_GCC_VERSION(3,1)
667 #define ecb_attribute(attrlist) __attribute__(attrlist)
668 #define ecb_is_constant(expr) __builtin_constant_p (expr)
669 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
670 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
671#else
672 #define ecb_attribute(attrlist)
673 #define ecb_is_constant(expr) 0
674 #define ecb_expect(expr,value) (expr)
675 #define ecb_prefetch(addr,rw,locality)
676#endif
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
685#define ecb_noinline ecb_attribute ((__noinline__))
686#define ecb_noreturn ecb_attribute ((__noreturn__))
687#define ecb_unused ecb_attribute ((__unused__))
688#define ecb_const ecb_attribute ((__const__))
689#define ecb_pure ecb_attribute ((__pure__))
690
691#if ECB_GCC_VERSION(4,3)
692 #define ecb_artificial ecb_attribute ((__artificial__))
693 #define ecb_hot ecb_attribute ((__hot__))
694 #define ecb_cold ecb_attribute ((__cold__))
695#else
696 #define ecb_artificial
697 #define ecb_hot
698 #define ecb_cold
699#endif
700
701/* put around conditional expressions if you are very sure that the */
702/* expression is mostly true or mostly false. note that these return */
703/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 704#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 705#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
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
951
952#define expect_false(cond) ecb_expect_false (cond)
953#define expect_true(cond) ecb_expect_true (cond)
954#define noinline ecb_noinline
955
482#define inline_size static inline 956#define inline_size ecb_inline
483 957
484#if EV_FEATURE_CODE 958#if EV_FEATURE_CODE
485# define inline_speed static inline 959# define inline_speed ecb_inline
486#else 960#else
487# define inline_speed static noinline 961# define inline_speed static noinline
488#endif 962#endif
489 963
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 964#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
581 1055
582#ifdef __linux 1056#ifdef __linux
583# include <sys/utsname.h> 1057# include <sys/utsname.h>
584#endif 1058#endif
585 1059
586static unsigned int noinline 1060static unsigned int noinline ecb_cold
587ev_linux_version (void) 1061ev_linux_version (void)
588{ 1062{
589#ifdef __linux 1063#ifdef __linux
590 unsigned int v = 0; 1064 unsigned int v = 0;
591 struct utsname buf; 1065 struct utsname buf;
620} 1094}
621 1095
622/*****************************************************************************/ 1096/*****************************************************************************/
623 1097
624#if EV_AVOID_STDIO 1098#if EV_AVOID_STDIO
625static void noinline 1099static void noinline ecb_cold
626ev_printerr (const char *msg) 1100ev_printerr (const char *msg)
627{ 1101{
628 write (STDERR_FILENO, msg, strlen (msg)); 1102 write (STDERR_FILENO, msg, strlen (msg));
629} 1103}
630#endif 1104#endif
631 1105
632static void (*syserr_cb)(const char *msg); 1106static void (*syserr_cb)(const char *msg);
633 1107
634void 1108void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 1109ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 1110{
637 syserr_cb = cb; 1111 syserr_cb = cb;
638} 1112}
639 1113
640static void noinline 1114static void noinline ecb_cold
641ev_syserr (const char *msg) 1115ev_syserr (const char *msg)
642{ 1116{
643 if (!msg) 1117 if (!msg)
644 msg = "(libev) system error"; 1118 msg = "(libev) system error";
645 1119
678#endif 1152#endif
679} 1153}
680 1154
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1155static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 1156
683void 1157void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 1158ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 1159{
686 alloc = cb; 1160 alloc = cb;
687} 1161}
688 1162
777 #undef VAR 1251 #undef VAR
778 }; 1252 };
779 #include "ev_wrap.h" 1253 #include "ev_wrap.h"
780 1254
781 static struct ev_loop default_loop_struct; 1255 static struct ev_loop default_loop_struct;
782 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 */
783 1257
784#else 1258#else
785 1259
786 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 */
787 #define VAR(name,decl) static decl; 1261 #define VAR(name,decl) static decl;
788 #include "ev_vars.h" 1262 #include "ev_vars.h"
789 #undef VAR 1263 #undef VAR
790 1264
791 static int ev_default_loop_ptr; 1265 static int ev_default_loop_ptr;
885 1359
886 do 1360 do
887 ncur <<= 1; 1361 ncur <<= 1;
888 while (cnt > ncur); 1362 while (cnt > ncur);
889 1363
890 /* 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 */
891 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1365 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
892 { 1366 {
893 ncur *= elem; 1367 ncur *= elem;
894 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);
895 ncur = ncur - sizeof (void *) * 4; 1369 ncur = ncur - sizeof (void *) * 4;
897 } 1371 }
898 1372
899 return ncur; 1373 return ncur;
900} 1374}
901 1375
902static noinline void * 1376static void * noinline ecb_cold
903array_realloc (int elem, void *base, int *cur, int cnt) 1377array_realloc (int elem, void *base, int *cur, int cnt)
904{ 1378{
905 *cur = array_nextsize (elem, *cur, cnt); 1379 *cur = array_nextsize (elem, *cur, cnt);
906 return ev_realloc (base, elem * *cur); 1380 return ev_realloc (base, elem * *cur);
907} 1381}
910 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1384 memset ((void *)(base), 0, sizeof (*(base)) * (count))
911 1385
912#define array_needsize(type,base,cur,cnt,init) \ 1386#define array_needsize(type,base,cur,cnt,init) \
913 if (expect_false ((cnt) > (cur))) \ 1387 if (expect_false ((cnt) > (cur))) \
914 { \ 1388 { \
915 int ocur_ = (cur); \ 1389 int ecb_unused ocur_ = (cur); \
916 (base) = (type *)array_realloc \ 1390 (base) = (type *)array_realloc \
917 (sizeof (type), (base), &(cur), (cnt)); \ 1391 (sizeof (type), (base), &(cur), (cnt)); \
918 init ((base) + (ocur_), (cur) - ocur_); \ 1392 init ((base) + (ocur_), (cur) - ocur_); \
919 } 1393 }
920 1394
1090 fdchanges [fdchangecnt - 1] = fd; 1564 fdchanges [fdchangecnt - 1] = fd;
1091 } 1565 }
1092} 1566}
1093 1567
1094/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1568/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1095inline_speed void 1569inline_speed void ecb_cold
1096fd_kill (EV_P_ int fd) 1570fd_kill (EV_P_ int fd)
1097{ 1571{
1098 ev_io *w; 1572 ev_io *w;
1099 1573
1100 while ((w = (ev_io *)anfds [fd].head)) 1574 while ((w = (ev_io *)anfds [fd].head))
1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1577 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1104 } 1578 }
1105} 1579}
1106 1580
1107/* check whether the given fd is actually valid, for error recovery */ 1581/* check whether the given fd is actually valid, for error recovery */
1108inline_size int 1582inline_size int ecb_cold
1109fd_valid (int fd) 1583fd_valid (int fd)
1110{ 1584{
1111#ifdef _WIN32 1585#ifdef _WIN32
1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1586 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1113#else 1587#else
1114 return fcntl (fd, F_GETFD) != -1; 1588 return fcntl (fd, F_GETFD) != -1;
1115#endif 1589#endif
1116} 1590}
1117 1591
1118/* called on EBADF to verify fds */ 1592/* called on EBADF to verify fds */
1119static void noinline 1593static void noinline ecb_cold
1120fd_ebadf (EV_P) 1594fd_ebadf (EV_P)
1121{ 1595{
1122 int fd; 1596 int fd;
1123 1597
1124 for (fd = 0; fd < anfdmax; ++fd) 1598 for (fd = 0; fd < anfdmax; ++fd)
1126 if (!fd_valid (fd) && errno == EBADF) 1600 if (!fd_valid (fd) && errno == EBADF)
1127 fd_kill (EV_A_ fd); 1601 fd_kill (EV_A_ fd);
1128} 1602}
1129 1603
1130/* called on ENOMEM in select/poll to kill some fds and retry */ 1604/* called on ENOMEM in select/poll to kill some fds and retry */
1131static void noinline 1605static void noinline ecb_cold
1132fd_enomem (EV_P) 1606fd_enomem (EV_P)
1133{ 1607{
1134 int fd; 1608 int fd;
1135 1609
1136 for (fd = anfdmax; fd--; ) 1610 for (fd = anfdmax; fd--; )
1331 1805
1332/*****************************************************************************/ 1806/*****************************************************************************/
1333 1807
1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1335 1809
1336static void noinline 1810static void noinline ecb_cold
1337evpipe_init (EV_P) 1811evpipe_init (EV_P)
1338{ 1812{
1339 if (!ev_is_active (&pipe_w)) 1813 if (!ev_is_active (&pipe_w))
1340 { 1814 {
1341# if EV_USE_EVENTFD 1815# if EV_USE_EVENTFD
1363 ev_io_start (EV_A_ &pipe_w); 1837 ev_io_start (EV_A_ &pipe_w);
1364 ev_unref (EV_A); /* watcher should not keep loop alive */ 1838 ev_unref (EV_A); /* watcher should not keep loop alive */
1365 } 1839 }
1366} 1840}
1367 1841
1368inline_size void 1842inline_speed void
1369evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1843evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1370{ 1844{
1371 if (!*flag) 1845 if (expect_true (*flag))
1372 { 1846 return;
1847
1373 *flag = 1; 1848 *flag = 1;
1374 1849
1850 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1851
1375 pipe_write_skipped = 1; 1852 pipe_write_skipped = 1;
1376 1853
1854 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1855
1377 if (pipe_write_wanted) 1856 if (pipe_write_wanted)
1857 {
1858 int old_errno;
1859
1860 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1861
1862 old_errno = errno; /* save errno because write will clobber it */
1863
1864#if EV_USE_EVENTFD
1865 if (evfd >= 0)
1378 { 1866 {
1379 int old_errno = errno; /* save errno because write will clobber it */
1380 char dummy;
1381
1382 pipe_write_skipped = 0;
1383
1384#if EV_USE_EVENTFD
1385 if (evfd >= 0)
1386 {
1387 uint64_t counter = 1; 1867 uint64_t counter = 1;
1388 write (evfd, &counter, sizeof (uint64_t)); 1868 write (evfd, &counter, sizeof (uint64_t));
1389 }
1390 else
1391#endif
1392 {
1393 /* win32 people keep sending patches that change this write() to send() */
1394 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1395 /* so when you think this write should be a send instead, please find out */
1396 /* where your send() is from - it's definitely not the microsoft send, and */
1397 /* tell me. thank you. */
1398 write (evpipe [1], &dummy, 1);
1399 }
1400
1401 errno = old_errno;
1402 } 1869 }
1870 else
1871#endif
1872 {
1873 /* win32 people keep sending patches that change this write() to send() */
1874 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1875 /* so when you think this write should be a send instead, please find out */
1876 /* where your send() is from - it's definitely not the microsoft send, and */
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 */
1880 write (evpipe [1], &(evpipe [1]), 1);
1881 }
1882
1883 errno = old_errno;
1403 } 1884 }
1404} 1885}
1405 1886
1406/* called whenever the libev signal pipe */ 1887/* called whenever the libev signal pipe */
1407/* got some events (signal, async) */ 1888/* got some events (signal, async) */
1465 1946
1466 if (!EV_A) 1947 if (!EV_A)
1467 return; 1948 return;
1468#endif 1949#endif
1469 1950
1470 evpipe_init (EV_A); 1951 if (!ev_active (&pipe_w))
1952 return;
1471 1953
1472 signals [signum - 1].pending = 1; 1954 signals [signum - 1].pending = 1;
1473 evpipe_write (EV_A_ &sig_pending); 1955 evpipe_write (EV_A_ &sig_pending);
1474} 1956}
1475 1957
1607#endif 2089#endif
1608#if EV_USE_SELECT 2090#if EV_USE_SELECT
1609# include "ev_select.c" 2091# include "ev_select.c"
1610#endif 2092#endif
1611 2093
1612int 2094int ecb_cold
1613ev_version_major (void) 2095ev_version_major (void)
1614{ 2096{
1615 return EV_VERSION_MAJOR; 2097 return EV_VERSION_MAJOR;
1616} 2098}
1617 2099
1618int 2100int ecb_cold
1619ev_version_minor (void) 2101ev_version_minor (void)
1620{ 2102{
1621 return EV_VERSION_MINOR; 2103 return EV_VERSION_MINOR;
1622} 2104}
1623 2105
1624/* return true if we are running with elevated privileges and should ignore env variables */ 2106/* return true if we are running with elevated privileges and should ignore env variables */
1625int inline_size 2107int inline_size ecb_cold
1626enable_secure (void) 2108enable_secure (void)
1627{ 2109{
1628#ifdef _WIN32 2110#ifdef _WIN32
1629 return 0; 2111 return 0;
1630#else 2112#else
1631 return getuid () != geteuid () 2113 return getuid () != geteuid ()
1632 || getgid () != getegid (); 2114 || getgid () != getegid ();
1633#endif 2115#endif
1634} 2116}
1635 2117
1636unsigned int 2118unsigned int ecb_cold
1637ev_supported_backends (void) 2119ev_supported_backends (void)
1638{ 2120{
1639 unsigned int flags = 0; 2121 unsigned int flags = 0;
1640 2122
1641 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2123 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1645 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 2127 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1646 2128
1647 return flags; 2129 return flags;
1648} 2130}
1649 2131
1650unsigned int 2132unsigned int ecb_cold
1651ev_recommended_backends (void) 2133ev_recommended_backends (void)
1652{ 2134{
1653 unsigned int flags = ev_supported_backends (); 2135 unsigned int flags = ev_supported_backends ();
1654 2136
1655#ifndef __NetBSD__ 2137#ifndef __NetBSD__
1667#endif 2149#endif
1668 2150
1669 return flags; 2151 return flags;
1670} 2152}
1671 2153
1672unsigned int 2154unsigned int ecb_cold
1673ev_embeddable_backends (void) 2155ev_embeddable_backends (void)
1674{ 2156{
1675 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2157 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1676 2158
1677 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2159 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1722ev_userdata (EV_P) 2204ev_userdata (EV_P)
1723{ 2205{
1724 return userdata; 2206 return userdata;
1725} 2207}
1726 2208
2209void
1727void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2210ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1728{ 2211{
1729 invoke_cb = invoke_pending_cb; 2212 invoke_cb = invoke_pending_cb;
1730} 2213}
1731 2214
2215void
1732void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2216ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1733{ 2217{
1734 release_cb = release; 2218 release_cb = release;
1735 acquire_cb = acquire; 2219 acquire_cb = acquire;
1736} 2220}
1737#endif 2221#endif
1738 2222
1739/* initialise a loop structure, must be zero-initialised */ 2223/* initialise a loop structure, must be zero-initialised */
1740static void noinline 2224static void noinline ecb_cold
1741loop_init (EV_P_ unsigned int flags) 2225loop_init (EV_P_ unsigned int flags)
1742{ 2226{
1743 if (!backend) 2227 if (!backend)
1744 { 2228 {
1745 origflags = flags; 2229 origflags = flags;
1830#endif 2314#endif
1831 } 2315 }
1832} 2316}
1833 2317
1834/* free up a loop structure */ 2318/* free up a loop structure */
1835void 2319void ecb_cold
1836ev_loop_destroy (EV_P) 2320ev_loop_destroy (EV_P)
1837{ 2321{
1838 int i; 2322 int i;
1839 2323
1840#if EV_MULTIPLICITY 2324#if EV_MULTIPLICITY
1998 postfork = 0; 2482 postfork = 0;
1999} 2483}
2000 2484
2001#if EV_MULTIPLICITY 2485#if EV_MULTIPLICITY
2002 2486
2003struct ev_loop * 2487struct ev_loop * ecb_cold
2004ev_loop_new (unsigned int flags) 2488ev_loop_new (unsigned int flags)
2005{ 2489{
2006 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2490 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2007 2491
2008 memset (EV_A, 0, sizeof (struct ev_loop)); 2492 memset (EV_A, 0, sizeof (struct ev_loop));
2016} 2500}
2017 2501
2018#endif /* multiplicity */ 2502#endif /* multiplicity */
2019 2503
2020#if EV_VERIFY 2504#if EV_VERIFY
2021static void noinline 2505static void noinline ecb_cold
2022verify_watcher (EV_P_ W w) 2506verify_watcher (EV_P_ W w)
2023{ 2507{
2024 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2508 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2025 2509
2026 if (w->pending) 2510 if (w->pending)
2027 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2511 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2028} 2512}
2029 2513
2030static void noinline 2514static void noinline ecb_cold
2031verify_heap (EV_P_ ANHE *heap, int N) 2515verify_heap (EV_P_ ANHE *heap, int N)
2032{ 2516{
2033 int i; 2517 int i;
2034 2518
2035 for (i = HEAP0; i < N + HEAP0; ++i) 2519 for (i = HEAP0; i < N + HEAP0; ++i)
2040 2524
2041 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2525 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2042 } 2526 }
2043} 2527}
2044 2528
2045static void noinline 2529static void noinline ecb_cold
2046array_verify (EV_P_ W *ws, int cnt) 2530array_verify (EV_P_ W *ws, int cnt)
2047{ 2531{
2048 while (cnt--) 2532 while (cnt--)
2049 { 2533 {
2050 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2534 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
2052 } 2536 }
2053} 2537}
2054#endif 2538#endif
2055 2539
2056#if EV_FEATURE_API 2540#if EV_FEATURE_API
2057void 2541void ecb_cold
2058ev_verify (EV_P) 2542ev_verify (EV_P)
2059{ 2543{
2060#if EV_VERIFY 2544#if EV_VERIFY
2061 int i; 2545 int i;
2062 WL w; 2546 WL w;
2128#endif 2612#endif
2129} 2613}
2130#endif 2614#endif
2131 2615
2132#if EV_MULTIPLICITY 2616#if EV_MULTIPLICITY
2133struct ev_loop * 2617struct ev_loop * ecb_cold
2134#else 2618#else
2135int 2619int
2136#endif 2620#endif
2137ev_default_loop (unsigned int flags) 2621ev_default_loop (unsigned int flags)
2138{ 2622{
2337 } 2821 }
2338} 2822}
2339 2823
2340/* simply recalculate all periodics */ 2824/* simply recalculate all periodics */
2341/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2825/* TODO: maybe ensure that at least one event happens when jumping forward? */
2342static void noinline 2826static void noinline ecb_cold
2343periodics_reschedule (EV_P) 2827periodics_reschedule (EV_P)
2344{ 2828{
2345 int i; 2829 int i;
2346 2830
2347 /* adjust periodics after time jump */ 2831 /* adjust periodics after time jump */
2360 reheap (periodics, periodiccnt); 2844 reheap (periodics, periodiccnt);
2361} 2845}
2362#endif 2846#endif
2363 2847
2364/* adjust all timers by a given offset */ 2848/* adjust all timers by a given offset */
2365static void noinline 2849static void noinline ecb_cold
2366timers_reschedule (EV_P_ ev_tstamp adjust) 2850timers_reschedule (EV_P_ ev_tstamp adjust)
2367{ 2851{
2368 int i; 2852 int i;
2369 2853
2370 for (i = 0; i < timercnt; ++i) 2854 for (i = 0; i < timercnt; ++i)
2515 time_update (EV_A_ 1e100); 2999 time_update (EV_A_ 1e100);
2516 3000
2517 /* from now on, we want a pipe-wake-up */ 3001 /* from now on, we want a pipe-wake-up */
2518 pipe_write_wanted = 1; 3002 pipe_write_wanted = 1;
2519 3003
3004 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
3005
2520 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 3006 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2521 { 3007 {
2522 waittime = MAX_BLOCKTIME; 3008 waittime = MAX_BLOCKTIME;
2523 3009
2524 if (timercnt) 3010 if (timercnt)
2565#endif 3051#endif
2566 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 3052 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2567 backend_poll (EV_A_ waittime); 3053 backend_poll (EV_A_ waittime);
2568 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3054 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2569 3055
2570 pipe_write_wanted = 0; 3056 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
2571 3057
2572 if (pipe_write_skipped) 3058 if (pipe_write_skipped)
2573 { 3059 {
2574 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)));
2575 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3061 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2833 3319
2834void noinline 3320void noinline
2835ev_timer_again (EV_P_ ev_timer *w) 3321ev_timer_again (EV_P_ ev_timer *w)
2836{ 3322{
2837 EV_FREQUENT_CHECK; 3323 EV_FREQUENT_CHECK;
3324
3325 clear_pending (EV_A_ (W)w);
2838 3326
2839 if (ev_is_active (w)) 3327 if (ev_is_active (w))
2840 { 3328 {
2841 if (w->repeat) 3329 if (w->repeat)
2842 { 3330 {
3236 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3724 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3237 ofs += sizeof (struct inotify_event) + ev->len; 3725 ofs += sizeof (struct inotify_event) + ev->len;
3238 } 3726 }
3239} 3727}
3240 3728
3241inline_size void 3729inline_size void ecb_cold
3242ev_check_2625 (EV_P) 3730ev_check_2625 (EV_P)
3243{ 3731{
3244 /* kernels < 2.6.25 are borked 3732 /* kernels < 2.6.25 are borked
3245 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3733 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3246 */ 3734 */
3871} 4359}
3872 4360
3873/*****************************************************************************/ 4361/*****************************************************************************/
3874 4362
3875#if EV_WALK_ENABLE 4363#if EV_WALK_ENABLE
3876void 4364void ecb_cold
3877ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4365ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3878{ 4366{
3879 int i, j; 4367 int i, j;
3880 ev_watcher_list *wl, *wn; 4368 ev_watcher_list *wl, *wn;
3881 4369
3925 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4413 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3926#endif 4414#endif
3927 4415
3928#if EV_IDLE_ENABLE 4416#if EV_IDLE_ENABLE
3929 if (types & EV_IDLE) 4417 if (types & EV_IDLE)
3930 for (j = NUMPRI; i--; ) 4418 for (j = NUMPRI; j--; )
3931 for (i = idlecnt [j]; i--; ) 4419 for (i = idlecnt [j]; i--; )
3932 cb (EV_A_ EV_IDLE, idles [j][i]); 4420 cb (EV_A_ EV_IDLE, idles [j][i]);
3933#endif 4421#endif
3934 4422
3935#if EV_FORK_ENABLE 4423#if EV_FORK_ENABLE
3988 4476
3989#if EV_MULTIPLICITY 4477#if EV_MULTIPLICITY
3990 #include "ev_wrap.h" 4478 #include "ev_wrap.h"
3991#endif 4479#endif
3992 4480
3993EV_CPP(})
3994

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines