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

Comparing libev/ev.c (file contents):
Revision 1.428 by root, Tue May 8 15:44:09 2012 UTC vs.
Revision 1.460 by root, Tue Oct 29 12:53:38 2013 UTC

… …
201# include <sys/wait.h> 201# include <sys/wait.h>
202# include <unistd.h> 202# include <unistd.h>
203#else 203#else
204# include <io.h> 204# include <io.h>
205# define WIN32_LEAN_AND_MEAN 205# define WIN32_LEAN_AND_MEAN
206# include <winsock2.h>
206# include <windows.h> 207# include <windows.h>
207# include <winsock2.h>
208# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
209# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
210# endif 210# endif
211# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
212#endif 212#endif
… …
241#elif defined SIGARRAYSIZE 241#elif defined SIGARRAYSIZE
242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
243#elif defined _sys_nsig 243#elif defined _sys_nsig
244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
245#else 245#else
246# error "unable to find value for NSIG, please report" 246# define EV_NSIG (8 * sizeof (sigset_t) + 1)
247/* to make it compile regardless, just remove the above line, */
248/* but consider reporting it, too! :) */
249# define EV_NSIG 65
250#endif 247#endif
251 248
252#ifndef EV_USE_FLOOR 249#ifndef EV_USE_FLOOR
253# define EV_USE_FLOOR 0 250# define EV_USE_FLOOR 0
254#endif 251#endif
255 252
256#ifndef EV_USE_CLOCK_SYSCALL 253#ifndef EV_USE_CLOCK_SYSCALL
257# if __linux && __GLIBC__ >= 2 254# if __linux && __GLIBC__ == 2 && __GLIBC_MINOR__ < 17
258# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 255# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
259# else 256# else
260# define EV_USE_CLOCK_SYSCALL 0 257# define EV_USE_CLOCK_SYSCALL 0
261# endif 258# endif
262#endif 259#endif
… …
355# define EV_USE_4HEAP EV_FEATURE_DATA 352# define EV_USE_4HEAP EV_FEATURE_DATA
356#endif 353#endif
357 354
358#ifndef EV_HEAP_CACHE_AT 355#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 356# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
357#endif
358
359#ifdef ANDROID
360/* supposedly, android doesn't typedef fd_mask */
361# undef EV_USE_SELECT
362# define EV_USE_SELECT 0
363/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
364# undef EV_USE_CLOCK_SYSCALL
365# define EV_USE_CLOCK_SYSCALL 0
366#endif
367
368/* aix's poll.h seems to cause lots of trouble */
369#ifdef _AIX
370/* AIX has a completely broken poll.h header */
371# undef EV_USE_POLL
372# define EV_USE_POLL 0
360#endif 373#endif
361 374
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 375/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
363/* which makes programs even slower. might work on other unices, too. */ 376/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 377#if EV_USE_CLOCK_SYSCALL
… …
373# endif 386# endif
374#endif 387#endif
375 388
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 389/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377 390
378#ifdef _AIX
379/* AIX has a completely broken poll.h header */
380# undef EV_USE_POLL
381# define EV_USE_POLL 0
382#endif
383
384#ifndef CLOCK_MONOTONIC 391#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 392# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 393# define EV_USE_MONOTONIC 0
387#endif 394#endif
388 395
… …
409/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 416/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
410# ifndef IN_DONT_FOLLOW 417# ifndef IN_DONT_FOLLOW
411# undef EV_USE_INOTIFY 418# undef EV_USE_INOTIFY
412# define EV_USE_INOTIFY 0 419# define EV_USE_INOTIFY 0
413# endif 420# endif
414#endif
415
416#if EV_SELECT_IS_WINSOCKET
417# include <winsock.h>
418#endif 421#endif
419 422
420#if EV_USE_EVENTFD 423#if EV_USE_EVENTFD
421/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 424/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
422# include <stdint.h> 425# include <stdint.h>
… …
508 */ 511 */
509 512
510#ifndef ECB_H 513#ifndef ECB_H
511#define ECB_H 514#define ECB_H
512 515
516/* 16 bits major, 16 bits minor */
517#define ECB_VERSION 0x00010003
518
513#ifdef _WIN32 519#ifdef _WIN32
514 typedef signed char int8_t; 520 typedef signed char int8_t;
515 typedef unsigned char uint8_t; 521 typedef unsigned char uint8_t;
516 typedef signed short int16_t; 522 typedef signed short int16_t;
517 typedef unsigned short uint16_t; 523 typedef unsigned short uint16_t;
… …
522 typedef unsigned long long uint64_t; 528 typedef unsigned long long uint64_t;
523 #else /* _MSC_VER || __BORLANDC__ */ 529 #else /* _MSC_VER || __BORLANDC__ */
524 typedef signed __int64 int64_t; 530 typedef signed __int64 int64_t;
525 typedef unsigned __int64 uint64_t; 531 typedef unsigned __int64 uint64_t;
526 #endif 532 #endif
533 #ifdef _WIN64
534 #define ECB_PTRSIZE 8
535 typedef uint64_t uintptr_t;
536 typedef int64_t intptr_t;
537 #else
538 #define ECB_PTRSIZE 4
539 typedef uint32_t uintptr_t;
540 typedef int32_t intptr_t;
541 #endif
527#else 542#else
528 #include <inttypes.h> 543 #include <inttypes.h>
544 #if UINTMAX_MAX > 0xffffffffU
545 #define ECB_PTRSIZE 8
546 #else
547 #define ECB_PTRSIZE 4
548 #endif
549#endif
550
551/* work around x32 idiocy by defining proper macros */
552#if __x86_64 || _M_AMD64
553 #if _ILP32
554 #define ECB_AMD64_X32 1
555 #else
556 #define ECB_AMD64 1
557 #endif
529#endif 558#endif
530 559
531/* many compilers define _GNUC_ to some versions but then only implement 560/* many compilers define _GNUC_ to some versions but then only implement
532 * what their idiot authors think are the "more important" extensions, 561 * what their idiot authors think are the "more important" extensions,
533 * causing enormous grief in return for some better fake benchmark numbers. 562 * causing enormous grief in return for some better fake benchmark numbers.
… …
541 #else 570 #else
542 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 571 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
543 #endif 572 #endif
544#endif 573#endif
545 574
575#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
576#define ECB_C99 (__STDC_VERSION__ >= 199901L)
577#define ECB_C11 (__STDC_VERSION__ >= 201112L)
578#define ECB_CPP (__cplusplus+0)
579#define ECB_CPP11 (__cplusplus >= 201103L)
580
581#if ECB_CPP
582 #define ECB_EXTERN_C extern "C"
583 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
584 #define ECB_EXTERN_C_END }
585#else
586 #define ECB_EXTERN_C extern
587 #define ECB_EXTERN_C_BEG
588 #define ECB_EXTERN_C_END
589#endif
590
546/*****************************************************************************/ 591/*****************************************************************************/
547 592
548/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 593/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
549/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 594/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
550 595
551#if ECB_NO_THREADS 596#if ECB_NO_THREADS
552# define ECB_NO_SMP 1 597 #define ECB_NO_SMP 1
553#endif 598#endif
554 599
555#if ECB_NO_THREADS || ECB_NO_SMP 600#if ECB_NO_SMP
556 #define ECB_MEMORY_FENCE do { } while (0) 601 #define ECB_MEMORY_FENCE do { } while (0)
557#endif 602#endif
558 603
559#ifndef ECB_MEMORY_FENCE 604#ifndef ECB_MEMORY_FENCE
560 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 605 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
561 #if __i386 || __i386__ 606 #if __i386 || __i386__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 608 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 610 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 612 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
568 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 613 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
569 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 614 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
570 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 615 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
571 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 616 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
572 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 617 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
573 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 618 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
574 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 619 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
575 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 620 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
576 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 621 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
577 #elif __sparc || __sparc__ 622 #elif __sparc || __sparc__
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 623 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 624 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
580 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 625 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
581 #elif defined __s390__ || defined __s390x__ 626 #elif defined __s390__ || defined __s390x__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 627 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
583 #elif defined __mips__ 628 #elif defined __mips__
629 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
630 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
584 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 631 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
585 #elif defined __alpha__ 632 #elif defined __alpha__
586 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 633 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
634 #elif defined __hppa__
635 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
636 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
637 #elif defined __ia64__
638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
639 #elif defined __m68k__
640 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
641 #elif defined __m88k__
642 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
643 #elif defined __sh__
644 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
587 #endif 645 #endif
588 #endif 646 #endif
589#endif 647#endif
590 648
591#ifndef ECB_MEMORY_FENCE 649#ifndef ECB_MEMORY_FENCE
650 #if ECB_GCC_VERSION(4,7)
651 /* see comment below (stdatomic.h) about the C11 memory model. */
652 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
653
654 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
655 * without risking compile time errors with other compilers. We *could*
656 * define our own ecb_clang_has_feature, but I just can't be bothered to work
657 * around this shit time and again.
658 * #elif defined __clang && __has_feature (cxx_atomic)
659 * // see comment below (stdatomic.h) about the C11 memory model.
660 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
661 */
662
592 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 663 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
593 #define ECB_MEMORY_FENCE __sync_synchronize () 664 #define ECB_MEMORY_FENCE __sync_synchronize ()
594 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
595 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
596 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 665 #elif _MSC_VER >= 1400 /* VC++ 2005 */
597 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 666 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
598 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 667 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
599 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 668 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
600 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 669 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
610 #define ECB_MEMORY_FENCE __sync () 679 #define ECB_MEMORY_FENCE __sync ()
611 #endif 680 #endif
612#endif 681#endif
613 682
614#ifndef ECB_MEMORY_FENCE 683#ifndef ECB_MEMORY_FENCE
684 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
685 /* we assume that these memory fences work on all variables/all memory accesses, */
686 /* not just C11 atomics and atomic accesses */
687 #include <stdatomic.h>
688 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
689 /* any fence other than seq_cst, which isn't very efficient for us. */
690 /* Why that is, we don't know - either the C11 memory model is quite useless */
691 /* for most usages, or gcc and clang have a bug */
692 /* I *currently* lean towards the latter, and inefficiently implement */
693 /* all three of ecb's fences as a seq_cst fence */
694 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
695 #endif
696#endif
697
698#ifndef ECB_MEMORY_FENCE
615 #if !ECB_AVOID_PTHREADS 699 #if !ECB_AVOID_PTHREADS
616 /* 700 /*
617 * if you get undefined symbol references to pthread_mutex_lock, 701 * if you get undefined symbol references to pthread_mutex_lock,
618 * or failure to find pthread.h, then you should implement 702 * or failure to find pthread.h, then you should implement
619 * the ECB_MEMORY_FENCE operations for your cpu/compiler 703 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
637 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 721 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
638#endif 722#endif
639 723
640/*****************************************************************************/ 724/*****************************************************************************/
641 725
642#define ECB_C99 (__STDC_VERSION__ >= 199901L)
643
644#if __cplusplus 726#if __cplusplus
645 #define ecb_inline static inline 727 #define ecb_inline static inline
646#elif ECB_GCC_VERSION(2,5) 728#elif ECB_GCC_VERSION(2,5)
647 #define ecb_inline static __inline__ 729 #define ecb_inline static __inline__
648#elif ECB_C99 730#elif ECB_C99
… …
686#elif ECB_GCC_VERSION(3,0) 768#elif ECB_GCC_VERSION(3,0)
687 #define ecb_decltype(x) __typeof(x) 769 #define ecb_decltype(x) __typeof(x)
688#endif 770#endif
689 771
690#define ecb_noinline ecb_attribute ((__noinline__)) 772#define ecb_noinline ecb_attribute ((__noinline__))
691#define ecb_noreturn ecb_attribute ((__noreturn__))
692#define ecb_unused ecb_attribute ((__unused__)) 773#define ecb_unused ecb_attribute ((__unused__))
693#define ecb_const ecb_attribute ((__const__)) 774#define ecb_const ecb_attribute ((__const__))
694#define ecb_pure ecb_attribute ((__pure__)) 775#define ecb_pure ecb_attribute ((__pure__))
776
777#if ECB_C11
778 #define ecb_noreturn _Noreturn
779#else
780 #define ecb_noreturn ecb_attribute ((__noreturn__))
781#endif
695 782
696#if ECB_GCC_VERSION(4,3) 783#if ECB_GCC_VERSION(4,3)
697 #define ecb_artificial ecb_attribute ((__artificial__)) 784 #define ecb_artificial ecb_attribute ((__artificial__))
698 #define ecb_hot ecb_attribute ((__hot__)) 785 #define ecb_hot ecb_attribute ((__hot__))
699 #define ecb_cold ecb_attribute ((__cold__)) 786 #define ecb_cold ecb_attribute ((__cold__))
… …
790 877
791 return r + ecb_ld32 (x); 878 return r + ecb_ld32 (x);
792 } 879 }
793#endif 880#endif
794 881
882ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
883ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
884ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
885ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
886
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 887ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
796ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 888ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
797{ 889{
798 return ( (x * 0x0802U & 0x22110U) 890 return ( (x * 0x0802U & 0x22110U)
799 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 891 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
883 ecb_inline void ecb_unreachable (void) ecb_noreturn; 975 ecb_inline void ecb_unreachable (void) ecb_noreturn;
884 ecb_inline void ecb_unreachable (void) { } 976 ecb_inline void ecb_unreachable (void) { }
885#endif 977#endif
886 978
887/* try to tell the compiler that some condition is definitely true */ 979/* try to tell the compiler that some condition is definitely true */
888#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 980#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
889 981
890ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 982ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
891ecb_inline unsigned char 983ecb_inline unsigned char
892ecb_byteorder_helper (void) 984ecb_byteorder_helper (void)
893{ 985{
894 const uint32_t u = 0x11223344; 986 /* the union code still generates code under pressure in gcc, */
895 return *(unsigned char *)&u; 987 /* but less than using pointers, and always seems to */
988 /* successfully return a constant. */
989 /* the reason why we have this horrible preprocessor mess */
990 /* is to avoid it in all cases, at least on common architectures */
991 /* or when using a recent enough gcc version (>= 4.6) */
992#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
993 return 0x44;
994#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
995 return 0x44;
996#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
997 return 0x11;
998#else
999 union
1000 {
1001 uint32_t i;
1002 uint8_t c;
1003 } u = { 0x11223344 };
1004 return u.c;
1005#endif
896} 1006}
897 1007
898ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1008ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
899ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1009ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
900ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1010ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
931 } 1041 }
932#else 1042#else
933 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1043 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
934#endif 1044#endif
935 1045
1046/*******************************************************************************/
1047/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1048
1049/* basically, everything uses "ieee pure-endian" floating point numbers */
1050/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1051#if 0 \
1052 || __i386 || __i386__ \
1053 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1054 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1055 || defined __arm__ && defined __ARM_EABI__ \
1056 || defined __s390__ || defined __s390x__ \
1057 || defined __mips__ \
1058 || defined __alpha__ \
1059 || defined __hppa__ \
1060 || defined __ia64__ \
1061 || defined __m68k__ \
1062 || defined __m88k__ \
1063 || defined __sh__ \
1064 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1065 #define ECB_STDFP 1
1066 #include <string.h> /* for memcpy */
1067#else
1068 #define ECB_STDFP 0
1069#endif
1070
1071#ifndef ECB_NO_LIBM
1072
1073 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1074
1075 #ifdef NEN
1076 #define ECB_NAN NAN
1077 #else
1078 #define ECB_NAN INFINITY
1079 #endif
1080
1081 /* converts an ieee half/binary16 to a float */
1082 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
1083 ecb_function_ float
1084 ecb_binary16_to_float (uint16_t x)
1085 {
1086 int e = (x >> 10) & 0x1f;
1087 int m = x & 0x3ff;
1088 float r;
1089
1090 if (!e ) r = ldexpf (m , -24);
1091 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
1092 else if (m ) r = ECB_NAN;
1093 else r = INFINITY;
1094
1095 return x & 0x8000 ? -r : r;
1096 }
1097
1098 /* convert a float to ieee single/binary32 */
1099 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1100 ecb_function_ uint32_t
1101 ecb_float_to_binary32 (float x)
1102 {
1103 uint32_t r;
1104
1105 #if ECB_STDFP
1106 memcpy (&r, &x, 4);
1107 #else
1108 /* slow emulation, works for anything but -0 */
1109 uint32_t m;
1110 int e;
1111
1112 if (x == 0e0f ) return 0x00000000U;
1113 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1114 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1115 if (x != x ) return 0x7fbfffffU;
1116
1117 m = frexpf (x, &e) * 0x1000000U;
1118
1119 r = m & 0x80000000U;
1120
1121 if (r)
1122 m = -m;
1123
1124 if (e <= -126)
1125 {
1126 m &= 0xffffffU;
1127 m >>= (-125 - e);
1128 e = -126;
1129 }
1130
1131 r |= (e + 126) << 23;
1132 r |= m & 0x7fffffU;
1133 #endif
1134
1135 return r;
1136 }
1137
1138 /* converts an ieee single/binary32 to a float */
1139 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1140 ecb_function_ float
1141 ecb_binary32_to_float (uint32_t x)
1142 {
1143 float r;
1144
1145 #if ECB_STDFP
1146 memcpy (&r, &x, 4);
1147 #else
1148 /* emulation, only works for normals and subnormals and +0 */
1149 int neg = x >> 31;
1150 int e = (x >> 23) & 0xffU;
1151
1152 x &= 0x7fffffU;
1153
1154 if (e)
1155 x |= 0x800000U;
1156 else
1157 e = 1;
1158
1159 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1160 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1161
1162 r = neg ? -r : r;
1163 #endif
1164
1165 return r;
1166 }
1167
1168 /* convert a double to ieee double/binary64 */
1169 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1170 ecb_function_ uint64_t
1171 ecb_double_to_binary64 (double x)
1172 {
1173 uint64_t r;
1174
1175 #if ECB_STDFP
1176 memcpy (&r, &x, 8);
1177 #else
1178 /* slow emulation, works for anything but -0 */
1179 uint64_t m;
1180 int e;
1181
1182 if (x == 0e0 ) return 0x0000000000000000U;
1183 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1184 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1185 if (x != x ) return 0X7ff7ffffffffffffU;
1186
1187 m = frexp (x, &e) * 0x20000000000000U;
1188
1189 r = m & 0x8000000000000000;;
1190
1191 if (r)
1192 m = -m;
1193
1194 if (e <= -1022)
1195 {
1196 m &= 0x1fffffffffffffU;
1197 m >>= (-1021 - e);
1198 e = -1022;
1199 }
1200
1201 r |= ((uint64_t)(e + 1022)) << 52;
1202 r |= m & 0xfffffffffffffU;
1203 #endif
1204
1205 return r;
1206 }
1207
1208 /* converts an ieee double/binary64 to a double */
1209 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1210 ecb_function_ double
1211 ecb_binary64_to_double (uint64_t x)
1212 {
1213 double r;
1214
1215 #if ECB_STDFP
1216 memcpy (&r, &x, 8);
1217 #else
1218 /* emulation, only works for normals and subnormals and +0 */
1219 int neg = x >> 63;
1220 int e = (x >> 52) & 0x7ffU;
1221
1222 x &= 0xfffffffffffffU;
1223
1224 if (e)
1225 x |= 0x10000000000000U;
1226 else
1227 e = 1;
1228
1229 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1230 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1231
1232 r = neg ? -r : r;
1233 #endif
1234
1235 return r;
1236 }
1237
1238#endif
1239
936#endif 1240#endif
937 1241
938/* ECB.H END */ 1242/* ECB.H END */
939 1243
940#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1244#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1109#endif 1413#endif
1110 1414
1111static void (*syserr_cb)(const char *msg) EV_THROW; 1415static void (*syserr_cb)(const char *msg) EV_THROW;
1112 1416
1113void ecb_cold 1417void ecb_cold
1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1418ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1115{ 1419{
1116 syserr_cb = cb; 1420 syserr_cb = cb;
1117} 1421}
1118 1422
1119static void noinline ecb_cold 1423static void noinline ecb_cold
… …
1137 abort (); 1441 abort ();
1138 } 1442 }
1139} 1443}
1140 1444
1141static void * 1445static void *
1142ev_realloc_emul (void *ptr, long size) 1446ev_realloc_emul (void *ptr, long size) EV_THROW
1143{ 1447{
1144#if __GLIBC__
1145 return realloc (ptr, size);
1146#else
1147 /* some systems, notably openbsd and darwin, fail to properly 1448 /* some systems, notably openbsd and darwin, fail to properly
1148 * implement realloc (x, 0) (as required by both ansi c-89 and 1449 * implement realloc (x, 0) (as required by both ansi c-89 and
1149 * the single unix specification, so work around them here. 1450 * the single unix specification, so work around them here.
1451 * recently, also (at least) fedora and debian started breaking it,
1452 * despite documenting it otherwise.
1150 */ 1453 */
1151 1454
1152 if (size) 1455 if (size)
1153 return realloc (ptr, size); 1456 return realloc (ptr, size);
1154 1457
1155 free (ptr); 1458 free (ptr);
1156 return 0; 1459 return 0;
1157#endif
1158} 1460}
1159 1461
1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1462static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1161 1463
1162void ecb_cold 1464void ecb_cold
1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1465ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1164{ 1466{
1165 alloc = cb; 1467 alloc = cb;
1166} 1468}
1167 1469
1168inline_speed void * 1470inline_speed void *
… …
1817static void noinline ecb_cold 2119static void noinline ecb_cold
1818evpipe_init (EV_P) 2120evpipe_init (EV_P)
1819{ 2121{
1820 if (!ev_is_active (&pipe_w)) 2122 if (!ev_is_active (&pipe_w))
1821 { 2123 {
2124 int fds [2];
2125
1822# if EV_USE_EVENTFD 2126# if EV_USE_EVENTFD
2127 fds [0] = -1;
1823 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2128 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1824 if (evfd < 0 && errno == EINVAL) 2129 if (fds [1] < 0 && errno == EINVAL)
1825 evfd = eventfd (0, 0); 2130 fds [1] = eventfd (0, 0);
1826 2131
1827 if (evfd >= 0) 2132 if (fds [1] < 0)
1828 {
1829 evpipe [0] = -1;
1830 fd_intern (evfd); /* doing it twice doesn't hurt */
1831 ev_io_set (&pipe_w, evfd, EV_READ);
1832 }
1833 else
1834# endif 2133# endif
1835 { 2134 {
1836 while (pipe (evpipe)) 2135 while (pipe (fds))
1837 ev_syserr ("(libev) error creating signal/async pipe"); 2136 ev_syserr ("(libev) error creating signal/async pipe");
1838 2137
1839 fd_intern (evpipe [0]); 2138 fd_intern (fds [0]);
1840 fd_intern (evpipe [1]);
1841 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1842 } 2139 }
1843 2140
2141 evpipe [0] = fds [0];
2142
2143 if (evpipe [1] < 0)
2144 evpipe [1] = fds [1]; /* first call, set write fd */
2145 else
2146 {
2147 /* on subsequent calls, do not change evpipe [1] */
2148 /* so that evpipe_write can always rely on its value. */
2149 /* this branch does not do anything sensible on windows, */
2150 /* so must not be executed on windows */
2151
2152 dup2 (fds [1], evpipe [1]);
2153 close (fds [1]);
2154 }
2155
2156 fd_intern (evpipe [1]);
2157
2158 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1844 ev_io_start (EV_A_ &pipe_w); 2159 ev_io_start (EV_A_ &pipe_w);
1845 ev_unref (EV_A); /* watcher should not keep loop alive */ 2160 ev_unref (EV_A); /* watcher should not keep loop alive */
1846 } 2161 }
1847} 2162}
1848 2163
… …
1853 2168
1854 if (expect_true (*flag)) 2169 if (expect_true (*flag))
1855 return; 2170 return;
1856 2171
1857 *flag = 1; 2172 *flag = 1;
1858
1859 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 2173 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1860 2174
1861 pipe_write_skipped = 1; 2175 pipe_write_skipped = 1;
1862 2176
1863 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 2177 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1864 2178
1865 if (pipe_write_wanted) 2179 if (pipe_write_wanted)
1866 { 2180 {
1867 int old_errno; 2181 int old_errno;
1868 2182
1869 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 2183 pipe_write_skipped = 0;
2184 ECB_MEMORY_FENCE_RELEASE;
1870 2185
1871 old_errno = errno; /* save errno because write will clobber it */ 2186 old_errno = errno; /* save errno because write will clobber it */
1872 2187
1873#if EV_USE_EVENTFD 2188#if EV_USE_EVENTFD
1874 if (evfd >= 0) 2189 if (evpipe [0] < 0)
1875 { 2190 {
1876 uint64_t counter = 1; 2191 uint64_t counter = 1;
1877 write (evfd, &counter, sizeof (uint64_t)); 2192 write (evpipe [1], &counter, sizeof (uint64_t));
1878 } 2193 }
1879 else 2194 else
1880#endif 2195#endif
1881 { 2196 {
1882#ifdef _WIN32 2197#ifdef _WIN32
… …
1902 int i; 2217 int i;
1903 2218
1904 if (revents & EV_READ) 2219 if (revents & EV_READ)
1905 { 2220 {
1906#if EV_USE_EVENTFD 2221#if EV_USE_EVENTFD
1907 if (evfd >= 0) 2222 if (evpipe [0] < 0)
1908 { 2223 {
1909 uint64_t counter; 2224 uint64_t counter;
1910 read (evfd, &counter, sizeof (uint64_t)); 2225 read (evpipe [1], &counter, sizeof (uint64_t));
1911 } 2226 }
1912 else 2227 else
1913#endif 2228#endif
1914 { 2229 {
1915 char dummy[4]; 2230 char dummy[4];
1916#ifdef _WIN32 2231#ifdef _WIN32
1917 WSABUF buf; 2232 WSABUF buf;
1918 DWORD recvd; 2233 DWORD recvd;
2234 DWORD flags = 0;
1919 buf.buf = dummy; 2235 buf.buf = dummy;
1920 buf.len = sizeof (dummy); 2236 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 2237 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1922#else 2238#else
1923 read (evpipe [0], &dummy, sizeof (dummy)); 2239 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif 2240#endif
1925 } 2241 }
1926 } 2242 }
… …
1932#if EV_SIGNAL_ENABLE 2248#if EV_SIGNAL_ENABLE
1933 if (sig_pending) 2249 if (sig_pending)
1934 { 2250 {
1935 sig_pending = 0; 2251 sig_pending = 0;
1936 2252
1937 ECB_MEMORY_FENCE_RELEASE; 2253 ECB_MEMORY_FENCE;
1938 2254
1939 for (i = EV_NSIG - 1; i--; ) 2255 for (i = EV_NSIG - 1; i--; )
1940 if (expect_false (signals [i].pending)) 2256 if (expect_false (signals [i].pending))
1941 ev_feed_signal_event (EV_A_ i + 1); 2257 ev_feed_signal_event (EV_A_ i + 1);
1942 } 2258 }
… …
1945#if EV_ASYNC_ENABLE 2261#if EV_ASYNC_ENABLE
1946 if (async_pending) 2262 if (async_pending)
1947 { 2263 {
1948 async_pending = 0; 2264 async_pending = 0;
1949 2265
1950 ECB_MEMORY_FENCE_RELEASE; 2266 ECB_MEMORY_FENCE;
1951 2267
1952 for (i = asynccnt; i--; ) 2268 for (i = asynccnt; i--; )
1953 if (asyncs [i]->sent) 2269 if (asyncs [i]->sent)
1954 { 2270 {
1955 asyncs [i]->sent = 0; 2271 asyncs [i]->sent = 0;
2272 ECB_MEMORY_FENCE_RELEASE;
1956 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2273 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1957 } 2274 }
1958 } 2275 }
1959#endif 2276#endif
1960} 2277}
… …
1963 2280
1964void 2281void
1965ev_feed_signal (int signum) EV_THROW 2282ev_feed_signal (int signum) EV_THROW
1966{ 2283{
1967#if EV_MULTIPLICITY 2284#if EV_MULTIPLICITY
2285 EV_P;
2286 ECB_MEMORY_FENCE_ACQUIRE;
1968 EV_P = signals [signum - 1].loop; 2287 EV_A = signals [signum - 1].loop;
1969 2288
1970 if (!EV_A) 2289 if (!EV_A)
1971 return; 2290 return;
1972#endif 2291#endif
1973 2292
1974 if (!ev_active (&pipe_w))
1975 return;
1976
1977 signals [signum - 1].pending = 1; 2293 signals [signum - 1].pending = 1;
1978 evpipe_write (EV_A_ &sig_pending); 2294 evpipe_write (EV_A_ &sig_pending);
1979} 2295}
1980 2296
1981static void 2297static void
… …
1991void noinline 2307void noinline
1992ev_feed_signal_event (EV_P_ int signum) EV_THROW 2308ev_feed_signal_event (EV_P_ int signum) EV_THROW
1993{ 2309{
1994 WL w; 2310 WL w;
1995 2311
1996 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2312 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1997 return; 2313 return;
1998 2314
1999 --signum; 2315 --signum;
2000 2316
2001#if EV_MULTIPLICITY 2317#if EV_MULTIPLICITY
… …
2005 if (expect_false (signals [signum].loop != EV_A)) 2321 if (expect_false (signals [signum].loop != EV_A))
2006 return; 2322 return;
2007#endif 2323#endif
2008 2324
2009 signals [signum].pending = 0; 2325 signals [signum].pending = 0;
2326 ECB_MEMORY_FENCE_RELEASE;
2010 2327
2011 for (w = signals [signum].head; w; w = w->next) 2328 for (w = signals [signum].head; w; w = w->next)
2012 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2329 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2013} 2330}
2014 2331
… …
2298#if EV_ASYNC_ENABLE 2615#if EV_ASYNC_ENABLE
2299 async_pending = 0; 2616 async_pending = 0;
2300#endif 2617#endif
2301 pipe_write_skipped = 0; 2618 pipe_write_skipped = 0;
2302 pipe_write_wanted = 0; 2619 pipe_write_wanted = 0;
2620 evpipe [0] = -1;
2621 evpipe [1] = -1;
2303#if EV_USE_INOTIFY 2622#if EV_USE_INOTIFY
2304 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2623 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2305#endif 2624#endif
2306#if EV_USE_SIGNALFD 2625#if EV_USE_SIGNALFD
2307 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2626 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2358 EV_INVOKE_PENDING; 2677 EV_INVOKE_PENDING;
2359 } 2678 }
2360#endif 2679#endif
2361 2680
2362#if EV_CHILD_ENABLE 2681#if EV_CHILD_ENABLE
2363 if (ev_is_active (&childev)) 2682 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2364 { 2683 {
2365 ev_ref (EV_A); /* child watcher */ 2684 ev_ref (EV_A); /* child watcher */
2366 ev_signal_stop (EV_A_ &childev); 2685 ev_signal_stop (EV_A_ &childev);
2367 } 2686 }
2368#endif 2687#endif
… …
2370 if (ev_is_active (&pipe_w)) 2689 if (ev_is_active (&pipe_w))
2371 { 2690 {
2372 /*ev_ref (EV_A);*/ 2691 /*ev_ref (EV_A);*/
2373 /*ev_io_stop (EV_A_ &pipe_w);*/ 2692 /*ev_io_stop (EV_A_ &pipe_w);*/
2374 2693
2375#if EV_USE_EVENTFD
2376 if (evfd >= 0)
2377 close (evfd);
2378#endif
2379
2380 if (evpipe [0] >= 0)
2381 {
2382 EV_WIN32_CLOSE_FD (evpipe [0]); 2694 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2383 EV_WIN32_CLOSE_FD (evpipe [1]); 2695 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2384 }
2385 } 2696 }
2386 2697
2387#if EV_USE_SIGNALFD 2698#if EV_USE_SIGNALFD
2388 if (ev_is_active (&sigfd_w)) 2699 if (ev_is_active (&sigfd_w))
2389 close (sigfd); 2700 close (sigfd);
… …
2475#endif 2786#endif
2476#if EV_USE_INOTIFY 2787#if EV_USE_INOTIFY
2477 infy_fork (EV_A); 2788 infy_fork (EV_A);
2478#endif 2789#endif
2479 2790
2791#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2480 if (ev_is_active (&pipe_w)) 2792 if (ev_is_active (&pipe_w))
2481 { 2793 {
2482 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2794 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2483 2795
2484 ev_ref (EV_A); 2796 ev_ref (EV_A);
2485 ev_io_stop (EV_A_ &pipe_w); 2797 ev_io_stop (EV_A_ &pipe_w);
2486 2798
2487#if EV_USE_EVENTFD
2488 if (evfd >= 0)
2489 close (evfd);
2490#endif
2491
2492 if (evpipe [0] >= 0) 2799 if (evpipe [0] >= 0)
2493 {
2494 EV_WIN32_CLOSE_FD (evpipe [0]); 2800 EV_WIN32_CLOSE_FD (evpipe [0]);
2495 EV_WIN32_CLOSE_FD (evpipe [1]);
2496 }
2497 2801
2498#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2499 evpipe_init (EV_A); 2802 evpipe_init (EV_A);
2500 /* now iterate over everything, in case we missed something */ 2803 /* iterate over everything, in case we missed something before */
2501 pipecb (EV_A_ &pipe_w, EV_READ); 2804 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2502#endif
2503 } 2805 }
2806#endif
2504 2807
2505 postfork = 0; 2808 postfork = 0;
2506} 2809}
2507 2810
2508#if EV_MULTIPLICITY 2811#if EV_MULTIPLICITY
… …
2563#if EV_FEATURE_API 2866#if EV_FEATURE_API
2564void ecb_cold 2867void ecb_cold
2565ev_verify (EV_P) EV_THROW 2868ev_verify (EV_P) EV_THROW
2566{ 2869{
2567#if EV_VERIFY 2870#if EV_VERIFY
2568 int i, j; 2871 int i;
2569 WL w, w2; 2872 WL w, w2;
2570 2873
2571 assert (activecnt >= -1); 2874 assert (activecnt >= -1);
2572 2875
2573 assert (fdchangemax >= fdchangecnt); 2876 assert (fdchangemax >= fdchangecnt);
2574 for (i = 0; i < fdchangecnt; ++i) 2877 for (i = 0; i < fdchangecnt; ++i)
2575 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2878 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2576 2879
2577 assert (anfdmax >= 0); 2880 assert (anfdmax >= 0);
2578 for (i = j = 0; i < anfdmax; ++i) 2881 for (i = 0; i < anfdmax; ++i)
2882 {
2883 int j = 0;
2884
2579 for (w = w2 = anfds [i].head; w; w = w->next) 2885 for (w = w2 = anfds [i].head; w; w = w->next)
2580 { 2886 {
2581 verify_watcher (EV_A_ (W)w); 2887 verify_watcher (EV_A_ (W)w);
2582 2888
2583 if (j++ & 1) 2889 if (j++ & 1)
2584 { 2890 {
2585 assert (("libev: io watcher list contains a loop", w != w2)); 2891 assert (("libev: io watcher list contains a loop", w != w2));
2586 w2 = w2->next; 2892 w2 = w2->next;
2587 } 2893 }
2588 2894
2589 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2895 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2590 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2896 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2591 } 2897 }
2898 }
2592 2899
2593 assert (timermax >= timercnt); 2900 assert (timermax >= timercnt);
2594 verify_heap (EV_A_ timers, timercnt); 2901 verify_heap (EV_A_ timers, timercnt);
2595 2902
2596#if EV_PERIODIC_ENABLE 2903#if EV_PERIODIC_ENABLE
… …
2677} 2984}
2678 2985
2679void 2986void
2680ev_loop_fork (EV_P) EV_THROW 2987ev_loop_fork (EV_P) EV_THROW
2681{ 2988{
2682 postfork = 1; /* must be in line with ev_default_fork */ 2989 postfork = 1;
2683} 2990}
2684 2991
2685/*****************************************************************************/ 2992/*****************************************************************************/
2686 2993
2687void 2994void
… …
2703} 3010}
2704 3011
2705void noinline 3012void noinline
2706ev_invoke_pending (EV_P) 3013ev_invoke_pending (EV_P)
2707{ 3014{
2708 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 3015 pendingpri = NUMPRI;
3016
3017 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
3018 {
3019 --pendingpri;
3020
2709 while (pendingcnt [pendingpri]) 3021 while (pendingcnt [pendingpri])
2710 { 3022 {
2711 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3023 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2712 3024
2713 p->w->pending = 0; 3025 p->w->pending = 0;
2714 EV_CB_INVOKE (p->w, p->events); 3026 EV_CB_INVOKE (p->w, p->events);
2715 EV_FREQUENT_CHECK; 3027 EV_FREQUENT_CHECK;
2716 } 3028 }
3029 }
2717} 3030}
2718 3031
2719#if EV_IDLE_ENABLE 3032#if EV_IDLE_ENABLE
2720/* make idle watchers pending. this handles the "call-idle */ 3033/* make idle watchers pending. this handles the "call-idle */
2721/* only when higher priorities are idle" logic */ 3034/* only when higher priorities are idle" logic */
… …
2811{ 3124{
2812 EV_FREQUENT_CHECK; 3125 EV_FREQUENT_CHECK;
2813 3126
2814 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 3127 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2815 { 3128 {
2816 int feed_count = 0;
2817
2818 do 3129 do
2819 { 3130 {
2820 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 3131 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2821 3132
2822 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 3133 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3081 backend_poll (EV_A_ waittime); 3392 backend_poll (EV_A_ waittime);
3082 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3083 3394
3084 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3395 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3085 3396
3397 ECB_MEMORY_FENCE_ACQUIRE;
3086 if (pipe_write_skipped) 3398 if (pipe_write_skipped)
3087 { 3399 {
3088 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3400 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3089 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3401 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3090 } 3402 }
… …
3468#if EV_MULTIPLICITY 3780#if EV_MULTIPLICITY
3469 assert (("libev: a signal must not be attached to two different loops", 3781 assert (("libev: a signal must not be attached to two different loops",
3470 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3782 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3471 3783
3472 signals [w->signum - 1].loop = EV_A; 3784 signals [w->signum - 1].loop = EV_A;
3785 ECB_MEMORY_FENCE_RELEASE;
3473#endif 3786#endif
3474 3787
3475 EV_FREQUENT_CHECK; 3788 EV_FREQUENT_CHECK;
3476 3789
3477#if EV_USE_SIGNALFD 3790#if EV_USE_SIGNALFD
… …
3632# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3945# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3633 3946
3634static void noinline 3947static void noinline
3635infy_add (EV_P_ ev_stat *w) 3948infy_add (EV_P_ ev_stat *w)
3636{ 3949{
3637 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 3950 w->wd = inotify_add_watch (fs_fd, w->path,
3951 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3952 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3953 | IN_DONT_FOLLOW | IN_MASK_ADD);
3638 3954
3639 if (w->wd >= 0) 3955 if (w->wd >= 0)
3640 { 3956 {
3641 struct statfs sfs; 3957 struct statfs sfs;
3642 3958
… …
3646 3962
3647 if (!fs_2625) 3963 if (!fs_2625)
3648 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3964 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3649 else if (!statfs (w->path, &sfs) 3965 else if (!statfs (w->path, &sfs)
3650 && (sfs.f_type == 0x1373 /* devfs */ 3966 && (sfs.f_type == 0x1373 /* devfs */
3967 || sfs.f_type == 0x4006 /* fat */
3968 || sfs.f_type == 0x4d44 /* msdos */
3651 || sfs.f_type == 0xEF53 /* ext2/3 */ 3969 || sfs.f_type == 0xEF53 /* ext2/3 */
3970 || sfs.f_type == 0x72b6 /* jffs2 */
3971 || sfs.f_type == 0x858458f6 /* ramfs */
3972 || sfs.f_type == 0x5346544e /* ntfs */
3652 || sfs.f_type == 0x3153464a /* jfs */ 3973 || sfs.f_type == 0x3153464a /* jfs */
3974 || sfs.f_type == 0x9123683e /* btrfs */
3653 || sfs.f_type == 0x52654973 /* reiser3 */ 3975 || sfs.f_type == 0x52654973 /* reiser3 */
3654 || sfs.f_type == 0x01021994 /* tempfs */ 3976 || sfs.f_type == 0x01021994 /* tmpfs */
3655 || sfs.f_type == 0x58465342 /* xfs */)) 3977 || sfs.f_type == 0x58465342 /* xfs */))
3656 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3978 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3657 else 3979 else
3658 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3980 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3659 } 3981 }

Diff Legend

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