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

Comparing libev/ev.c (file contents):
Revision 1.432 by root, Mon May 14 19:09:58 2012 UTC vs.
Revision 1.463 by root, Thu Jan 16 11:51:05 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 *
… …
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-2013 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:
… …
504 */ 511 */
505 512
506#ifndef ECB_H 513#ifndef ECB_H
507#define ECB_H 514#define ECB_H
508 515
516/* 16 bits major, 16 bits minor */
517#define ECB_VERSION 0x00010003
518
509#ifdef _WIN32 519#ifdef _WIN32
510 typedef signed char int8_t; 520 typedef signed char int8_t;
511 typedef unsigned char uint8_t; 521 typedef unsigned char uint8_t;
512 typedef signed short int16_t; 522 typedef signed short int16_t;
513 typedef unsigned short uint16_t; 523 typedef unsigned short uint16_t;
… …
518 typedef unsigned long long uint64_t; 528 typedef unsigned long long uint64_t;
519 #else /* _MSC_VER || __BORLANDC__ */ 529 #else /* _MSC_VER || __BORLANDC__ */
520 typedef signed __int64 int64_t; 530 typedef signed __int64 int64_t;
521 typedef unsigned __int64 uint64_t; 531 typedef unsigned __int64 uint64_t;
522 #endif 532 #endif
533 #ifdef _WIN64
534 #define ECB_PTRSIZE 8
535 typedef uint64_t uintptr_t;
536 typedef int64_t intptr_t;
537 #else
538 #define ECB_PTRSIZE 4
539 typedef uint32_t uintptr_t;
540 typedef int32_t intptr_t;
541 #endif
523#else 542#else
524 #include <inttypes.h> 543 #include <inttypes.h>
544 #if UINTMAX_MAX > 0xffffffffU
545 #define ECB_PTRSIZE 8
546 #else
547 #define ECB_PTRSIZE 4
548 #endif
549#endif
550
551/* work around x32 idiocy by defining proper macros */
552#if __amd64 || __x86_64 || _M_AMD64 || _M_X64
553 #if _ILP32
554 #define ECB_AMD64_X32 1
555 #else
556 #define ECB_AMD64 1
557 #endif
525#endif 558#endif
526 559
527/* many compilers define _GNUC_ to some versions but then only implement 560/* many compilers define _GNUC_ to some versions but then only implement
528 * what their idiot authors think are the "more important" extensions, 561 * what their idiot authors think are the "more important" extensions,
529 * causing enormous grief in return for some better fake benchmark numbers. 562 * causing enormous grief in return for some better fake benchmark numbers.
… …
537 #else 570 #else
538 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 571 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
539 #endif 572 #endif
540#endif 573#endif
541 574
575#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
576#define ECB_C99 (__STDC_VERSION__ >= 199901L)
577#define ECB_C11 (__STDC_VERSION__ >= 201112L)
578#define ECB_CPP (__cplusplus+0)
579#define ECB_CPP11 (__cplusplus >= 201103L)
580
581#if ECB_CPP
582 #define ECB_EXTERN_C extern "C"
583 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
584 #define ECB_EXTERN_C_END }
585#else
586 #define ECB_EXTERN_C extern
587 #define ECB_EXTERN_C_BEG
588 #define ECB_EXTERN_C_END
589#endif
590
542/*****************************************************************************/ 591/*****************************************************************************/
543 592
544/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 593/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
545/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 594/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
546 595
547#if ECB_NO_THREADS 596#if ECB_NO_THREADS
548# define ECB_NO_SMP 1 597 #define ECB_NO_SMP 1
549#endif 598#endif
550 599
551#if ECB_NO_THREADS || ECB_NO_SMP 600#if ECB_NO_SMP
552 #define ECB_MEMORY_FENCE do { } while (0) 601 #define ECB_MEMORY_FENCE do { } while (0)
553#endif 602#endif
554 603
555#ifndef ECB_MEMORY_FENCE 604#ifndef ECB_MEMORY_FENCE
556 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 605 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
557 #if __i386 || __i386__ 606 #if __i386 || __i386__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
559 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 608 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
560 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
561 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 610 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 612 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 613 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 614 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 615 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
567 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 616 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
568 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 617 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 618 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
570 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 619 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
571 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 620 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 621 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
573 #elif __sparc || __sparc__ 622 #elif (__sparc || __sparc__) && !__sparcv8
574 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 623 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
575 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 624 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
576 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 625 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
577 #elif defined __s390__ || defined __s390x__ 626 #elif defined __s390__ || defined __s390x__
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 627 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
579 #elif defined __mips__ 628 #elif defined __mips__
629 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
630 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
580 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 631 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
581 #elif defined __alpha__ 632 #elif defined __alpha__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 633 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
634 #elif defined __hppa__
635 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
636 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
637 #elif defined __ia64__
638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
639 #elif defined __m68k__
640 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
641 #elif defined __m88k__
642 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
643 #elif defined __sh__
644 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
583 #endif 645 #endif
584 #endif 646 #endif
585#endif 647#endif
586 648
587#ifndef ECB_MEMORY_FENCE 649#ifndef ECB_MEMORY_FENCE
650 #if ECB_GCC_VERSION(4,7)
651 /* see comment below (stdatomic.h) about the C11 memory model. */
652 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
653
654 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
655 * without risking compile time errors with other compilers. We *could*
656 * define our own ecb_clang_has_feature, but I just can't be bothered to work
657 * around this shit time and again.
658 * #elif defined __clang && __has_feature (cxx_atomic)
659 * // see comment below (stdatomic.h) about the C11 memory model.
660 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
661 */
662
588 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 663 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
589 #define ECB_MEMORY_FENCE __sync_synchronize () 664 #define ECB_MEMORY_FENCE __sync_synchronize ()
590 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 665 #elif _MSC_VER >= 1500 /* VC++ 2008 */
591 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 666 /* apparently, microsoft broke all the memory barrier stuff in Visual Studio 2008... */
667 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
668 #define ECB_MEMORY_FENCE _ReadWriteBarrier (); MemoryBarrier()
669 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier (); MemoryBarrier() /* according to msdn, _ReadBarrier is not a load fence */
670 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier (); MemoryBarrier()
592 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 671 #elif _MSC_VER >= 1400 /* VC++ 2005 */
593 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 672 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
594 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 673 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
595 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 674 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
596 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 675 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
606 #define ECB_MEMORY_FENCE __sync () 685 #define ECB_MEMORY_FENCE __sync ()
607 #endif 686 #endif
608#endif 687#endif
609 688
610#ifndef ECB_MEMORY_FENCE 689#ifndef ECB_MEMORY_FENCE
690 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
691 /* we assume that these memory fences work on all variables/all memory accesses, */
692 /* not just C11 atomics and atomic accesses */
693 #include <stdatomic.h>
694 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
695 /* any fence other than seq_cst, which isn't very efficient for us. */
696 /* Why that is, we don't know - either the C11 memory model is quite useless */
697 /* for most usages, or gcc and clang have a bug */
698 /* I *currently* lean towards the latter, and inefficiently implement */
699 /* all three of ecb's fences as a seq_cst fence */
700 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
701 #endif
702#endif
703
704#ifndef ECB_MEMORY_FENCE
611 #if !ECB_AVOID_PTHREADS 705 #if !ECB_AVOID_PTHREADS
612 /* 706 /*
613 * if you get undefined symbol references to pthread_mutex_lock, 707 * if you get undefined symbol references to pthread_mutex_lock,
614 * or failure to find pthread.h, then you should implement 708 * or failure to find pthread.h, then you should implement
615 * the ECB_MEMORY_FENCE operations for your cpu/compiler 709 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
633 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 727 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
634#endif 728#endif
635 729
636/*****************************************************************************/ 730/*****************************************************************************/
637 731
638#define ECB_C99 (__STDC_VERSION__ >= 199901L)
639
640#if __cplusplus 732#if __cplusplus
641 #define ecb_inline static inline 733 #define ecb_inline static inline
642#elif ECB_GCC_VERSION(2,5) 734#elif ECB_GCC_VERSION(2,5)
643 #define ecb_inline static __inline__ 735 #define ecb_inline static __inline__
644#elif ECB_C99 736#elif ECB_C99
… …
682#elif ECB_GCC_VERSION(3,0) 774#elif ECB_GCC_VERSION(3,0)
683 #define ecb_decltype(x) __typeof(x) 775 #define ecb_decltype(x) __typeof(x)
684#endif 776#endif
685 777
686#define ecb_noinline ecb_attribute ((__noinline__)) 778#define ecb_noinline ecb_attribute ((__noinline__))
687#define ecb_noreturn ecb_attribute ((__noreturn__))
688#define ecb_unused ecb_attribute ((__unused__)) 779#define ecb_unused ecb_attribute ((__unused__))
689#define ecb_const ecb_attribute ((__const__)) 780#define ecb_const ecb_attribute ((__const__))
690#define ecb_pure ecb_attribute ((__pure__)) 781#define ecb_pure ecb_attribute ((__pure__))
782
783#if ECB_C11
784 #define ecb_noreturn _Noreturn
785#else
786 #define ecb_noreturn ecb_attribute ((__noreturn__))
787#endif
691 788
692#if ECB_GCC_VERSION(4,3) 789#if ECB_GCC_VERSION(4,3)
693 #define ecb_artificial ecb_attribute ((__artificial__)) 790 #define ecb_artificial ecb_attribute ((__artificial__))
694 #define ecb_hot ecb_attribute ((__hot__)) 791 #define ecb_hot ecb_attribute ((__hot__))
695 #define ecb_cold ecb_attribute ((__cold__)) 792 #define ecb_cold ecb_attribute ((__cold__))
… …
786 883
787 return r + ecb_ld32 (x); 884 return r + ecb_ld32 (x);
788 } 885 }
789#endif 886#endif
790 887
888ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
889ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
890ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
891ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
892
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 893ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
792ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 894ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
793{ 895{
794 return ( (x * 0x0802U & 0x22110U) 896 return ( (x * 0x0802U & 0x22110U)
795 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 897 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
879 ecb_inline void ecb_unreachable (void) ecb_noreturn; 981 ecb_inline void ecb_unreachable (void) ecb_noreturn;
880 ecb_inline void ecb_unreachable (void) { } 982 ecb_inline void ecb_unreachable (void) { }
881#endif 983#endif
882 984
883/* try to tell the compiler that some condition is definitely true */ 985/* try to tell the compiler that some condition is definitely true */
884#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 986#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
885 987
886ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 988ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
887ecb_inline unsigned char 989ecb_inline unsigned char
888ecb_byteorder_helper (void) 990ecb_byteorder_helper (void)
889{ 991{
890 const uint32_t u = 0x11223344; 992 /* the union code still generates code under pressure in gcc, */
891 return *(unsigned char *)&u; 993 /* but less than using pointers, and always seems to */
994 /* successfully return a constant. */
995 /* the reason why we have this horrible preprocessor mess */
996 /* is to avoid it in all cases, at least on common architectures */
997 /* or when using a recent enough gcc version (>= 4.6) */
998#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
999 return 0x44;
1000#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
1001 return 0x44;
1002#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1003 return 0x11;
1004#else
1005 union
1006 {
1007 uint32_t i;
1008 uint8_t c;
1009 } u = { 0x11223344 };
1010 return u.c;
1011#endif
892} 1012}
893 1013
894ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1014ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
895ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1015ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
896ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1016ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
927 } 1047 }
928#else 1048#else
929 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1049 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
930#endif 1050#endif
931 1051
1052/*******************************************************************************/
1053/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1054
1055/* basically, everything uses "ieee pure-endian" floating point numbers */
1056/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1057#if 0 \
1058 || __i386 || __i386__ \
1059 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1060 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1061 || defined __arm__ && defined __ARM_EABI__ \
1062 || defined __s390__ || defined __s390x__ \
1063 || defined __mips__ \
1064 || defined __alpha__ \
1065 || defined __hppa__ \
1066 || defined __ia64__ \
1067 || defined __m68k__ \
1068 || defined __m88k__ \
1069 || defined __sh__ \
1070 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1071 #define ECB_STDFP 1
1072 #include <string.h> /* for memcpy */
1073#else
1074 #define ECB_STDFP 0
1075#endif
1076
1077#ifndef ECB_NO_LIBM
1078
1079 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1080
1081 /* only the oldest of old doesn't have this one. solaris. */
1082 #ifdef INFINITY
1083 #define ECB_INFINITY INFINITY
1084 #else
1085 #define ECB_INFINITY HUGE_VAL
1086 #endif
1087
1088 #ifdef NAN
1089 #define ECB_NAN NAN
1090 #else
1091 #define ECB_NAN ECB_INFINITY
1092 #endif
1093
1094 /* converts an ieee half/binary16 to a float */
1095 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
1096 ecb_function_ float
1097 ecb_binary16_to_float (uint16_t x)
1098 {
1099 int e = (x >> 10) & 0x1f;
1100 int m = x & 0x3ff;
1101 float r;
1102
1103 if (!e ) r = ldexpf (m , -24);
1104 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
1105 else if (m ) r = ECB_NAN;
1106 else r = ECB_INFINITY;
1107
1108 return x & 0x8000 ? -r : r;
1109 }
1110
1111 /* convert a float to ieee single/binary32 */
1112 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1113 ecb_function_ uint32_t
1114 ecb_float_to_binary32 (float x)
1115 {
1116 uint32_t r;
1117
1118 #if ECB_STDFP
1119 memcpy (&r, &x, 4);
1120 #else
1121 /* slow emulation, works for anything but -0 */
1122 uint32_t m;
1123 int e;
1124
1125 if (x == 0e0f ) return 0x00000000U;
1126 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1127 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1128 if (x != x ) return 0x7fbfffffU;
1129
1130 m = frexpf (x, &e) * 0x1000000U;
1131
1132 r = m & 0x80000000U;
1133
1134 if (r)
1135 m = -m;
1136
1137 if (e <= -126)
1138 {
1139 m &= 0xffffffU;
1140 m >>= (-125 - e);
1141 e = -126;
1142 }
1143
1144 r |= (e + 126) << 23;
1145 r |= m & 0x7fffffU;
1146 #endif
1147
1148 return r;
1149 }
1150
1151 /* converts an ieee single/binary32 to a float */
1152 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1153 ecb_function_ float
1154 ecb_binary32_to_float (uint32_t x)
1155 {
1156 float r;
1157
1158 #if ECB_STDFP
1159 memcpy (&r, &x, 4);
1160 #else
1161 /* emulation, only works for normals and subnormals and +0 */
1162 int neg = x >> 31;
1163 int e = (x >> 23) & 0xffU;
1164
1165 x &= 0x7fffffU;
1166
1167 if (e)
1168 x |= 0x800000U;
1169 else
1170 e = 1;
1171
1172 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1173 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1174
1175 r = neg ? -r : r;
1176 #endif
1177
1178 return r;
1179 }
1180
1181 /* convert a double to ieee double/binary64 */
1182 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1183 ecb_function_ uint64_t
1184 ecb_double_to_binary64 (double x)
1185 {
1186 uint64_t r;
1187
1188 #if ECB_STDFP
1189 memcpy (&r, &x, 8);
1190 #else
1191 /* slow emulation, works for anything but -0 */
1192 uint64_t m;
1193 int e;
1194
1195 if (x == 0e0 ) return 0x0000000000000000U;
1196 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1197 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1198 if (x != x ) return 0X7ff7ffffffffffffU;
1199
1200 m = frexp (x, &e) * 0x20000000000000U;
1201
1202 r = m & 0x8000000000000000;;
1203
1204 if (r)
1205 m = -m;
1206
1207 if (e <= -1022)
1208 {
1209 m &= 0x1fffffffffffffU;
1210 m >>= (-1021 - e);
1211 e = -1022;
1212 }
1213
1214 r |= ((uint64_t)(e + 1022)) << 52;
1215 r |= m & 0xfffffffffffffU;
1216 #endif
1217
1218 return r;
1219 }
1220
1221 /* converts an ieee double/binary64 to a double */
1222 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1223 ecb_function_ double
1224 ecb_binary64_to_double (uint64_t x)
1225 {
1226 double r;
1227
1228 #if ECB_STDFP
1229 memcpy (&r, &x, 8);
1230 #else
1231 /* emulation, only works for normals and subnormals and +0 */
1232 int neg = x >> 63;
1233 int e = (x >> 52) & 0x7ffU;
1234
1235 x &= 0xfffffffffffffU;
1236
1237 if (e)
1238 x |= 0x10000000000000U;
1239 else
1240 e = 1;
1241
1242 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1243 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1244
1245 r = neg ? -r : r;
1246 #endif
1247
1248 return r;
1249 }
1250
1251#endif
1252
932#endif 1253#endif
933 1254
934/* ECB.H END */ 1255/* ECB.H END */
935 1256
936#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1257#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1105#endif 1426#endif
1106 1427
1107static void (*syserr_cb)(const char *msg) EV_THROW; 1428static void (*syserr_cb)(const char *msg) EV_THROW;
1108 1429
1109void ecb_cold 1430void ecb_cold
1110ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1431ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1111{ 1432{
1112 syserr_cb = cb; 1433 syserr_cb = cb;
1113} 1434}
1114 1435
1115static void noinline ecb_cold 1436static void noinline ecb_cold
… …
1133 abort (); 1454 abort ();
1134 } 1455 }
1135} 1456}
1136 1457
1137static void * 1458static void *
1138ev_realloc_emul (void *ptr, long size) 1459ev_realloc_emul (void *ptr, long size) EV_THROW
1139{ 1460{
1140#if __GLIBC__
1141 return realloc (ptr, size);
1142#else
1143 /* some systems, notably openbsd and darwin, fail to properly 1461 /* some systems, notably openbsd and darwin, fail to properly
1144 * implement realloc (x, 0) (as required by both ansi c-89 and 1462 * implement realloc (x, 0) (as required by both ansi c-89 and
1145 * the single unix specification, so work around them here. 1463 * the single unix specification, so work around them here.
1464 * recently, also (at least) fedora and debian started breaking it,
1465 * despite documenting it otherwise.
1146 */ 1466 */
1147 1467
1148 if (size) 1468 if (size)
1149 return realloc (ptr, size); 1469 return realloc (ptr, size);
1150 1470
1151 free (ptr); 1471 free (ptr);
1152 return 0; 1472 return 0;
1153#endif
1154} 1473}
1155 1474
1156static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1475static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1157 1476
1158void ecb_cold 1477void ecb_cold
1159ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1478ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1160{ 1479{
1161 alloc = cb; 1480 alloc = cb;
1162} 1481}
1163 1482
1164inline_speed void * 1483inline_speed void *
… …
1813static void noinline ecb_cold 2132static void noinline ecb_cold
1814evpipe_init (EV_P) 2133evpipe_init (EV_P)
1815{ 2134{
1816 if (!ev_is_active (&pipe_w)) 2135 if (!ev_is_active (&pipe_w))
1817 { 2136 {
2137 int fds [2];
2138
1818# if EV_USE_EVENTFD 2139# if EV_USE_EVENTFD
2140 fds [0] = -1;
1819 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2141 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1820 if (evfd < 0 && errno == EINVAL) 2142 if (fds [1] < 0 && errno == EINVAL)
1821 evfd = eventfd (0, 0); 2143 fds [1] = eventfd (0, 0);
1822 2144
1823 if (evfd >= 0) 2145 if (fds [1] < 0)
1824 {
1825 evpipe [0] = -1;
1826 fd_intern (evfd); /* doing it twice doesn't hurt */
1827 ev_io_set (&pipe_w, evfd, EV_READ);
1828 }
1829 else
1830# endif 2146# endif
1831 { 2147 {
1832 while (pipe (evpipe)) 2148 while (pipe (fds))
1833 ev_syserr ("(libev) error creating signal/async pipe"); 2149 ev_syserr ("(libev) error creating signal/async pipe");
1834 2150
1835 fd_intern (evpipe [0]); 2151 fd_intern (fds [0]);
1836 fd_intern (evpipe [1]);
1837 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1838 } 2152 }
1839 2153
2154 evpipe [0] = fds [0];
2155
2156 if (evpipe [1] < 0)
2157 evpipe [1] = fds [1]; /* first call, set write fd */
2158 else
2159 {
2160 /* on subsequent calls, do not change evpipe [1] */
2161 /* so that evpipe_write can always rely on its value. */
2162 /* this branch does not do anything sensible on windows, */
2163 /* so must not be executed on windows */
2164
2165 dup2 (fds [1], evpipe [1]);
2166 close (fds [1]);
2167 }
2168
2169 fd_intern (evpipe [1]);
2170
2171 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1840 ev_io_start (EV_A_ &pipe_w); 2172 ev_io_start (EV_A_ &pipe_w);
1841 ev_unref (EV_A); /* watcher should not keep loop alive */ 2173 ev_unref (EV_A); /* watcher should not keep loop alive */
1842 } 2174 }
1843} 2175}
1844 2176
… …
1849 2181
1850 if (expect_true (*flag)) 2182 if (expect_true (*flag))
1851 return; 2183 return;
1852 2184
1853 *flag = 1; 2185 *flag = 1;
1854
1855 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 2186 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1856 2187
1857 pipe_write_skipped = 1; 2188 pipe_write_skipped = 1;
1858 2189
1859 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 2190 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1860 2191
1861 if (pipe_write_wanted) 2192 if (pipe_write_wanted)
1862 { 2193 {
1863 int old_errno; 2194 int old_errno;
1864 2195
1865 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 2196 pipe_write_skipped = 0;
2197 ECB_MEMORY_FENCE_RELEASE;
1866 2198
1867 old_errno = errno; /* save errno because write will clobber it */ 2199 old_errno = errno; /* save errno because write will clobber it */
1868 2200
1869#if EV_USE_EVENTFD 2201#if EV_USE_EVENTFD
1870 if (evfd >= 0) 2202 if (evpipe [0] < 0)
1871 { 2203 {
1872 uint64_t counter = 1; 2204 uint64_t counter = 1;
1873 write (evfd, &counter, sizeof (uint64_t)); 2205 write (evpipe [1], &counter, sizeof (uint64_t));
1874 } 2206 }
1875 else 2207 else
1876#endif 2208#endif
1877 { 2209 {
1878#ifdef _WIN32 2210#ifdef _WIN32
… …
1898 int i; 2230 int i;
1899 2231
1900 if (revents & EV_READ) 2232 if (revents & EV_READ)
1901 { 2233 {
1902#if EV_USE_EVENTFD 2234#if EV_USE_EVENTFD
1903 if (evfd >= 0) 2235 if (evpipe [0] < 0)
1904 { 2236 {
1905 uint64_t counter; 2237 uint64_t counter;
1906 read (evfd, &counter, sizeof (uint64_t)); 2238 read (evpipe [1], &counter, sizeof (uint64_t));
1907 } 2239 }
1908 else 2240 else
1909#endif 2241#endif
1910 { 2242 {
1911 char dummy[4]; 2243 char dummy[4];
… …
1929#if EV_SIGNAL_ENABLE 2261#if EV_SIGNAL_ENABLE
1930 if (sig_pending) 2262 if (sig_pending)
1931 { 2263 {
1932 sig_pending = 0; 2264 sig_pending = 0;
1933 2265
1934 ECB_MEMORY_FENCE_RELEASE; 2266 ECB_MEMORY_FENCE;
1935 2267
1936 for (i = EV_NSIG - 1; i--; ) 2268 for (i = EV_NSIG - 1; i--; )
1937 if (expect_false (signals [i].pending)) 2269 if (expect_false (signals [i].pending))
1938 ev_feed_signal_event (EV_A_ i + 1); 2270 ev_feed_signal_event (EV_A_ i + 1);
1939 } 2271 }
… …
1942#if EV_ASYNC_ENABLE 2274#if EV_ASYNC_ENABLE
1943 if (async_pending) 2275 if (async_pending)
1944 { 2276 {
1945 async_pending = 0; 2277 async_pending = 0;
1946 2278
1947 ECB_MEMORY_FENCE_RELEASE; 2279 ECB_MEMORY_FENCE;
1948 2280
1949 for (i = asynccnt; i--; ) 2281 for (i = asynccnt; i--; )
1950 if (asyncs [i]->sent) 2282 if (asyncs [i]->sent)
1951 { 2283 {
1952 asyncs [i]->sent = 0; 2284 asyncs [i]->sent = 0;
2285 ECB_MEMORY_FENCE_RELEASE;
1953 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2286 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1954 } 2287 }
1955 } 2288 }
1956#endif 2289#endif
1957} 2290}
… …
1960 2293
1961void 2294void
1962ev_feed_signal (int signum) EV_THROW 2295ev_feed_signal (int signum) EV_THROW
1963{ 2296{
1964#if EV_MULTIPLICITY 2297#if EV_MULTIPLICITY
2298 EV_P;
2299 ECB_MEMORY_FENCE_ACQUIRE;
1965 EV_P = signals [signum - 1].loop; 2300 EV_A = signals [signum - 1].loop;
1966 2301
1967 if (!EV_A) 2302 if (!EV_A)
1968 return; 2303 return;
1969#endif 2304#endif
1970 2305
1971 if (!ev_active (&pipe_w))
1972 return;
1973
1974 signals [signum - 1].pending = 1; 2306 signals [signum - 1].pending = 1;
1975 evpipe_write (EV_A_ &sig_pending); 2307 evpipe_write (EV_A_ &sig_pending);
1976} 2308}
1977 2309
1978static void 2310static void
… …
1988void noinline 2320void noinline
1989ev_feed_signal_event (EV_P_ int signum) EV_THROW 2321ev_feed_signal_event (EV_P_ int signum) EV_THROW
1990{ 2322{
1991 WL w; 2323 WL w;
1992 2324
1993 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2325 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1994 return; 2326 return;
1995 2327
1996 --signum; 2328 --signum;
1997 2329
1998#if EV_MULTIPLICITY 2330#if EV_MULTIPLICITY
… …
2002 if (expect_false (signals [signum].loop != EV_A)) 2334 if (expect_false (signals [signum].loop != EV_A))
2003 return; 2335 return;
2004#endif 2336#endif
2005 2337
2006 signals [signum].pending = 0; 2338 signals [signum].pending = 0;
2339 ECB_MEMORY_FENCE_RELEASE;
2007 2340
2008 for (w = signals [signum].head; w; w = w->next) 2341 for (w = signals [signum].head; w; w = w->next)
2009 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2342 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2010} 2343}
2011 2344
… …
2225{ 2558{
2226 return userdata; 2559 return userdata;
2227} 2560}
2228 2561
2229void 2562void
2230ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW 2563ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
2231{ 2564{
2232 invoke_cb = invoke_pending_cb; 2565 invoke_cb = invoke_pending_cb;
2233} 2566}
2234 2567
2235void 2568void
2236ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW 2569ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW
2237{ 2570{
2238 release_cb = release; 2571 release_cb = release;
2239 acquire_cb = acquire; 2572 acquire_cb = acquire;
2240} 2573}
2241#endif 2574#endif
… …
2295#if EV_ASYNC_ENABLE 2628#if EV_ASYNC_ENABLE
2296 async_pending = 0; 2629 async_pending = 0;
2297#endif 2630#endif
2298 pipe_write_skipped = 0; 2631 pipe_write_skipped = 0;
2299 pipe_write_wanted = 0; 2632 pipe_write_wanted = 0;
2633 evpipe [0] = -1;
2634 evpipe [1] = -1;
2300#if EV_USE_INOTIFY 2635#if EV_USE_INOTIFY
2301 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2302#endif 2637#endif
2303#if EV_USE_SIGNALFD 2638#if EV_USE_SIGNALFD
2304 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2355 EV_INVOKE_PENDING; 2690 EV_INVOKE_PENDING;
2356 } 2691 }
2357#endif 2692#endif
2358 2693
2359#if EV_CHILD_ENABLE 2694#if EV_CHILD_ENABLE
2360 if (ev_is_active (&childev)) 2695 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2361 { 2696 {
2362 ev_ref (EV_A); /* child watcher */ 2697 ev_ref (EV_A); /* child watcher */
2363 ev_signal_stop (EV_A_ &childev); 2698 ev_signal_stop (EV_A_ &childev);
2364 } 2699 }
2365#endif 2700#endif
… …
2367 if (ev_is_active (&pipe_w)) 2702 if (ev_is_active (&pipe_w))
2368 { 2703 {
2369 /*ev_ref (EV_A);*/ 2704 /*ev_ref (EV_A);*/
2370 /*ev_io_stop (EV_A_ &pipe_w);*/ 2705 /*ev_io_stop (EV_A_ &pipe_w);*/
2371 2706
2372#if EV_USE_EVENTFD
2373 if (evfd >= 0)
2374 close (evfd);
2375#endif
2376
2377 if (evpipe [0] >= 0)
2378 {
2379 EV_WIN32_CLOSE_FD (evpipe [0]); 2707 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2380 EV_WIN32_CLOSE_FD (evpipe [1]); 2708 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2381 }
2382 } 2709 }
2383 2710
2384#if EV_USE_SIGNALFD 2711#if EV_USE_SIGNALFD
2385 if (ev_is_active (&sigfd_w)) 2712 if (ev_is_active (&sigfd_w))
2386 close (sigfd); 2713 close (sigfd);
… …
2472#endif 2799#endif
2473#if EV_USE_INOTIFY 2800#if EV_USE_INOTIFY
2474 infy_fork (EV_A); 2801 infy_fork (EV_A);
2475#endif 2802#endif
2476 2803
2804#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2477 if (ev_is_active (&pipe_w)) 2805 if (ev_is_active (&pipe_w))
2478 { 2806 {
2479 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2807 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2480 2808
2481 ev_ref (EV_A); 2809 ev_ref (EV_A);
2482 ev_io_stop (EV_A_ &pipe_w); 2810 ev_io_stop (EV_A_ &pipe_w);
2483 2811
2484#if EV_USE_EVENTFD
2485 if (evfd >= 0)
2486 close (evfd);
2487#endif
2488
2489 if (evpipe [0] >= 0) 2812 if (evpipe [0] >= 0)
2490 {
2491 EV_WIN32_CLOSE_FD (evpipe [0]); 2813 EV_WIN32_CLOSE_FD (evpipe [0]);
2492 EV_WIN32_CLOSE_FD (evpipe [1]);
2493 }
2494 2814
2495#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2496 evpipe_init (EV_A); 2815 evpipe_init (EV_A);
2497 /* now iterate over everything, in case we missed something */ 2816 /* iterate over everything, in case we missed something before */
2498 pipecb (EV_A_ &pipe_w, EV_READ); 2817 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2499#endif
2500 } 2818 }
2819#endif
2501 2820
2502 postfork = 0; 2821 postfork = 0;
2503} 2822}
2504 2823
2505#if EV_MULTIPLICITY 2824#if EV_MULTIPLICITY
… …
2678} 2997}
2679 2998
2680void 2999void
2681ev_loop_fork (EV_P) EV_THROW 3000ev_loop_fork (EV_P) EV_THROW
2682{ 3001{
2683 postfork = 1; /* must be in line with ev_default_fork */ 3002 postfork = 1;
2684} 3003}
2685 3004
2686/*****************************************************************************/ 3005/*****************************************************************************/
2687 3006
2688void 3007void
… …
2704} 3023}
2705 3024
2706void noinline 3025void noinline
2707ev_invoke_pending (EV_P) 3026ev_invoke_pending (EV_P)
2708{ 3027{
2709 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 3028 pendingpri = NUMPRI;
3029
3030 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
3031 {
3032 --pendingpri;
3033
2710 while (pendingcnt [pendingpri]) 3034 while (pendingcnt [pendingpri])
2711 { 3035 {
2712 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 3036 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2713 3037
2714 p->w->pending = 0; 3038 p->w->pending = 0;
2715 EV_CB_INVOKE (p->w, p->events); 3039 EV_CB_INVOKE (p->w, p->events);
2716 EV_FREQUENT_CHECK; 3040 EV_FREQUENT_CHECK;
2717 } 3041 }
3042 }
2718} 3043}
2719 3044
2720#if EV_IDLE_ENABLE 3045#if EV_IDLE_ENABLE
2721/* make idle watchers pending. this handles the "call-idle */ 3046/* make idle watchers pending. this handles the "call-idle */
2722/* only when higher priorities are idle" logic */ 3047/* only when higher priorities are idle" logic */
… …
2812{ 3137{
2813 EV_FREQUENT_CHECK; 3138 EV_FREQUENT_CHECK;
2814 3139
2815 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 3140 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2816 { 3141 {
2817 int feed_count = 0;
2818
2819 do 3142 do
2820 { 3143 {
2821 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 3144 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2822 3145
2823 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 3146 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3082 backend_poll (EV_A_ waittime); 3405 backend_poll (EV_A_ waittime);
3083 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3406 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3084 3407
3085 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3408 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3086 3409
3410 ECB_MEMORY_FENCE_ACQUIRE;
3087 if (pipe_write_skipped) 3411 if (pipe_write_skipped)
3088 { 3412 {
3089 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3413 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3090 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3414 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3091 } 3415 }
… …
3469#if EV_MULTIPLICITY 3793#if EV_MULTIPLICITY
3470 assert (("libev: a signal must not be attached to two different loops", 3794 assert (("libev: a signal must not be attached to two different loops",
3471 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3795 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3472 3796
3473 signals [w->signum - 1].loop = EV_A; 3797 signals [w->signum - 1].loop = EV_A;
3798 ECB_MEMORY_FENCE_RELEASE;
3474#endif 3799#endif
3475 3800
3476 EV_FREQUENT_CHECK; 3801 EV_FREQUENT_CHECK;
3477 3802
3478#if EV_USE_SIGNALFD 3803#if EV_USE_SIGNALFD
… …
3633# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3958# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3634 3959
3635static void noinline 3960static void noinline
3636infy_add (EV_P_ ev_stat *w) 3961infy_add (EV_P_ ev_stat *w)
3637{ 3962{
3638 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); 3963 w->wd = inotify_add_watch (fs_fd, w->path,
3964 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3965 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3966 | IN_DONT_FOLLOW | IN_MASK_ADD);
3639 3967
3640 if (w->wd >= 0) 3968 if (w->wd >= 0)
3641 { 3969 {
3642 struct statfs sfs; 3970 struct statfs sfs;
3643 3971
… …
3647 3975
3648 if (!fs_2625) 3976 if (!fs_2625)
3649 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3977 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3650 else if (!statfs (w->path, &sfs) 3978 else if (!statfs (w->path, &sfs)
3651 && (sfs.f_type == 0x1373 /* devfs */ 3979 && (sfs.f_type == 0x1373 /* devfs */
3980 || sfs.f_type == 0x4006 /* fat */
3981 || sfs.f_type == 0x4d44 /* msdos */
3652 || sfs.f_type == 0xEF53 /* ext2/3 */ 3982 || sfs.f_type == 0xEF53 /* ext2/3 */
3983 || sfs.f_type == 0x72b6 /* jffs2 */
3984 || sfs.f_type == 0x858458f6 /* ramfs */
3985 || sfs.f_type == 0x5346544e /* ntfs */
3653 || sfs.f_type == 0x3153464a /* jfs */ 3986 || sfs.f_type == 0x3153464a /* jfs */
3987 || sfs.f_type == 0x9123683e /* btrfs */
3654 || sfs.f_type == 0x52654973 /* reiser3 */ 3988 || sfs.f_type == 0x52654973 /* reiser3 */
3655 || sfs.f_type == 0x01021994 /* tempfs */ 3989 || sfs.f_type == 0x01021994 /* tmpfs */
3656 || sfs.f_type == 0x58465342 /* xfs */)) 3990 || sfs.f_type == 0x58465342 /* xfs */))
3657 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3991 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3658 else 3992 else
3659 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3993 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3660 } 3994 }

Diff Legend

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