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

Comparing libev/ev.c (file contents):
Revision 1.426 by root, Sun May 6 13:42:10 2012 UTC vs.
Revision 1.437 by root, Tue May 29 21:03:22 2012 UTC

… …
201# include <sys/wait.h> 201# include <sys/wait.h>
202# include <unistd.h> 202# include <unistd.h>
203#else 203#else
204# include <io.h> 204# include <io.h>
205# define WIN32_LEAN_AND_MEAN 205# define WIN32_LEAN_AND_MEAN
206# include <winsock2.h>
206# include <windows.h> 207# include <windows.h>
207# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
208# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
209# endif 210# endif
210# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
… …
408/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 409/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
409# ifndef IN_DONT_FOLLOW 410# ifndef IN_DONT_FOLLOW
410# undef EV_USE_INOTIFY 411# undef EV_USE_INOTIFY
411# define EV_USE_INOTIFY 0 412# define EV_USE_INOTIFY 0
412# endif 413# endif
413#endif
414
415#if EV_SELECT_IS_WINSOCKET
416# include <winsock.h>
417#endif 414#endif
418 415
419#if EV_USE_EVENTFD 416#if EV_USE_EVENTFD
420/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
421# include <stdint.h> 418# include <stdint.h>
… …
507 */ 504 */
508 505
509#ifndef ECB_H 506#ifndef ECB_H
510#define ECB_H 507#define ECB_H
511 508
509/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001
511
512#ifdef _WIN32 512#ifdef _WIN32
513 typedef signed char int8_t; 513 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 514 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 515 typedef signed short int16_t;
516 typedef unsigned short uint16_t; 516 typedef unsigned short uint16_t;
… …
521 typedef unsigned long long uint64_t; 521 typedef unsigned long long uint64_t;
522 #else /* _MSC_VER || __BORLANDC__ */ 522 #else /* _MSC_VER || __BORLANDC__ */
523 typedef signed __int64 int64_t; 523 typedef signed __int64 int64_t;
524 typedef unsigned __int64 uint64_t; 524 typedef unsigned __int64 uint64_t;
525 #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;
526#else 536#else
527 #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
528#endif 543#endif
529 544
530/* many compilers define _GNUC_ to some versions but then only implement 545/* many compilers define _GNUC_ to some versions but then only implement
531 * what their idiot authors think are the "more important" extensions, 546 * what their idiot authors think are the "more important" extensions,
532 * causing enormous grief in return for some better fake benchmark numbers. 547 * causing enormous grief in return for some better fake benchmark numbers.
… …
540 #else 555 #else
541 #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)))
542 #endif 557 #endif
543#endif 558#endif
544 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_CPP98 (__cplusplus >= 199711L)
565#define ECB_CPP11 (__cplusplus >= 201103L)
566
545/*****************************************************************************/ 567/*****************************************************************************/
546 568
547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
548/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 570/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
549 571
550#if ECB_NO_THREADS 572#if ECB_NO_THREADS
551# define ECB_NO_SMP 1 573# define ECB_NO_SMP 1
552#endif 574#endif
553 575
554#if ECB_NO_THREADS || ECB_NO_SMP 576#if ECB_NO_SMP
555 #define ECB_MEMORY_FENCE do { } while (0) 577 #define ECB_MEMORY_FENCE do { } while (0)
556#endif 578#endif
557 579
558#ifndef ECB_MEMORY_FENCE 580#ifndef ECB_MEMORY_FENCE
559 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 581 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
560 #if __i386 || __i386__ 582 #if __i386 || __i386__
561 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 584 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 585 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 586 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 587 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 588 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
567 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 589 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 590 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 591 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
570 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 592 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
571 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 593 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
572 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory") 594 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
573 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 595 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
574 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 596 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 597 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
576 #elif __sparc || __sparc__ 598 #elif __sparc || __sparc__
577 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") 599 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 600 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 601 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined __s390__ || defined __s390x__ 602 #elif defined __s390__ || defined __s390x__
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 603 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
582 #elif defined __mips__ 604 #elif defined __mips__
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 605 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
584 #elif defined __alpha__ 606 #elif defined __alpha__
585 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
608 #elif defined __hppa__
609 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
610 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
611 #elif defined __ia64__
612 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
586 #endif 613 #endif
587 #endif 614 #endif
588#endif 615#endif
589 616
590#ifndef ECB_MEMORY_FENCE 617#ifndef ECB_MEMORY_FENCE
618 #if ECB_GCC_VERSION(4,7)
619 /* see comment below about the C11 memory model. in short - avoid */
620 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
621 #elif defined __clang && __has_feature (cxx_atomic)
622 /* see above */
623 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
591 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
592 #define ECB_MEMORY_FENCE __sync_synchronize () 625 #define ECB_MEMORY_FENCE __sync_synchronize ()
593 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */ 626 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
594 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */ 627 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
595 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 628 #elif _MSC_VER >= 1400 /* VC++ 2005 */
596 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 629 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
… …
609 #define ECB_MEMORY_FENCE __sync () 642 #define ECB_MEMORY_FENCE __sync ()
610 #endif 643 #endif
611#endif 644#endif
612 645
613#ifndef ECB_MEMORY_FENCE 646#ifndef ECB_MEMORY_FENCE
647 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
648 /* we assume that these memory fences work on all variables/all memory accesses, */
649 /* not just C11 atomics and atomic accesses */
650 #include <stdatomic.h>
651 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */
652 /* simple barrier semantics. That means we need to take out thor's hammer. */
653 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
654 #endif
655 #endif
656#endif
657
658#ifndef ECB_MEMORY_FENCE
614 #if !ECB_AVOID_PTHREADS 659 #if !ECB_AVOID_PTHREADS
615 /* 660 /*
616 * if you get undefined symbol references to pthread_mutex_lock, 661 * if you get undefined symbol references to pthread_mutex_lock,
617 * or failure to find pthread.h, then you should implement 662 * or failure to find pthread.h, then you should implement
618 * the ECB_MEMORY_FENCE operations for your cpu/compiler 663 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
636 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 681 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
637#endif 682#endif
638 683
639/*****************************************************************************/ 684/*****************************************************************************/
640 685
641#define ECB_C99 (__STDC_VERSION__ >= 199901L)
642
643#if __cplusplus 686#if __cplusplus
644 #define ecb_inline static inline 687 #define ecb_inline static inline
645#elif ECB_GCC_VERSION(2,5) 688#elif ECB_GCC_VERSION(2,5)
646 #define ecb_inline static __inline__ 689 #define ecb_inline static __inline__
647#elif ECB_C99 690#elif ECB_C99
… …
685#elif ECB_GCC_VERSION(3,0) 728#elif ECB_GCC_VERSION(3,0)
686 #define ecb_decltype(x) __typeof(x) 729 #define ecb_decltype(x) __typeof(x)
687#endif 730#endif
688 731
689#define ecb_noinline ecb_attribute ((__noinline__)) 732#define ecb_noinline ecb_attribute ((__noinline__))
690#define ecb_noreturn ecb_attribute ((__noreturn__))
691#define ecb_unused ecb_attribute ((__unused__)) 733#define ecb_unused ecb_attribute ((__unused__))
692#define ecb_const ecb_attribute ((__const__)) 734#define ecb_const ecb_attribute ((__const__))
693#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
694 742
695#if ECB_GCC_VERSION(4,3) 743#if ECB_GCC_VERSION(4,3)
696 #define ecb_artificial ecb_attribute ((__artificial__)) 744 #define ecb_artificial ecb_attribute ((__artificial__))
697 #define ecb_hot ecb_attribute ((__hot__)) 745 #define ecb_hot ecb_attribute ((__hot__))
698 #define ecb_cold ecb_attribute ((__cold__)) 746 #define ecb_cold ecb_attribute ((__cold__))
… …
789 837
790 return r + ecb_ld32 (x); 838 return r + ecb_ld32 (x);
791 } 839 }
792#endif 840#endif
793 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
794ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 847ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 848ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
796{ 849{
797 return ( (x * 0x0802U & 0x22110U) 850 return ( (x * 0x0802U & 0x22110U)
798 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 851 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
1108#endif 1161#endif
1109 1162
1110static void (*syserr_cb)(const char *msg) EV_THROW; 1163static void (*syserr_cb)(const char *msg) EV_THROW;
1111 1164
1112void ecb_cold 1165void ecb_cold
1113ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1166ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1114{ 1167{
1115 syserr_cb = cb; 1168 syserr_cb = cb;
1116} 1169}
1117 1170
1118static void noinline ecb_cold 1171static void noinline ecb_cold
… …
1136 abort (); 1189 abort ();
1137 } 1190 }
1138} 1191}
1139 1192
1140static void * 1193static void *
1141ev_realloc_emul (void *ptr, long size) 1194ev_realloc_emul (void *ptr, long size) EV_THROW
1142{ 1195{
1143#if __GLIBC__ 1196#if __GLIBC__
1144 return realloc (ptr, size); 1197 return realloc (ptr, size);
1145#else 1198#else
1146 /* some systems, notably openbsd and darwin, fail to properly 1199 /* some systems, notably openbsd and darwin, fail to properly
… …
1157} 1210}
1158 1211
1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1160 1213
1161void ecb_cold 1214void ecb_cold
1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1215ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1163{ 1216{
1164 alloc = cb; 1217 alloc = cb;
1165} 1218}
1166 1219
1167inline_speed void * 1220inline_speed void *
… …
1852 1905
1853 if (expect_true (*flag)) 1906 if (expect_true (*flag))
1854 return; 1907 return;
1855 1908
1856 *flag = 1; 1909 *flag = 1;
1857
1858 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 1910 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1859 1911
1860 pipe_write_skipped = 1; 1912 pipe_write_skipped = 1;
1861 1913
1862 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 1914 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1863 1915
1864 if (pipe_write_wanted) 1916 if (pipe_write_wanted)
1865 { 1917 {
1866 int old_errno; 1918 int old_errno;
1867 1919
1868 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1920 pipe_write_skipped = 0;
1921 ECB_MEMORY_FENCE_RELEASE;
1869 1922
1870 old_errno = errno; /* save errno because write will clobber it */ 1923 old_errno = errno; /* save errno because write will clobber it */
1871 1924
1872#if EV_USE_EVENTFD 1925#if EV_USE_EVENTFD
1873 if (evfd >= 0) 1926 if (evfd >= 0)
… …
1876 write (evfd, &counter, sizeof (uint64_t)); 1929 write (evfd, &counter, sizeof (uint64_t));
1877 } 1930 }
1878 else 1931 else
1879#endif 1932#endif
1880 { 1933 {
1881 /* win32 people keep sending patches that change this write() to send() */ 1934#ifdef _WIN32
1882 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1935 WSABUF buf;
1883 /* so when you think this write should be a send instead, please find out */ 1936 DWORD sent;
1884 /* where your send() is from - it's definitely not the microsoft send, and */ 1937 buf.buf = &buf;
1885 /* tell me. thank you. */ 1938 buf.len = 1;
1886 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */ 1939 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1887 /* check the ev documentation on how to use this flag */ 1940#else
1888 write (evpipe [1], &(evpipe [1]), 1); 1941 write (evpipe [1], &(evpipe [1]), 1);
1942#endif
1889 } 1943 }
1890 1944
1891 errno = old_errno; 1945 errno = old_errno;
1892 } 1946 }
1893} 1947}
… …
1908 read (evfd, &counter, sizeof (uint64_t)); 1962 read (evfd, &counter, sizeof (uint64_t));
1909 } 1963 }
1910 else 1964 else
1911#endif 1965#endif
1912 { 1966 {
1913 char dummy; 1967 char dummy[4];
1914 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1968#ifdef _WIN32
1969 WSABUF buf;
1970 DWORD recvd;
1971 DWORD flags = 0;
1972 buf.buf = dummy;
1973 buf.len = sizeof (dummy);
1974 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1975#else
1915 read (evpipe [0], &dummy, 1); 1976 read (evpipe [0], &dummy, sizeof (dummy));
1977#endif
1916 } 1978 }
1917 } 1979 }
1918 1980
1919 pipe_write_skipped = 0; 1981 pipe_write_skipped = 0;
1920 1982
… …
1923#if EV_SIGNAL_ENABLE 1985#if EV_SIGNAL_ENABLE
1924 if (sig_pending) 1986 if (sig_pending)
1925 { 1987 {
1926 sig_pending = 0; 1988 sig_pending = 0;
1927 1989
1928 ECB_MEMORY_FENCE_RELEASE; 1990 ECB_MEMORY_FENCE;
1929 1991
1930 for (i = EV_NSIG - 1; i--; ) 1992 for (i = EV_NSIG - 1; i--; )
1931 if (expect_false (signals [i].pending)) 1993 if (expect_false (signals [i].pending))
1932 ev_feed_signal_event (EV_A_ i + 1); 1994 ev_feed_signal_event (EV_A_ i + 1);
1933 } 1995 }
… …
1936#if EV_ASYNC_ENABLE 1998#if EV_ASYNC_ENABLE
1937 if (async_pending) 1999 if (async_pending)
1938 { 2000 {
1939 async_pending = 0; 2001 async_pending = 0;
1940 2002
1941 ECB_MEMORY_FENCE_RELEASE; 2003 ECB_MEMORY_FENCE;
1942 2004
1943 for (i = asynccnt; i--; ) 2005 for (i = asynccnt; i--; )
1944 if (asyncs [i]->sent) 2006 if (asyncs [i]->sent)
1945 { 2007 {
1946 asyncs [i]->sent = 0; 2008 asyncs [i]->sent = 0;
2009 ECB_MEMORY_FENCE_RELEASE;
1947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2010 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1948 } 2011 }
1949 } 2012 }
1950#endif 2013#endif
1951} 2014}
… …
1996 if (expect_false (signals [signum].loop != EV_A)) 2059 if (expect_false (signals [signum].loop != EV_A))
1997 return; 2060 return;
1998#endif 2061#endif
1999 2062
2000 signals [signum].pending = 0; 2063 signals [signum].pending = 0;
2064 MEMORY_FENCE_RELEASE;
2001 2065
2002 for (w = signals [signum].head; w; w = w->next) 2066 for (w = signals [signum].head; w; w = w->next)
2003 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2067 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2004} 2068}
2005 2069
… …
2349 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2350 } 2414 }
2351#endif 2415#endif
2352 2416
2353#if EV_CHILD_ENABLE 2417#if EV_CHILD_ENABLE
2354 if (ev_is_active (&childev)) 2418 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2355 { 2419 {
2356 ev_ref (EV_A); /* child watcher */ 2420 ev_ref (EV_A); /* child watcher */
2357 ev_signal_stop (EV_A_ &childev); 2421 ev_signal_stop (EV_A_ &childev);
2358 } 2422 }
2359#endif 2423#endif
… …
2554#if EV_FEATURE_API 2618#if EV_FEATURE_API
2555void ecb_cold 2619void ecb_cold
2556ev_verify (EV_P) EV_THROW 2620ev_verify (EV_P) EV_THROW
2557{ 2621{
2558#if EV_VERIFY 2622#if EV_VERIFY
2559 int i, j; 2623 int i;
2560 WL w, w2; 2624 WL w, w2;
2561 2625
2562 assert (activecnt >= -1); 2626 assert (activecnt >= -1);
2563 2627
2564 assert (fdchangemax >= fdchangecnt); 2628 assert (fdchangemax >= fdchangecnt);
2565 for (i = 0; i < fdchangecnt; ++i) 2629 for (i = 0; i < fdchangecnt; ++i)
2566 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2630 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2567 2631
2568 assert (anfdmax >= 0); 2632 assert (anfdmax >= 0);
2569 for (i = j = 0; i < anfdmax; ++i) 2633 for (i = 0; i < anfdmax; ++i)
2634 {
2635 int j = 0;
2636
2570 for (w = w2 = anfds [i].head; w; w = w->next) 2637 for (w = w2 = anfds [i].head; w; w = w->next)
2571 { 2638 {
2572 verify_watcher (EV_A_ (W)w); 2639 verify_watcher (EV_A_ (W)w);
2573 2640
2574 if (++j & 1) 2641 if (j++ & 1)
2575 w2 = w2->next; 2642 {
2576
2577 assert (("libev: io watcher list contains a loop", w != w2)); 2643 assert (("libev: io watcher list contains a loop", w != w2));
2644 w2 = w2->next;
2645 }
2646
2578 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2647 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2579 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2648 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2580 } 2649 }
2650 }
2581 2651
2582 assert (timermax >= timercnt); 2652 assert (timermax >= timercnt);
2583 verify_heap (EV_A_ timers, timercnt); 2653 verify_heap (EV_A_ timers, timercnt);
2584 2654
2585#if EV_PERIODIC_ENABLE 2655#if EV_PERIODIC_ENABLE
… …
2800{ 2870{
2801 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2802 2872
2803 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2804 { 2874 {
2805 int feed_count = 0;
2806
2807 do 2875 do
2808 { 2876 {
2809 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2877 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2810 2878
2811 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2879 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/

Diff Legend

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