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

Comparing libev/ev.c (file contents):
Revision 1.373 by root, Sun Feb 20 02:56:23 2011 UTC vs.
Revision 1.392 by root, Thu Aug 4 14:37:49 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 #define ECB_MEMORY_FENCE_ACQUIRE do { } while (0)
544 #define ECB_MEMORY_FENCE_RELEASE do { } while (0)
545#endif
546
547#ifndef ECB_MEMORY_FENCE
548 #if ECB_GCC_VERSION(2,5)
549 #if __x86
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
552 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
553 #elif __amd64
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
555 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
556 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
557 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
559 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
560 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) \
561 || defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
562 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
563 #define ECB_MEMORY_FENCE \
564 do { \
565 int null = 0; \
566 __asm__ __volatile__ ("mcr p15,0,%0,c6,c10,5", : "=&r" (null) : : "memory"); \
567 while (0)
568 #endif
569 #endif
570#endif
571
572#ifndef ECB_MEMORY_FENCE
573 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER)
574 #define ECB_MEMORY_FENCE __sync_synchronize ()
575 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
576 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
577 #elif _MSC_VER >= 1400 /* VC++ 2005 */
578 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
579 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
580 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
581 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
582 #elif defined(_WIN32)
583 #include <WinNT.h>
584 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
585 #endif
586#endif
587
588#ifndef ECB_MEMORY_FENCE
589 #if !ECB_AVOID_PTHREADS
590 /*
591 * if you get undefined symbol references to pthread_mutex_lock,
592 * or failure to find pthread.h, then you should implement
593 * the ECB_MEMORY_FENCE operations for your cpu/compiler
594 * OR provide pthread.h and link against the posix thread library
595 * of your system.
596 */
597 #include <pthread.h>
598 #define ECB_NEEDS_PTHREADS 1
599 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
600
601 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
602 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
603 #endif
604#endif
605
606#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
607 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
608#endif
609
610#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
611 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
612#endif
613
614/*****************************************************************************/
615
616#define ECB_C99 (__STDC_VERSION__ >= 199901L)
617
618#if __cplusplus
619 #define ecb_inline static inline
620#elif ECB_GCC_VERSION(2,5)
621 #define ecb_inline static __inline__
622#elif ECB_C99
623 #define ecb_inline static inline
624#else
625 #define ecb_inline static
626#endif
627
628#if ECB_GCC_VERSION(3,3)
629 #define ecb_restrict __restrict__
630#elif ECB_C99
631 #define ecb_restrict restrict
632#else
633 #define ecb_restrict
634#endif
635
636typedef int ecb_bool;
637
638#define ECB_CONCAT_(a, b) a ## b
639#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
640#define ECB_STRINGIFY_(a) # a
641#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
642
643#define ecb_function_ ecb_inline
644
645#if ECB_GCC_VERSION(3,1)
646 #define ecb_attribute(attrlist) __attribute__(attrlist)
647 #define ecb_is_constant(expr) __builtin_constant_p (expr)
648 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
649 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
650#else
651 #define ecb_attribute(attrlist)
652 #define ecb_is_constant(expr) 0
653 #define ecb_expect(expr,value) (expr)
654 #define ecb_prefetch(addr,rw,locality)
655#endif
656
657/* no emulation for ecb_decltype */
658#if ECB_GCC_VERSION(4,5)
659 #define ecb_decltype(x) __decltype(x)
660#elif ECB_GCC_VERSION(3,0)
661 #define ecb_decltype(x) __typeof(x)
662#endif
663
664#define ecb_noinline ecb_attribute ((__noinline__))
665#define ecb_noreturn ecb_attribute ((__noreturn__))
666#define ecb_unused ecb_attribute ((__unused__))
667#define ecb_const ecb_attribute ((__const__))
668#define ecb_pure ecb_attribute ((__pure__))
669
670#if ECB_GCC_VERSION(4,3)
671 #define ecb_artificial ecb_attribute ((__artificial__))
672 #define ecb_hot ecb_attribute ((__hot__))
673 #define ecb_cold ecb_attribute ((__cold__))
674#else
675 #define ecb_artificial
676 #define ecb_hot
677 #define ecb_cold
678#endif
679
680/* put around conditional expressions if you are very sure that the */
681/* expression is mostly true or mostly false. note that these return */
682/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 683#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 684#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
685/* for compatibility to the rest of the world */
686#define ecb_likely(expr) ecb_expect_true (expr)
687#define ecb_unlikely(expr) ecb_expect_false (expr)
688
689/* count trailing zero bits and count # of one bits */
690#if ECB_GCC_VERSION(3,4)
691 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
692 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
693 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
694 #define ecb_ctz32(x) __builtin_ctz (x)
695 #define ecb_ctz64(x) __builtin_ctzll (x)
696 #define ecb_popcount32(x) __builtin_popcount (x)
697 /* no popcountll */
698#else
699 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
700 ecb_function_ int
701 ecb_ctz32 (uint32_t x)
702 {
703 int r = 0;
704
705 x &= ~x + 1; /* this isolates the lowest bit */
706
707#if ECB_branchless_on_i386
708 r += !!(x & 0xaaaaaaaa) << 0;
709 r += !!(x & 0xcccccccc) << 1;
710 r += !!(x & 0xf0f0f0f0) << 2;
711 r += !!(x & 0xff00ff00) << 3;
712 r += !!(x & 0xffff0000) << 4;
713#else
714 if (x & 0xaaaaaaaa) r += 1;
715 if (x & 0xcccccccc) r += 2;
716 if (x & 0xf0f0f0f0) r += 4;
717 if (x & 0xff00ff00) r += 8;
718 if (x & 0xffff0000) r += 16;
719#endif
720
721 return r;
722 }
723
724 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
725 ecb_function_ int
726 ecb_ctz64 (uint64_t x)
727 {
728 int shift = x & 0xffffffffU ? 0 : 32;
729 return ecb_ctz32 (x >> shift) + shift;
730 }
731
732 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
733 ecb_function_ int
734 ecb_popcount32 (uint32_t x)
735 {
736 x -= (x >> 1) & 0x55555555;
737 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
738 x = ((x >> 4) + x) & 0x0f0f0f0f;
739 x *= 0x01010101;
740
741 return x >> 24;
742 }
743
744 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
745 ecb_function_ int ecb_ld32 (uint32_t x)
746 {
747 int r = 0;
748
749 if (x >> 16) { x >>= 16; r += 16; }
750 if (x >> 8) { x >>= 8; r += 8; }
751 if (x >> 4) { x >>= 4; r += 4; }
752 if (x >> 2) { x >>= 2; r += 2; }
753 if (x >> 1) { r += 1; }
754
755 return r;
756 }
757
758 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
759 ecb_function_ int ecb_ld64 (uint64_t x)
760 {
761 int r = 0;
762
763 if (x >> 32) { x >>= 32; r += 32; }
764
765 return r + ecb_ld32 (x);
766 }
767#endif
768
769/* popcount64 is only available on 64 bit cpus as gcc builtin */
770/* so for this version we are lazy */
771ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
772ecb_function_ int
773ecb_popcount64 (uint64_t x)
774{
775 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
776}
777
778ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
779ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
780ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
781ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
782ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
783ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
784ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
785ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
786
787ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
788ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
789ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
790ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
791ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
792ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
793ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
794ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
795
796#if ECB_GCC_VERSION(4,3)
797 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
798 #define ecb_bswap32(x) __builtin_bswap32 (x)
799 #define ecb_bswap64(x) __builtin_bswap64 (x)
800#else
801 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
802 ecb_function_ uint16_t
803 ecb_bswap16 (uint16_t x)
804 {
805 return ecb_rotl16 (x, 8);
806 }
807
808 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
809 ecb_function_ uint32_t
810 ecb_bswap32 (uint32_t x)
811 {
812 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
813 }
814
815 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
816 ecb_function_ uint64_t
817 ecb_bswap64 (uint64_t x)
818 {
819 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
820 }
821#endif
822
823#if ECB_GCC_VERSION(4,5)
824 #define ecb_unreachable() __builtin_unreachable ()
825#else
826 /* this seems to work fine, but gcc always emits a warning for it :/ */
827 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
828 ecb_function_ void ecb_unreachable (void) { }
829#endif
830
831/* try to tell the compiler that some condition is definitely true */
832#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
833
834ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
835ecb_function_ unsigned char
836ecb_byteorder_helper (void)
837{
838 const uint32_t u = 0x11223344;
839 return *(unsigned char *)&u;
840}
841
842ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
843ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
844ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
845ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
846
847#if ECB_GCC_VERSION(3,0) || ECB_C99
848 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
849#else
850 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
851#endif
852
853#if ecb_cplusplus_does_not_suck
854 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
855 template<typename T, int N>
856 static inline int ecb_array_length (const T (&arr)[N])
857 {
858 return N;
859 }
860#else
861 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
862#endif
863
864#endif
865
866/* ECB.H END */
867
868#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
869# undef ECB_MEMORY_FENCE
870# undef ECB_MEMORY_FENCE_ACQUIRE
871# undef ECB_MEMORY_FENCE_RELEASE
872#endif
873
874#define expect_false(cond) ecb_expect_false (cond)
875#define expect_true(cond) ecb_expect_true (cond)
876#define noinline ecb_noinline
877
482#define inline_size static inline 878#define inline_size ecb_inline
483 879
484#if EV_FEATURE_CODE 880#if EV_FEATURE_CODE
485# define inline_speed static inline 881# define inline_speed ecb_inline
486#else 882#else
487# define inline_speed static noinline 883# define inline_speed static noinline
488#endif 884#endif
489 885
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 886#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
581 977
582#ifdef __linux 978#ifdef __linux
583# include <sys/utsname.h> 979# include <sys/utsname.h>
584#endif 980#endif
585 981
586static unsigned int noinline 982static unsigned int noinline ecb_cold
587ev_linux_version (void) 983ev_linux_version (void)
588{ 984{
589#ifdef __linux 985#ifdef __linux
590 unsigned int v = 0; 986 unsigned int v = 0;
591 struct utsname buf; 987 struct utsname buf;
… …
620} 1016}
621 1017
622/*****************************************************************************/ 1018/*****************************************************************************/
623 1019
624#if EV_AVOID_STDIO 1020#if EV_AVOID_STDIO
625static void noinline 1021static void noinline ecb_cold
626ev_printerr (const char *msg) 1022ev_printerr (const char *msg)
627{ 1023{
628 write (STDERR_FILENO, msg, strlen (msg)); 1024 write (STDERR_FILENO, msg, strlen (msg));
629} 1025}
630#endif 1026#endif
631 1027
632static void (*syserr_cb)(const char *msg); 1028static void (*syserr_cb)(const char *msg);
633 1029
634void 1030void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 1031ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 1032{
637 syserr_cb = cb; 1033 syserr_cb = cb;
638} 1034}
639 1035
640static void noinline 1036static void noinline ecb_cold
641ev_syserr (const char *msg) 1037ev_syserr (const char *msg)
642{ 1038{
643 if (!msg) 1039 if (!msg)
644 msg = "(libev) system error"; 1040 msg = "(libev) system error";
645 1041
… …
678#endif 1074#endif
679} 1075}
680 1076
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 1077static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 1078
683void 1079void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 1080ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 1081{
686 alloc = cb; 1082 alloc = cb;
687} 1083}
688 1084
… …
870 select (0, 0, 0, 0, &tv); 1266 select (0, 0, 0, 0, &tv);
871#endif 1267#endif
872 } 1268 }
873} 1269}
874 1270
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/*****************************************************************************/ 1271/*****************************************************************************/
884 1272
885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 1273#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
886 1274
887/* find a suitable new size for the given array, */ 1275/* find a suitable new size for the given array, */
… …
905 } 1293 }
906 1294
907 return ncur; 1295 return ncur;
908} 1296}
909 1297
910static noinline void * 1298static void * noinline ecb_cold
911array_realloc (int elem, void *base, int *cur, int cnt) 1299array_realloc (int elem, void *base, int *cur, int cnt)
912{ 1300{
913 *cur = array_nextsize (elem, *cur, cnt); 1301 *cur = array_nextsize (elem, *cur, cnt);
914 return ev_realloc (base, elem * *cur); 1302 return ev_realloc (base, elem * *cur);
915} 1303}
… …
918 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1306 memset ((void *)(base), 0, sizeof (*(base)) * (count))
919 1307
920#define array_needsize(type,base,cur,cnt,init) \ 1308#define array_needsize(type,base,cur,cnt,init) \
921 if (expect_false ((cnt) > (cur))) \ 1309 if (expect_false ((cnt) > (cur))) \
922 { \ 1310 { \
923 int ocur_ = (cur); \ 1311 int ecb_unused ocur_ = (cur); \
924 (base) = (type *)array_realloc \ 1312 (base) = (type *)array_realloc \
925 (sizeof (type), (base), &(cur), (cnt)); \ 1313 (sizeof (type), (base), &(cur), (cnt)); \
926 init ((base) + (ocur_), (cur) - ocur_); \ 1314 init ((base) + (ocur_), (cur) - ocur_); \
927 } 1315 }
928 1316
… …
1034 for (i = 0; i < fdchangecnt; ++i) 1422 for (i = 0; i < fdchangecnt; ++i)
1035 { 1423 {
1036 int fd = fdchanges [i]; 1424 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd; 1425 ANFD *anfd = anfds + fd;
1038 1426
1039 if (anfd->reify & EV__IOFDSET) 1427 if (anfd->reify & EV__IOFDSET && anfd->head)
1040 { 1428 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd); 1429 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042 1430
1043 if (handle != anfd->handle) 1431 if (handle != anfd->handle)
1044 { 1432 {
… …
1098 fdchanges [fdchangecnt - 1] = fd; 1486 fdchanges [fdchangecnt - 1] = fd;
1099 } 1487 }
1100} 1488}
1101 1489
1102/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1490/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1103inline_speed void 1491inline_speed void ecb_cold
1104fd_kill (EV_P_ int fd) 1492fd_kill (EV_P_ int fd)
1105{ 1493{
1106 ev_io *w; 1494 ev_io *w;
1107 1495
1108 while ((w = (ev_io *)anfds [fd].head)) 1496 while ((w = (ev_io *)anfds [fd].head))
… …
1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1499 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1112 } 1500 }
1113} 1501}
1114 1502
1115/* check whether the given fd is actually valid, for error recovery */ 1503/* check whether the given fd is actually valid, for error recovery */
1116inline_size int 1504inline_size int ecb_cold
1117fd_valid (int fd) 1505fd_valid (int fd)
1118{ 1506{
1119#ifdef _WIN32 1507#ifdef _WIN32
1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1508 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1121#else 1509#else
1122 return fcntl (fd, F_GETFD) != -1; 1510 return fcntl (fd, F_GETFD) != -1;
1123#endif 1511#endif
1124} 1512}
1125 1513
1126/* called on EBADF to verify fds */ 1514/* called on EBADF to verify fds */
1127static void noinline 1515static void noinline ecb_cold
1128fd_ebadf (EV_P) 1516fd_ebadf (EV_P)
1129{ 1517{
1130 int fd; 1518 int fd;
1131 1519
1132 for (fd = 0; fd < anfdmax; ++fd) 1520 for (fd = 0; fd < anfdmax; ++fd)
… …
1134 if (!fd_valid (fd) && errno == EBADF) 1522 if (!fd_valid (fd) && errno == EBADF)
1135 fd_kill (EV_A_ fd); 1523 fd_kill (EV_A_ fd);
1136} 1524}
1137 1525
1138/* called on ENOMEM in select/poll to kill some fds and retry */ 1526/* called on ENOMEM in select/poll to kill some fds and retry */
1139static void noinline 1527static void noinline ecb_cold
1140fd_enomem (EV_P) 1528fd_enomem (EV_P)
1141{ 1529{
1142 int fd; 1530 int fd;
1143 1531
1144 for (fd = anfdmax; fd--; ) 1532 for (fd = anfdmax; fd--; )
… …
1339 1727
1340/*****************************************************************************/ 1728/*****************************************************************************/
1341 1729
1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1730#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1343 1731
1344static void noinline 1732static void noinline ecb_cold
1345evpipe_init (EV_P) 1733evpipe_init (EV_P)
1346{ 1734{
1347 if (!ev_is_active (&pipe_w)) 1735 if (!ev_is_active (&pipe_w))
1348 { 1736 {
1349# if EV_USE_EVENTFD 1737# if EV_USE_EVENTFD
… …
1371 ev_io_start (EV_A_ &pipe_w); 1759 ev_io_start (EV_A_ &pipe_w);
1372 ev_unref (EV_A); /* watcher should not keep loop alive */ 1760 ev_unref (EV_A); /* watcher should not keep loop alive */
1373 } 1761 }
1374} 1762}
1375 1763
1376inline_size void 1764inline_speed void
1377evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1765evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1378{ 1766{
1379 if (!*flag) 1767 if (expect_true (*flag))
1768 return;
1769
1770 *flag = 1;
1771
1772 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1773
1774 pipe_write_skipped = 1;
1775
1776 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1777
1778 if (pipe_write_wanted)
1380 { 1779 {
1780 int old_errno;
1781
1782 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1783
1381 int old_errno = errno; /* save errno because write might clobber it */ 1784 old_errno = errno; /* save errno because write will clobber it */
1382 char dummy;
1383
1384 *flag = 1;
1385 1785
1386#if EV_USE_EVENTFD 1786#if EV_USE_EVENTFD
1387 if (evfd >= 0) 1787 if (evfd >= 0)
1388 { 1788 {
1389 uint64_t counter = 1; 1789 uint64_t counter = 1;
1390 write (evfd, &counter, sizeof (uint64_t)); 1790 write (evfd, &counter, sizeof (uint64_t));
1391 } 1791 }
1392 else 1792 else
1393#endif 1793#endif
1794 {
1394 /* win32 people keep sending patches that change this write() to send() */ 1795 /* 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 */ 1796 /* 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 */ 1797 /* 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 */ 1798 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */ 1799 /* tell me. thank you. */
1399 write (evpipe [1], &dummy, 1); 1800 write (evpipe [1], &(evpipe [1]), 1);
1801 }
1400 1802
1401 errno = old_errno; 1803 errno = old_errno;
1402 } 1804 }
1403} 1805}
1404 1806
… …
1407static void 1809static void
1408pipecb (EV_P_ ev_io *iow, int revents) 1810pipecb (EV_P_ ev_io *iow, int revents)
1409{ 1811{
1410 int i; 1812 int i;
1411 1813
1814 if (revents & EV_READ)
1815 {
1412#if EV_USE_EVENTFD 1816#if EV_USE_EVENTFD
1413 if (evfd >= 0) 1817 if (evfd >= 0)
1414 { 1818 {
1415 uint64_t counter; 1819 uint64_t counter;
1416 read (evfd, &counter, sizeof (uint64_t)); 1820 read (evfd, &counter, sizeof (uint64_t));
1417 } 1821 }
1418 else 1822 else
1419#endif 1823#endif
1420 { 1824 {
1421 char dummy; 1825 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1826 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1423 read (evpipe [0], &dummy, 1); 1827 read (evpipe [0], &dummy, 1);
1828 }
1424 } 1829 }
1830
1831 pipe_write_skipped = 0;
1425 1832
1426#if EV_SIGNAL_ENABLE 1833#if EV_SIGNAL_ENABLE
1427 if (sig_pending) 1834 if (sig_pending)
1428 { 1835 {
1429 sig_pending = 0; 1836 sig_pending = 0;
… …
1458 EV_P = signals [signum - 1].loop; 1865 EV_P = signals [signum - 1].loop;
1459 1866
1460 if (!EV_A) 1867 if (!EV_A)
1461 return; 1868 return;
1462#endif 1869#endif
1870
1871 if (!ev_active (&pipe_w))
1872 return;
1463 1873
1464 signals [signum - 1].pending = 1; 1874 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending); 1875 evpipe_write (EV_A_ &sig_pending);
1466} 1876}
1467 1877
… …
1599#endif 2009#endif
1600#if EV_USE_SELECT 2010#if EV_USE_SELECT
1601# include "ev_select.c" 2011# include "ev_select.c"
1602#endif 2012#endif
1603 2013
1604int 2014int ecb_cold
1605ev_version_major (void) 2015ev_version_major (void)
1606{ 2016{
1607 return EV_VERSION_MAJOR; 2017 return EV_VERSION_MAJOR;
1608} 2018}
1609 2019
1610int 2020int ecb_cold
1611ev_version_minor (void) 2021ev_version_minor (void)
1612{ 2022{
1613 return EV_VERSION_MINOR; 2023 return EV_VERSION_MINOR;
1614} 2024}
1615 2025
1616/* return true if we are running with elevated privileges and should ignore env variables */ 2026/* return true if we are running with elevated privileges and should ignore env variables */
1617int inline_size 2027int inline_size ecb_cold
1618enable_secure (void) 2028enable_secure (void)
1619{ 2029{
1620#ifdef _WIN32 2030#ifdef _WIN32
1621 return 0; 2031 return 0;
1622#else 2032#else
1623 return getuid () != geteuid () 2033 return getuid () != geteuid ()
1624 || getgid () != getegid (); 2034 || getgid () != getegid ();
1625#endif 2035#endif
1626} 2036}
1627 2037
1628unsigned int 2038unsigned int ecb_cold
1629ev_supported_backends (void) 2039ev_supported_backends (void)
1630{ 2040{
1631 unsigned int flags = 0; 2041 unsigned int flags = 0;
1632 2042
1633 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 2043 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1637 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 2047 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1638 2048
1639 return flags; 2049 return flags;
1640} 2050}
1641 2051
1642unsigned int 2052unsigned int ecb_cold
1643ev_recommended_backends (void) 2053ev_recommended_backends (void)
1644{ 2054{
1645 unsigned int flags = ev_supported_backends (); 2055 unsigned int flags = ev_supported_backends ();
1646 2056
1647#ifndef __NetBSD__ 2057#ifndef __NetBSD__
… …
1659#endif 2069#endif
1660 2070
1661 return flags; 2071 return flags;
1662} 2072}
1663 2073
1664unsigned int 2074unsigned int ecb_cold
1665ev_embeddable_backends (void) 2075ev_embeddable_backends (void)
1666{ 2076{
1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 2077 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1668 2078
1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 2079 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1714ev_userdata (EV_P) 2124ev_userdata (EV_P)
1715{ 2125{
1716 return userdata; 2126 return userdata;
1717} 2127}
1718 2128
2129void
1719void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 2130ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1720{ 2131{
1721 invoke_cb = invoke_pending_cb; 2132 invoke_cb = invoke_pending_cb;
1722} 2133}
1723 2134
2135void
1724void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 2136ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1725{ 2137{
1726 release_cb = release; 2138 release_cb = release;
1727 acquire_cb = acquire; 2139 acquire_cb = acquire;
1728} 2140}
1729#endif 2141#endif
1730 2142
1731/* initialise a loop structure, must be zero-initialised */ 2143/* initialise a loop structure, must be zero-initialised */
1732static void noinline 2144static void noinline ecb_cold
1733loop_init (EV_P_ unsigned int flags) 2145loop_init (EV_P_ unsigned int flags)
1734{ 2146{
1735 if (!backend) 2147 if (!backend)
1736 { 2148 {
1737 origflags = flags; 2149 origflags = flags;
… …
1765 if (!(flags & EVFLAG_NOENV) 2177 if (!(flags & EVFLAG_NOENV)
1766 && !enable_secure () 2178 && !enable_secure ()
1767 && getenv ("LIBEV_FLAGS")) 2179 && getenv ("LIBEV_FLAGS"))
1768 flags = atoi (getenv ("LIBEV_FLAGS")); 2180 flags = atoi (getenv ("LIBEV_FLAGS"));
1769 2181
1770 ev_rt_now = ev_time (); 2182 ev_rt_now = ev_time ();
1771 mn_now = get_clock (); 2183 mn_now = get_clock ();
1772 now_floor = mn_now; 2184 now_floor = mn_now;
1773 rtmn_diff = ev_rt_now - mn_now; 2185 rtmn_diff = ev_rt_now - mn_now;
1774#if EV_FEATURE_API 2186#if EV_FEATURE_API
1775 invoke_cb = ev_invoke_pending; 2187 invoke_cb = ev_invoke_pending;
1776#endif 2188#endif
1777 2189
1778 io_blocktime = 0.; 2190 io_blocktime = 0.;
1779 timeout_blocktime = 0.; 2191 timeout_blocktime = 0.;
1780 backend = 0; 2192 backend = 0;
1781 backend_fd = -1; 2193 backend_fd = -1;
1782 sig_pending = 0; 2194 sig_pending = 0;
1783#if EV_ASYNC_ENABLE 2195#if EV_ASYNC_ENABLE
1784 async_pending = 0; 2196 async_pending = 0;
1785#endif 2197#endif
2198 pipe_write_skipped = 0;
2199 pipe_write_wanted = 0;
1786#if EV_USE_INOTIFY 2200#if EV_USE_INOTIFY
1787 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2201 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1788#endif 2202#endif
1789#if EV_USE_SIGNALFD 2203#if EV_USE_SIGNALFD
1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2204 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1791#endif 2205#endif
1792 2206
1793 if (!(flags & EVBACKEND_MASK)) 2207 if (!(flags & EVBACKEND_MASK))
1794 flags |= ev_recommended_backends (); 2208 flags |= ev_recommended_backends ();
1795 2209
… …
1820#endif 2234#endif
1821 } 2235 }
1822} 2236}
1823 2237
1824/* free up a loop structure */ 2238/* free up a loop structure */
1825void 2239void ecb_cold
1826ev_loop_destroy (EV_P) 2240ev_loop_destroy (EV_P)
1827{ 2241{
1828 int i; 2242 int i;
1829 2243
1830#if EV_MULTIPLICITY 2244#if EV_MULTIPLICITY
… …
1960 infy_fork (EV_A); 2374 infy_fork (EV_A);
1961#endif 2375#endif
1962 2376
1963 if (ev_is_active (&pipe_w)) 2377 if (ev_is_active (&pipe_w))
1964 { 2378 {
1965 /* this "locks" the handlers against writing to the pipe */ 2379 /* 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 2380
1972 ev_ref (EV_A); 2381 ev_ref (EV_A);
1973 ev_io_stop (EV_A_ &pipe_w); 2382 ev_io_stop (EV_A_ &pipe_w);
1974 2383
1975#if EV_USE_EVENTFD 2384#if EV_USE_EVENTFD
… …
1993 postfork = 0; 2402 postfork = 0;
1994} 2403}
1995 2404
1996#if EV_MULTIPLICITY 2405#if EV_MULTIPLICITY
1997 2406
1998struct ev_loop * 2407struct ev_loop * ecb_cold
1999ev_loop_new (unsigned int flags) 2408ev_loop_new (unsigned int flags)
2000{ 2409{
2001 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2410 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2002 2411
2003 memset (EV_A, 0, sizeof (struct ev_loop)); 2412 memset (EV_A, 0, sizeof (struct ev_loop));
… …
2011} 2420}
2012 2421
2013#endif /* multiplicity */ 2422#endif /* multiplicity */
2014 2423
2015#if EV_VERIFY 2424#if EV_VERIFY
2016static void noinline 2425static void noinline ecb_cold
2017verify_watcher (EV_P_ W w) 2426verify_watcher (EV_P_ W w)
2018{ 2427{
2019 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2428 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2020 2429
2021 if (w->pending) 2430 if (w->pending)
2022 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2431 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2023} 2432}
2024 2433
2025static void noinline 2434static void noinline ecb_cold
2026verify_heap (EV_P_ ANHE *heap, int N) 2435verify_heap (EV_P_ ANHE *heap, int N)
2027{ 2436{
2028 int i; 2437 int i;
2029 2438
2030 for (i = HEAP0; i < N + HEAP0; ++i) 2439 for (i = HEAP0; i < N + HEAP0; ++i)
… …
2035 2444
2036 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2445 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2037 } 2446 }
2038} 2447}
2039 2448
2040static void noinline 2449static void noinline ecb_cold
2041array_verify (EV_P_ W *ws, int cnt) 2450array_verify (EV_P_ W *ws, int cnt)
2042{ 2451{
2043 while (cnt--) 2452 while (cnt--)
2044 { 2453 {
2045 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2454 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
2047 } 2456 }
2048} 2457}
2049#endif 2458#endif
2050 2459
2051#if EV_FEATURE_API 2460#if EV_FEATURE_API
2052void 2461void ecb_cold
2053ev_verify (EV_P) 2462ev_verify (EV_P)
2054{ 2463{
2055#if EV_VERIFY 2464#if EV_VERIFY
2056 int i; 2465 int i;
2057 WL w; 2466 WL w;
… …
2123#endif 2532#endif
2124} 2533}
2125#endif 2534#endif
2126 2535
2127#if EV_MULTIPLICITY 2536#if EV_MULTIPLICITY
2128struct ev_loop * 2537struct ev_loop * ecb_cold
2129#else 2538#else
2130int 2539int
2131#endif 2540#endif
2132ev_default_loop (unsigned int flags) 2541ev_default_loop (unsigned int flags)
2133{ 2542{
… …
2332 } 2741 }
2333} 2742}
2334 2743
2335/* simply recalculate all periodics */ 2744/* simply recalculate all periodics */
2336/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2745/* TODO: maybe ensure that at least one event happens when jumping forward? */
2337static void noinline 2746static void noinline ecb_cold
2338periodics_reschedule (EV_P) 2747periodics_reschedule (EV_P)
2339{ 2748{
2340 int i; 2749 int i;
2341 2750
2342 /* adjust periodics after time jump */ 2751 /* adjust periodics after time jump */
… …
2355 reheap (periodics, periodiccnt); 2764 reheap (periodics, periodiccnt);
2356} 2765}
2357#endif 2766#endif
2358 2767
2359/* adjust all timers by a given offset */ 2768/* adjust all timers by a given offset */
2360static void noinline 2769static void noinline ecb_cold
2361timers_reschedule (EV_P_ ev_tstamp adjust) 2770timers_reschedule (EV_P_ ev_tstamp adjust)
2362{ 2771{
2363 int i; 2772 int i;
2364 2773
2365 for (i = 0; i < timercnt; ++i) 2774 for (i = 0; i < timercnt; ++i)
… …
2507 ev_tstamp prev_mn_now = mn_now; 2916 ev_tstamp prev_mn_now = mn_now;
2508 2917
2509 /* update time to cancel out callback processing overhead */ 2918 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100); 2919 time_update (EV_A_ 1e100);
2511 2920
2921 /* from now on, we want a pipe-wake-up */
2922 pipe_write_wanted = 1;
2923
2924 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2925
2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2926 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2513 { 2927 {
2514 waittime = MAX_BLOCKTIME; 2928 waittime = MAX_BLOCKTIME;
2515 2929
2516 if (timercnt) 2930 if (timercnt)
2517 { 2931 {
2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2932 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2519 if (waittime > to) waittime = to; 2933 if (waittime > to) waittime = to;
2520 } 2934 }
2521 2935
2522#if EV_PERIODIC_ENABLE 2936#if EV_PERIODIC_ENABLE
2523 if (periodiccnt) 2937 if (periodiccnt)
2524 { 2938 {
2525 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2939 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2526 if (waittime > to) waittime = to; 2940 if (waittime > to) waittime = to;
2527 } 2941 }
2528#endif 2942#endif
2529 2943
2530 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2944 /* don't let timeouts decrease the waittime below timeout_blocktime */
2531 if (expect_false (waittime < timeout_blocktime)) 2945 if (expect_false (waittime < timeout_blocktime))
2532 waittime = timeout_blocktime; 2946 waittime = timeout_blocktime;
2947
2948 /* at this point, we NEED to wait, so we have to ensure */
2949 /* to pass a minimum nonzero value to the backend */
2950 if (expect_false (waittime < backend_mintime))
2951 waittime = backend_mintime;
2533 2952
2534 /* extra check because io_blocktime is commonly 0 */ 2953 /* extra check because io_blocktime is commonly 0 */
2535 if (expect_false (io_blocktime)) 2954 if (expect_false (io_blocktime))
2536 { 2955 {
2537 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2956 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2538 2957
2539 if (sleeptime > waittime - backend_fudge) 2958 if (sleeptime > waittime - backend_mintime)
2540 sleeptime = waittime - backend_fudge; 2959 sleeptime = waittime - backend_mintime;
2541 2960
2542 if (expect_true (sleeptime > 0.)) 2961 if (expect_true (sleeptime > 0.))
2543 { 2962 {
2544 ev_sleep (sleeptime); 2963 ev_sleep (sleeptime);
2545 waittime -= sleeptime; 2964 waittime -= sleeptime;
… …
2551 ++loop_count; 2970 ++loop_count;
2552#endif 2971#endif
2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2972 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2554 backend_poll (EV_A_ waittime); 2973 backend_poll (EV_A_ waittime);
2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2974 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2975
2976 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2977
2978 if (pipe_write_skipped)
2979 {
2980 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2981 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2982 }
2983
2556 2984
2557 /* update ev_rt_now, do magic */ 2985 /* update ev_rt_now, do magic */
2558 time_update (EV_A_ waittime + sleeptime); 2986 time_update (EV_A_ waittime + sleeptime);
2559 } 2987 }
2560 2988
… …
3214 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3642 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3215 ofs += sizeof (struct inotify_event) + ev->len; 3643 ofs += sizeof (struct inotify_event) + ev->len;
3216 } 3644 }
3217} 3645}
3218 3646
3219inline_size void 3647inline_size void ecb_cold
3220ev_check_2625 (EV_P) 3648ev_check_2625 (EV_P)
3221{ 3649{
3222 /* kernels < 2.6.25 are borked 3650 /* kernels < 2.6.25 are borked
3223 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3651 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3224 */ 3652 */
… …
3849} 4277}
3850 4278
3851/*****************************************************************************/ 4279/*****************************************************************************/
3852 4280
3853#if EV_WALK_ENABLE 4281#if EV_WALK_ENABLE
3854void 4282void ecb_cold
3855ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 4283ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3856{ 4284{
3857 int i, j; 4285 int i, j;
3858 ev_watcher_list *wl, *wn; 4286 ev_watcher_list *wl, *wn;
3859 4287
… …
3903 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4331 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3904#endif 4332#endif
3905 4333
3906#if EV_IDLE_ENABLE 4334#if EV_IDLE_ENABLE
3907 if (types & EV_IDLE) 4335 if (types & EV_IDLE)
3908 for (j = NUMPRI; i--; ) 4336 for (j = NUMPRI; j--; )
3909 for (i = idlecnt [j]; i--; ) 4337 for (i = idlecnt [j]; i--; )
3910 cb (EV_A_ EV_IDLE, idles [j][i]); 4338 cb (EV_A_ EV_IDLE, idles [j][i]);
3911#endif 4339#endif
3912 4340
3913#if EV_FORK_ENABLE 4341#if EV_FORK_ENABLE

Diff Legend

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