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

Comparing libev/ev.c (file contents):
Revision 1.439 by root, Tue May 29 21:06:11 2012 UTC vs.
Revision 1.477 by root, Sun Aug 9 00:13:28 2015 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47 47
48#if HAVE_FLOOR 48# if HAVE_FLOOR
49# ifndef EV_USE_FLOOR 49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1 50# define EV_USE_FLOOR 1
51# endif
51# endif 52# endif
52#endif
53 53
54# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
55# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
56# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
57# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
… …
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
258# endif
259#endif
260
261#if !(_POSIX_TIMERS > 0)
262# ifndef EV_USE_MONOTONIC
263# define EV_USE_MONOTONIC 0
264# endif
265# ifndef EV_USE_REALTIME
266# define EV_USE_REALTIME 0
261# endif 267# endif
262#endif 268#endif
263 269
264#ifndef EV_USE_MONOTONIC 270#ifndef EV_USE_MONOTONIC
265# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 271# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
… …
355# define EV_USE_4HEAP EV_FEATURE_DATA 361# define EV_USE_4HEAP EV_FEATURE_DATA
356#endif 362#endif
357 363
358#ifndef EV_HEAP_CACHE_AT 364#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 365# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
366#endif
367
368#ifdef ANDROID
369/* supposedly, android doesn't typedef fd_mask */
370# undef EV_USE_SELECT
371# define EV_USE_SELECT 0
372/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
373# undef EV_USE_CLOCK_SYSCALL
374# define EV_USE_CLOCK_SYSCALL 0
375#endif
376
377/* aix's poll.h seems to cause lots of trouble */
378#ifdef _AIX
379/* AIX has a completely broken poll.h header */
380# undef EV_USE_POLL
381# define EV_USE_POLL 0
360#endif 382#endif
361 383
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 384/* 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. */ 385/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 386#if EV_USE_CLOCK_SYSCALL
… …
372# define EV_USE_CLOCK_SYSCALL 0 394# define EV_USE_CLOCK_SYSCALL 0
373# endif 395# endif
374#endif 396#endif
375 397
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 398/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377
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 399
384#ifndef CLOCK_MONOTONIC 400#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 401# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 402# define EV_USE_MONOTONIC 0
387#endif 403#endif
… …
475/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 491/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
476/* ECB.H BEGIN */ 492/* ECB.H BEGIN */
477/* 493/*
478 * libecb - http://software.schmorp.de/pkg/libecb 494 * libecb - http://software.schmorp.de/pkg/libecb
479 * 495 *
480 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de> 496 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
481 * Copyright (©) 2011 Emanuele Giaquinta 497 * Copyright (©) 2011 Emanuele Giaquinta
482 * All rights reserved. 498 * All rights reserved.
483 * 499 *
484 * Redistribution and use in source and binary forms, with or without modifica- 500 * Redistribution and use in source and binary forms, with or without modifica-
485 * tion, are permitted provided that the following conditions are met: 501 * tion, are permitted provided that the following conditions are met:
… …
499 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 515 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
500 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 516 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
501 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 517 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
502 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 518 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
503 * OF THE POSSIBILITY OF SUCH DAMAGE. 519 * OF THE POSSIBILITY OF SUCH DAMAGE.
520 *
521 * Alternatively, the contents of this file may be used under the terms of
522 * the GNU General Public License ("GPL") version 2 or any later version,
523 * in which case the provisions of the GPL are applicable instead of
524 * the above. If you wish to allow the use of your version of this file
525 * only under the terms of the GPL and not to allow others to use your
526 * version of this file under the BSD license, indicate your decision
527 * by deleting the provisions above and replace them with the notice
528 * and other provisions required by the GPL. If you do not delete the
529 * provisions above, a recipient may use your version of this file under
530 * either the BSD or the GPL.
504 */ 531 */
505 532
506#ifndef ECB_H 533#ifndef ECB_H
507#define ECB_H 534#define ECB_H
508 535
509/* 16 bits major, 16 bits minor */ 536/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 537#define ECB_VERSION 0x00010004
511 538
512#ifdef _WIN32 539#ifdef _WIN32
513 typedef signed char int8_t; 540 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 541 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 542 typedef signed short int16_t;
… …
530 #else 557 #else
531 #define ECB_PTRSIZE 4 558 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 559 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 560 typedef int32_t intptr_t;
534 #endif 561 #endif
535 typedef intptr_t ptrdiff_t;
536#else 562#else
537 #include <inttypes.h> 563 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 564 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 565 #define ECB_PTRSIZE 8
540 #else 566 #else
541 #define ECB_PTRSIZE 4 567 #define ECB_PTRSIZE 4
542 #endif 568 #endif
543#endif 569#endif
544 570
571#define ECB_GCC_AMD64 (__amd64 || __amd64__ || __x86_64 || __x86_64__)
572#define ECB_MSVC_AMD64 (_M_AMD64 || _M_X64)
573
574/* work around x32 idiocy by defining proper macros */
575#if ECB_GCC_AMD64 || ECB_MSVC_AMD64
576 #if _ILP32
577 #define ECB_AMD64_X32 1
578 #else
579 #define ECB_AMD64 1
580 #endif
581#endif
582
545/* many compilers define _GNUC_ to some versions but then only implement 583/* many compilers define _GNUC_ to some versions but then only implement
546 * what their idiot authors think are the "more important" extensions, 584 * what their idiot authors think are the "more important" extensions,
547 * causing enormous grief in return for some better fake benchmark numbers. 585 * causing enormous grief in return for some better fake benchmark numbers.
548 * or so. 586 * or so.
549 * we try to detect these and simply assume they are not gcc - if they have 587 * we try to detect these and simply assume they are not gcc - if they have
550 * an issue with that they should have done it right in the first place. 588 * an issue with that they should have done it right in the first place.
551 */ 589 */
552#ifndef ECB_GCC_VERSION
553 #if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__ 590#if !defined __GNUC_MINOR__ || defined __INTEL_COMPILER || defined __SUNPRO_C || defined __SUNPRO_CC || defined __llvm__ || defined __clang__
554 #define ECB_GCC_VERSION(major,minor) 0 591 #define ECB_GCC_VERSION(major,minor) 0
555 #else 592#else
556 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 593 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
557 #endif 594#endif
558#endif
559 595
560#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 596#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
561#define ECB_C99 (__STDC_VERSION__ >= 199901L) 597
562#define ECB_C11 (__STDC_VERSION__ >= 201112L) 598#if __clang__ && defined __has_builtin
599 #define ECB_CLANG_BUILTIN(x) __has_builtin (x)
600#else
601 #define ECB_CLANG_BUILTIN(x) 0
602#endif
603
604#if __clang__ && defined __has_extension
605 #define ECB_CLANG_EXTENSION(x) __has_extension (x)
606#else
607 #define ECB_CLANG_EXTENSION(x) 0
608#endif
609
563#define ECB_CPP (__cplusplus+0) 610#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP98 (__cplusplus >= 199711L)
565#define ECB_CPP11 (__cplusplus >= 201103L) 611#define ECB_CPP11 (__cplusplus >= 201103L)
612
613#if ECB_CPP
614 #define ECB_C 0
615 #define ECB_STDC_VERSION 0
616#else
617 #define ECB_C 1
618 #define ECB_STDC_VERSION __STDC_VERSION__
619#endif
620
621#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
622#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
623
624#if ECB_CPP
625 #define ECB_EXTERN_C extern "C"
626 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
627 #define ECB_EXTERN_C_END }
628#else
629 #define ECB_EXTERN_C extern
630 #define ECB_EXTERN_C_BEG
631 #define ECB_EXTERN_C_END
632#endif
566 633
567/*****************************************************************************/ 634/*****************************************************************************/
568 635
569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 636/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
570/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 637/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
… …
573 #define ECB_NO_SMP 1 640 #define ECB_NO_SMP 1
574#endif 641#endif
575 642
576#if ECB_NO_SMP 643#if ECB_NO_SMP
577 #define ECB_MEMORY_FENCE do { } while (0) 644 #define ECB_MEMORY_FENCE do { } while (0)
645#endif
646
647/* http://www-01.ibm.com/support/knowledgecenter/SSGH3R_13.1.0/com.ibm.xlcpp131.aix.doc/compiler_ref/compiler_builtins.html */
648#if __xlC__ && ECB_CPP
649 #include <builtins.h>
578#endif 650#endif
579 651
580#ifndef ECB_MEMORY_FENCE 652#ifndef ECB_MEMORY_FENCE
581 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 653 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
582 #if __i386 || __i386__ 654 #if __i386 || __i386__
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 655 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
584 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 656 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
585 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 657 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
586 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 658 #elif ECB_GCC_AMD64
587 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 659 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
588 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 660 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
589 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 661 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
590 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 662 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
591 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 663 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
593 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 665 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
594 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 666 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
595 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 667 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
596 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 668 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
597 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 669 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
598 #elif __sparc || __sparc__ 670 #elif __aarch64__
671 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
672 #elif (__sparc || __sparc__) && !(__sparc_v8__ || defined __sparcv8)
599 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 673 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
600 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 674 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
601 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 675 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
602 #elif defined __s390__ || defined __s390x__ 676 #elif defined __s390__ || defined __s390x__
603 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 677 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
604 #elif defined __mips__ 678 #elif defined __mips__
679 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
680 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
605 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 681 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
606 #elif defined __alpha__ 682 #elif defined __alpha__
607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 683 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
608 #elif defined __hppa__ 684 #elif defined __hppa__
609 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 685 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
610 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 686 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
611 #elif defined __ia64__ 687 #elif defined __ia64__
612 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 688 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
689 #elif defined __m68k__
690 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
691 #elif defined __m88k__
692 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
693 #elif defined __sh__
694 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
613 #endif 695 #endif
614 #endif 696 #endif
615#endif 697#endif
616 698
617#ifndef ECB_MEMORY_FENCE 699#ifndef ECB_MEMORY_FENCE
618 #if ECB_GCC_VERSION(4,7) 700 #if ECB_GCC_VERSION(4,7)
619 /* see comment below about the C11 memory model. in short - avoid */ 701 /* see comment below (stdatomic.h) about the C11 memory model. */
620 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 702 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
621 #elif defined __clang && __has_feature (cxx_atomic) 703 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
622 /* see above */ 704 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
705
706 #elif ECB_CLANG_EXTENSION(c_atomic)
707 /* see comment below (stdatomic.h) about the C11 memory model. */
623 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 708 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
709 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
710 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
711
624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 712 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
625 #define ECB_MEMORY_FENCE __sync_synchronize () 713 #define ECB_MEMORY_FENCE __sync_synchronize ()
714 #elif _MSC_VER >= 1500 /* VC++ 2008 */
715 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
716 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
717 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
718 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
719 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
626 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 720 #elif _MSC_VER >= 1400 /* VC++ 2005 */
627 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 721 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
628 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 722 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
629 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 723 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
630 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 724 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
644#ifndef ECB_MEMORY_FENCE 738#ifndef ECB_MEMORY_FENCE
645 #if ECB_C11 && !defined __STDC_NO_ATOMICS__ 739 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
646 /* we assume that these memory fences work on all variables/all memory accesses, */ 740 /* we assume that these memory fences work on all variables/all memory accesses, */
647 /* not just C11 atomics and atomic accesses */ 741 /* not just C11 atomics and atomic accesses */
648 #include <stdatomic.h> 742 #include <stdatomic.h>
649 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */ 743 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
650 /* simple barrier semantics. That means we need to take out thor's hammer. */ 744 /* any fence other than seq_cst, which isn't very efficient for us. */
745 /* Why that is, we don't know - either the C11 memory model is quite useless */
746 /* for most usages, or gcc and clang have a bug */
747 /* I *currently* lean towards the latter, and inefficiently implement */
748 /* all three of ecb's fences as a seq_cst fence */
749 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
750 /* for all __atomic_thread_fence's except seq_cst */
651 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 751 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
652 #endif 752 #endif
653#endif 753#endif
654 754
655#ifndef ECB_MEMORY_FENCE 755#ifndef ECB_MEMORY_FENCE
… …
678 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 778 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
679#endif 779#endif
680 780
681/*****************************************************************************/ 781/*****************************************************************************/
682 782
683#if __cplusplus 783#if ECB_CPP
684 #define ecb_inline static inline 784 #define ecb_inline static inline
685#elif ECB_GCC_VERSION(2,5) 785#elif ECB_GCC_VERSION(2,5)
686 #define ecb_inline static __inline__ 786 #define ecb_inline static __inline__
687#elif ECB_C99 787#elif ECB_C99
688 #define ecb_inline static inline 788 #define ecb_inline static inline
… …
702 802
703#define ECB_CONCAT_(a, b) a ## b 803#define ECB_CONCAT_(a, b) a ## b
704#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 804#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
705#define ECB_STRINGIFY_(a) # a 805#define ECB_STRINGIFY_(a) # a
706#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 806#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
807#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
707 808
708#define ecb_function_ ecb_inline 809#define ecb_function_ ecb_inline
709 810
710#if ECB_GCC_VERSION(3,1) 811#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
711 #define ecb_attribute(attrlist) __attribute__(attrlist) 812 #define ecb_attribute(attrlist) __attribute__ (attrlist)
813#else
814 #define ecb_attribute(attrlist)
815#endif
816
817#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
712 #define ecb_is_constant(expr) __builtin_constant_p (expr) 818 #define ecb_is_constant(expr) __builtin_constant_p (expr)
819#else
820 /* possible C11 impl for integral types
821 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
822 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
823
824 #define ecb_is_constant(expr) 0
825#endif
826
827#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
713 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 828 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
829#else
830 #define ecb_expect(expr,value) (expr)
831#endif
832
833#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
714 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 834 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
715#else 835#else
716 #define ecb_attribute(attrlist)
717 #define ecb_is_constant(expr) 0
718 #define ecb_expect(expr,value) (expr)
719 #define ecb_prefetch(addr,rw,locality) 836 #define ecb_prefetch(addr,rw,locality)
720#endif 837#endif
721 838
722/* no emulation for ecb_decltype */ 839/* no emulation for ecb_decltype */
723#if ECB_GCC_VERSION(4,5) 840#if ECB_CPP11
841 // older implementations might have problems with decltype(x)::type, work around it
842 template<class T> struct ecb_decltype_t { typedef T type; };
724 #define ecb_decltype(x) __decltype(x) 843 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
725#elif ECB_GCC_VERSION(3,0) 844#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
726 #define ecb_decltype(x) __typeof(x) 845 #define ecb_decltype(x) __typeof__ (x)
727#endif 846#endif
728 847
848#if _MSC_VER >= 1300
849 #define ecb_deprecated __declspec (deprecated)
850#else
851 #define ecb_deprecated ecb_attribute ((__deprecated__))
852#endif
853
854#if _MSC_VER >= 1500
855 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
856#elif ECB_GCC_VERSION(4,5)
857 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
858#else
859 #define ecb_deprecated_message(msg) ecb_deprecated
860#endif
861
862#if _MSC_VER >= 1400
863 #define ecb_noinline __declspec (noinline)
864#else
729#define ecb_noinline ecb_attribute ((__noinline__)) 865 #define ecb_noinline ecb_attribute ((__noinline__))
866#endif
867
730#define ecb_unused ecb_attribute ((__unused__)) 868#define ecb_unused ecb_attribute ((__unused__))
731#define ecb_const ecb_attribute ((__const__)) 869#define ecb_const ecb_attribute ((__const__))
732#define ecb_pure ecb_attribute ((__pure__)) 870#define ecb_pure ecb_attribute ((__pure__))
733 871
734#if ECB_C11 872#if ECB_C11 || __IBMC_NORETURN
873 /* http://www-01.ibm.com/support/knowledgecenter/SSGH3R_13.1.0/com.ibm.xlcpp131.aix.doc/language_ref/noreturn.html */
735 #define ecb_noreturn _Noreturn 874 #define ecb_noreturn _Noreturn
875#elif ECB_CPP11
876 #define ecb_noreturn [[noreturn]]
877#elif _MSC_VER >= 1200
878 /* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx */
879 #define ecb_noreturn __declspec (noreturn)
736#else 880#else
737 #define ecb_noreturn ecb_attribute ((__noreturn__)) 881 #define ecb_noreturn ecb_attribute ((__noreturn__))
738#endif 882#endif
739 883
740#if ECB_GCC_VERSION(4,3) 884#if ECB_GCC_VERSION(4,3)
… …
755/* for compatibility to the rest of the world */ 899/* for compatibility to the rest of the world */
756#define ecb_likely(expr) ecb_expect_true (expr) 900#define ecb_likely(expr) ecb_expect_true (expr)
757#define ecb_unlikely(expr) ecb_expect_false (expr) 901#define ecb_unlikely(expr) ecb_expect_false (expr)
758 902
759/* count trailing zero bits and count # of one bits */ 903/* count trailing zero bits and count # of one bits */
760#if ECB_GCC_VERSION(3,4) 904#if ECB_GCC_VERSION(3,4) \
905 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
906 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
907 && ECB_CLANG_BUILTIN(__builtin_popcount))
761 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 908 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
762 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 909 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
763 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 910 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
764 #define ecb_ctz32(x) __builtin_ctz (x) 911 #define ecb_ctz32(x) __builtin_ctz (x)
765 #define ecb_ctz64(x) __builtin_ctzll (x) 912 #define ecb_ctz64(x) __builtin_ctzll (x)
766 #define ecb_popcount32(x) __builtin_popcount (x) 913 #define ecb_popcount32(x) __builtin_popcount (x)
767 /* no popcountll */ 914 /* no popcountll */
768#else 915#else
769 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 916 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
770 ecb_function_ int 917 ecb_function_ ecb_const int
771 ecb_ctz32 (uint32_t x) 918 ecb_ctz32 (uint32_t x)
772 { 919 {
773 int r = 0; 920 int r = 0;
774 921
775 x &= ~x + 1; /* this isolates the lowest bit */ 922 x &= ~x + 1; /* this isolates the lowest bit */
… …
789#endif 936#endif
790 937
791 return r; 938 return r;
792 } 939 }
793 940
794 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 941 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
795 ecb_function_ int 942 ecb_function_ ecb_const int
796 ecb_ctz64 (uint64_t x) 943 ecb_ctz64 (uint64_t x)
797 { 944 {
798 int shift = x & 0xffffffffU ? 0 : 32; 945 int shift = x & 0xffffffffU ? 0 : 32;
799 return ecb_ctz32 (x >> shift) + shift; 946 return ecb_ctz32 (x >> shift) + shift;
800 } 947 }
801 948
802 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 949 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
803 ecb_function_ int 950 ecb_function_ ecb_const int
804 ecb_popcount32 (uint32_t x) 951 ecb_popcount32 (uint32_t x)
805 { 952 {
806 x -= (x >> 1) & 0x55555555; 953 x -= (x >> 1) & 0x55555555;
807 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 954 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
808 x = ((x >> 4) + x) & 0x0f0f0f0f; 955 x = ((x >> 4) + x) & 0x0f0f0f0f;
809 x *= 0x01010101; 956 x *= 0x01010101;
810 957
811 return x >> 24; 958 return x >> 24;
812 } 959 }
813 960
814 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 961 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
815 ecb_function_ int ecb_ld32 (uint32_t x) 962 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
816 { 963 {
817 int r = 0; 964 int r = 0;
818 965
819 if (x >> 16) { x >>= 16; r += 16; } 966 if (x >> 16) { x >>= 16; r += 16; }
820 if (x >> 8) { x >>= 8; r += 8; } 967 if (x >> 8) { x >>= 8; r += 8; }
… …
823 if (x >> 1) { r += 1; } 970 if (x >> 1) { r += 1; }
824 971
825 return r; 972 return r;
826 } 973 }
827 974
828 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 975 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
829 ecb_function_ int ecb_ld64 (uint64_t x) 976 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
830 { 977 {
831 int r = 0; 978 int r = 0;
832 979
833 if (x >> 32) { x >>= 32; r += 32; } 980 if (x >> 32) { x >>= 32; r += 32; }
834 981
835 return r + ecb_ld32 (x); 982 return r + ecb_ld32 (x);
836 } 983 }
837#endif 984#endif
838 985
839ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const; 986ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
840ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); } 987ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
841ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const; 988ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
842ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); } 989ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
843 990
844ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 991ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
845ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 992ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
846{ 993{
847 return ( (x * 0x0802U & 0x22110U) 994 return ( (x * 0x0802U & 0x22110U)
848 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 995 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
849} 996}
850 997
851ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 998ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
852ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 999ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
853{ 1000{
854 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 1001 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
855 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 1002 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
856 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 1003 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
857 x = ( x >> 8 ) | ( x << 8); 1004 x = ( x >> 8 ) | ( x << 8);
858 1005
859 return x; 1006 return x;
860} 1007}
861 1008
862ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 1009ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
863ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 1010ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
864{ 1011{
865 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 1012 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
866 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 1013 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
867 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 1014 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
868 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 1015 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
871 return x; 1018 return x;
872} 1019}
873 1020
874/* popcount64 is only available on 64 bit cpus as gcc builtin */ 1021/* popcount64 is only available on 64 bit cpus as gcc builtin */
875/* so for this version we are lazy */ 1022/* so for this version we are lazy */
876ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 1023ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
877ecb_function_ int 1024ecb_function_ ecb_const int
878ecb_popcount64 (uint64_t x) 1025ecb_popcount64 (uint64_t x)
879{ 1026{
880 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 1027 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
881} 1028}
882 1029
883ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 1030ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
884ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 1031ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
885ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 1032ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
886ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 1033ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
887ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 1034ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
888ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 1035ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
889ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 1036ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
890ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 1037ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
891 1038
892ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 1039ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
893ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 1040ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
894ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 1041ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
895ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 1042ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
896ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 1043ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
897ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 1044ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
898ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 1045ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
899ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 1046ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
900 1047
901#if ECB_GCC_VERSION(4,3) 1048#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
1049 #if ECB_GCC_VERSION(4,8) || ECB_CLANG_BUILTIN(__builtin_bswap16)
1050 #define ecb_bswap16(x) __builtin_bswap16 (x)
1051 #else
902 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 1052 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
1053 #endif
903 #define ecb_bswap32(x) __builtin_bswap32 (x) 1054 #define ecb_bswap32(x) __builtin_bswap32 (x)
904 #define ecb_bswap64(x) __builtin_bswap64 (x) 1055 #define ecb_bswap64(x) __builtin_bswap64 (x)
1056#elif _MSC_VER
1057 #include <stdlib.h>
1058 #define ecb_bswap16(x) ((uint16_t)_byteswap_ushort ((uint16_t)(x)))
1059 #define ecb_bswap32(x) ((uint32_t)_byteswap_ulong ((uint32_t)(x)))
1060 #define ecb_bswap64(x) ((uint64_t)_byteswap_uint64 ((uint64_t)(x)))
905#else 1061#else
906 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 1062 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
907 ecb_function_ uint16_t 1063 ecb_function_ ecb_const uint16_t
908 ecb_bswap16 (uint16_t x) 1064 ecb_bswap16 (uint16_t x)
909 { 1065 {
910 return ecb_rotl16 (x, 8); 1066 return ecb_rotl16 (x, 8);
911 } 1067 }
912 1068
913 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 1069 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
914 ecb_function_ uint32_t 1070 ecb_function_ ecb_const uint32_t
915 ecb_bswap32 (uint32_t x) 1071 ecb_bswap32 (uint32_t x)
916 { 1072 {
917 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 1073 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
918 } 1074 }
919 1075
920 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 1076 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
921 ecb_function_ uint64_t 1077 ecb_function_ ecb_const uint64_t
922 ecb_bswap64 (uint64_t x) 1078 ecb_bswap64 (uint64_t x)
923 { 1079 {
924 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 1080 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
925 } 1081 }
926#endif 1082#endif
927 1083
928#if ECB_GCC_VERSION(4,5) 1084#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
929 #define ecb_unreachable() __builtin_unreachable () 1085 #define ecb_unreachable() __builtin_unreachable ()
930#else 1086#else
931 /* this seems to work fine, but gcc always emits a warning for it :/ */ 1087 /* this seems to work fine, but gcc always emits a warning for it :/ */
932 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1088 ecb_inline ecb_noreturn void ecb_unreachable (void);
933 ecb_inline void ecb_unreachable (void) { } 1089 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
934#endif 1090#endif
935 1091
936/* try to tell the compiler that some condition is definitely true */ 1092/* try to tell the compiler that some condition is definitely true */
937#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 1093#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
938 1094
939ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1095ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
940ecb_inline unsigned char 1096ecb_inline ecb_const unsigned char
941ecb_byteorder_helper (void) 1097ecb_byteorder_helper (void)
942{ 1098{
943 const uint32_t u = 0x11223344; 1099 /* the union code still generates code under pressure in gcc, */
944 return *(unsigned char *)&u; 1100 /* but less than using pointers, and always seems to */
1101 /* successfully return a constant. */
1102 /* the reason why we have this horrible preprocessor mess */
1103 /* is to avoid it in all cases, at least on common architectures */
1104 /* or when using a recent enough gcc version (>= 4.6) */
1105#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || ECB_GCC_AMD64 || ECB_MSVC_AMD64
1106 return 0x44;
1107#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1108 return 0x44;
1109#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1110 return 0x11;
1111#else
1112 union
1113 {
1114 uint32_t i;
1115 uint8_t c;
1116 } u = { 0x11223344 };
1117 return u.c;
1118#endif
945} 1119}
946 1120
947ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1121ecb_inline ecb_const ecb_bool ecb_big_endian (void);
948ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1122ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
949ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1123ecb_inline ecb_const ecb_bool ecb_little_endian (void);
950ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 1124ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
951 1125
952#if ECB_GCC_VERSION(3,0) || ECB_C99 1126#if ECB_GCC_VERSION(3,0) || ECB_C99
953 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 1127 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
954#else 1128#else
955 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 1129 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
956#endif 1130#endif
957 1131
958#if __cplusplus 1132#if ECB_CPP
959 template<typename T> 1133 template<typename T>
960 static inline T ecb_div_rd (T val, T div) 1134 static inline T ecb_div_rd (T val, T div)
961 { 1135 {
962 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 1136 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
963 } 1137 }
… …
980 } 1154 }
981#else 1155#else
982 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1156 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
983#endif 1157#endif
984 1158
1159/*******************************************************************************/
1160/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1161
1162/* basically, everything uses "ieee pure-endian" floating point numbers */
1163/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1164#if 0 \
1165 || __i386 || __i386__ \
1166 || ECB_GCC_AMD64 \
1167 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1168 || defined __s390__ || defined __s390x__ \
1169 || defined __mips__ \
1170 || defined __alpha__ \
1171 || defined __hppa__ \
1172 || defined __ia64__ \
1173 || defined __m68k__ \
1174 || defined __m88k__ \
1175 || defined __sh__ \
1176 || defined _M_IX86 || defined ECB_MSVC_AMD64 || defined _M_IA64 \
1177 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
1178 || defined __aarch64__
1179 #define ECB_STDFP 1
1180 #include <string.h> /* for memcpy */
1181#else
1182 #define ECB_STDFP 0
1183#endif
1184
1185#ifndef ECB_NO_LIBM
1186
1187 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1188
1189 /* only the oldest of old doesn't have this one. solaris. */
1190 #ifdef INFINITY
1191 #define ECB_INFINITY INFINITY
1192 #else
1193 #define ECB_INFINITY HUGE_VAL
1194 #endif
1195
1196 #ifdef NAN
1197 #define ECB_NAN NAN
1198 #else
1199 #define ECB_NAN ECB_INFINITY
1200 #endif
1201
1202 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
1203 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
1204 #define ecb_frexpf(x,e) frexpf ((x), (e))
1205 #else
1206 #define ecb_ldexpf(x,e) (float) ldexp ((double) (x), (e))
1207 #define ecb_frexpf(x,e) (float) frexp ((double) (x), (e))
1208 #endif
1209
1210 /* converts an ieee half/binary16 to a float */
1211 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
1212 ecb_function_ ecb_const float
1213 ecb_binary16_to_float (uint16_t x)
1214 {
1215 int e = (x >> 10) & 0x1f;
1216 int m = x & 0x3ff;
1217 float r;
1218
1219 if (!e ) r = ecb_ldexpf (m , -24);
1220 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
1221 else if (m ) r = ECB_NAN;
1222 else r = ECB_INFINITY;
1223
1224 return x & 0x8000 ? -r : r;
1225 }
1226
1227 /* convert a float to ieee single/binary32 */
1228 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
1229 ecb_function_ ecb_const uint32_t
1230 ecb_float_to_binary32 (float x)
1231 {
1232 uint32_t r;
1233
1234 #if ECB_STDFP
1235 memcpy (&r, &x, 4);
1236 #else
1237 /* slow emulation, works for anything but -0 */
1238 uint32_t m;
1239 int e;
1240
1241 if (x == 0e0f ) return 0x00000000U;
1242 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1243 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1244 if (x != x ) return 0x7fbfffffU;
1245
1246 m = ecb_frexpf (x, &e) * 0x1000000U;
1247
1248 r = m & 0x80000000U;
1249
1250 if (r)
1251 m = -m;
1252
1253 if (e <= -126)
1254 {
1255 m &= 0xffffffU;
1256 m >>= (-125 - e);
1257 e = -126;
1258 }
1259
1260 r |= (e + 126) << 23;
1261 r |= m & 0x7fffffU;
1262 #endif
1263
1264 return r;
1265 }
1266
1267 /* converts an ieee single/binary32 to a float */
1268 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
1269 ecb_function_ ecb_const float
1270 ecb_binary32_to_float (uint32_t x)
1271 {
1272 float r;
1273
1274 #if ECB_STDFP
1275 memcpy (&r, &x, 4);
1276 #else
1277 /* emulation, only works for normals and subnormals and +0 */
1278 int neg = x >> 31;
1279 int e = (x >> 23) & 0xffU;
1280
1281 x &= 0x7fffffU;
1282
1283 if (e)
1284 x |= 0x800000U;
1285 else
1286 e = 1;
1287
1288 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1289 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
1290
1291 r = neg ? -r : r;
1292 #endif
1293
1294 return r;
1295 }
1296
1297 /* convert a double to ieee double/binary64 */
1298 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
1299 ecb_function_ ecb_const uint64_t
1300 ecb_double_to_binary64 (double x)
1301 {
1302 uint64_t r;
1303
1304 #if ECB_STDFP
1305 memcpy (&r, &x, 8);
1306 #else
1307 /* slow emulation, works for anything but -0 */
1308 uint64_t m;
1309 int e;
1310
1311 if (x == 0e0 ) return 0x0000000000000000U;
1312 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1313 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1314 if (x != x ) return 0X7ff7ffffffffffffU;
1315
1316 m = frexp (x, &e) * 0x20000000000000U;
1317
1318 r = m & 0x8000000000000000;;
1319
1320 if (r)
1321 m = -m;
1322
1323 if (e <= -1022)
1324 {
1325 m &= 0x1fffffffffffffU;
1326 m >>= (-1021 - e);
1327 e = -1022;
1328 }
1329
1330 r |= ((uint64_t)(e + 1022)) << 52;
1331 r |= m & 0xfffffffffffffU;
1332 #endif
1333
1334 return r;
1335 }
1336
1337 /* converts an ieee double/binary64 to a double */
1338 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
1339 ecb_function_ ecb_const double
1340 ecb_binary64_to_double (uint64_t x)
1341 {
1342 double r;
1343
1344 #if ECB_STDFP
1345 memcpy (&r, &x, 8);
1346 #else
1347 /* emulation, only works for normals and subnormals and +0 */
1348 int neg = x >> 63;
1349 int e = (x >> 52) & 0x7ffU;
1350
1351 x &= 0xfffffffffffffU;
1352
1353 if (e)
1354 x |= 0x10000000000000U;
1355 else
1356 e = 1;
1357
1358 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1359 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1360
1361 r = neg ? -r : r;
1362 #endif
1363
1364 return r;
1365 }
1366
1367#endif
1368
985#endif 1369#endif
986 1370
987/* ECB.H END */ 1371/* ECB.H END */
988 1372
989#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1373#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1188} 1572}
1189 1573
1190static void * 1574static void *
1191ev_realloc_emul (void *ptr, long size) EV_THROW 1575ev_realloc_emul (void *ptr, long size) EV_THROW
1192{ 1576{
1193#if __GLIBC__
1194 return realloc (ptr, size);
1195#else
1196 /* some systems, notably openbsd and darwin, fail to properly 1577 /* some systems, notably openbsd and darwin, fail to properly
1197 * implement realloc (x, 0) (as required by both ansi c-89 and 1578 * implement realloc (x, 0) (as required by both ansi c-89 and
1198 * the single unix specification, so work around them here. 1579 * the single unix specification, so work around them here.
1580 * recently, also (at least) fedora and debian started breaking it,
1581 * despite documenting it otherwise.
1199 */ 1582 */
1200 1583
1201 if (size) 1584 if (size)
1202 return realloc (ptr, size); 1585 return realloc (ptr, size);
1203 1586
1204 free (ptr); 1587 free (ptr);
1205 return 0; 1588 return 0;
1206#endif
1207} 1589}
1208 1590
1209static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1591static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1210 1592
1211void ecb_cold 1593void ecb_cold
… …
1866static void noinline ecb_cold 2248static void noinline ecb_cold
1867evpipe_init (EV_P) 2249evpipe_init (EV_P)
1868{ 2250{
1869 if (!ev_is_active (&pipe_w)) 2251 if (!ev_is_active (&pipe_w))
1870 { 2252 {
2253 int fds [2];
2254
1871# if EV_USE_EVENTFD 2255# if EV_USE_EVENTFD
2256 fds [0] = -1;
1872 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2257 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1873 if (evfd < 0 && errno == EINVAL) 2258 if (fds [1] < 0 && errno == EINVAL)
1874 evfd = eventfd (0, 0); 2259 fds [1] = eventfd (0, 0);
1875 2260
1876 if (evfd >= 0) 2261 if (fds [1] < 0)
1877 {
1878 evpipe [0] = -1;
1879 fd_intern (evfd); /* doing it twice doesn't hurt */
1880 ev_io_set (&pipe_w, evfd, EV_READ);
1881 }
1882 else
1883# endif 2262# endif
1884 { 2263 {
1885 while (pipe (evpipe)) 2264 while (pipe (fds))
1886 ev_syserr ("(libev) error creating signal/async pipe"); 2265 ev_syserr ("(libev) error creating signal/async pipe");
1887 2266
1888 fd_intern (evpipe [0]); 2267 fd_intern (fds [0]);
1889 fd_intern (evpipe [1]);
1890 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1891 } 2268 }
1892 2269
2270 evpipe [0] = fds [0];
2271
2272 if (evpipe [1] < 0)
2273 evpipe [1] = fds [1]; /* first call, set write fd */
2274 else
2275 {
2276 /* on subsequent calls, do not change evpipe [1] */
2277 /* so that evpipe_write can always rely on its value. */
2278 /* this branch does not do anything sensible on windows, */
2279 /* so must not be executed on windows */
2280
2281 dup2 (fds [1], evpipe [1]);
2282 close (fds [1]);
2283 }
2284
2285 fd_intern (evpipe [1]);
2286
2287 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1893 ev_io_start (EV_A_ &pipe_w); 2288 ev_io_start (EV_A_ &pipe_w);
1894 ev_unref (EV_A); /* watcher should not keep loop alive */ 2289 ev_unref (EV_A); /* watcher should not keep loop alive */
1895 } 2290 }
1896} 2291}
1897 2292
… …
1918 ECB_MEMORY_FENCE_RELEASE; 2313 ECB_MEMORY_FENCE_RELEASE;
1919 2314
1920 old_errno = errno; /* save errno because write will clobber it */ 2315 old_errno = errno; /* save errno because write will clobber it */
1921 2316
1922#if EV_USE_EVENTFD 2317#if EV_USE_EVENTFD
1923 if (evfd >= 0) 2318 if (evpipe [0] < 0)
1924 { 2319 {
1925 uint64_t counter = 1; 2320 uint64_t counter = 1;
1926 write (evfd, &counter, sizeof (uint64_t)); 2321 write (evpipe [1], &counter, sizeof (uint64_t));
1927 } 2322 }
1928 else 2323 else
1929#endif 2324#endif
1930 { 2325 {
1931#ifdef _WIN32 2326#ifdef _WIN32
… …
1951 int i; 2346 int i;
1952 2347
1953 if (revents & EV_READ) 2348 if (revents & EV_READ)
1954 { 2349 {
1955#if EV_USE_EVENTFD 2350#if EV_USE_EVENTFD
1956 if (evfd >= 0) 2351 if (evpipe [0] < 0)
1957 { 2352 {
1958 uint64_t counter; 2353 uint64_t counter;
1959 read (evfd, &counter, sizeof (uint64_t)); 2354 read (evpipe [1], &counter, sizeof (uint64_t));
1960 } 2355 }
1961 else 2356 else
1962#endif 2357#endif
1963 { 2358 {
1964 char dummy[4]; 2359 char dummy[4];
… …
2014 2409
2015void 2410void
2016ev_feed_signal (int signum) EV_THROW 2411ev_feed_signal (int signum) EV_THROW
2017{ 2412{
2018#if EV_MULTIPLICITY 2413#if EV_MULTIPLICITY
2414 EV_P;
2415 ECB_MEMORY_FENCE_ACQUIRE;
2019 EV_P = signals [signum - 1].loop; 2416 EV_A = signals [signum - 1].loop;
2020 2417
2021 if (!EV_A) 2418 if (!EV_A)
2022 return; 2419 return;
2023#endif 2420#endif
2024 2421
2025 if (!ev_active (&pipe_w))
2026 return;
2027
2028 signals [signum - 1].pending = 1; 2422 signals [signum - 1].pending = 1;
2029 evpipe_write (EV_A_ &sig_pending); 2423 evpipe_write (EV_A_ &sig_pending);
2030} 2424}
2031 2425
2032static void 2426static void
… …
2042void noinline 2436void noinline
2043ev_feed_signal_event (EV_P_ int signum) EV_THROW 2437ev_feed_signal_event (EV_P_ int signum) EV_THROW
2044{ 2438{
2045 WL w; 2439 WL w;
2046 2440
2047 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2441 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2048 return; 2442 return;
2049 2443
2050 --signum; 2444 --signum;
2051 2445
2052#if EV_MULTIPLICITY 2446#if EV_MULTIPLICITY
… …
2280{ 2674{
2281 return userdata; 2675 return userdata;
2282} 2676}
2283 2677
2284void 2678void
2285ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW 2679ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
2286{ 2680{
2287 invoke_cb = invoke_pending_cb; 2681 invoke_cb = invoke_pending_cb;
2288} 2682}
2289 2683
2290void 2684void
… …
2350#if EV_ASYNC_ENABLE 2744#if EV_ASYNC_ENABLE
2351 async_pending = 0; 2745 async_pending = 0;
2352#endif 2746#endif
2353 pipe_write_skipped = 0; 2747 pipe_write_skipped = 0;
2354 pipe_write_wanted = 0; 2748 pipe_write_wanted = 0;
2749 evpipe [0] = -1;
2750 evpipe [1] = -1;
2355#if EV_USE_INOTIFY 2751#if EV_USE_INOTIFY
2356 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2752 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2357#endif 2753#endif
2358#if EV_USE_SIGNALFD 2754#if EV_USE_SIGNALFD
2359 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2755 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2422 if (ev_is_active (&pipe_w)) 2818 if (ev_is_active (&pipe_w))
2423 { 2819 {
2424 /*ev_ref (EV_A);*/ 2820 /*ev_ref (EV_A);*/
2425 /*ev_io_stop (EV_A_ &pipe_w);*/ 2821 /*ev_io_stop (EV_A_ &pipe_w);*/
2426 2822
2427#if EV_USE_EVENTFD
2428 if (evfd >= 0)
2429 close (evfd);
2430#endif
2431
2432 if (evpipe [0] >= 0)
2433 {
2434 EV_WIN32_CLOSE_FD (evpipe [0]); 2823 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2435 EV_WIN32_CLOSE_FD (evpipe [1]); 2824 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2436 }
2437 } 2825 }
2438 2826
2439#if EV_USE_SIGNALFD 2827#if EV_USE_SIGNALFD
2440 if (ev_is_active (&sigfd_w)) 2828 if (ev_is_active (&sigfd_w))
2441 close (sigfd); 2829 close (sigfd);
… …
2527#endif 2915#endif
2528#if EV_USE_INOTIFY 2916#if EV_USE_INOTIFY
2529 infy_fork (EV_A); 2917 infy_fork (EV_A);
2530#endif 2918#endif
2531 2919
2920#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2532 if (ev_is_active (&pipe_w)) 2921 if (ev_is_active (&pipe_w))
2533 { 2922 {
2534 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2923 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2535 2924
2536 ev_ref (EV_A); 2925 ev_ref (EV_A);
2537 ev_io_stop (EV_A_ &pipe_w); 2926 ev_io_stop (EV_A_ &pipe_w);
2538 2927
2539#if EV_USE_EVENTFD
2540 if (evfd >= 0)
2541 close (evfd);
2542#endif
2543
2544 if (evpipe [0] >= 0) 2928 if (evpipe [0] >= 0)
2545 {
2546 EV_WIN32_CLOSE_FD (evpipe [0]); 2929 EV_WIN32_CLOSE_FD (evpipe [0]);
2547 EV_WIN32_CLOSE_FD (evpipe [1]);
2548 }
2549 2930
2550#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2551 evpipe_init (EV_A); 2931 evpipe_init (EV_A);
2552 /* now iterate over everything, in case we missed something */ 2932 /* iterate over everything, in case we missed something before */
2553 pipecb (EV_A_ &pipe_w, EV_READ); 2933 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2554#endif
2555 } 2934 }
2935#endif
2556 2936
2557 postfork = 0; 2937 postfork = 0;
2558} 2938}
2559 2939
2560#if EV_MULTIPLICITY 2940#if EV_MULTIPLICITY
… …
2733} 3113}
2734 3114
2735void 3115void
2736ev_loop_fork (EV_P) EV_THROW 3116ev_loop_fork (EV_P) EV_THROW
2737{ 3117{
2738 postfork = 1; /* must be in line with ev_default_fork */ 3118 postfork = 1;
2739} 3119}
2740 3120
2741/*****************************************************************************/ 3121/*****************************************************************************/
2742 3122
2743void 3123void
… …
2759} 3139}
2760 3140
2761void noinline 3141void noinline
2762ev_invoke_pending (EV_P) 3142ev_invoke_pending (EV_P)
2763{ 3143{
2764 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 3144 pendingpri = NUMPRI;
3145
3146 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
3147 {
3148 --pendingpri;
3149
2765 while (pendingcnt [pendingpri]) 3150 while (pendingcnt [pendingpri])
2766 { 3151 {
2767 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3152 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2768 3153
2769 p->w->pending = 0; 3154 p->w->pending = 0;
2770 EV_CB_INVOKE (p->w, p->events); 3155 EV_CB_INVOKE (p->w, p->events);
2771 EV_FREQUENT_CHECK; 3156 EV_FREQUENT_CHECK;
2772 } 3157 }
3158 }
2773} 3159}
2774 3160
2775#if EV_IDLE_ENABLE 3161#if EV_IDLE_ENABLE
2776/* make idle watchers pending. this handles the "call-idle */ 3162/* make idle watchers pending. this handles the "call-idle */
2777/* only when higher priorities are idle" logic */ 3163/* only when higher priorities are idle" logic */
… …
3135 backend_poll (EV_A_ waittime); 3521 backend_poll (EV_A_ waittime);
3136 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3522 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3137 3523
3138 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3524 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3139 3525
3526 ECB_MEMORY_FENCE_ACQUIRE;
3140 if (pipe_write_skipped) 3527 if (pipe_write_skipped)
3141 { 3528 {
3142 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3529 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3143 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3530 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3144 } 3531 }
… …
3522#if EV_MULTIPLICITY 3909#if EV_MULTIPLICITY
3523 assert (("libev: a signal must not be attached to two different loops", 3910 assert (("libev: a signal must not be attached to two different loops",
3524 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3911 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3525 3912
3526 signals [w->signum - 1].loop = EV_A; 3913 signals [w->signum - 1].loop = EV_A;
3914 ECB_MEMORY_FENCE_RELEASE;
3527#endif 3915#endif
3528 3916
3529 EV_FREQUENT_CHECK; 3917 EV_FREQUENT_CHECK;
3530 3918
3531#if EV_USE_SIGNALFD 3919#if EV_USE_SIGNALFD
… …
3686# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 4074# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3687 4075
3688static void noinline 4076static void noinline
3689infy_add (EV_P_ ev_stat *w) 4077infy_add (EV_P_ ev_stat *w)
3690{ 4078{
3691 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); 4079 w->wd = inotify_add_watch (fs_fd, w->path,
4080 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
4081 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
4082 | IN_DONT_FOLLOW | IN_MASK_ADD);
3692 4083
3693 if (w->wd >= 0) 4084 if (w->wd >= 0)
3694 { 4085 {
3695 struct statfs sfs; 4086 struct statfs sfs;
3696 4087
… …
3700 4091
3701 if (!fs_2625) 4092 if (!fs_2625)
3702 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 4093 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3703 else if (!statfs (w->path, &sfs) 4094 else if (!statfs (w->path, &sfs)
3704 && (sfs.f_type == 0x1373 /* devfs */ 4095 && (sfs.f_type == 0x1373 /* devfs */
4096 || sfs.f_type == 0x4006 /* fat */
4097 || sfs.f_type == 0x4d44 /* msdos */
3705 || sfs.f_type == 0xEF53 /* ext2/3 */ 4098 || sfs.f_type == 0xEF53 /* ext2/3 */
4099 || sfs.f_type == 0x72b6 /* jffs2 */
4100 || sfs.f_type == 0x858458f6 /* ramfs */
4101 || sfs.f_type == 0x5346544e /* ntfs */
3706 || sfs.f_type == 0x3153464a /* jfs */ 4102 || sfs.f_type == 0x3153464a /* jfs */
4103 || sfs.f_type == 0x9123683e /* btrfs */
3707 || sfs.f_type == 0x52654973 /* reiser3 */ 4104 || sfs.f_type == 0x52654973 /* reiser3 */
3708 || sfs.f_type == 0x01021994 /* tempfs */ 4105 || sfs.f_type == 0x01021994 /* tmpfs */
3709 || sfs.f_type == 0x58465342 /* xfs */)) 4106 || sfs.f_type == 0x58465342 /* xfs */))
3710 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 4107 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3711 else 4108 else
3712 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 4109 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3713 } 4110 }

Diff Legend

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