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

Comparing libev/ev.c (file contents):
Revision 1.440 by root, Tue May 29 21:37:14 2012 UTC vs.
Revision 1.469 by root, Fri Sep 5 16:21:19 2014 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
261# endif 258# endif
262#endif 259#endif
… …
355# define EV_USE_4HEAP EV_FEATURE_DATA 352# define EV_USE_4HEAP EV_FEATURE_DATA
356#endif 353#endif
357 354
358#ifndef EV_HEAP_CACHE_AT 355#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 356# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
357#endif
358
359#ifdef ANDROID
360/* supposedly, android doesn't typedef fd_mask */
361# undef EV_USE_SELECT
362# define EV_USE_SELECT 0
363/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
364# undef EV_USE_CLOCK_SYSCALL
365# define EV_USE_CLOCK_SYSCALL 0
366#endif
367
368/* aix's poll.h seems to cause lots of trouble */
369#ifdef _AIX
370/* AIX has a completely broken poll.h header */
371# undef EV_USE_POLL
372# define EV_USE_POLL 0
360#endif 373#endif
361 374
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 375/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
363/* which makes programs even slower. might work on other unices, too. */ 376/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 377#if EV_USE_CLOCK_SYSCALL
… …
372# define EV_USE_CLOCK_SYSCALL 0 385# define EV_USE_CLOCK_SYSCALL 0
373# endif 386# endif
374#endif 387#endif
375 388
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 389/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377
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 390
384#ifndef CLOCK_MONOTONIC 391#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 392# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 393# define EV_USE_MONOTONIC 0
387#endif 394#endif
… …
475/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 482/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
476/* ECB.H BEGIN */ 483/* ECB.H BEGIN */
477/* 484/*
478 * libecb - http://software.schmorp.de/pkg/libecb 485 * libecb - http://software.schmorp.de/pkg/libecb
479 * 486 *
480 * Copyright (©) 2009-2012 Marc Alexander Lehmann <libecb@schmorp.de> 487 * Copyright (©) 2009-2014 Marc Alexander Lehmann <libecb@schmorp.de>
481 * Copyright (©) 2011 Emanuele Giaquinta 488 * Copyright (©) 2011 Emanuele Giaquinta
482 * All rights reserved. 489 * All rights reserved.
483 * 490 *
484 * Redistribution and use in source and binary forms, with or without modifica- 491 * Redistribution and use in source and binary forms, with or without modifica-
485 * tion, are permitted provided that the following conditions are met: 492 * tion, are permitted provided that the following conditions are met:
… …
499 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 506 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
500 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 507 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
501 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 508 * 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 509 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
503 * OF THE POSSIBILITY OF SUCH DAMAGE. 510 * OF THE POSSIBILITY OF SUCH DAMAGE.
511 *
512 * Alternatively, the contents of this file may be used under the terms of
513 * the GNU General Public License ("GPL") version 2 or any later version,
514 * in which case the provisions of the GPL are applicable instead of
515 * the above. If you wish to allow the use of your version of this file
516 * only under the terms of the GPL and not to allow others to use your
517 * version of this file under the BSD license, indicate your decision
518 * by deleting the provisions above and replace them with the notice
519 * and other provisions required by the GPL. If you do not delete the
520 * provisions above, a recipient may use your version of this file under
521 * either the BSD or the GPL.
504 */ 522 */
505 523
506#ifndef ECB_H 524#ifndef ECB_H
507#define ECB_H 525#define ECB_H
508 526
509/* 16 bits major, 16 bits minor */ 527/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 528#define ECB_VERSION 0x00010003
511 529
512#ifdef _WIN32 530#ifdef _WIN32
513 typedef signed char int8_t; 531 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 532 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 533 typedef signed short int16_t;
… …
530 #else 548 #else
531 #define ECB_PTRSIZE 4 549 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 550 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 551 typedef int32_t intptr_t;
534 #endif 552 #endif
535 typedef intptr_t ptrdiff_t;
536#else 553#else
537 #include <inttypes.h> 554 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 555 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 556 #define ECB_PTRSIZE 8
540 #else 557 #else
541 #define ECB_PTRSIZE 4 558 #define ECB_PTRSIZE 4
559 #endif
560#endif
561
562/* work around x32 idiocy by defining proper macros */
563#if __amd64 || __x86_64 || _M_AMD64 || _M_X64
564 #if _ILP32
565 #define ECB_AMD64_X32 1
566 #else
567 #define ECB_AMD64 1
542 #endif 568 #endif
543#endif 569#endif
544 570
545/* many compilers define _GNUC_ to some versions but then only implement 571/* many compilers define _GNUC_ to some versions but then only implement
546 * what their idiot authors think are the "more important" extensions, 572 * what their idiot authors think are the "more important" extensions,
… …
555 #else 581 #else
556 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 582 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
557 #endif 583 #endif
558#endif 584#endif
559 585
560#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
561#define ECB_C99 (__STDC_VERSION__ >= 199901L)
562#define ECB_C11 (__STDC_VERSION__ >= 201112L)
563#define ECB_CPP (__cplusplus+0) 586#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP98 (__cplusplus >= 199711L)
565#define ECB_CPP11 (__cplusplus >= 201103L) 587#define ECB_CPP11 (__cplusplus >= 201103L)
588
589#if ECB_CPP
590 #define ECB_C 0
591 #define ECB_STDC_VERSION 0
592#else
593 #define ECB_C 1
594 #define ECB_STDC_VERSION __STDC_VERSION__
595#endif
596
597#define ECB_C99 (ECB_STDC_VERSION >= 199901L)
598#define ECB_C11 (ECB_STDC_VERSION >= 201112L)
599
600#if ECB_CPP
601 #define ECB_EXTERN_C extern "C"
602 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
603 #define ECB_EXTERN_C_END }
604#else
605 #define ECB_EXTERN_C extern
606 #define ECB_EXTERN_C_BEG
607 #define ECB_EXTERN_C_END
608#endif
566 609
567/*****************************************************************************/ 610/*****************************************************************************/
568 611
569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 612/* 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 */ 613/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
… …
593 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 636 || 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") 637 #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__ \ 638 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
596 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 639 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
597 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 640 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
641 #elif __aarch64__
642 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
598 #elif __sparc || __sparc__ 643 #elif (__sparc || __sparc__) && !__sparcv8
599 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 644 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
600 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 645 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
601 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 646 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
602 #elif defined __s390__ || defined __s390x__ 647 #elif defined __s390__ || defined __s390x__
603 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 648 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
604 #elif defined __mips__ 649 #elif defined __mips__
650 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
651 /* 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") 652 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
606 #elif defined __alpha__ 653 #elif defined __alpha__
607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 654 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
608 #elif defined __hppa__ 655 #elif defined __hppa__
609 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 656 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
610 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 657 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
611 #elif defined __ia64__ 658 #elif defined __ia64__
612 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 659 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
660 #elif defined __m68k__
661 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
662 #elif defined __m88k__
663 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
664 #elif defined __sh__
665 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
613 #endif 666 #endif
614 #endif 667 #endif
615#endif 668#endif
616 669
617#ifndef ECB_MEMORY_FENCE 670#ifndef ECB_MEMORY_FENCE
618 #if ECB_GCC_VERSION(4,7) 671 #if ECB_GCC_VERSION(4,7)
619 /* see comment below about the C11 memory model. in short - avoid */ 672 /* see comment below (stdatomic.h) about the C11 memory model. */
620 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 673 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
674 #define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
675 #define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
676
677 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
678 * without risking compile time errors with other compilers. We *could*
679 * define our own ecb_clang_has_feature, but I just can't be bothered to work
680 * around this shit time and again.
621 #elif defined __clang && __has_feature (cxx_atomic) 681 * #elif defined __clang && __has_feature (cxx_atomic)
622 /* see above */ 682 * // see comment below (stdatomic.h) about the C11 memory model.
623 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 683 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
684 * #define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
685 * #define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
686 */
687
624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 688 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
625 #define ECB_MEMORY_FENCE __sync_synchronize () 689 #define ECB_MEMORY_FENCE __sync_synchronize ()
690 #elif _MSC_VER >= 1500 /* VC++ 2008 */
691 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
692 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
693 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
694 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
695 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
626 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 696 #elif _MSC_VER >= 1400 /* VC++ 2005 */
627 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 697 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
628 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 698 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
629 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 699 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
630 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 700 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
644#ifndef ECB_MEMORY_FENCE 714#ifndef ECB_MEMORY_FENCE
645 #if ECB_C11 && !defined __STDC_NO_ATOMICS__ 715 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
646 /* we assume that these memory fences work on all variables/all memory accesses, */ 716 /* we assume that these memory fences work on all variables/all memory accesses, */
647 /* not just C11 atomics and atomic accesses */ 717 /* not just C11 atomics and atomic accesses */
648 #include <stdatomic.h> 718 #include <stdatomic.h>
649 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */ 719 /* 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. */ 720 /* any fence other than seq_cst, which isn't very efficient for us. */
721 /* Why that is, we don't know - either the C11 memory model is quite useless */
722 /* for most usages, or gcc and clang have a bug */
723 /* I *currently* lean towards the latter, and inefficiently implement */
724 /* all three of ecb's fences as a seq_cst fence */
725 /* Update, gcc-4.8 generates mfence for all c++ fences, but nothing */
726 /* for all __atomic_thread_fence's except seq_cst */
651 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 727 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
652 #endif 728 #endif
653#endif 729#endif
654 730
655#ifndef ECB_MEMORY_FENCE 731#ifndef ECB_MEMORY_FENCE
… …
712 #define ecb_is_constant(expr) __builtin_constant_p (expr) 788 #define ecb_is_constant(expr) __builtin_constant_p (expr)
713 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 789 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
714 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality) 790 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
715#else 791#else
716 #define ecb_attribute(attrlist) 792 #define ecb_attribute(attrlist)
793
794 /* possible C11 impl for integral types
795 typedef struct ecb_is_constant_struct ecb_is_constant_struct;
796 #define ecb_is_constant(expr) _Generic ((1 ? (struct ecb_is_constant_struct *)0 : (void *)((expr) - (expr)), ecb_is_constant_struct *: 0, default: 1)) */
797
717 #define ecb_is_constant(expr) 0 798 #define ecb_is_constant(expr) 0
718 #define ecb_expect(expr,value) (expr) 799 #define ecb_expect(expr,value) (expr)
719 #define ecb_prefetch(addr,rw,locality) 800 #define ecb_prefetch(addr,rw,locality)
720#endif 801#endif
721 802
… …
724 #define ecb_decltype(x) __decltype(x) 805 #define ecb_decltype(x) __decltype(x)
725#elif ECB_GCC_VERSION(3,0) 806#elif ECB_GCC_VERSION(3,0)
726 #define ecb_decltype(x) __typeof(x) 807 #define ecb_decltype(x) __typeof(x)
727#endif 808#endif
728 809
810#if _MSC_VER >= 1300
811 #define ecb_deprecated __declspec(deprecated)
812#else
813 #define ecb_deprecated ecb_attribute ((__deprecated__))
814#endif
815
729#define ecb_noinline ecb_attribute ((__noinline__)) 816#define ecb_noinline ecb_attribute ((__noinline__))
730#define ecb_unused ecb_attribute ((__unused__)) 817#define ecb_unused ecb_attribute ((__unused__))
731#define ecb_const ecb_attribute ((__const__)) 818#define ecb_const ecb_attribute ((__const__))
732#define ecb_pure ecb_attribute ((__pure__)) 819#define ecb_pure ecb_attribute ((__pure__))
733 820
821/* http://msdn.microsoft.com/en-us/library/k6ktzx3s.aspx __declspec(noreturn) */
734#if ECB_C11 822#if ECB_C11
735 #define ecb_noreturn _Noreturn 823 #define ecb_noreturn _Noreturn
736#else 824#else
737 #define ecb_noreturn ecb_attribute ((__noreturn__)) 825 #define ecb_noreturn ecb_attribute ((__noreturn__))
738#endif 826#endif
… …
932 ecb_inline void ecb_unreachable (void) ecb_noreturn; 1020 ecb_inline void ecb_unreachable (void) ecb_noreturn;
933 ecb_inline void ecb_unreachable (void) { } 1021 ecb_inline void ecb_unreachable (void) { }
934#endif 1022#endif
935 1023
936/* try to tell the compiler that some condition is definitely true */ 1024/* try to tell the compiler that some condition is definitely true */
937#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 1025#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
938 1026
939ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 1027ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
940ecb_inline unsigned char 1028ecb_inline unsigned char
941ecb_byteorder_helper (void) 1029ecb_byteorder_helper (void)
942{ 1030{
943 const uint32_t u = 0x11223344; 1031 /* the union code still generates code under pressure in gcc, */
944 return *(unsigned char *)&u; 1032 /* but less than using pointers, and always seems to */
1033 /* successfully return a constant. */
1034 /* the reason why we have this horrible preprocessor mess */
1035 /* is to avoid it in all cases, at least on common architectures */
1036 /* or when using a recent enough gcc version (>= 4.6) */
1037#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
1038 return 0x44;
1039#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1040 return 0x44;
1041#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1042 return 0x11;
1043#else
1044 union
1045 {
1046 uint32_t i;
1047 uint8_t c;
1048 } u = { 0x11223344 };
1049 return u.c;
1050#endif
945} 1051}
946 1052
947ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1053ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
948ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1054ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
949ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1055ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
980 } 1086 }
981#else 1087#else
982 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1088 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
983#endif 1089#endif
984 1090
1091/*******************************************************************************/
1092/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1093
1094/* basically, everything uses "ieee pure-endian" floating point numbers */
1095/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1096#if 0 \
1097 || __i386 || __i386__ \
1098 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1099 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1100 || defined __s390__ || defined __s390x__ \
1101 || defined __mips__ \
1102 || defined __alpha__ \
1103 || defined __hppa__ \
1104 || defined __ia64__ \
1105 || defined __m68k__ \
1106 || defined __m88k__ \
1107 || defined __sh__ \
1108 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \
1109 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
1110 || defined __aarch64__
1111 #define ECB_STDFP 1
1112 #include <string.h> /* for memcpy */
1113#else
1114 #define ECB_STDFP 0
1115#endif
1116
1117#ifndef ECB_NO_LIBM
1118
1119 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1120
1121 /* only the oldest of old doesn't have this one. solaris. */
1122 #ifdef INFINITY
1123 #define ECB_INFINITY INFINITY
1124 #else
1125 #define ECB_INFINITY HUGE_VAL
1126 #endif
1127
1128 #ifdef NAN
1129 #define ECB_NAN NAN
1130 #else
1131 #define ECB_NAN ECB_INFINITY
1132 #endif
1133
1134 /* converts an ieee half/binary16 to a float */
1135 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
1136 ecb_function_ float
1137 ecb_binary16_to_float (uint16_t x)
1138 {
1139 int e = (x >> 10) & 0x1f;
1140 int m = x & 0x3ff;
1141 float r;
1142
1143 if (!e ) r = ldexpf (m , -24);
1144 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
1145 else if (m ) r = ECB_NAN;
1146 else r = ECB_INFINITY;
1147
1148 return x & 0x8000 ? -r : r;
1149 }
1150
1151 /* convert a float to ieee single/binary32 */
1152 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1153 ecb_function_ uint32_t
1154 ecb_float_to_binary32 (float x)
1155 {
1156 uint32_t r;
1157
1158 #if ECB_STDFP
1159 memcpy (&r, &x, 4);
1160 #else
1161 /* slow emulation, works for anything but -0 */
1162 uint32_t m;
1163 int e;
1164
1165 if (x == 0e0f ) return 0x00000000U;
1166 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1167 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1168 if (x != x ) return 0x7fbfffffU;
1169
1170 m = frexpf (x, &e) * 0x1000000U;
1171
1172 r = m & 0x80000000U;
1173
1174 if (r)
1175 m = -m;
1176
1177 if (e <= -126)
1178 {
1179 m &= 0xffffffU;
1180 m >>= (-125 - e);
1181 e = -126;
1182 }
1183
1184 r |= (e + 126) << 23;
1185 r |= m & 0x7fffffU;
1186 #endif
1187
1188 return r;
1189 }
1190
1191 /* converts an ieee single/binary32 to a float */
1192 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1193 ecb_function_ float
1194 ecb_binary32_to_float (uint32_t x)
1195 {
1196 float r;
1197
1198 #if ECB_STDFP
1199 memcpy (&r, &x, 4);
1200 #else
1201 /* emulation, only works for normals and subnormals and +0 */
1202 int neg = x >> 31;
1203 int e = (x >> 23) & 0xffU;
1204
1205 x &= 0x7fffffU;
1206
1207 if (e)
1208 x |= 0x800000U;
1209 else
1210 e = 1;
1211
1212 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1213 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1214
1215 r = neg ? -r : r;
1216 #endif
1217
1218 return r;
1219 }
1220
1221 /* convert a double to ieee double/binary64 */
1222 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1223 ecb_function_ uint64_t
1224 ecb_double_to_binary64 (double x)
1225 {
1226 uint64_t r;
1227
1228 #if ECB_STDFP
1229 memcpy (&r, &x, 8);
1230 #else
1231 /* slow emulation, works for anything but -0 */
1232 uint64_t m;
1233 int e;
1234
1235 if (x == 0e0 ) return 0x0000000000000000U;
1236 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1237 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1238 if (x != x ) return 0X7ff7ffffffffffffU;
1239
1240 m = frexp (x, &e) * 0x20000000000000U;
1241
1242 r = m & 0x8000000000000000;;
1243
1244 if (r)
1245 m = -m;
1246
1247 if (e <= -1022)
1248 {
1249 m &= 0x1fffffffffffffU;
1250 m >>= (-1021 - e);
1251 e = -1022;
1252 }
1253
1254 r |= ((uint64_t)(e + 1022)) << 52;
1255 r |= m & 0xfffffffffffffU;
1256 #endif
1257
1258 return r;
1259 }
1260
1261 /* converts an ieee double/binary64 to a double */
1262 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1263 ecb_function_ double
1264 ecb_binary64_to_double (uint64_t x)
1265 {
1266 double r;
1267
1268 #if ECB_STDFP
1269 memcpy (&r, &x, 8);
1270 #else
1271 /* emulation, only works for normals and subnormals and +0 */
1272 int neg = x >> 63;
1273 int e = (x >> 52) & 0x7ffU;
1274
1275 x &= 0xfffffffffffffU;
1276
1277 if (e)
1278 x |= 0x10000000000000U;
1279 else
1280 e = 1;
1281
1282 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1283 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1284
1285 r = neg ? -r : r;
1286 #endif
1287
1288 return r;
1289 }
1290
1291#endif
1292
985#endif 1293#endif
986 1294
987/* ECB.H END */ 1295/* ECB.H END */
988 1296
989#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1297#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1188} 1496}
1189 1497
1190static void * 1498static void *
1191ev_realloc_emul (void *ptr, long size) EV_THROW 1499ev_realloc_emul (void *ptr, long size) EV_THROW
1192{ 1500{
1193#if __GLIBC__
1194 return realloc (ptr, size);
1195#else
1196 /* some systems, notably openbsd and darwin, fail to properly 1501 /* some systems, notably openbsd and darwin, fail to properly
1197 * implement realloc (x, 0) (as required by both ansi c-89 and 1502 * implement realloc (x, 0) (as required by both ansi c-89 and
1198 * the single unix specification, so work around them here. 1503 * the single unix specification, so work around them here.
1504 * recently, also (at least) fedora and debian started breaking it,
1505 * despite documenting it otherwise.
1199 */ 1506 */
1200 1507
1201 if (size) 1508 if (size)
1202 return realloc (ptr, size); 1509 return realloc (ptr, size);
1203 1510
1204 free (ptr); 1511 free (ptr);
1205 return 0; 1512 return 0;
1206#endif
1207} 1513}
1208 1514
1209static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1515static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1210 1516
1211void ecb_cold 1517void ecb_cold
… …
1866static void noinline ecb_cold 2172static void noinline ecb_cold
1867evpipe_init (EV_P) 2173evpipe_init (EV_P)
1868{ 2174{
1869 if (!ev_is_active (&pipe_w)) 2175 if (!ev_is_active (&pipe_w))
1870 { 2176 {
2177 int fds [2];
2178
1871# if EV_USE_EVENTFD 2179# if EV_USE_EVENTFD
2180 fds [0] = -1;
1872 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2181 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1873 if (evfd < 0 && errno == EINVAL) 2182 if (fds [1] < 0 && errno == EINVAL)
1874 evfd = eventfd (0, 0); 2183 fds [1] = eventfd (0, 0);
1875 2184
1876 if (evfd >= 0) 2185 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 2186# endif
1884 { 2187 {
1885 while (pipe (evpipe)) 2188 while (pipe (fds))
1886 ev_syserr ("(libev) error creating signal/async pipe"); 2189 ev_syserr ("(libev) error creating signal/async pipe");
1887 2190
1888 fd_intern (evpipe [0]); 2191 fd_intern (fds [0]);
1889 fd_intern (evpipe [1]);
1890 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1891 } 2192 }
1892 2193
2194 evpipe [0] = fds [0];
2195
2196 if (evpipe [1] < 0)
2197 evpipe [1] = fds [1]; /* first call, set write fd */
2198 else
2199 {
2200 /* on subsequent calls, do not change evpipe [1] */
2201 /* so that evpipe_write can always rely on its value. */
2202 /* this branch does not do anything sensible on windows, */
2203 /* so must not be executed on windows */
2204
2205 dup2 (fds [1], evpipe [1]);
2206 close (fds [1]);
2207 }
2208
2209 fd_intern (evpipe [1]);
2210
2211 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1893 ev_io_start (EV_A_ &pipe_w); 2212 ev_io_start (EV_A_ &pipe_w);
1894 ev_unref (EV_A); /* watcher should not keep loop alive */ 2213 ev_unref (EV_A); /* watcher should not keep loop alive */
1895 } 2214 }
1896} 2215}
1897 2216
… …
1918 ECB_MEMORY_FENCE_RELEASE; 2237 ECB_MEMORY_FENCE_RELEASE;
1919 2238
1920 old_errno = errno; /* save errno because write will clobber it */ 2239 old_errno = errno; /* save errno because write will clobber it */
1921 2240
1922#if EV_USE_EVENTFD 2241#if EV_USE_EVENTFD
1923 if (evfd >= 0) 2242 if (evpipe [0] < 0)
1924 { 2243 {
1925 uint64_t counter = 1; 2244 uint64_t counter = 1;
1926 write (evfd, &counter, sizeof (uint64_t)); 2245 write (evpipe [1], &counter, sizeof (uint64_t));
1927 } 2246 }
1928 else 2247 else
1929#endif 2248#endif
1930 { 2249 {
1931#ifdef _WIN32 2250#ifdef _WIN32
… …
1951 int i; 2270 int i;
1952 2271
1953 if (revents & EV_READ) 2272 if (revents & EV_READ)
1954 { 2273 {
1955#if EV_USE_EVENTFD 2274#if EV_USE_EVENTFD
1956 if (evfd >= 0) 2275 if (evpipe [0] < 0)
1957 { 2276 {
1958 uint64_t counter; 2277 uint64_t counter;
1959 read (evfd, &counter, sizeof (uint64_t)); 2278 read (evpipe [1], &counter, sizeof (uint64_t));
1960 } 2279 }
1961 else 2280 else
1962#endif 2281#endif
1963 { 2282 {
1964 char dummy[4]; 2283 char dummy[4];
… …
2014 2333
2015void 2334void
2016ev_feed_signal (int signum) EV_THROW 2335ev_feed_signal (int signum) EV_THROW
2017{ 2336{
2018#if EV_MULTIPLICITY 2337#if EV_MULTIPLICITY
2338 EV_P;
2339 ECB_MEMORY_FENCE_ACQUIRE;
2019 EV_P = signals [signum - 1].loop; 2340 EV_A = signals [signum - 1].loop;
2020 2341
2021 if (!EV_A) 2342 if (!EV_A)
2022 return; 2343 return;
2023#endif 2344#endif
2024 2345
2025 if (!ev_active (&pipe_w))
2026 return;
2027
2028 signals [signum - 1].pending = 1; 2346 signals [signum - 1].pending = 1;
2029 evpipe_write (EV_A_ &sig_pending); 2347 evpipe_write (EV_A_ &sig_pending);
2030} 2348}
2031 2349
2032static void 2350static void
… …
2042void noinline 2360void noinline
2043ev_feed_signal_event (EV_P_ int signum) EV_THROW 2361ev_feed_signal_event (EV_P_ int signum) EV_THROW
2044{ 2362{
2045 WL w; 2363 WL w;
2046 2364
2047 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2365 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2048 return; 2366 return;
2049 2367
2050 --signum; 2368 --signum;
2051 2369
2052#if EV_MULTIPLICITY 2370#if EV_MULTIPLICITY
… …
2280{ 2598{
2281 return userdata; 2599 return userdata;
2282} 2600}
2283 2601
2284void 2602void
2285ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW 2603ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
2286{ 2604{
2287 invoke_cb = invoke_pending_cb; 2605 invoke_cb = invoke_pending_cb;
2288} 2606}
2289 2607
2290void 2608void
2291ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW 2609ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW
2292{ 2610{
2293 release_cb = release; 2611 release_cb = release;
2294 acquire_cb = acquire; 2612 acquire_cb = acquire;
2295} 2613}
2296#endif 2614#endif
… …
2350#if EV_ASYNC_ENABLE 2668#if EV_ASYNC_ENABLE
2351 async_pending = 0; 2669 async_pending = 0;
2352#endif 2670#endif
2353 pipe_write_skipped = 0; 2671 pipe_write_skipped = 0;
2354 pipe_write_wanted = 0; 2672 pipe_write_wanted = 0;
2673 evpipe [0] = -1;
2674 evpipe [1] = -1;
2355#if EV_USE_INOTIFY 2675#if EV_USE_INOTIFY
2356 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2676 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2357#endif 2677#endif
2358#if EV_USE_SIGNALFD 2678#if EV_USE_SIGNALFD
2359 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2679 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2422 if (ev_is_active (&pipe_w)) 2742 if (ev_is_active (&pipe_w))
2423 { 2743 {
2424 /*ev_ref (EV_A);*/ 2744 /*ev_ref (EV_A);*/
2425 /*ev_io_stop (EV_A_ &pipe_w);*/ 2745 /*ev_io_stop (EV_A_ &pipe_w);*/
2426 2746
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]); 2747 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2435 EV_WIN32_CLOSE_FD (evpipe [1]); 2748 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2436 }
2437 } 2749 }
2438 2750
2439#if EV_USE_SIGNALFD 2751#if EV_USE_SIGNALFD
2440 if (ev_is_active (&sigfd_w)) 2752 if (ev_is_active (&sigfd_w))
2441 close (sigfd); 2753 close (sigfd);
… …
2527#endif 2839#endif
2528#if EV_USE_INOTIFY 2840#if EV_USE_INOTIFY
2529 infy_fork (EV_A); 2841 infy_fork (EV_A);
2530#endif 2842#endif
2531 2843
2844#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2532 if (ev_is_active (&pipe_w)) 2845 if (ev_is_active (&pipe_w))
2533 { 2846 {
2534 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2847 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2535 2848
2536 ev_ref (EV_A); 2849 ev_ref (EV_A);
2537 ev_io_stop (EV_A_ &pipe_w); 2850 ev_io_stop (EV_A_ &pipe_w);
2538 2851
2539#if EV_USE_EVENTFD
2540 if (evfd >= 0)
2541 close (evfd);
2542#endif
2543
2544 if (evpipe [0] >= 0) 2852 if (evpipe [0] >= 0)
2545 {
2546 EV_WIN32_CLOSE_FD (evpipe [0]); 2853 EV_WIN32_CLOSE_FD (evpipe [0]);
2547 EV_WIN32_CLOSE_FD (evpipe [1]);
2548 }
2549 2854
2550#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2551 evpipe_init (EV_A); 2855 evpipe_init (EV_A);
2552 /* now iterate over everything, in case we missed something */ 2856 /* iterate over everything, in case we missed something before */
2553 pipecb (EV_A_ &pipe_w, EV_READ); 2857 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2554#endif
2555 } 2858 }
2859#endif
2556 2860
2557 postfork = 0; 2861 postfork = 0;
2558} 2862}
2559 2863
2560#if EV_MULTIPLICITY 2864#if EV_MULTIPLICITY
… …
2759} 3063}
2760 3064
2761void noinline 3065void noinline
2762ev_invoke_pending (EV_P) 3066ev_invoke_pending (EV_P)
2763{ 3067{
2764 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 3068 pendingpri = NUMPRI;
3069
3070 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
3071 {
3072 --pendingpri;
3073
2765 while (pendingcnt [pendingpri]) 3074 while (pendingcnt [pendingpri])
2766 { 3075 {
2767 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3076 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2768 3077
2769 p->w->pending = 0; 3078 p->w->pending = 0;
2770 EV_CB_INVOKE (p->w, p->events); 3079 EV_CB_INVOKE (p->w, p->events);
2771 EV_FREQUENT_CHECK; 3080 EV_FREQUENT_CHECK;
2772 } 3081 }
3082 }
2773} 3083}
2774 3084
2775#if EV_IDLE_ENABLE 3085#if EV_IDLE_ENABLE
2776/* make idle watchers pending. this handles the "call-idle */ 3086/* make idle watchers pending. this handles the "call-idle */
2777/* only when higher priorities are idle" logic */ 3087/* only when higher priorities are idle" logic */
… …
3135 backend_poll (EV_A_ waittime); 3445 backend_poll (EV_A_ waittime);
3136 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3446 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3137 3447
3138 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3448 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3139 3449
3450 ECB_MEMORY_FENCE_ACQUIRE;
3140 if (pipe_write_skipped) 3451 if (pipe_write_skipped)
3141 { 3452 {
3142 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3453 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); 3454 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3144 } 3455 }
… …
3522#if EV_MULTIPLICITY 3833#if EV_MULTIPLICITY
3523 assert (("libev: a signal must not be attached to two different loops", 3834 assert (("libev: a signal must not be attached to two different loops",
3524 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3835 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3525 3836
3526 signals [w->signum - 1].loop = EV_A; 3837 signals [w->signum - 1].loop = EV_A;
3838 ECB_MEMORY_FENCE_RELEASE;
3527#endif 3839#endif
3528 3840
3529 EV_FREQUENT_CHECK; 3841 EV_FREQUENT_CHECK;
3530 3842
3531#if EV_USE_SIGNALFD 3843#if EV_USE_SIGNALFD
… …
3686# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3998# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3687 3999
3688static void noinline 4000static void noinline
3689infy_add (EV_P_ ev_stat *w) 4001infy_add (EV_P_ ev_stat *w)
3690{ 4002{
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); 4003 w->wd = inotify_add_watch (fs_fd, w->path,
4004 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
4005 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
4006 | IN_DONT_FOLLOW | IN_MASK_ADD);
3692 4007
3693 if (w->wd >= 0) 4008 if (w->wd >= 0)
3694 { 4009 {
3695 struct statfs sfs; 4010 struct statfs sfs;
3696 4011
… …
3700 4015
3701 if (!fs_2625) 4016 if (!fs_2625)
3702 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 4017 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3703 else if (!statfs (w->path, &sfs) 4018 else if (!statfs (w->path, &sfs)
3704 && (sfs.f_type == 0x1373 /* devfs */ 4019 && (sfs.f_type == 0x1373 /* devfs */
4020 || sfs.f_type == 0x4006 /* fat */
4021 || sfs.f_type == 0x4d44 /* msdos */
3705 || sfs.f_type == 0xEF53 /* ext2/3 */ 4022 || sfs.f_type == 0xEF53 /* ext2/3 */
4023 || sfs.f_type == 0x72b6 /* jffs2 */
4024 || sfs.f_type == 0x858458f6 /* ramfs */
4025 || sfs.f_type == 0x5346544e /* ntfs */
3706 || sfs.f_type == 0x3153464a /* jfs */ 4026 || sfs.f_type == 0x3153464a /* jfs */
4027 || sfs.f_type == 0x9123683e /* btrfs */
3707 || sfs.f_type == 0x52654973 /* reiser3 */ 4028 || sfs.f_type == 0x52654973 /* reiser3 */
3708 || sfs.f_type == 0x01021994 /* tempfs */ 4029 || sfs.f_type == 0x01021994 /* tmpfs */
3709 || sfs.f_type == 0x58465342 /* xfs */)) 4030 || sfs.f_type == 0x58465342 /* xfs */))
3710 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 4031 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3711 else 4032 else
3712 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 4033 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3713 } 4034 }

Diff Legend

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