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

Comparing libev/ev.c (file contents):
Revision 1.434 by root, Fri May 18 00:04:52 2012 UTC vs.
Revision 1.447 by root, Tue Jun 19 12:29:43 2012 UTC

… …
504 */ 504 */
505 505
506#ifndef ECB_H 506#ifndef ECB_H
507#define ECB_H 507#define ECB_H
508 508
509/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001
511
509#ifdef _WIN32 512#ifdef _WIN32
510 typedef signed char int8_t; 513 typedef signed char int8_t;
511 typedef unsigned char uint8_t; 514 typedef unsigned char uint8_t;
512 typedef signed short int16_t; 515 typedef signed short int16_t;
513 typedef unsigned short uint16_t; 516 typedef unsigned short uint16_t;
… …
518 typedef unsigned long long uint64_t; 521 typedef unsigned long long uint64_t;
519 #else /* _MSC_VER || __BORLANDC__ */ 522 #else /* _MSC_VER || __BORLANDC__ */
520 typedef signed __int64 int64_t; 523 typedef signed __int64 int64_t;
521 typedef unsigned __int64 uint64_t; 524 typedef unsigned __int64 uint64_t;
522 #endif 525 #endif
526 #ifdef _WIN64
527 #define ECB_PTRSIZE 8
528 typedef uint64_t uintptr_t;
529 typedef int64_t intptr_t;
530 #else
531 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t;
534 #endif
535 typedef intptr_t ptrdiff_t;
523#else 536#else
524 #include <inttypes.h> 537 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8
540 #else
541 #define ECB_PTRSIZE 4
542 #endif
525#endif 543#endif
526 544
527/* many compilers define _GNUC_ to some versions but then only implement 545/* many compilers define _GNUC_ to some versions but then only implement
528 * what their idiot authors think are the "more important" extensions, 546 * what their idiot authors think are the "more important" extensions,
529 * causing enormous grief in return for some better fake benchmark numbers. 547 * causing enormous grief in return for some better fake benchmark numbers.
… …
537 #else 555 #else
538 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 556 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
539 #endif 557 #endif
540#endif 558#endif
541 559
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)
564#define ECB_CPP11 (__cplusplus >= 201103L)
565
542/*****************************************************************************/ 566/*****************************************************************************/
543 567
544/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 568/* 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 */ 569/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
546 570
547#if ECB_NO_THREADS 571#if ECB_NO_THREADS
548# define ECB_NO_SMP 1 572 #define ECB_NO_SMP 1
549#endif 573#endif
550 574
551#if ECB_NO_THREADS || ECB_NO_SMP 575#if ECB_NO_SMP
552 #define ECB_MEMORY_FENCE do { } while (0) 576 #define ECB_MEMORY_FENCE do { } while (0)
553#endif 577#endif
554 578
555#ifndef ECB_MEMORY_FENCE 579#ifndef ECB_MEMORY_FENCE
556 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 580 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
557 #if __i386 || __i386__ 581 #if __i386 || __i386__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 582 #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 */ 583 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
560 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 584 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
561 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 585 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
562 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 586 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
563 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 587 #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 */ 588 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 589 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 590 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
567 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 591 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
568 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 592 || 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") 593 #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__ \ 594 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
571 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 595 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 596 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
573 #elif __sparc || __sparc__ 597 #elif __sparc || __sparc__
574 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 598 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
575 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 599 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
576 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 600 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
577 #elif defined __s390__ || defined __s390x__ 601 #elif defined __s390__ || defined __s390x__
578 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 602 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
579 #elif defined __mips__ 603 #elif defined __mips__
580 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 604 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
581 #elif defined __alpha__ 605 #elif defined __alpha__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 606 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
607 #elif defined __hppa__
608 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
610 #elif defined __ia64__
611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
583 #endif 612 #endif
584 #endif 613 #endif
585#endif 614#endif
586 615
587#ifndef ECB_MEMORY_FENCE 616#ifndef ECB_MEMORY_FENCE
617 #if ECB_GCC_VERSION(4,7)
618 /* see comment below (stdatomic.h) about the C11 memory model. */
619 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
620 #elif defined __clang && __has_feature (cxx_atomic)
621 /* see comment below (stdatomic.h) about the C11 memory model. */
622 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
588 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 623 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
589 #define ECB_MEMORY_FENCE __sync_synchronize () 624 #define ECB_MEMORY_FENCE __sync_synchronize ()
590 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
591 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
592 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 625 #elif _MSC_VER >= 1400 /* VC++ 2005 */
593 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 626 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
594 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 627 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
595 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 628 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
596 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 629 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
606 #define ECB_MEMORY_FENCE __sync () 639 #define ECB_MEMORY_FENCE __sync ()
607 #endif 640 #endif
608#endif 641#endif
609 642
610#ifndef ECB_MEMORY_FENCE 643#ifndef ECB_MEMORY_FENCE
644 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
645 /* we assume that these memory fences work on all variables/all memory accesses, */
646 /* not just C11 atomics and atomic accesses */
647 #include <stdatomic.h>
648 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
649 /* any fence other than seq_cst, which isn't very efficient for us. */
650 /* Why that is, we don't know - either the C11 memory model is quite useless */
651 /* for most usages, or gcc and clang have a bug */
652 /* I *currently* lean towards the latter, and inefficiently implement */
653 /* all three of ecb's fences as a seq_cst fence */
654 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
655 #endif
656#endif
657
658#ifndef ECB_MEMORY_FENCE
611 #if !ECB_AVOID_PTHREADS 659 #if !ECB_AVOID_PTHREADS
612 /* 660 /*
613 * if you get undefined symbol references to pthread_mutex_lock, 661 * if you get undefined symbol references to pthread_mutex_lock,
614 * or failure to find pthread.h, then you should implement 662 * or failure to find pthread.h, then you should implement
615 * the ECB_MEMORY_FENCE operations for your cpu/compiler 663 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
633 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 681 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
634#endif 682#endif
635 683
636/*****************************************************************************/ 684/*****************************************************************************/
637 685
638#define ECB_C99 (__STDC_VERSION__ >= 199901L)
639
640#if __cplusplus 686#if __cplusplus
641 #define ecb_inline static inline 687 #define ecb_inline static inline
642#elif ECB_GCC_VERSION(2,5) 688#elif ECB_GCC_VERSION(2,5)
643 #define ecb_inline static __inline__ 689 #define ecb_inline static __inline__
644#elif ECB_C99 690#elif ECB_C99
… …
682#elif ECB_GCC_VERSION(3,0) 728#elif ECB_GCC_VERSION(3,0)
683 #define ecb_decltype(x) __typeof(x) 729 #define ecb_decltype(x) __typeof(x)
684#endif 730#endif
685 731
686#define ecb_noinline ecb_attribute ((__noinline__)) 732#define ecb_noinline ecb_attribute ((__noinline__))
687#define ecb_noreturn ecb_attribute ((__noreturn__))
688#define ecb_unused ecb_attribute ((__unused__)) 733#define ecb_unused ecb_attribute ((__unused__))
689#define ecb_const ecb_attribute ((__const__)) 734#define ecb_const ecb_attribute ((__const__))
690#define ecb_pure ecb_attribute ((__pure__)) 735#define ecb_pure ecb_attribute ((__pure__))
736
737#if ECB_C11
738 #define ecb_noreturn _Noreturn
739#else
740 #define ecb_noreturn ecb_attribute ((__noreturn__))
741#endif
691 742
692#if ECB_GCC_VERSION(4,3) 743#if ECB_GCC_VERSION(4,3)
693 #define ecb_artificial ecb_attribute ((__artificial__)) 744 #define ecb_artificial ecb_attribute ((__artificial__))
694 #define ecb_hot ecb_attribute ((__hot__)) 745 #define ecb_hot ecb_attribute ((__hot__))
695 #define ecb_cold ecb_attribute ((__cold__)) 746 #define ecb_cold ecb_attribute ((__cold__))
… …
786 837
787 return r + ecb_ld32 (x); 838 return r + ecb_ld32 (x);
788 } 839 }
789#endif 840#endif
790 841
842ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
843ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
844ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
845ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
846
791ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 847ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
792ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 848ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
793{ 849{
794 return ( (x * 0x0802U & 0x22110U) 850 return ( (x * 0x0802U & 0x22110U)
795 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 851 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
1135} 1191}
1136 1192
1137static void * 1193static void *
1138ev_realloc_emul (void *ptr, long size) EV_THROW 1194ev_realloc_emul (void *ptr, long size) EV_THROW
1139{ 1195{
1140#if __GLIBC__
1141 return realloc (ptr, size);
1142#else
1143 /* some systems, notably openbsd and darwin, fail to properly 1196 /* some systems, notably openbsd and darwin, fail to properly
1144 * implement realloc (x, 0) (as required by both ansi c-89 and 1197 * implement realloc (x, 0) (as required by both ansi c-89 and
1145 * the single unix specification, so work around them here. 1198 * the single unix specification, so work around them here.
1199 * recently, also (at least) fedora and debian started breaking it,
1200 * despite documenting it otherwise.
1146 */ 1201 */
1147 1202
1148 if (size) 1203 if (size)
1149 return realloc (ptr, size); 1204 return realloc (ptr, size);
1150 1205
1151 free (ptr); 1206 free (ptr);
1152 return 0; 1207 return 0;
1153#endif
1154} 1208}
1155 1209
1156static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1210static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1157 1211
1158void ecb_cold 1212void ecb_cold
… …
1849 1903
1850 if (expect_true (*flag)) 1904 if (expect_true (*flag))
1851 return; 1905 return;
1852 1906
1853 *flag = 1; 1907 *flag = 1;
1854
1855 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 1908 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1856 1909
1857 pipe_write_skipped = 1; 1910 pipe_write_skipped = 1;
1858 1911
1859 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 1912 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1860 1913
1861 if (pipe_write_wanted) 1914 if (pipe_write_wanted)
1862 { 1915 {
1863 int old_errno; 1916 int old_errno;
1864 1917
1865 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1918 pipe_write_skipped = 0;
1919 ECB_MEMORY_FENCE_RELEASE;
1866 1920
1867 old_errno = errno; /* save errno because write will clobber it */ 1921 old_errno = errno; /* save errno because write will clobber it */
1868 1922
1869#if EV_USE_EVENTFD 1923#if EV_USE_EVENTFD
1870 if (evfd >= 0) 1924 if (evfd >= 0)
… …
1929#if EV_SIGNAL_ENABLE 1983#if EV_SIGNAL_ENABLE
1930 if (sig_pending) 1984 if (sig_pending)
1931 { 1985 {
1932 sig_pending = 0; 1986 sig_pending = 0;
1933 1987
1934 ECB_MEMORY_FENCE_RELEASE; 1988 ECB_MEMORY_FENCE;
1935 1989
1936 for (i = EV_NSIG - 1; i--; ) 1990 for (i = EV_NSIG - 1; i--; )
1937 if (expect_false (signals [i].pending)) 1991 if (expect_false (signals [i].pending))
1938 ev_feed_signal_event (EV_A_ i + 1); 1992 ev_feed_signal_event (EV_A_ i + 1);
1939 } 1993 }
… …
1942#if EV_ASYNC_ENABLE 1996#if EV_ASYNC_ENABLE
1943 if (async_pending) 1997 if (async_pending)
1944 { 1998 {
1945 async_pending = 0; 1999 async_pending = 0;
1946 2000
1947 ECB_MEMORY_FENCE_RELEASE; 2001 ECB_MEMORY_FENCE;
1948 2002
1949 for (i = asynccnt; i--; ) 2003 for (i = asynccnt; i--; )
1950 if (asyncs [i]->sent) 2004 if (asyncs [i]->sent)
1951 { 2005 {
1952 asyncs [i]->sent = 0; 2006 asyncs [i]->sent = 0;
2007 ECB_MEMORY_FENCE_RELEASE;
1953 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2008 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1954 } 2009 }
1955 } 2010 }
1956#endif 2011#endif
1957} 2012}
… …
1988void noinline 2043void noinline
1989ev_feed_signal_event (EV_P_ int signum) EV_THROW 2044ev_feed_signal_event (EV_P_ int signum) EV_THROW
1990{ 2045{
1991 WL w; 2046 WL w;
1992 2047
1993 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2048 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1994 return; 2049 return;
1995 2050
1996 --signum; 2051 --signum;
1997 2052
1998#if EV_MULTIPLICITY 2053#if EV_MULTIPLICITY
… …
2002 if (expect_false (signals [signum].loop != EV_A)) 2057 if (expect_false (signals [signum].loop != EV_A))
2003 return; 2058 return;
2004#endif 2059#endif
2005 2060
2006 signals [signum].pending = 0; 2061 signals [signum].pending = 0;
2062 ECB_MEMORY_FENCE_RELEASE;
2007 2063
2008 for (w = signals [signum].head; w; w = w->next) 2064 for (w = signals [signum].head; w; w = w->next)
2009 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2065 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2010} 2066}
2011 2067
… …
2492 EV_WIN32_CLOSE_FD (evpipe [1]); 2548 EV_WIN32_CLOSE_FD (evpipe [1]);
2493 } 2549 }
2494 2550
2495#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 2551#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2496 evpipe_init (EV_A); 2552 evpipe_init (EV_A);
2497 /* now iterate over everything, in case we missed something */ 2553 /* iterate over everything, in case we missed something before */
2498 pipecb (EV_A_ &pipe_w, EV_READ); 2554 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2499#endif 2555#endif
2500 } 2556 }
2501 2557
2502 postfork = 0; 2558 postfork = 0;
2503} 2559}
… …
2678} 2734}
2679 2735
2680void 2736void
2681ev_loop_fork (EV_P) EV_THROW 2737ev_loop_fork (EV_P) EV_THROW
2682{ 2738{
2683 postfork = 1; /* must be in line with ev_default_fork */ 2739 postfork = 1;
2684} 2740}
2685 2741
2686/*****************************************************************************/ 2742/*****************************************************************************/
2687 2743
2688void 2744void
… …
2704} 2760}
2705 2761
2706void noinline 2762void noinline
2707ev_invoke_pending (EV_P) 2763ev_invoke_pending (EV_P)
2708{ 2764{
2709 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2765 pendingpri = NUMPRI;
2766
2767 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2768 {
2769 --pendingpri;
2770
2710 while (pendingcnt [pendingpri]) 2771 while (pendingcnt [pendingpri])
2711 { 2772 {
2712 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 2773 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2713 2774
2714 p->w->pending = 0; 2775 p->w->pending = 0;
2715 EV_CB_INVOKE (p->w, p->events); 2776 EV_CB_INVOKE (p->w, p->events);
2716 EV_FREQUENT_CHECK; 2777 EV_FREQUENT_CHECK;
2717 } 2778 }
2779 }
2718} 2780}
2719 2781
2720#if EV_IDLE_ENABLE 2782#if EV_IDLE_ENABLE
2721/* make idle watchers pending. this handles the "call-idle */ 2783/* make idle watchers pending. this handles the "call-idle */
2722/* only when higher priorities are idle" logic */ 2784/* only when higher priorities are idle" logic */
… …
2812{ 2874{
2813 EV_FREQUENT_CHECK; 2875 EV_FREQUENT_CHECK;
2814 2876
2815 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2877 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2816 { 2878 {
2817 int feed_count = 0;
2818
2819 do 2879 do
2820 { 2880 {
2821 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2881 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2822 2882
2823 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2883 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3082 backend_poll (EV_A_ waittime); 3142 backend_poll (EV_A_ waittime);
3083 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3143 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3084 3144
3085 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3145 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3086 3146
3147 ECB_MEMORY_FENCE_ACQUIRE;
3087 if (pipe_write_skipped) 3148 if (pipe_write_skipped)
3088 { 3149 {
3089 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3150 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); 3151 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3091 } 3152 }

Diff Legend

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