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

Comparing libev/ev.c (file contents):
Revision 1.374 by root, Sat Feb 26 15:21:01 2011 UTC vs.
Revision 1.398 by root, Sun Sep 25 21:27:35 2011 UTC

… …
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#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) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468 468
469/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
470/* ECB.H BEGIN */
471/*
472 * libecb - http://software.schmorp.de/pkg/libecb
473 *
474 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de>
475 * Copyright (©) 2011 Emanuele Giaquinta
476 * All rights reserved.
477 *
478 * Redistribution and use in source and binary forms, with or without modifica-
479 * tion, are permitted provided that the following conditions are met:
480 *
481 * 1. Redistributions of source code must retain the above copyright notice,
482 * this list of conditions and the following disclaimer.
483 *
484 * 2. Redistributions in binary form must reproduce the above copyright
485 * notice, this list of conditions and the following disclaimer in the
486 * documentation and/or other materials provided with the distribution.
487 *
488 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
489 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
490 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
491 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
492 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
493 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
494 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
495 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
496 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
497 * OF THE POSSIBILITY OF SUCH DAMAGE.
498 */
499
500#ifndef ECB_H
501#define ECB_H
502
503#ifdef _WIN32
504 typedef signed char int8_t;
505 typedef unsigned char uint8_t;
506 typedef signed short int16_t;
507 typedef unsigned short uint16_t;
508 typedef signed int int32_t;
509 typedef unsigned int uint32_t;
469#if __GNUC__ >= 4 510 #if __GNUC__
470# define expect(expr,value) __builtin_expect ((expr),(value)) 511 typedef signed long long int64_t;
471# define noinline __attribute__ ((noinline)) 512 typedef unsigned long long uint64_t;
513 #else /* _MSC_VER || __BORLANDC__ */
514 typedef signed __int64 int64_t;
515 typedef unsigned __int64 uint64_t;
516 #endif
472#else 517#else
473# define expect(expr,value) (expr) 518 #include <inttypes.h>
474# define noinline
475# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
476# define inline
477# endif 519#endif
520
521/* many compilers define _GNUC_ to some versions but then only implement
522 * what their idiot authors think are the "more important" extensions,
523 * causing enormous grief in return for some better fake benchmark numbers.
524 * or so.
525 * we try to detect these and simply assume they are not gcc - if they have
526 * an issue with that they should have done it right in the first place.
527 */
528#ifndef ECB_GCC_VERSION
529 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
530 #define ECB_GCC_VERSION(major,minor) 0
531 #else
532 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
478#endif 533 #endif
534#endif
479 535
536/*****************************************************************************/
537
538/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
539/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
540
541#if ECB_NO_THREADS || ECB_NO_SMP
542 #define ECB_MEMORY_FENCE do { } while (0)
543#endif
544
545#ifndef ECB_MEMORY_FENCE
546 #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || defined(__clang__)
547 #if __i386__
548 #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 */
550 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
551 #elif __amd64
552 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
553 #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 */
555 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
556 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
557 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
558 || 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")
560 #elif defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
561 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
563 #endif
564 #endif
565#endif
566
567#ifndef ECB_MEMORY_FENCE
568 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER) || defined(__clang__)
569 #define ECB_MEMORY_FENCE __sync_synchronize ()
570 /*#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 ); }) */
572 #elif _MSC_VER >= 1400 /* VC++ 2005 */
573 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
574 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
575 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
576 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
577 #elif defined(_WIN32)
578 #include <WinNT.h>
579 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
580 #endif
581#endif
582
583#ifndef ECB_MEMORY_FENCE
584 #if !ECB_AVOID_PTHREADS
585 /*
586 * if you get undefined symbol references to pthread_mutex_lock,
587 * or failure to find pthread.h, then you should implement
588 * the ECB_MEMORY_FENCE operations for your cpu/compiler
589 * OR provide pthread.h and link against the posix thread library
590 * of your system.
591 */
592 #include <pthread.h>
593 #define ECB_NEEDS_PTHREADS 1
594 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
595
596 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
597 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
598 #endif
599#endif
600
601#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
602 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
603#endif
604
605#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
606 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
607#endif
608
609/*****************************************************************************/
610
611#define ECB_C99 (__STDC_VERSION__ >= 199901L)
612
613#if __cplusplus
614 #define ecb_inline static inline
615#elif ECB_GCC_VERSION(2,5)
616 #define ecb_inline static __inline__
617#elif ECB_C99
618 #define ecb_inline static inline
619#else
620 #define ecb_inline static
621#endif
622
623#if ECB_GCC_VERSION(3,3)
624 #define ecb_restrict __restrict__
625#elif ECB_C99
626 #define ecb_restrict restrict
627#else
628 #define ecb_restrict
629#endif
630
631typedef int ecb_bool;
632
633#define ECB_CONCAT_(a, b) a ## b
634#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
635#define ECB_STRINGIFY_(a) # a
636#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
637
638#define ecb_function_ ecb_inline
639
640#if ECB_GCC_VERSION(3,1)
641 #define ecb_attribute(attrlist) __attribute__(attrlist)
642 #define ecb_is_constant(expr) __builtin_constant_p (expr)
643 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
644 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
645#else
646 #define ecb_attribute(attrlist)
647 #define ecb_is_constant(expr) 0
648 #define ecb_expect(expr,value) (expr)
649 #define ecb_prefetch(addr,rw,locality)
650#endif
651
652/* no emulation for ecb_decltype */
653#if ECB_GCC_VERSION(4,5)
654 #define ecb_decltype(x) __decltype(x)
655#elif ECB_GCC_VERSION(3,0)
656 #define ecb_decltype(x) __typeof(x)
657#endif
658
659#define ecb_noinline ecb_attribute ((__noinline__))
660#define ecb_noreturn ecb_attribute ((__noreturn__))
661#define ecb_unused ecb_attribute ((__unused__))
662#define ecb_const ecb_attribute ((__const__))
663#define ecb_pure ecb_attribute ((__pure__))
664
665#if ECB_GCC_VERSION(4,3)
666 #define ecb_artificial ecb_attribute ((__artificial__))
667 #define ecb_hot ecb_attribute ((__hot__))
668 #define ecb_cold ecb_attribute ((__cold__))
669#else
670 #define ecb_artificial
671 #define ecb_hot
672 #define ecb_cold
673#endif
674
675/* put around conditional expressions if you are very sure that the */
676/* expression is mostly true or mostly false. note that these return */
677/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 678#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 679#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
680/* for compatibility to the rest of the world */
681#define ecb_likely(expr) ecb_expect_true (expr)
682#define ecb_unlikely(expr) ecb_expect_false (expr)
683
684/* count trailing zero bits and count # of one bits */
685#if ECB_GCC_VERSION(3,4)
686 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
687 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
688 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
689 #define ecb_ctz32(x) __builtin_ctz (x)
690 #define ecb_ctz64(x) __builtin_ctzll (x)
691 #define ecb_popcount32(x) __builtin_popcount (x)
692 /* no popcountll */
693#else
694 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
695 ecb_function_ int
696 ecb_ctz32 (uint32_t x)
697 {
698 int r = 0;
699
700 x &= ~x + 1; /* this isolates the lowest bit */
701
702#if ECB_branchless_on_i386
703 r += !!(x & 0xaaaaaaaa) << 0;
704 r += !!(x & 0xcccccccc) << 1;
705 r += !!(x & 0xf0f0f0f0) << 2;
706 r += !!(x & 0xff00ff00) << 3;
707 r += !!(x & 0xffff0000) << 4;
708#else
709 if (x & 0xaaaaaaaa) r += 1;
710 if (x & 0xcccccccc) r += 2;
711 if (x & 0xf0f0f0f0) r += 4;
712 if (x & 0xff00ff00) r += 8;
713 if (x & 0xffff0000) r += 16;
714#endif
715
716 return r;
717 }
718
719 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
720 ecb_function_ int
721 ecb_ctz64 (uint64_t x)
722 {
723 int shift = x & 0xffffffffU ? 0 : 32;
724 return ecb_ctz32 (x >> shift) + shift;
725 }
726
727 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
728 ecb_function_ int
729 ecb_popcount32 (uint32_t x)
730 {
731 x -= (x >> 1) & 0x55555555;
732 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
733 x = ((x >> 4) + x) & 0x0f0f0f0f;
734 x *= 0x01010101;
735
736 return x >> 24;
737 }
738
739 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
740 ecb_function_ int ecb_ld32 (uint32_t x)
741 {
742 int r = 0;
743
744 if (x >> 16) { x >>= 16; r += 16; }
745 if (x >> 8) { x >>= 8; r += 8; }
746 if (x >> 4) { x >>= 4; r += 4; }
747 if (x >> 2) { x >>= 2; r += 2; }
748 if (x >> 1) { r += 1; }
749
750 return r;
751 }
752
753 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
754 ecb_function_ int ecb_ld64 (uint64_t x)
755 {
756 int r = 0;
757
758 if (x >> 32) { x >>= 32; r += 32; }
759
760 return r + ecb_ld32 (x);
761 }
762#endif
763
764/* popcount64 is only available on 64 bit cpus as gcc builtin */
765/* so for this version we are lazy */
766ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
767ecb_function_ int
768ecb_popcount64 (uint64_t x)
769{
770 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
771}
772
773ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
774ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
775ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
776ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
777ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
778ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
779ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
780ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
781
782ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
783ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
784ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
785ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
786ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
787ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
788ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
789ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
790
791#if ECB_GCC_VERSION(4,3)
792 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
793 #define ecb_bswap32(x) __builtin_bswap32 (x)
794 #define ecb_bswap64(x) __builtin_bswap64 (x)
795#else
796 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
797 ecb_function_ uint16_t
798 ecb_bswap16 (uint16_t x)
799 {
800 return ecb_rotl16 (x, 8);
801 }
802
803 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
804 ecb_function_ uint32_t
805 ecb_bswap32 (uint32_t x)
806 {
807 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
808 }
809
810 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
811 ecb_function_ uint64_t
812 ecb_bswap64 (uint64_t x)
813 {
814 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
815 }
816#endif
817
818#if ECB_GCC_VERSION(4,5)
819 #define ecb_unreachable() __builtin_unreachable ()
820#else
821 /* this seems to work fine, but gcc always emits a warning for it :/ */
822 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
823 ecb_function_ void ecb_unreachable (void) { }
824#endif
825
826/* try to tell the compiler that some condition is definitely true */
827#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
828
829ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
830ecb_function_ unsigned char
831ecb_byteorder_helper (void)
832{
833 const uint32_t u = 0x11223344;
834 return *(unsigned char *)&u;
835}
836
837ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
838ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
839ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
840ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
841
842#if ECB_GCC_VERSION(3,0) || ECB_C99
843 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
844#else
845 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
846#endif
847
848#if __cplusplus
849 template<typename T>
850 static inline T ecb_div_rd (T val, T div)
851 {
852 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
853 }
854 template<typename T>
855 static inline T ecb_div_ru (T val, T div)
856 {
857 return val < 0 ? - ((-val ) / div) : (val + div - 1) / div;
858 }
859#else
860 #define ecb_div_rd(val,div) ((val) < 0 ? - ((-(val) + (div) - 1) / (div)) : ((val) ) / (div))
861 #define ecb_div_ru(val,div) ((val) < 0 ? - ((-(val) ) / (div)) : ((val) + (div) - 1) / (div))
862#endif
863
864#if ecb_cplusplus_does_not_suck
865 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
866 template<typename T, int N>
867 static inline int ecb_array_length (const T (&arr)[N])
868 {
869 return N;
870 }
871#else
872 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
873#endif
874
875#endif
876
877/* ECB.H END */
878
879#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
880/* if your architecture doesn't need memory fences, e.g. because it is
881 * single-cpu/core, or if you use libev in a project that doesn't use libev
882 * from multiple threads, then you can define ECB_AVOID_PTHREADS when compiling
883 * libev, in which casess the memory fences become nops.
884 * alternatively, you can remove this #error and link against libpthread,
885 * which will then provide the memory fences.
886 */
887# error "memory fences not defined for your architecture, please report"
888#endif
889
890#ifndef ECB_MEMORY_FENCE
891# define ECB_MEMORY_FENCE do { } while (0)
892# define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
893# define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
894#endif
895
896#define expect_false(cond) ecb_expect_false (cond)
897#define expect_true(cond) ecb_expect_true (cond)
898#define noinline ecb_noinline
899
482#define inline_size static inline 900#define inline_size ecb_inline
483 901
484#if EV_FEATURE_CODE 902#if EV_FEATURE_CODE
485# define inline_speed static inline 903# define inline_speed ecb_inline
486#else 904#else
487# define inline_speed static noinline 905# define inline_speed static noinline
488#endif 906#endif
489 907
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 908#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
581 999
582#ifdef __linux 1000#ifdef __linux
583# include <sys/utsname.h> 1001# include <sys/utsname.h>
584#endif 1002#endif
585 1003
586static unsigned int noinline 1004static unsigned int noinline ecb_cold
587ev_linux_version (void) 1005ev_linux_version (void)
588{ 1006{
589#ifdef __linux 1007#ifdef __linux
590 unsigned int v = 0; 1008 unsigned int v = 0;
591 struct utsname buf; 1009 struct utsname buf;
… …
620} 1038}
621 1039
622/*****************************************************************************/ 1040/*****************************************************************************/
623 1041
624#if EV_AVOID_STDIO 1042#if EV_AVOID_STDIO
625static void noinline 1043static void noinline ecb_cold
626ev_printerr (const char *msg) 1044ev_printerr (const char *msg)
627{ 1045{
628 write (STDERR_FILENO, msg, strlen (msg)); 1046 write (STDERR_FILENO, msg, strlen (msg));
629} 1047}
630#endif 1048#endif
631 1049
632static void (*syserr_cb)(const char *msg); 1050static void (*syserr_cb)(const char *msg);
633 1051
634void 1052void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 1053ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 1054{
637 syserr_cb = cb; 1055 syserr_cb = cb;
638} 1056}
639 1057
640static void noinline 1058static void noinline ecb_cold
641ev_syserr (const char *msg) 1059ev_syserr (const char *msg)
642{ 1060{
643 if (!msg) 1061 if (!msg)
644 msg = "(libev) system error"; 1062 msg = "(libev) system error";
645 1063
… …
678#endif 1096#endif
679} 1097}
680 1098
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1099static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 1100
683void 1101void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 1102ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 1103{
686 alloc = cb; 1104 alloc = cb;
687} 1105}
688 1106
… …
870 select (0, 0, 0, 0, &tv); 1288 select (0, 0, 0, 0, &tv);
871#endif 1289#endif
872 } 1290 }
873} 1291}
874 1292
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
883/*****************************************************************************/ 1293/*****************************************************************************/
884 1294
885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 1295#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
886 1296
887/* find a suitable new size for the given array, */ 1297/* find a suitable new size for the given array, */
… …
905 } 1315 }
906 1316
907 return ncur; 1317 return ncur;
908} 1318}
909 1319
910static noinline void * 1320static void * noinline ecb_cold
911array_realloc (int elem, void *base, int *cur, int cnt) 1321array_realloc (int elem, void *base, int *cur, int cnt)
912{ 1322{
913 *cur = array_nextsize (elem, *cur, cnt); 1323 *cur = array_nextsize (elem, *cur, cnt);
914 return ev_realloc (base, elem * *cur); 1324 return ev_realloc (base, elem * *cur);
915} 1325}
… …
918 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1328 memset ((void *)(base), 0, sizeof (*(base)) * (count))
919 1329
920#define array_needsize(type,base,cur,cnt,init) \ 1330#define array_needsize(type,base,cur,cnt,init) \
921 if (expect_false ((cnt) > (cur))) \ 1331 if (expect_false ((cnt) > (cur))) \
922 { \ 1332 { \
923 int ocur_ = (cur); \ 1333 int ecb_unused ocur_ = (cur); \
924 (base) = (type *)array_realloc \ 1334 (base) = (type *)array_realloc \
925 (sizeof (type), (base), &(cur), (cnt)); \ 1335 (sizeof (type), (base), &(cur), (cnt)); \
926 init ((base) + (ocur_), (cur) - ocur_); \ 1336 init ((base) + (ocur_), (cur) - ocur_); \
927 } 1337 }
928 1338
… …
1098 fdchanges [fdchangecnt - 1] = fd; 1508 fdchanges [fdchangecnt - 1] = fd;
1099 } 1509 }
1100} 1510}
1101 1511
1102/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1512/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1103inline_speed void 1513inline_speed void ecb_cold
1104fd_kill (EV_P_ int fd) 1514fd_kill (EV_P_ int fd)
1105{ 1515{
1106 ev_io *w; 1516 ev_io *w;
1107 1517
1108 while ((w = (ev_io *)anfds [fd].head)) 1518 while ((w = (ev_io *)anfds [fd].head))
… …
1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1521 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1112 } 1522 }
1113} 1523}
1114 1524
1115/* check whether the given fd is actually valid, for error recovery */ 1525/* check whether the given fd is actually valid, for error recovery */
1116inline_size int 1526inline_size int ecb_cold
1117fd_valid (int fd) 1527fd_valid (int fd)
1118{ 1528{
1119#ifdef _WIN32 1529#ifdef _WIN32
1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1530 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1121#else 1531#else
1122 return fcntl (fd, F_GETFD) != -1; 1532 return fcntl (fd, F_GETFD) != -1;
1123#endif 1533#endif
1124} 1534}
1125 1535
1126/* called on EBADF to verify fds */ 1536/* called on EBADF to verify fds */
1127static void noinline 1537static void noinline ecb_cold
1128fd_ebadf (EV_P) 1538fd_ebadf (EV_P)
1129{ 1539{
1130 int fd; 1540 int fd;
1131 1541
1132 for (fd = 0; fd < anfdmax; ++fd) 1542 for (fd = 0; fd < anfdmax; ++fd)
… …
1134 if (!fd_valid (fd) && errno == EBADF) 1544 if (!fd_valid (fd) && errno == EBADF)
1135 fd_kill (EV_A_ fd); 1545 fd_kill (EV_A_ fd);
1136} 1546}
1137 1547
1138/* called on ENOMEM in select/poll to kill some fds and retry */ 1548/* called on ENOMEM in select/poll to kill some fds and retry */
1139static void noinline 1549static void noinline ecb_cold
1140fd_enomem (EV_P) 1550fd_enomem (EV_P)
1141{ 1551{
1142 int fd; 1552 int fd;
1143 1553
1144 for (fd = anfdmax; fd--; ) 1554 for (fd = anfdmax; fd--; )
… …
1339 1749
1340/*****************************************************************************/ 1750/*****************************************************************************/
1341 1751
1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1752#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1343 1753
1344static void noinline 1754static void noinline ecb_cold
1345evpipe_init (EV_P) 1755evpipe_init (EV_P)
1346{ 1756{
1347 if (!ev_is_active (&pipe_w)) 1757 if (!ev_is_active (&pipe_w))
1348 { 1758 {
1349# if EV_USE_EVENTFD 1759# if EV_USE_EVENTFD
… …
1371 ev_io_start (EV_A_ &pipe_w); 1781 ev_io_start (EV_A_ &pipe_w);
1372 ev_unref (EV_A); /* watcher should not keep loop alive */ 1782 ev_unref (EV_A); /* watcher should not keep loop alive */
1373 } 1783 }
1374} 1784}
1375 1785
1376inline_size void 1786inline_speed void
1377evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1787evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1378{ 1788{
1379 if (!*flag) 1789 if (expect_true (*flag))
1790 return;
1791
1792 *flag = 1;
1793
1794 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1795
1796 pipe_write_skipped = 1;
1797
1798 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1799
1800 if (pipe_write_wanted)
1380 { 1801 {
1802 int old_errno;
1803
1804 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1805
1381 int old_errno = errno; /* save errno because write might clobber it */ 1806 old_errno = errno; /* save errno because write will clobber it */
1382 char dummy;
1383
1384 *flag = 1;
1385 1807
1386#if EV_USE_EVENTFD 1808#if EV_USE_EVENTFD
1387 if (evfd >= 0) 1809 if (evfd >= 0)
1388 { 1810 {
1389 uint64_t counter = 1; 1811 uint64_t counter = 1;
1390 write (evfd, &counter, sizeof (uint64_t)); 1812 write (evfd, &counter, sizeof (uint64_t));
1391 } 1813 }
1392 else 1814 else
1393#endif 1815#endif
1816 {
1394 /* win32 people keep sending patches that change this write() to send() */ 1817 /* win32 people keep sending patches that change this write() to send() */
1395 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1818 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1396 /* so when you think this write should be a send instead, please find out */ 1819 /* so when you think this write should be a send instead, please find out */
1397 /* where your send() is from - it's definitely not the microsoft send, and */ 1820 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */ 1821 /* tell me. thank you. */
1399 write (evpipe [1], &dummy, 1); 1822 write (evpipe [1], &(evpipe [1]), 1);
1823 }
1400 1824
1401 errno = old_errno; 1825 errno = old_errno;
1402 } 1826 }
1403} 1827}
1404 1828
… …
1407static void 1831static void
1408pipecb (EV_P_ ev_io *iow, int revents) 1832pipecb (EV_P_ ev_io *iow, int revents)
1409{ 1833{
1410 int i; 1834 int i;
1411 1835
1836 if (revents & EV_READ)
1837 {
1412#if EV_USE_EVENTFD 1838#if EV_USE_EVENTFD
1413 if (evfd >= 0) 1839 if (evfd >= 0)
1414 { 1840 {
1415 uint64_t counter; 1841 uint64_t counter;
1416 read (evfd, &counter, sizeof (uint64_t)); 1842 read (evfd, &counter, sizeof (uint64_t));
1417 } 1843 }
1418 else 1844 else
1419#endif 1845#endif
1420 { 1846 {
1421 char dummy; 1847 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1848 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1423 read (evpipe [0], &dummy, 1); 1849 read (evpipe [0], &dummy, 1);
1850 }
1424 } 1851 }
1852
1853 pipe_write_skipped = 0;
1425 1854
1426#if EV_SIGNAL_ENABLE 1855#if EV_SIGNAL_ENABLE
1427 if (sig_pending) 1856 if (sig_pending)
1428 { 1857 {
1429 sig_pending = 0; 1858 sig_pending = 0;
… …
1458 EV_P = signals [signum - 1].loop; 1887 EV_P = signals [signum - 1].loop;
1459 1888
1460 if (!EV_A) 1889 if (!EV_A)
1461 return; 1890 return;
1462#endif 1891#endif
1892
1893 if (!ev_active (&pipe_w))
1894 return;
1463 1895
1464 signals [signum - 1].pending = 1; 1896 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending); 1897 evpipe_write (EV_A_ &sig_pending);
1466} 1898}
1467 1899
… …
1599#endif 2031#endif
1600#if EV_USE_SELECT 2032#if EV_USE_SELECT
1601# include "ev_select.c" 2033# include "ev_select.c"
1602#endif 2034#endif
1603 2035
1604int 2036int ecb_cold
1605ev_version_major (void) 2037ev_version_major (void)
1606{ 2038{
1607 return EV_VERSION_MAJOR; 2039 return EV_VERSION_MAJOR;
1608} 2040}
1609 2041
1610int 2042int ecb_cold
1611ev_version_minor (void) 2043ev_version_minor (void)
1612{ 2044{
1613 return EV_VERSION_MINOR; 2045 return EV_VERSION_MINOR;
1614} 2046}
1615 2047
1616/* return true if we are running with elevated privileges and should ignore env variables */ 2048/* return true if we are running with elevated privileges and should ignore env variables */
1617int inline_size 2049int inline_size ecb_cold
1618enable_secure (void) 2050enable_secure (void)
1619{ 2051{
1620#ifdef _WIN32 2052#ifdef _WIN32
1621 return 0; 2053 return 0;
1622#else 2054#else
1623 return getuid () != geteuid () 2055 return getuid () != geteuid ()
1624 || getgid () != getegid (); 2056 || getgid () != getegid ();
1625#endif 2057#endif
1626} 2058}
1627 2059
1628unsigned int 2060unsigned int ecb_cold
1629ev_supported_backends (void) 2061ev_supported_backends (void)
1630{ 2062{
1631 unsigned int flags = 0; 2063 unsigned int flags = 0;
1632 2064
1633 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2065 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1637 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 2069 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1638 2070
1639 return flags; 2071 return flags;
1640} 2072}
1641 2073
1642unsigned int 2074unsigned int ecb_cold
1643ev_recommended_backends (void) 2075ev_recommended_backends (void)
1644{ 2076{
1645 unsigned int flags = ev_supported_backends (); 2077 unsigned int flags = ev_supported_backends ();
1646 2078
1647#ifndef __NetBSD__ 2079#ifndef __NetBSD__
… …
1659#endif 2091#endif
1660 2092
1661 return flags; 2093 return flags;
1662} 2094}
1663 2095
1664unsigned int 2096unsigned int ecb_cold
1665ev_embeddable_backends (void) 2097ev_embeddable_backends (void)
1666{ 2098{
1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2099 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1668 2100
1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2101 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1714ev_userdata (EV_P) 2146ev_userdata (EV_P)
1715{ 2147{
1716 return userdata; 2148 return userdata;
1717} 2149}
1718 2150
2151void
1719void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2152ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1720{ 2153{
1721 invoke_cb = invoke_pending_cb; 2154 invoke_cb = invoke_pending_cb;
1722} 2155}
1723 2156
2157void
1724void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2158ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1725{ 2159{
1726 release_cb = release; 2160 release_cb = release;
1727 acquire_cb = acquire; 2161 acquire_cb = acquire;
1728} 2162}
1729#endif 2163#endif
1730 2164
1731/* initialise a loop structure, must be zero-initialised */ 2165/* initialise a loop structure, must be zero-initialised */
1732static void noinline 2166static void noinline ecb_cold
1733loop_init (EV_P_ unsigned int flags) 2167loop_init (EV_P_ unsigned int flags)
1734{ 2168{
1735 if (!backend) 2169 if (!backend)
1736 { 2170 {
1737 origflags = flags; 2171 origflags = flags;
… …
1765 if (!(flags & EVFLAG_NOENV) 2199 if (!(flags & EVFLAG_NOENV)
1766 && !enable_secure () 2200 && !enable_secure ()
1767 && getenv ("LIBEV_FLAGS")) 2201 && getenv ("LIBEV_FLAGS"))
1768 flags = atoi (getenv ("LIBEV_FLAGS")); 2202 flags = atoi (getenv ("LIBEV_FLAGS"));
1769 2203
1770 ev_rt_now = ev_time (); 2204 ev_rt_now = ev_time ();
1771 mn_now = get_clock (); 2205 mn_now = get_clock ();
1772 now_floor = mn_now; 2206 now_floor = mn_now;
1773 rtmn_diff = ev_rt_now - mn_now; 2207 rtmn_diff = ev_rt_now - mn_now;
1774#if EV_FEATURE_API 2208#if EV_FEATURE_API
1775 invoke_cb = ev_invoke_pending; 2209 invoke_cb = ev_invoke_pending;
1776#endif 2210#endif
1777 2211
1778 io_blocktime = 0.; 2212 io_blocktime = 0.;
1779 timeout_blocktime = 0.; 2213 timeout_blocktime = 0.;
1780 backend = 0; 2214 backend = 0;
1781 backend_fd = -1; 2215 backend_fd = -1;
1782 sig_pending = 0; 2216 sig_pending = 0;
1783#if EV_ASYNC_ENABLE 2217#if EV_ASYNC_ENABLE
1784 async_pending = 0; 2218 async_pending = 0;
1785#endif 2219#endif
2220 pipe_write_skipped = 0;
2221 pipe_write_wanted = 0;
1786#if EV_USE_INOTIFY 2222#if EV_USE_INOTIFY
1787 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2223 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1788#endif 2224#endif
1789#if EV_USE_SIGNALFD 2225#if EV_USE_SIGNALFD
1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2226 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1791#endif 2227#endif
1792 2228
1793 if (!(flags & EVBACKEND_MASK)) 2229 if (!(flags & EVBACKEND_MASK))
1794 flags |= ev_recommended_backends (); 2230 flags |= ev_recommended_backends ();
1795 2231
… …
1820#endif 2256#endif
1821 } 2257 }
1822} 2258}
1823 2259
1824/* free up a loop structure */ 2260/* free up a loop structure */
1825void 2261void ecb_cold
1826ev_loop_destroy (EV_P) 2262ev_loop_destroy (EV_P)
1827{ 2263{
1828 int i; 2264 int i;
1829 2265
1830#if EV_MULTIPLICITY 2266#if EV_MULTIPLICITY
… …
1960 infy_fork (EV_A); 2396 infy_fork (EV_A);
1961#endif 2397#endif
1962 2398
1963 if (ev_is_active (&pipe_w)) 2399 if (ev_is_active (&pipe_w))
1964 { 2400 {
1965 /* this "locks" the handlers against writing to the pipe */ 2401 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1966 /* while we modify the fd vars */
1967 sig_pending = 1;
1968#if EV_ASYNC_ENABLE
1969 async_pending = 1;
1970#endif
1971 2402
1972 ev_ref (EV_A); 2403 ev_ref (EV_A);
1973 ev_io_stop (EV_A_ &pipe_w); 2404 ev_io_stop (EV_A_ &pipe_w);
1974 2405
1975#if EV_USE_EVENTFD 2406#if EV_USE_EVENTFD
… …
1993 postfork = 0; 2424 postfork = 0;
1994} 2425}
1995 2426
1996#if EV_MULTIPLICITY 2427#if EV_MULTIPLICITY
1997 2428
1998struct ev_loop * 2429struct ev_loop * ecb_cold
1999ev_loop_new (unsigned int flags) 2430ev_loop_new (unsigned int flags)
2000{ 2431{
2001 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2432 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2002 2433
2003 memset (EV_A, 0, sizeof (struct ev_loop)); 2434 memset (EV_A, 0, sizeof (struct ev_loop));
… …
2011} 2442}
2012 2443
2013#endif /* multiplicity */ 2444#endif /* multiplicity */
2014 2445
2015#if EV_VERIFY 2446#if EV_VERIFY
2016static void noinline 2447static void noinline ecb_cold
2017verify_watcher (EV_P_ W w) 2448verify_watcher (EV_P_ W w)
2018{ 2449{
2019 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2450 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2020 2451
2021 if (w->pending) 2452 if (w->pending)
2022 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2453 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2023} 2454}
2024 2455
2025static void noinline 2456static void noinline ecb_cold
2026verify_heap (EV_P_ ANHE *heap, int N) 2457verify_heap (EV_P_ ANHE *heap, int N)
2027{ 2458{
2028 int i; 2459 int i;
2029 2460
2030 for (i = HEAP0; i < N + HEAP0; ++i) 2461 for (i = HEAP0; i < N + HEAP0; ++i)
… …
2035 2466
2036 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2467 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2037 } 2468 }
2038} 2469}
2039 2470
2040static void noinline 2471static void noinline ecb_cold
2041array_verify (EV_P_ W *ws, int cnt) 2472array_verify (EV_P_ W *ws, int cnt)
2042{ 2473{
2043 while (cnt--) 2474 while (cnt--)
2044 { 2475 {
2045 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2476 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
2047 } 2478 }
2048} 2479}
2049#endif 2480#endif
2050 2481
2051#if EV_FEATURE_API 2482#if EV_FEATURE_API
2052void 2483void ecb_cold
2053ev_verify (EV_P) 2484ev_verify (EV_P)
2054{ 2485{
2055#if EV_VERIFY 2486#if EV_VERIFY
2056 int i; 2487 int i;
2057 WL w; 2488 WL w;
… …
2123#endif 2554#endif
2124} 2555}
2125#endif 2556#endif
2126 2557
2127#if EV_MULTIPLICITY 2558#if EV_MULTIPLICITY
2128struct ev_loop * 2559struct ev_loop * ecb_cold
2129#else 2560#else
2130int 2561int
2131#endif 2562#endif
2132ev_default_loop (unsigned int flags) 2563ev_default_loop (unsigned int flags)
2133{ 2564{
… …
2332 } 2763 }
2333} 2764}
2334 2765
2335/* simply recalculate all periodics */ 2766/* simply recalculate all periodics */
2336/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2767/* TODO: maybe ensure that at least one event happens when jumping forward? */
2337static void noinline 2768static void noinline ecb_cold
2338periodics_reschedule (EV_P) 2769periodics_reschedule (EV_P)
2339{ 2770{
2340 int i; 2771 int i;
2341 2772
2342 /* adjust periodics after time jump */ 2773 /* adjust periodics after time jump */
… …
2355 reheap (periodics, periodiccnt); 2786 reheap (periodics, periodiccnt);
2356} 2787}
2357#endif 2788#endif
2358 2789
2359/* adjust all timers by a given offset */ 2790/* adjust all timers by a given offset */
2360static void noinline 2791static void noinline ecb_cold
2361timers_reschedule (EV_P_ ev_tstamp adjust) 2792timers_reschedule (EV_P_ ev_tstamp adjust)
2362{ 2793{
2363 int i; 2794 int i;
2364 2795
2365 for (i = 0; i < timercnt; ++i) 2796 for (i = 0; i < timercnt; ++i)
… …
2507 ev_tstamp prev_mn_now = mn_now; 2938 ev_tstamp prev_mn_now = mn_now;
2508 2939
2509 /* update time to cancel out callback processing overhead */ 2940 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100); 2941 time_update (EV_A_ 1e100);
2511 2942
2943 /* from now on, we want a pipe-wake-up */
2944 pipe_write_wanted = 1;
2945
2946 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2947
2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2948 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2513 { 2949 {
2514 waittime = MAX_BLOCKTIME; 2950 waittime = MAX_BLOCKTIME;
2515 2951
2516 if (timercnt) 2952 if (timercnt)
2517 { 2953 {
2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2954 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2519 if (waittime > to) waittime = to; 2955 if (waittime > to) waittime = to;
2520 } 2956 }
2521 2957
2522#if EV_PERIODIC_ENABLE 2958#if EV_PERIODIC_ENABLE
2523 if (periodiccnt) 2959 if (periodiccnt)
2524 { 2960 {
2525 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2961 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2526 if (waittime > to) waittime = to; 2962 if (waittime > to) waittime = to;
2527 } 2963 }
2528#endif 2964#endif
2529 2965
2530 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2966 /* don't let timeouts decrease the waittime below timeout_blocktime */
2531 if (expect_false (waittime < timeout_blocktime)) 2967 if (expect_false (waittime < timeout_blocktime))
2532 waittime = timeout_blocktime; 2968 waittime = timeout_blocktime;
2969
2970 /* at this point, we NEED to wait, so we have to ensure */
2971 /* to pass a minimum nonzero value to the backend */
2972 if (expect_false (waittime < backend_mintime))
2973 waittime = backend_mintime;
2533 2974
2534 /* extra check because io_blocktime is commonly 0 */ 2975 /* extra check because io_blocktime is commonly 0 */
2535 if (expect_false (io_blocktime)) 2976 if (expect_false (io_blocktime))
2536 { 2977 {
2537 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2978 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2538 2979
2539 if (sleeptime > waittime - backend_fudge) 2980 if (sleeptime > waittime - backend_mintime)
2540 sleeptime = waittime - backend_fudge; 2981 sleeptime = waittime - backend_mintime;
2541 2982
2542 if (expect_true (sleeptime > 0.)) 2983 if (expect_true (sleeptime > 0.))
2543 { 2984 {
2544 ev_sleep (sleeptime); 2985 ev_sleep (sleeptime);
2545 waittime -= sleeptime; 2986 waittime -= sleeptime;
… …
2551 ++loop_count; 2992 ++loop_count;
2552#endif 2993#endif
2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2994 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2554 backend_poll (EV_A_ waittime); 2995 backend_poll (EV_A_ waittime);
2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2996 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2997
2998 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2999
3000 if (pipe_write_skipped)
3001 {
3002 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3003 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3004 }
3005
2556 3006
2557 /* update ev_rt_now, do magic */ 3007 /* update ev_rt_now, do magic */
2558 time_update (EV_A_ waittime + sleeptime); 3008 time_update (EV_A_ waittime + sleeptime);
2559 } 3009 }
2560 3010
… …
3214 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3664 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3215 ofs += sizeof (struct inotify_event) + ev->len; 3665 ofs += sizeof (struct inotify_event) + ev->len;
3216 } 3666 }
3217} 3667}
3218 3668
3219inline_size void 3669inline_size void ecb_cold
3220ev_check_2625 (EV_P) 3670ev_check_2625 (EV_P)
3221{ 3671{
3222 /* kernels < 2.6.25 are borked 3672 /* kernels < 2.6.25 are borked
3223 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3673 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3224 */ 3674 */
… …
3849} 4299}
3850 4300
3851/*****************************************************************************/ 4301/*****************************************************************************/
3852 4302
3853#if EV_WALK_ENABLE 4303#if EV_WALK_ENABLE
3854void 4304void ecb_cold
3855ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4305ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3856{ 4306{
3857 int i, j; 4307 int i, j;
3858 ev_watcher_list *wl, *wn; 4308 ev_watcher_list *wl, *wn;
3859 4309
… …
3903 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4353 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3904#endif 4354#endif
3905 4355
3906#if EV_IDLE_ENABLE 4356#if EV_IDLE_ENABLE
3907 if (types & EV_IDLE) 4357 if (types & EV_IDLE)
3908 for (j = NUMPRI; i--; ) 4358 for (j = NUMPRI; j--; )
3909 for (i = idlecnt [j]; i--; ) 4359 for (i = idlecnt [j]; i--; )
3910 cb (EV_A_ EV_IDLE, idles [j][i]); 4360 cb (EV_A_ EV_IDLE, idles [j][i]);
3911#endif 4361#endif
3912 4362
3913#if EV_FORK_ENABLE 4363#if EV_FORK_ENABLE

Diff Legend

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