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.475 by sf-exg, Wed Apr 1 06:57:41 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
… …
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
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
… …
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 399
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 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
388 404
… …
409/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 425/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
410# ifndef IN_DONT_FOLLOW 426# ifndef IN_DONT_FOLLOW
411# undef EV_USE_INOTIFY 427# undef EV_USE_INOTIFY
412# define EV_USE_INOTIFY 0 428# define EV_USE_INOTIFY 0
413# endif 429# endif
414#endif
415
416#if EV_SELECT_IS_WINSOCKET
417# include <winsock.h>
418#endif 430#endif
419 431
420#if EV_USE_EVENTFD 432#if EV_USE_EVENTFD
421/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 433/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
422# include <stdint.h> 434# include <stdint.h>
… …
479/* 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 */
480/* ECB.H BEGIN */ 492/* ECB.H BEGIN */
481/* 493/*
482 * libecb - http://software.schmorp.de/pkg/libecb 494 * libecb - http://software.schmorp.de/pkg/libecb
483 * 495 *
484 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de> 496 * Copyright (©) 2009-2015 Marc Alexander Lehmann <libecb@schmorp.de>
485 * Copyright (©) 2011 Emanuele Giaquinta 497 * Copyright (©) 2011 Emanuele Giaquinta
486 * All rights reserved. 498 * All rights reserved.
487 * 499 *
488 * 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-
489 * tion, are permitted provided that the following conditions are met: 501 * tion, are permitted provided that the following conditions are met:
… …
503 * 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;
504 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 516 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
505 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 517 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
506 * 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
507 * 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.
508 */ 531 */
509 532
510#ifndef ECB_H 533#ifndef ECB_H
511#define ECB_H 534#define ECB_H
535
536/* 16 bits major, 16 bits minor */
537#define ECB_VERSION 0x00010004
512 538
513#ifdef _WIN32 539#ifdef _WIN32
514 typedef signed char int8_t; 540 typedef signed char int8_t;
515 typedef unsigned char uint8_t; 541 typedef unsigned char uint8_t;
516 typedef signed short int16_t; 542 typedef signed short int16_t;
… …
522 typedef unsigned long long uint64_t; 548 typedef unsigned long long uint64_t;
523 #else /* _MSC_VER || __BORLANDC__ */ 549 #else /* _MSC_VER || __BORLANDC__ */
524 typedef signed __int64 int64_t; 550 typedef signed __int64 int64_t;
525 typedef unsigned __int64 uint64_t; 551 typedef unsigned __int64 uint64_t;
526 #endif 552 #endif
553 #ifdef _WIN64
554 #define ECB_PTRSIZE 8
555 typedef uint64_t uintptr_t;
556 typedef int64_t intptr_t;
557 #else
558 #define ECB_PTRSIZE 4
559 typedef uint32_t uintptr_t;
560 typedef int32_t intptr_t;
561 #endif
527#else 562#else
528 #include <inttypes.h> 563 #include <inttypes.h>
564 #if UINTMAX_MAX > 0xffffffffU
565 #define ECB_PTRSIZE 8
566 #else
567 #define ECB_PTRSIZE 4
568 #endif
569#endif
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
529#endif 581#endif
530 582
531/* many compilers define _GNUC_ to some versions but then only implement 583/* many compilers define _GNUC_ to some versions but then only implement
532 * what their idiot authors think are the "more important" extensions, 584 * what their idiot authors think are the "more important" extensions,
533 * causing enormous grief in return for some better fake benchmark numbers. 585 * causing enormous grief in return for some better fake benchmark numbers.
534 * or so. 586 * or so.
535 * 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
536 * 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.
537 */ 589 */
538#ifndef ECB_GCC_VERSION
539 #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__
540 #define ECB_GCC_VERSION(major,minor) 0 591 #define ECB_GCC_VERSION(major,minor) 0
541 #else 592#else
542 #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)))
543 #endif 594#endif
595
596#define ECB_CLANG_VERSION(major,minor) (__clang_major__ > (major) || (__clang_major__ == (major) && __clang_minor__ >= (minor)))
597
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
610#define ECB_CPP (__cplusplus+0)
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
544#endif 632#endif
545 633
546/*****************************************************************************/ 634/*****************************************************************************/
547 635
548/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 636/* 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 */ 637/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
550 638
551#if ECB_NO_THREADS 639#if ECB_NO_THREADS
552# define ECB_NO_SMP 1 640 #define ECB_NO_SMP 1
553#endif 641#endif
554 642
555#if ECB_NO_THREADS || ECB_NO_SMP 643#if ECB_NO_SMP
556 #define ECB_MEMORY_FENCE do { } while (0) 644 #define ECB_MEMORY_FENCE do { } while (0)
557#endif 645#endif
558 646
559#ifndef ECB_MEMORY_FENCE 647#ifndef ECB_MEMORY_FENCE
560 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 648 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
561 #if __i386 || __i386__ 649 #if __i386 || __i386__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 650 #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 */ 651 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 652 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 653 #elif ECB_GCC_AMD64
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 654 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 655 #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 */ 656 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
569 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 657 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
570 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 658 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
571 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 659 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
572 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 660 || 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") 661 #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__ \ 662 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
575 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 663 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
576 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 664 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
665 #elif __aarch64__
666 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
577 #elif __sparc || __sparc__ 667 #elif (__sparc || __sparc__) && !__sparcv8
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 668 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 669 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
580 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 670 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
581 #elif defined __s390__ || defined __s390x__ 671 #elif defined __s390__ || defined __s390x__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 672 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
583 #elif defined __mips__ 673 #elif defined __mips__
674 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
675 /* 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") 676 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
585 #elif defined __alpha__ 677 #elif defined __alpha__
586 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 678 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
679 #elif defined __hppa__
680 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
681 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
682 #elif defined __ia64__
683 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
684 #elif defined __m68k__
685 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
686 #elif defined __m88k__
687 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
688 #elif defined __sh__
689 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
587 #endif 690 #endif
588 #endif 691 #endif
589#endif 692#endif
590 693
591#ifndef ECB_MEMORY_FENCE 694#ifndef ECB_MEMORY_FENCE
695 #if ECB_GCC_VERSION(4,7)
696 /* see comment below (stdatomic.h) about the C11 memory model. */
697 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
698 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
699 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
700
701 #elif ECB_CLANG_EXTENSION(c_atomic)
702 /* see comment below (stdatomic.h) about the C11 memory model. */
703 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
704 #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
705 #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
706
592 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 707 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
593 #define ECB_MEMORY_FENCE __sync_synchronize () 708 #define ECB_MEMORY_FENCE __sync_synchronize ()
594 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 709 #elif _MSC_VER >= 1500 /* VC++ 2008 */
595 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 710 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
711 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
712 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
713 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
714 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
596 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 715 #elif _MSC_VER >= 1400 /* VC++ 2005 */
597 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 716 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
598 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 717 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
599 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 718 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
600 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 719 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
610 #define ECB_MEMORY_FENCE __sync () 729 #define ECB_MEMORY_FENCE __sync ()
611 #endif 730 #endif
612#endif 731#endif
613 732
614#ifndef ECB_MEMORY_FENCE 733#ifndef ECB_MEMORY_FENCE
734 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
735 /* we assume that these memory fences work on all variables/all memory accesses, */
736 /* not just C11 atomics and atomic accesses */
737 #include <stdatomic.h>
738 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
739 /* any fence other than seq_cst, which isn't very efficient for us. */
740 /* Why that is, we don't know - either the C11 memory model is quite useless */
741 /* for most usages, or gcc and clang have a bug */
742 /* I *currently* lean towards the latter, and inefficiently implement */
743 /* all three of ecb's fences as a seq_cst fence */
744 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
745 /* for all __atomic_thread_fence's except seq_cst */
746 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
747 #endif
748#endif
749
750#ifndef ECB_MEMORY_FENCE
615 #if !ECB_AVOID_PTHREADS 751 #if !ECB_AVOID_PTHREADS
616 /* 752 /*
617 * if you get undefined symbol references to pthread_mutex_lock, 753 * if you get undefined symbol references to pthread_mutex_lock,
618 * or failure to find pthread.h, then you should implement 754 * or failure to find pthread.h, then you should implement
619 * the ECB_MEMORY_FENCE operations for your cpu/compiler 755 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
637 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 773 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
638#endif 774#endif
639 775
640/*****************************************************************************/ 776/*****************************************************************************/
641 777
642#define ECB_C99 (__STDC_VERSION__ >= 199901L) 778#if ECB_CPP
643
644#if __cplusplus
645 #define ecb_inline static inline 779 #define ecb_inline static inline
646#elif ECB_GCC_VERSION(2,5) 780#elif ECB_GCC_VERSION(2,5)
647 #define ecb_inline static __inline__ 781 #define ecb_inline static __inline__
648#elif ECB_C99 782#elif ECB_C99
649 #define ecb_inline static inline 783 #define ecb_inline static inline
… …
663 797
664#define ECB_CONCAT_(a, b) a ## b 798#define ECB_CONCAT_(a, b) a ## b
665#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b) 799#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
666#define ECB_STRINGIFY_(a) # a 800#define ECB_STRINGIFY_(a) # a
667#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a) 801#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
802#define ECB_STRINGIFY_EXPR(expr) ((expr), ECB_STRINGIFY_ (expr))
668 803
669#define ecb_function_ ecb_inline 804#define ecb_function_ ecb_inline
670 805
671#if ECB_GCC_VERSION(3,1) 806#if ECB_GCC_VERSION(3,1) || ECB_CLANG_VERSION(2,8)
672 #define ecb_attribute(attrlist) __attribute__(attrlist) 807 #define ecb_attribute(attrlist) __attribute__ (attrlist)
808#else
809 #define ecb_attribute(attrlist)
810#endif
811
812#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_constant_p)
673 #define ecb_is_constant(expr) __builtin_constant_p (expr) 813 #define ecb_is_constant(expr) __builtin_constant_p (expr)
814#else
815 /* possible C11 impl for integral types
816 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
817 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
818
819 #define ecb_is_constant(expr) 0
820#endif
821
822#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_expect)
674 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 823 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
824#else
825 #define ecb_expect(expr,value) (expr)
826#endif
827
828#if ECB_GCC_VERSION(3,1) || ECB_CLANG_BUILTIN(__builtin_prefetch)
675 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 829 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
676#else 830#else
677 #define ecb_attribute(attrlist)
678 #define ecb_is_constant(expr) 0
679 #define ecb_expect(expr,value) (expr)
680 #define ecb_prefetch(addr,rw,locality) 831 #define ecb_prefetch(addr,rw,locality)
681#endif 832#endif
682 833
683/* no emulation for ecb_decltype */ 834/* no emulation for ecb_decltype */
684#if ECB_GCC_VERSION(4,5) 835#if ECB_CPP11
836 // older implementations might have problems with decltype(x)::type, work around it
837 template<class T> struct ecb_decltype_t { typedef T type; };
685 #define ecb_decltype(x) __decltype(x) 838 #define ecb_decltype(x) ecb_decltype_t<decltype (x)>::type
686#elif ECB_GCC_VERSION(3,0) 839#elif ECB_GCC_VERSION(3,0) || ECB_CLANG_VERSION(2,8)
687 #define ecb_decltype(x) __typeof(x) 840 #define ecb_decltype(x) __typeof__ (x)
688#endif 841#endif
689 842
843#if _MSC_VER >= 1300
844 #define ecb_deprecated __declspec (deprecated)
845#else
846 #define ecb_deprecated ecb_attribute ((__deprecated__))
847#endif
848
849#if __MSC_VER >= 1500
850 #define ecb_deprecated_message(msg) __declspec (deprecated (msg))
851#elif ECB_GCC_VERSION(4,5)
852 #define ecb_deprecated_message(msg) ecb_attribute ((__deprecated__ (msg))
853#else
854 #define ecb_deprecated_message(msg) ecb_deprecated
855#endif
856
857#if _MSC_VER >= 1400
858 #define ecb_noinline __declspec (noinline)
859#else
690#define ecb_noinline ecb_attribute ((__noinline__)) 860 #define ecb_noinline ecb_attribute ((__noinline__))
691#define ecb_noreturn ecb_attribute ((__noreturn__)) 861#endif
862
692#define ecb_unused ecb_attribute ((__unused__)) 863#define ecb_unused ecb_attribute ((__unused__))
693#define ecb_const ecb_attribute ((__const__)) 864#define ecb_const ecb_attribute ((__const__))
694#define ecb_pure ecb_attribute ((__pure__)) 865#define ecb_pure ecb_attribute ((__pure__))
866
867#if ECB_C11 || __IBMC_NORETURN
868 /* http://pic.dhe.ibm.com/infocenter/compbg/v121v141/topic/com.ibm.xlcpp121.bg.doc/language_ref/noreturn.html */
869 #define ecb_noreturn _Noreturn
870#elif ECB_CPP11
871 #define ecb_noreturn [[noreturn]]
872#elif _MSC_VER >= 1200
873 /* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx */
874 #define ecb_noreturn __declspec (noreturn)
875#else
876 #define ecb_noreturn ecb_attribute ((__noreturn__))
877#endif
695 878
696#if ECB_GCC_VERSION(4,3) 879#if ECB_GCC_VERSION(4,3)
697 #define ecb_artificial ecb_attribute ((__artificial__)) 880 #define ecb_artificial ecb_attribute ((__artificial__))
698 #define ecb_hot ecb_attribute ((__hot__)) 881 #define ecb_hot ecb_attribute ((__hot__))
699 #define ecb_cold ecb_attribute ((__cold__)) 882 #define ecb_cold ecb_attribute ((__cold__))
… …
711/* for compatibility to the rest of the world */ 894/* for compatibility to the rest of the world */
712#define ecb_likely(expr) ecb_expect_true (expr) 895#define ecb_likely(expr) ecb_expect_true (expr)
713#define ecb_unlikely(expr) ecb_expect_false (expr) 896#define ecb_unlikely(expr) ecb_expect_false (expr)
714 897
715/* count trailing zero bits and count # of one bits */ 898/* count trailing zero bits and count # of one bits */
716#if ECB_GCC_VERSION(3,4) 899#if ECB_GCC_VERSION(3,4) \
900 || (ECB_CLANG_BUILTIN(__builtin_clz) && ECB_CLANG_BUILTIN(__builtin_clzll) \
901 && ECB_CLANG_BUILTIN(__builtin_ctz) && ECB_CLANG_BUILTIN(__builtin_ctzll) \
902 && ECB_CLANG_BUILTIN(__builtin_popcount))
717 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */ 903 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
718 #define ecb_ld32(x) (__builtin_clz (x) ^ 31) 904 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
719 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63) 905 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
720 #define ecb_ctz32(x) __builtin_ctz (x) 906 #define ecb_ctz32(x) __builtin_ctz (x)
721 #define ecb_ctz64(x) __builtin_ctzll (x) 907 #define ecb_ctz64(x) __builtin_ctzll (x)
722 #define ecb_popcount32(x) __builtin_popcount (x) 908 #define ecb_popcount32(x) __builtin_popcount (x)
723 /* no popcountll */ 909 /* no popcountll */
724#else 910#else
725 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const; 911 ecb_function_ ecb_const int ecb_ctz32 (uint32_t x);
726 ecb_function_ int 912 ecb_function_ ecb_const int
727 ecb_ctz32 (uint32_t x) 913 ecb_ctz32 (uint32_t x)
728 { 914 {
729 int r = 0; 915 int r = 0;
730 916
731 x &= ~x + 1; /* this isolates the lowest bit */ 917 x &= ~x + 1; /* this isolates the lowest bit */
… …
745#endif 931#endif
746 932
747 return r; 933 return r;
748 } 934 }
749 935
750 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const; 936 ecb_function_ ecb_const int ecb_ctz64 (uint64_t x);
751 ecb_function_ int 937 ecb_function_ ecb_const int
752 ecb_ctz64 (uint64_t x) 938 ecb_ctz64 (uint64_t x)
753 { 939 {
754 int shift = x & 0xffffffffU ? 0 : 32; 940 int shift = x & 0xffffffffU ? 0 : 32;
755 return ecb_ctz32 (x >> shift) + shift; 941 return ecb_ctz32 (x >> shift) + shift;
756 } 942 }
757 943
758 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const; 944 ecb_function_ ecb_const int ecb_popcount32 (uint32_t x);
759 ecb_function_ int 945 ecb_function_ ecb_const int
760 ecb_popcount32 (uint32_t x) 946 ecb_popcount32 (uint32_t x)
761 { 947 {
762 x -= (x >> 1) & 0x55555555; 948 x -= (x >> 1) & 0x55555555;
763 x = ((x >> 2) & 0x33333333) + (x & 0x33333333); 949 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
764 x = ((x >> 4) + x) & 0x0f0f0f0f; 950 x = ((x >> 4) + x) & 0x0f0f0f0f;
765 x *= 0x01010101; 951 x *= 0x01010101;
766 952
767 return x >> 24; 953 return x >> 24;
768 } 954 }
769 955
770 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const; 956 ecb_function_ ecb_const int ecb_ld32 (uint32_t x);
771 ecb_function_ int ecb_ld32 (uint32_t x) 957 ecb_function_ ecb_const int ecb_ld32 (uint32_t x)
772 { 958 {
773 int r = 0; 959 int r = 0;
774 960
775 if (x >> 16) { x >>= 16; r += 16; } 961 if (x >> 16) { x >>= 16; r += 16; }
776 if (x >> 8) { x >>= 8; r += 8; } 962 if (x >> 8) { x >>= 8; r += 8; }
… …
779 if (x >> 1) { r += 1; } 965 if (x >> 1) { r += 1; }
780 966
781 return r; 967 return r;
782 } 968 }
783 969
784 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const; 970 ecb_function_ ecb_const int ecb_ld64 (uint64_t x);
785 ecb_function_ int ecb_ld64 (uint64_t x) 971 ecb_function_ ecb_const int ecb_ld64 (uint64_t x)
786 { 972 {
787 int r = 0; 973 int r = 0;
788 974
789 if (x >> 32) { x >>= 32; r += 32; } 975 if (x >> 32) { x >>= 32; r += 32; }
790 976
791 return r + ecb_ld32 (x); 977 return r + ecb_ld32 (x);
792 } 978 }
793#endif 979#endif
794 980
981ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x);
982ecb_function_ ecb_const ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
983ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x);
984ecb_function_ ecb_const ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
985
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 986ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x);
796ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 987ecb_function_ ecb_const uint8_t ecb_bitrev8 (uint8_t x)
797{ 988{
798 return ( (x * 0x0802U & 0x22110U) 989 return ( (x * 0x0802U & 0x22110U)
799 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 990 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
800} 991}
801 992
802ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) ecb_const; 993ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x);
803ecb_function_ uint16_t ecb_bitrev16 (uint16_t x) 994ecb_function_ ecb_const uint16_t ecb_bitrev16 (uint16_t x)
804{ 995{
805 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1); 996 x = ((x >> 1) & 0x5555) | ((x & 0x5555) << 1);
806 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2); 997 x = ((x >> 2) & 0x3333) | ((x & 0x3333) << 2);
807 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4); 998 x = ((x >> 4) & 0x0f0f) | ((x & 0x0f0f) << 4);
808 x = ( x >> 8 ) | ( x << 8); 999 x = ( x >> 8 ) | ( x << 8);
809 1000
810 return x; 1001 return x;
811} 1002}
812 1003
813ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) ecb_const; 1004ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x);
814ecb_function_ uint32_t ecb_bitrev32 (uint32_t x) 1005ecb_function_ ecb_const uint32_t ecb_bitrev32 (uint32_t x)
815{ 1006{
816 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1); 1007 x = ((x >> 1) & 0x55555555) | ((x & 0x55555555) << 1);
817 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2); 1008 x = ((x >> 2) & 0x33333333) | ((x & 0x33333333) << 2);
818 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4); 1009 x = ((x >> 4) & 0x0f0f0f0f) | ((x & 0x0f0f0f0f) << 4);
819 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8); 1010 x = ((x >> 8) & 0x00ff00ff) | ((x & 0x00ff00ff) << 8);
… …
822 return x; 1013 return x;
823} 1014}
824 1015
825/* popcount64 is only available on 64 bit cpus as gcc builtin */ 1016/* popcount64 is only available on 64 bit cpus as gcc builtin */
826/* so for this version we are lazy */ 1017/* so for this version we are lazy */
827ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const; 1018ecb_function_ ecb_const int ecb_popcount64 (uint64_t x);
828ecb_function_ int 1019ecb_function_ ecb_const int
829ecb_popcount64 (uint64_t x) 1020ecb_popcount64 (uint64_t x)
830{ 1021{
831 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32); 1022 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
832} 1023}
833 1024
834ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const; 1025ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count);
835ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const; 1026ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count);
836ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const; 1027ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count);
837ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const; 1028ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count);
838ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const; 1029ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count);
839ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const; 1030ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count);
840ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const; 1031ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count);
841ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const; 1032ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count);
842 1033
843ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); } 1034ecb_inline ecb_const uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
844ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); } 1035ecb_inline ecb_const uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
845ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); } 1036ecb_inline ecb_const uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
846ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); } 1037ecb_inline ecb_const uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
847ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); } 1038ecb_inline ecb_const uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
848ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); } 1039ecb_inline ecb_const uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
849ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); } 1040ecb_inline ecb_const uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
850ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); } 1041ecb_inline ecb_const uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
851 1042
852#if ECB_GCC_VERSION(4,3) 1043#if ECB_GCC_VERSION(4,3) || (ECB_CLANG_BUILTIN(__builtin_bswap32) && ECB_CLANG_BUILTIN(__builtin_bswap64))
853 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16) 1044 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
854 #define ecb_bswap32(x) __builtin_bswap32 (x) 1045 #define ecb_bswap32(x) __builtin_bswap32 (x)
855 #define ecb_bswap64(x) __builtin_bswap64 (x) 1046 #define ecb_bswap64(x) __builtin_bswap64 (x)
856#else 1047#else
857 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const; 1048 ecb_function_ ecb_const uint16_t ecb_bswap16 (uint16_t x);
858 ecb_function_ uint16_t 1049 ecb_function_ ecb_const uint16_t
859 ecb_bswap16 (uint16_t x) 1050 ecb_bswap16 (uint16_t x)
860 { 1051 {
861 return ecb_rotl16 (x, 8); 1052 return ecb_rotl16 (x, 8);
862 } 1053 }
863 1054
864 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const; 1055 ecb_function_ ecb_const uint32_t ecb_bswap32 (uint32_t x);
865 ecb_function_ uint32_t 1056 ecb_function_ ecb_const uint32_t
866 ecb_bswap32 (uint32_t x) 1057 ecb_bswap32 (uint32_t x)
867 { 1058 {
868 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16); 1059 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
869 } 1060 }
870 1061
871 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const; 1062 ecb_function_ ecb_const uint64_t ecb_bswap64 (uint64_t x);
872 ecb_function_ uint64_t 1063 ecb_function_ ecb_const uint64_t
873 ecb_bswap64 (uint64_t x) 1064 ecb_bswap64 (uint64_t x)
874 { 1065 {
875 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32); 1066 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
876 } 1067 }
877#endif 1068#endif
878 1069
879#if ECB_GCC_VERSION(4,5) 1070#if ECB_GCC_VERSION(4,5) || ECB_CLANG_BUILTIN(__builtin_unreachable)
880 #define ecb_unreachable() __builtin_unreachable () 1071 #define ecb_unreachable() __builtin_unreachable ()
881#else 1072#else
882 /* this seems to work fine, but gcc always emits a warning for it :/ */ 1073 /* this seems to work fine, but gcc always emits a warning for it :/ */
883 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1074 ecb_inline ecb_noreturn void ecb_unreachable (void);
884 ecb_inline void ecb_unreachable (void) { } 1075 ecb_inline ecb_noreturn void ecb_unreachable (void) { }
885#endif 1076#endif
886 1077
887/* try to tell the compiler that some condition is definitely true */ 1078/* try to tell the compiler that some condition is definitely true */
888#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 1079#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
889 1080
890ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1081ecb_inline ecb_const unsigned char ecb_byteorder_helper (void);
891ecb_inline unsigned char 1082ecb_inline ecb_const unsigned char
892ecb_byteorder_helper (void) 1083ecb_byteorder_helper (void)
893{ 1084{
894 const uint32_t u = 0x11223344; 1085 /* the union code still generates code under pressure in gcc, */
895 return *(unsigned char *)&u; 1086 /* but less than using pointers, and always seems to */
1087 /* successfully return a constant. */
1088 /* the reason why we have this horrible preprocessor mess */
1089 /* is to avoid it in all cases, at least on common architectures */
1090 /* or when using a recent enough gcc version (>= 4.6) */
1091#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || ECB_GCC_AMD64 || ECB_MSVC_AMD64
1092 return 0x44;
1093#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1094 return 0x44;
1095#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1096 return 0x11;
1097#else
1098 union
1099 {
1100 uint32_t i;
1101 uint8_t c;
1102 } u = { 0x11223344 };
1103 return u.c;
1104#endif
896} 1105}
897 1106
898ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1107ecb_inline ecb_const ecb_bool ecb_big_endian (void);
899ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1108ecb_inline ecb_const ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
900ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1109ecb_inline ecb_const ecb_bool ecb_little_endian (void);
901ecb_inline ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; } 1110ecb_inline ecb_const ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
902 1111
903#if ECB_GCC_VERSION(3,0) || ECB_C99 1112#if ECB_GCC_VERSION(3,0) || ECB_C99
904 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0)) 1113 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
905#else 1114#else
906 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n))) 1115 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
907#endif 1116#endif
908 1117
909#if __cplusplus 1118#if ECB_CPP
910 template<typename T> 1119 template<typename T>
911 static inline T ecb_div_rd (T val, T div) 1120 static inline T ecb_div_rd (T val, T div)
912 { 1121 {
913 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div; 1122 return val < 0 ? - ((-val + div - 1) / div) : (val ) / div;
914 } 1123 }
… …
931 } 1140 }
932#else 1141#else
933 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1142 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
934#endif 1143#endif
935 1144
1145/*******************************************************************************/
1146/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1147
1148/* basically, everything uses "ieee pure-endian" floating point numbers */
1149/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1150#if 0 \
1151 || __i386 || __i386__ \
1152 || ECB_GCC_AMD64 \
1153 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1154 || defined __s390__ || defined __s390x__ \
1155 || defined __mips__ \
1156 || defined __alpha__ \
1157 || defined __hppa__ \
1158 || defined __ia64__ \
1159 || defined __m68k__ \
1160 || defined __m88k__ \
1161 || defined __sh__ \
1162 || defined _M_IX86 || defined ECB_MSVC_AMD64 || defined _M_IA64 \
1163 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
1164 || defined __aarch64__
1165 #define ECB_STDFP 1
1166 #include <string.h> /* for memcpy */
1167#else
1168 #define ECB_STDFP 0
1169#endif
1170
1171#ifndef ECB_NO_LIBM
1172
1173 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1174
1175 /* only the oldest of old doesn't have this one. solaris. */
1176 #ifdef INFINITY
1177 #define ECB_INFINITY INFINITY
1178 #else
1179 #define ECB_INFINITY HUGE_VAL
1180 #endif
1181
1182 #ifdef NAN
1183 #define ECB_NAN NAN
1184 #else
1185 #define ECB_NAN ECB_INFINITY
1186 #endif
1187
1188 #if ECB_C99 || _XOPEN_VERSION >= 600 || _POSIX_VERSION >= 200112L
1189 #define ecb_ldexpf(x,e) ldexpf ((x), (e))
1190 #else
1191 #define ecb_ldexpf(x,e) (float) ldexp ((float) (x), (e))
1192 #endif
1193
1194 /* converts an ieee half/binary16 to a float */
1195 ecb_function_ ecb_const float ecb_binary16_to_float (uint16_t x);
1196 ecb_function_ ecb_const float
1197 ecb_binary16_to_float (uint16_t x)
1198 {
1199 int e = (x >> 10) & 0x1f;
1200 int m = x & 0x3ff;
1201 float r;
1202
1203 if (!e ) r = ecb_ldexpf (m , -24);
1204 else if (e != 31) r = ecb_ldexpf (m + 0x400, e - 25);
1205 else if (m ) r = ECB_NAN;
1206 else r = ECB_INFINITY;
1207
1208 return x & 0x8000 ? -r : r;
1209 }
1210
1211 /* convert a float to ieee single/binary32 */
1212 ecb_function_ ecb_const uint32_t ecb_float_to_binary32 (float x);
1213 ecb_function_ ecb_const uint32_t
1214 ecb_float_to_binary32 (float x)
1215 {
1216 uint32_t r;
1217
1218 #if ECB_STDFP
1219 memcpy (&r, &x, 4);
1220 #else
1221 /* slow emulation, works for anything but -0 */
1222 uint32_t m;
1223 int e;
1224
1225 if (x == 0e0f ) return 0x00000000U;
1226 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1227 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1228 if (x != x ) return 0x7fbfffffU;
1229
1230 m = frexpf (x, &e) * 0x1000000U;
1231
1232 r = m & 0x80000000U;
1233
1234 if (r)
1235 m = -m;
1236
1237 if (e <= -126)
1238 {
1239 m &= 0xffffffU;
1240 m >>= (-125 - e);
1241 e = -126;
1242 }
1243
1244 r |= (e + 126) << 23;
1245 r |= m & 0x7fffffU;
1246 #endif
1247
1248 return r;
1249 }
1250
1251 /* converts an ieee single/binary32 to a float */
1252 ecb_function_ ecb_const float ecb_binary32_to_float (uint32_t x);
1253 ecb_function_ ecb_const float
1254 ecb_binary32_to_float (uint32_t x)
1255 {
1256 float r;
1257
1258 #if ECB_STDFP
1259 memcpy (&r, &x, 4);
1260 #else
1261 /* emulation, only works for normals and subnormals and +0 */
1262 int neg = x >> 31;
1263 int e = (x >> 23) & 0xffU;
1264
1265 x &= 0x7fffffU;
1266
1267 if (e)
1268 x |= 0x800000U;
1269 else
1270 e = 1;
1271
1272 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1273 r = ecb_ldexpf (x * (0.5f / 0x800000U), e - 126);
1274
1275 r = neg ? -r : r;
1276 #endif
1277
1278 return r;
1279 }
1280
1281 /* convert a double to ieee double/binary64 */
1282 ecb_function_ ecb_const uint64_t ecb_double_to_binary64 (double x);
1283 ecb_function_ ecb_const uint64_t
1284 ecb_double_to_binary64 (double x)
1285 {
1286 uint64_t r;
1287
1288 #if ECB_STDFP
1289 memcpy (&r, &x, 8);
1290 #else
1291 /* slow emulation, works for anything but -0 */
1292 uint64_t m;
1293 int e;
1294
1295 if (x == 0e0 ) return 0x0000000000000000U;
1296 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1297 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1298 if (x != x ) return 0X7ff7ffffffffffffU;
1299
1300 m = frexp (x, &e) * 0x20000000000000U;
1301
1302 r = m & 0x8000000000000000;;
1303
1304 if (r)
1305 m = -m;
1306
1307 if (e <= -1022)
1308 {
1309 m &= 0x1fffffffffffffU;
1310 m >>= (-1021 - e);
1311 e = -1022;
1312 }
1313
1314 r |= ((uint64_t)(e + 1022)) << 52;
1315 r |= m & 0xfffffffffffffU;
1316 #endif
1317
1318 return r;
1319 }
1320
1321 /* converts an ieee double/binary64 to a double */
1322 ecb_function_ ecb_const double ecb_binary64_to_double (uint64_t x);
1323 ecb_function_ ecb_const double
1324 ecb_binary64_to_double (uint64_t x)
1325 {
1326 double r;
1327
1328 #if ECB_STDFP
1329 memcpy (&r, &x, 8);
1330 #else
1331 /* emulation, only works for normals and subnormals and +0 */
1332 int neg = x >> 63;
1333 int e = (x >> 52) & 0x7ffU;
1334
1335 x &= 0xfffffffffffffU;
1336
1337 if (e)
1338 x |= 0x10000000000000U;
1339 else
1340 e = 1;
1341
1342 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1343 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1344
1345 r = neg ? -r : r;
1346 #endif
1347
1348 return r;
1349 }
1350
1351#endif
1352
936#endif 1353#endif
937 1354
938/* ECB.H END */ 1355/* ECB.H END */
939 1356
940#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1357#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1109#endif 1526#endif
1110 1527
1111static void (*syserr_cb)(const char *msg) EV_THROW; 1528static void (*syserr_cb)(const char *msg) EV_THROW;
1112 1529
1113void ecb_cold 1530void ecb_cold
1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1531ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1115{ 1532{
1116 syserr_cb = cb; 1533 syserr_cb = cb;
1117} 1534}
1118 1535
1119static void noinline ecb_cold 1536static void noinline ecb_cold
… …
1137 abort (); 1554 abort ();
1138 } 1555 }
1139} 1556}
1140 1557
1141static void * 1558static void *
1142ev_realloc_emul (void *ptr, long size) 1559ev_realloc_emul (void *ptr, long size) EV_THROW
1143{ 1560{
1144#if __GLIBC__
1145 return realloc (ptr, size);
1146#else
1147 /* some systems, notably openbsd and darwin, fail to properly 1561 /* some systems, notably openbsd and darwin, fail to properly
1148 * implement realloc (x, 0) (as required by both ansi c-89 and 1562 * implement realloc (x, 0) (as required by both ansi c-89 and
1149 * the single unix specification, so work around them here. 1563 * the single unix specification, so work around them here.
1564 * recently, also (at least) fedora and debian started breaking it,
1565 * despite documenting it otherwise.
1150 */ 1566 */
1151 1567
1152 if (size) 1568 if (size)
1153 return realloc (ptr, size); 1569 return realloc (ptr, size);
1154 1570
1155 free (ptr); 1571 free (ptr);
1156 return 0; 1572 return 0;
1157#endif
1158} 1573}
1159 1574
1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1575static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1161 1576
1162void ecb_cold 1577void ecb_cold
1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1578ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1164{ 1579{
1165 alloc = cb; 1580 alloc = cb;
1166} 1581}
1167 1582
1168inline_speed void * 1583inline_speed void *
… …
1817static void noinline ecb_cold 2232static void noinline ecb_cold
1818evpipe_init (EV_P) 2233evpipe_init (EV_P)
1819{ 2234{
1820 if (!ev_is_active (&pipe_w)) 2235 if (!ev_is_active (&pipe_w))
1821 { 2236 {
2237 int fds [2];
2238
1822# if EV_USE_EVENTFD 2239# if EV_USE_EVENTFD
2240 fds [0] = -1;
1823 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2241 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1824 if (evfd < 0 && errno == EINVAL) 2242 if (fds [1] < 0 && errno == EINVAL)
1825 evfd = eventfd (0, 0); 2243 fds [1] = eventfd (0, 0);
1826 2244
1827 if (evfd >= 0) 2245 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 2246# endif
1835 { 2247 {
1836 while (pipe (evpipe)) 2248 while (pipe (fds))
1837 ev_syserr ("(libev) error creating signal/async pipe"); 2249 ev_syserr ("(libev) error creating signal/async pipe");
1838 2250
1839 fd_intern (evpipe [0]); 2251 fd_intern (fds [0]);
1840 fd_intern (evpipe [1]);
1841 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1842 } 2252 }
1843 2253
2254 evpipe [0] = fds [0];
2255
2256 if (evpipe [1] < 0)
2257 evpipe [1] = fds [1]; /* first call, set write fd */
2258 else
2259 {
2260 /* on subsequent calls, do not change evpipe [1] */
2261 /* so that evpipe_write can always rely on its value. */
2262 /* this branch does not do anything sensible on windows, */
2263 /* so must not be executed on windows */
2264
2265 dup2 (fds [1], evpipe [1]);
2266 close (fds [1]);
2267 }
2268
2269 fd_intern (evpipe [1]);
2270
2271 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1844 ev_io_start (EV_A_ &pipe_w); 2272 ev_io_start (EV_A_ &pipe_w);
1845 ev_unref (EV_A); /* watcher should not keep loop alive */ 2273 ev_unref (EV_A); /* watcher should not keep loop alive */
1846 } 2274 }
1847} 2275}
1848 2276
… …
1853 2281
1854 if (expect_true (*flag)) 2282 if (expect_true (*flag))
1855 return; 2283 return;
1856 2284
1857 *flag = 1; 2285 *flag = 1;
1858
1859 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 2286 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1860 2287
1861 pipe_write_skipped = 1; 2288 pipe_write_skipped = 1;
1862 2289
1863 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 2290 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1864 2291
1865 if (pipe_write_wanted) 2292 if (pipe_write_wanted)
1866 { 2293 {
1867 int old_errno; 2294 int old_errno;
1868 2295
1869 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 2296 pipe_write_skipped = 0;
2297 ECB_MEMORY_FENCE_RELEASE;
1870 2298
1871 old_errno = errno; /* save errno because write will clobber it */ 2299 old_errno = errno; /* save errno because write will clobber it */
1872 2300
1873#if EV_USE_EVENTFD 2301#if EV_USE_EVENTFD
1874 if (evfd >= 0) 2302 if (evpipe [0] < 0)
1875 { 2303 {
1876 uint64_t counter = 1; 2304 uint64_t counter = 1;
1877 write (evfd, &counter, sizeof (uint64_t)); 2305 write (evpipe [1], &counter, sizeof (uint64_t));
1878 } 2306 }
1879 else 2307 else
1880#endif 2308#endif
1881 { 2309 {
1882#ifdef _WIN32 2310#ifdef _WIN32
… …
1902 int i; 2330 int i;
1903 2331
1904 if (revents & EV_READ) 2332 if (revents & EV_READ)
1905 { 2333 {
1906#if EV_USE_EVENTFD 2334#if EV_USE_EVENTFD
1907 if (evfd >= 0) 2335 if (evpipe [0] < 0)
1908 { 2336 {
1909 uint64_t counter; 2337 uint64_t counter;
1910 read (evfd, &counter, sizeof (uint64_t)); 2338 read (evpipe [1], &counter, sizeof (uint64_t));
1911 } 2339 }
1912 else 2340 else
1913#endif 2341#endif
1914 { 2342 {
1915 char dummy[4]; 2343 char dummy[4];
1916#ifdef _WIN32 2344#ifdef _WIN32
1917 WSABUF buf; 2345 WSABUF buf;
1918 DWORD recvd; 2346 DWORD recvd;
2347 DWORD flags = 0;
1919 buf.buf = dummy; 2348 buf.buf = dummy;
1920 buf.len = sizeof (dummy); 2349 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 2350 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1922#else 2351#else
1923 read (evpipe [0], &dummy, sizeof (dummy)); 2352 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif 2353#endif
1925 } 2354 }
1926 } 2355 }
… …
1932#if EV_SIGNAL_ENABLE 2361#if EV_SIGNAL_ENABLE
1933 if (sig_pending) 2362 if (sig_pending)
1934 { 2363 {
1935 sig_pending = 0; 2364 sig_pending = 0;
1936 2365
1937 ECB_MEMORY_FENCE_RELEASE; 2366 ECB_MEMORY_FENCE;
1938 2367
1939 for (i = EV_NSIG - 1; i--; ) 2368 for (i = EV_NSIG - 1; i--; )
1940 if (expect_false (signals [i].pending)) 2369 if (expect_false (signals [i].pending))
1941 ev_feed_signal_event (EV_A_ i + 1); 2370 ev_feed_signal_event (EV_A_ i + 1);
1942 } 2371 }
… …
1945#if EV_ASYNC_ENABLE 2374#if EV_ASYNC_ENABLE
1946 if (async_pending) 2375 if (async_pending)
1947 { 2376 {
1948 async_pending = 0; 2377 async_pending = 0;
1949 2378
1950 ECB_MEMORY_FENCE_RELEASE; 2379 ECB_MEMORY_FENCE;
1951 2380
1952 for (i = asynccnt; i--; ) 2381 for (i = asynccnt; i--; )
1953 if (asyncs [i]->sent) 2382 if (asyncs [i]->sent)
1954 { 2383 {
1955 asyncs [i]->sent = 0; 2384 asyncs [i]->sent = 0;
2385 ECB_MEMORY_FENCE_RELEASE;
1956 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2386 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1957 } 2387 }
1958 } 2388 }
1959#endif 2389#endif
1960} 2390}
… …
1963 2393
1964void 2394void
1965ev_feed_signal (int signum) EV_THROW 2395ev_feed_signal (int signum) EV_THROW
1966{ 2396{
1967#if EV_MULTIPLICITY 2397#if EV_MULTIPLICITY
2398 EV_P;
2399 ECB_MEMORY_FENCE_ACQUIRE;
1968 EV_P = signals [signum - 1].loop; 2400 EV_A = signals [signum - 1].loop;
1969 2401
1970 if (!EV_A) 2402 if (!EV_A)
1971 return; 2403 return;
1972#endif 2404#endif
1973 2405
1974 if (!ev_active (&pipe_w))
1975 return;
1976
1977 signals [signum - 1].pending = 1; 2406 signals [signum - 1].pending = 1;
1978 evpipe_write (EV_A_ &sig_pending); 2407 evpipe_write (EV_A_ &sig_pending);
1979} 2408}
1980 2409
1981static void 2410static void
… …
1991void noinline 2420void noinline
1992ev_feed_signal_event (EV_P_ int signum) EV_THROW 2421ev_feed_signal_event (EV_P_ int signum) EV_THROW
1993{ 2422{
1994 WL w; 2423 WL w;
1995 2424
1996 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2425 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1997 return; 2426 return;
1998 2427
1999 --signum; 2428 --signum;
2000 2429
2001#if EV_MULTIPLICITY 2430#if EV_MULTIPLICITY
… …
2005 if (expect_false (signals [signum].loop != EV_A)) 2434 if (expect_false (signals [signum].loop != EV_A))
2006 return; 2435 return;
2007#endif 2436#endif
2008 2437
2009 signals [signum].pending = 0; 2438 signals [signum].pending = 0;
2439 ECB_MEMORY_FENCE_RELEASE;
2010 2440
2011 for (w = signals [signum].head; w; w = w->next) 2441 for (w = signals [signum].head; w; w = w->next)
2012 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2442 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2013} 2443}
2014 2444
… …
2228{ 2658{
2229 return userdata; 2659 return userdata;
2230} 2660}
2231 2661
2232void 2662void
2233ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW 2663ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
2234{ 2664{
2235 invoke_cb = invoke_pending_cb; 2665 invoke_cb = invoke_pending_cb;
2236} 2666}
2237 2667
2238void 2668void
… …
2298#if EV_ASYNC_ENABLE 2728#if EV_ASYNC_ENABLE
2299 async_pending = 0; 2729 async_pending = 0;
2300#endif 2730#endif
2301 pipe_write_skipped = 0; 2731 pipe_write_skipped = 0;
2302 pipe_write_wanted = 0; 2732 pipe_write_wanted = 0;
2733 evpipe [0] = -1;
2734 evpipe [1] = -1;
2303#if EV_USE_INOTIFY 2735#if EV_USE_INOTIFY
2304 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2736 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2305#endif 2737#endif
2306#if EV_USE_SIGNALFD 2738#if EV_USE_SIGNALFD
2307 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2739 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2358 EV_INVOKE_PENDING; 2790 EV_INVOKE_PENDING;
2359 } 2791 }
2360#endif 2792#endif
2361 2793
2362#if EV_CHILD_ENABLE 2794#if EV_CHILD_ENABLE
2363 if (ev_is_active (&childev)) 2795 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2364 { 2796 {
2365 ev_ref (EV_A); /* child watcher */ 2797 ev_ref (EV_A); /* child watcher */
2366 ev_signal_stop (EV_A_ &childev); 2798 ev_signal_stop (EV_A_ &childev);
2367 } 2799 }
2368#endif 2800#endif
… …
2370 if (ev_is_active (&pipe_w)) 2802 if (ev_is_active (&pipe_w))
2371 { 2803 {
2372 /*ev_ref (EV_A);*/ 2804 /*ev_ref (EV_A);*/
2373 /*ev_io_stop (EV_A_ &pipe_w);*/ 2805 /*ev_io_stop (EV_A_ &pipe_w);*/
2374 2806
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]); 2807 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2383 EV_WIN32_CLOSE_FD (evpipe [1]); 2808 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2384 }
2385 } 2809 }
2386 2810
2387#if EV_USE_SIGNALFD 2811#if EV_USE_SIGNALFD
2388 if (ev_is_active (&sigfd_w)) 2812 if (ev_is_active (&sigfd_w))
2389 close (sigfd); 2813 close (sigfd);
… …
2475#endif 2899#endif
2476#if EV_USE_INOTIFY 2900#if EV_USE_INOTIFY
2477 infy_fork (EV_A); 2901 infy_fork (EV_A);
2478#endif 2902#endif
2479 2903
2904#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2480 if (ev_is_active (&pipe_w)) 2905 if (ev_is_active (&pipe_w))
2481 { 2906 {
2482 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2907 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2483 2908
2484 ev_ref (EV_A); 2909 ev_ref (EV_A);
2485 ev_io_stop (EV_A_ &pipe_w); 2910 ev_io_stop (EV_A_ &pipe_w);
2486 2911
2487#if EV_USE_EVENTFD
2488 if (evfd >= 0)
2489 close (evfd);
2490#endif
2491
2492 if (evpipe [0] >= 0) 2912 if (evpipe [0] >= 0)
2493 {
2494 EV_WIN32_CLOSE_FD (evpipe [0]); 2913 EV_WIN32_CLOSE_FD (evpipe [0]);
2495 EV_WIN32_CLOSE_FD (evpipe [1]);
2496 }
2497 2914
2498#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2499 evpipe_init (EV_A); 2915 evpipe_init (EV_A);
2500 /* now iterate over everything, in case we missed something */ 2916 /* iterate over everything, in case we missed something before */
2501 pipecb (EV_A_ &pipe_w, EV_READ); 2917 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2502#endif
2503 } 2918 }
2919#endif
2504 2920
2505 postfork = 0; 2921 postfork = 0;
2506} 2922}
2507 2923
2508#if EV_MULTIPLICITY 2924#if EV_MULTIPLICITY
… …
2563#if EV_FEATURE_API 2979#if EV_FEATURE_API
2564void ecb_cold 2980void ecb_cold
2565ev_verify (EV_P) EV_THROW 2981ev_verify (EV_P) EV_THROW
2566{ 2982{
2567#if EV_VERIFY 2983#if EV_VERIFY
2568 int i, j; 2984 int i;
2569 WL w, w2; 2985 WL w, w2;
2570 2986
2571 assert (activecnt >= -1); 2987 assert (activecnt >= -1);
2572 2988
2573 assert (fdchangemax >= fdchangecnt); 2989 assert (fdchangemax >= fdchangecnt);
2574 for (i = 0; i < fdchangecnt; ++i) 2990 for (i = 0; i < fdchangecnt; ++i)
2575 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2991 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2576 2992
2577 assert (anfdmax >= 0); 2993 assert (anfdmax >= 0);
2578 for (i = j = 0; i < anfdmax; ++i) 2994 for (i = 0; i < anfdmax; ++i)
2995 {
2996 int j = 0;
2997
2579 for (w = w2 = anfds [i].head; w; w = w->next) 2998 for (w = w2 = anfds [i].head; w; w = w->next)
2580 { 2999 {
2581 verify_watcher (EV_A_ (W)w); 3000 verify_watcher (EV_A_ (W)w);
2582 3001
2583 if (j++ & 1) 3002 if (j++ & 1)
2584 { 3003 {
2585 assert (("libev: io watcher list contains a loop", w != w2)); 3004 assert (("libev: io watcher list contains a loop", w != w2));
2586 w2 = w2->next; 3005 w2 = w2->next;
2587 } 3006 }
2588 3007
2589 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 3008 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)); 3009 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2591 } 3010 }
3011 }
2592 3012
2593 assert (timermax >= timercnt); 3013 assert (timermax >= timercnt);
2594 verify_heap (EV_A_ timers, timercnt); 3014 verify_heap (EV_A_ timers, timercnt);
2595 3015
2596#if EV_PERIODIC_ENABLE 3016#if EV_PERIODIC_ENABLE
… …
2677} 3097}
2678 3098
2679void 3099void
2680ev_loop_fork (EV_P) EV_THROW 3100ev_loop_fork (EV_P) EV_THROW
2681{ 3101{
2682 postfork = 1; /* must be in line with ev_default_fork */ 3102 postfork = 1;
2683} 3103}
2684 3104
2685/*****************************************************************************/ 3105/*****************************************************************************/
2686 3106
2687void 3107void
… …
2703} 3123}
2704 3124
2705void noinline 3125void noinline
2706ev_invoke_pending (EV_P) 3126ev_invoke_pending (EV_P)
2707{ 3127{
2708 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 3128 pendingpri = NUMPRI;
3129
3130 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
3131 {
3132 --pendingpri;
3133
2709 while (pendingcnt [pendingpri]) 3134 while (pendingcnt [pendingpri])
2710 { 3135 {
2711 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3136 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2712 3137
2713 p->w->pending = 0; 3138 p->w->pending = 0;
2714 EV_CB_INVOKE (p->w, p->events); 3139 EV_CB_INVOKE (p->w, p->events);
2715 EV_FREQUENT_CHECK; 3140 EV_FREQUENT_CHECK;
2716 } 3141 }
3142 }
2717} 3143}
2718 3144
2719#if EV_IDLE_ENABLE 3145#if EV_IDLE_ENABLE
2720/* make idle watchers pending. this handles the "call-idle */ 3146/* make idle watchers pending. this handles the "call-idle */
2721/* only when higher priorities are idle" logic */ 3147/* only when higher priorities are idle" logic */
… …
2811{ 3237{
2812 EV_FREQUENT_CHECK; 3238 EV_FREQUENT_CHECK;
2813 3239
2814 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 3240 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2815 { 3241 {
2816 int feed_count = 0;
2817
2818 do 3242 do
2819 { 3243 {
2820 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 3244 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2821 3245
2822 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 3246 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3081 backend_poll (EV_A_ waittime); 3505 backend_poll (EV_A_ waittime);
3082 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3506 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3083 3507
3084 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3508 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3085 3509
3510 ECB_MEMORY_FENCE_ACQUIRE;
3086 if (pipe_write_skipped) 3511 if (pipe_write_skipped)
3087 { 3512 {
3088 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3513 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); 3514 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3090 } 3515 }
… …
3468#if EV_MULTIPLICITY 3893#if EV_MULTIPLICITY
3469 assert (("libev: a signal must not be attached to two different loops", 3894 assert (("libev: a signal must not be attached to two different loops",
3470 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3895 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3471 3896
3472 signals [w->signum - 1].loop = EV_A; 3897 signals [w->signum - 1].loop = EV_A;
3898 ECB_MEMORY_FENCE_RELEASE;
3473#endif 3899#endif
3474 3900
3475 EV_FREQUENT_CHECK; 3901 EV_FREQUENT_CHECK;
3476 3902
3477#if EV_USE_SIGNALFD 3903#if EV_USE_SIGNALFD
… …
3632# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 4058# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3633 4059
3634static void noinline 4060static void noinline
3635infy_add (EV_P_ ev_stat *w) 4061infy_add (EV_P_ ev_stat *w)
3636{ 4062{
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); 4063 w->wd = inotify_add_watch (fs_fd, w->path,
4064 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
4065 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
4066 | IN_DONT_FOLLOW | IN_MASK_ADD);
3638 4067
3639 if (w->wd >= 0) 4068 if (w->wd >= 0)
3640 { 4069 {
3641 struct statfs sfs; 4070 struct statfs sfs;
3642 4071
… …
3646 4075
3647 if (!fs_2625) 4076 if (!fs_2625)
3648 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 4077 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3649 else if (!statfs (w->path, &sfs) 4078 else if (!statfs (w->path, &sfs)
3650 && (sfs.f_type == 0x1373 /* devfs */ 4079 && (sfs.f_type == 0x1373 /* devfs */
4080 || sfs.f_type == 0x4006 /* fat */
4081 || sfs.f_type == 0x4d44 /* msdos */
3651 || sfs.f_type == 0xEF53 /* ext2/3 */ 4082 || sfs.f_type == 0xEF53 /* ext2/3 */
4083 || sfs.f_type == 0x72b6 /* jffs2 */
4084 || sfs.f_type == 0x858458f6 /* ramfs */
4085 || sfs.f_type == 0x5346544e /* ntfs */
3652 || sfs.f_type == 0x3153464a /* jfs */ 4086 || sfs.f_type == 0x3153464a /* jfs */
4087 || sfs.f_type == 0x9123683e /* btrfs */
3653 || sfs.f_type == 0x52654973 /* reiser3 */ 4088 || sfs.f_type == 0x52654973 /* reiser3 */
3654 || sfs.f_type == 0x01021994 /* tempfs */ 4089 || sfs.f_type == 0x01021994 /* tmpfs */
3655 || sfs.f_type == 0x58465342 /* xfs */)) 4090 || sfs.f_type == 0x58465342 /* xfs */))
3656 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 4091 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3657 else 4092 else
3658 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 4093 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3659 } 4094 }

Diff Legend

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