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

Comparing libev/ev.c (file contents):
Revision 1.423 by root, Sun Apr 22 10:14:20 2012 UTC vs.
Revision 1.439 by root, Tue May 29 21:06:11 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); }) */
594 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
595 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 626 #elif _MSC_VER >= 1400 /* VC++ 2005 */
596 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 627 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
597 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 628 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
598 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */ 629 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
599 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 630 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
609 #define ECB_MEMORY_FENCE __sync () 640 #define ECB_MEMORY_FENCE __sync ()
610 #endif 641 #endif
611#endif 642#endif
612 643
613#ifndef ECB_MEMORY_FENCE 644#ifndef ECB_MEMORY_FENCE
645 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
646 /* we assume that these memory fences work on all variables/all memory accesses, */
647 /* not just C11 atomics and atomic accesses */
648 #include <stdatomic.h>
649 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */
650 /* simple barrier semantics. That means we need to take out thor's hammer. */
651 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
652 #endif
653#endif
654
655#ifndef ECB_MEMORY_FENCE
614 #if !ECB_AVOID_PTHREADS 656 #if !ECB_AVOID_PTHREADS
615 /* 657 /*
616 * if you get undefined symbol references to pthread_mutex_lock, 658 * if you get undefined symbol references to pthread_mutex_lock,
617 * or failure to find pthread.h, then you should implement 659 * or failure to find pthread.h, then you should implement
618 * the ECB_MEMORY_FENCE operations for your cpu/compiler 660 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
636 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 678 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
637#endif 679#endif
638 680
639/*****************************************************************************/ 681/*****************************************************************************/
640 682
641#define ECB_C99 (__STDC_VERSION__ >= 199901L)
642
643#if __cplusplus 683#if __cplusplus
644 #define ecb_inline static inline 684 #define ecb_inline static inline
645#elif ECB_GCC_VERSION(2,5) 685#elif ECB_GCC_VERSION(2,5)
646 #define ecb_inline static __inline__ 686 #define ecb_inline static __inline__
647#elif ECB_C99 687#elif ECB_C99
… …
685#elif ECB_GCC_VERSION(3,0) 725#elif ECB_GCC_VERSION(3,0)
686 #define ecb_decltype(x) __typeof(x) 726 #define ecb_decltype(x) __typeof(x)
687#endif 727#endif
688 728
689#define ecb_noinline ecb_attribute ((__noinline__)) 729#define ecb_noinline ecb_attribute ((__noinline__))
690#define ecb_noreturn ecb_attribute ((__noreturn__))
691#define ecb_unused ecb_attribute ((__unused__)) 730#define ecb_unused ecb_attribute ((__unused__))
692#define ecb_const ecb_attribute ((__const__)) 731#define ecb_const ecb_attribute ((__const__))
693#define ecb_pure ecb_attribute ((__pure__)) 732#define ecb_pure ecb_attribute ((__pure__))
733
734#if ECB_C11
735 #define ecb_noreturn _Noreturn
736#else
737 #define ecb_noreturn ecb_attribute ((__noreturn__))
738#endif
694 739
695#if ECB_GCC_VERSION(4,3) 740#if ECB_GCC_VERSION(4,3)
696 #define ecb_artificial ecb_attribute ((__artificial__)) 741 #define ecb_artificial ecb_attribute ((__artificial__))
697 #define ecb_hot ecb_attribute ((__hot__)) 742 #define ecb_hot ecb_attribute ((__hot__))
698 #define ecb_cold ecb_attribute ((__cold__)) 743 #define ecb_cold ecb_attribute ((__cold__))
… …
789 834
790 return r + ecb_ld32 (x); 835 return r + ecb_ld32 (x);
791 } 836 }
792#endif 837#endif
793 838
839ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) ecb_const;
840ecb_function_ ecb_bool ecb_is_pot32 (uint32_t x) { return !(x & (x - 1)); }
841ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) ecb_const;
842ecb_function_ ecb_bool ecb_is_pot64 (uint64_t x) { return !(x & (x - 1)); }
843
794ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 844ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 845ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
796{ 846{
797 return ( (x * 0x0802U & 0x22110U) 847 return ( (x * 0x0802U & 0x22110U)
798 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 848 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
1108#endif 1158#endif
1109 1159
1110static void (*syserr_cb)(const char *msg) EV_THROW; 1160static void (*syserr_cb)(const char *msg) EV_THROW;
1111 1161
1112void ecb_cold 1162void ecb_cold
1113ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1163ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1114{ 1164{
1115 syserr_cb = cb; 1165 syserr_cb = cb;
1116} 1166}
1117 1167
1118static void noinline ecb_cold 1168static void noinline ecb_cold
… …
1136 abort (); 1186 abort ();
1137 } 1187 }
1138} 1188}
1139 1189
1140static void * 1190static void *
1141ev_realloc_emul (void *ptr, long size) 1191ev_realloc_emul (void *ptr, long size) EV_THROW
1142{ 1192{
1143#if __GLIBC__ 1193#if __GLIBC__
1144 return realloc (ptr, size); 1194 return realloc (ptr, size);
1145#else 1195#else
1146 /* some systems, notably openbsd and darwin, fail to properly 1196 /* some systems, notably openbsd and darwin, fail to properly
… …
1157} 1207}
1158 1208
1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1209static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1160 1210
1161void ecb_cold 1211void ecb_cold
1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1212ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1163{ 1213{
1164 alloc = cb; 1214 alloc = cb;
1165} 1215}
1166 1216
1167inline_speed void * 1217inline_speed void *
… …
1430 w_->pending = ++pendingcnt [pri]; 1480 w_->pending = ++pendingcnt [pri];
1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1481 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1432 pendings [pri][w_->pending - 1].w = w_; 1482 pendings [pri][w_->pending - 1].w = w_;
1433 pendings [pri][w_->pending - 1].events = revents; 1483 pendings [pri][w_->pending - 1].events = revents;
1434 } 1484 }
1485
1486 pendingpri = NUMPRI - 1;
1435} 1487}
1436 1488
1437inline_speed void 1489inline_speed void
1438feed_reverse (EV_P_ W w) 1490feed_reverse (EV_P_ W w)
1439{ 1491{
… …
1844} 1896}
1845 1897
1846inline_speed void 1898inline_speed void
1847evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1899evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1848{ 1900{
1901 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1902
1849 if (expect_true (*flag)) 1903 if (expect_true (*flag))
1850 return; 1904 return;
1851 1905
1852 *flag = 1; 1906 *flag = 1;
1853
1854 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 1907 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1855 1908
1856 pipe_write_skipped = 1; 1909 pipe_write_skipped = 1;
1857 1910
1858 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */ 1911 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1859 1912
1860 if (pipe_write_wanted) 1913 if (pipe_write_wanted)
1861 { 1914 {
1862 int old_errno; 1915 int old_errno;
1863 1916
1864 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1917 pipe_write_skipped = 0;
1918 ECB_MEMORY_FENCE_RELEASE;
1865 1919
1866 old_errno = errno; /* save errno because write will clobber it */ 1920 old_errno = errno; /* save errno because write will clobber it */
1867 1921
1868#if EV_USE_EVENTFD 1922#if EV_USE_EVENTFD
1869 if (evfd >= 0) 1923 if (evfd >= 0)
… …
1872 write (evfd, &counter, sizeof (uint64_t)); 1926 write (evfd, &counter, sizeof (uint64_t));
1873 } 1927 }
1874 else 1928 else
1875#endif 1929#endif
1876 { 1930 {
1877 /* win32 people keep sending patches that change this write() to send() */ 1931#ifdef _WIN32
1878 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1932 WSABUF buf;
1879 /* so when you think this write should be a send instead, please find out */ 1933 DWORD sent;
1880 /* where your send() is from - it's definitely not the microsoft send, and */ 1934 buf.buf = &buf;
1881 /* tell me. thank you. */ 1935 buf.len = 1;
1882 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */ 1936 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1883 /* check the ev documentation on how to use this flag */ 1937#else
1884 write (evpipe [1], &(evpipe [1]), 1); 1938 write (evpipe [1], &(evpipe [1]), 1);
1939#endif
1885 } 1940 }
1886 1941
1887 errno = old_errno; 1942 errno = old_errno;
1888 } 1943 }
1889} 1944}
… …
1904 read (evfd, &counter, sizeof (uint64_t)); 1959 read (evfd, &counter, sizeof (uint64_t));
1905 } 1960 }
1906 else 1961 else
1907#endif 1962#endif
1908 { 1963 {
1909 char dummy; 1964 char dummy[4];
1910 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1965#ifdef _WIN32
1966 WSABUF buf;
1967 DWORD recvd;
1968 DWORD flags = 0;
1969 buf.buf = dummy;
1970 buf.len = sizeof (dummy);
1971 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1972#else
1911 read (evpipe [0], &dummy, 1); 1973 read (evpipe [0], &dummy, sizeof (dummy));
1974#endif
1912 } 1975 }
1913 } 1976 }
1914 1977
1915 pipe_write_skipped = 0; 1978 pipe_write_skipped = 0;
1979
1980 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1916 1981
1917#if EV_SIGNAL_ENABLE 1982#if EV_SIGNAL_ENABLE
1918 if (sig_pending) 1983 if (sig_pending)
1919 { 1984 {
1920 sig_pending = 0; 1985 sig_pending = 0;
1986
1987 ECB_MEMORY_FENCE;
1921 1988
1922 for (i = EV_NSIG - 1; i--; ) 1989 for (i = EV_NSIG - 1; i--; )
1923 if (expect_false (signals [i].pending)) 1990 if (expect_false (signals [i].pending))
1924 ev_feed_signal_event (EV_A_ i + 1); 1991 ev_feed_signal_event (EV_A_ i + 1);
1925 } 1992 }
… …
1927 1994
1928#if EV_ASYNC_ENABLE 1995#if EV_ASYNC_ENABLE
1929 if (async_pending) 1996 if (async_pending)
1930 { 1997 {
1931 async_pending = 0; 1998 async_pending = 0;
1999
2000 ECB_MEMORY_FENCE;
1932 2001
1933 for (i = asynccnt; i--; ) 2002 for (i = asynccnt; i--; )
1934 if (asyncs [i]->sent) 2003 if (asyncs [i]->sent)
1935 { 2004 {
1936 asyncs [i]->sent = 0; 2005 asyncs [i]->sent = 0;
2006 ECB_MEMORY_FENCE_RELEASE;
1937 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2007 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1938 } 2008 }
1939 } 2009 }
1940#endif 2010#endif
1941} 2011}
… …
1986 if (expect_false (signals [signum].loop != EV_A)) 2056 if (expect_false (signals [signum].loop != EV_A))
1987 return; 2057 return;
1988#endif 2058#endif
1989 2059
1990 signals [signum].pending = 0; 2060 signals [signum].pending = 0;
2061 ECB_MEMORY_FENCE_RELEASE;
1991 2062
1992 for (w = signals [signum].head; w; w = w->next) 2063 for (w = signals [signum].head; w; w = w->next)
1993 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2064 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1994} 2065}
1995 2066
… …
2339 EV_INVOKE_PENDING; 2410 EV_INVOKE_PENDING;
2340 } 2411 }
2341#endif 2412#endif
2342 2413
2343#if EV_CHILD_ENABLE 2414#if EV_CHILD_ENABLE
2344 if (ev_is_active (&childev)) 2415 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2345 { 2416 {
2346 ev_ref (EV_A); /* child watcher */ 2417 ev_ref (EV_A); /* child watcher */
2347 ev_signal_stop (EV_A_ &childev); 2418 ev_signal_stop (EV_A_ &childev);
2348 } 2419 }
2349#endif 2420#endif
… …
2545void ecb_cold 2616void ecb_cold
2546ev_verify (EV_P) EV_THROW 2617ev_verify (EV_P) EV_THROW
2547{ 2618{
2548#if EV_VERIFY 2619#if EV_VERIFY
2549 int i; 2620 int i;
2550 WL w; 2621 WL w, w2;
2551 2622
2552 assert (activecnt >= -1); 2623 assert (activecnt >= -1);
2553 2624
2554 assert (fdchangemax >= fdchangecnt); 2625 assert (fdchangemax >= fdchangecnt);
2555 for (i = 0; i < fdchangecnt; ++i) 2626 for (i = 0; i < fdchangecnt; ++i)
2556 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2627 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2557 2628
2558 assert (anfdmax >= 0); 2629 assert (anfdmax >= 0);
2559 for (i = 0; i < anfdmax; ++i) 2630 for (i = 0; i < anfdmax; ++i)
2631 {
2632 int j = 0;
2633
2560 for (w = anfds [i].head; w; w = w->next) 2634 for (w = w2 = anfds [i].head; w; w = w->next)
2561 { 2635 {
2562 verify_watcher (EV_A_ (W)w); 2636 verify_watcher (EV_A_ (W)w);
2637
2638 if (j++ & 1)
2639 {
2640 assert (("libev: io watcher list contains a loop", w != w2));
2641 w2 = w2->next;
2642 }
2643
2563 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2644 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2564 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2645 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2565 } 2646 }
2647 }
2566 2648
2567 assert (timermax >= timercnt); 2649 assert (timermax >= timercnt);
2568 verify_heap (EV_A_ timers, timercnt); 2650 verify_heap (EV_A_ timers, timercnt);
2569 2651
2570#if EV_PERIODIC_ENABLE 2652#if EV_PERIODIC_ENABLE
… …
2677} 2759}
2678 2760
2679void noinline 2761void noinline
2680ev_invoke_pending (EV_P) 2762ev_invoke_pending (EV_P)
2681{ 2763{
2682 int pri; 2764 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */
2683
2684 for (pri = NUMPRI; pri--; )
2685 while (pendingcnt [pri]) 2765 while (pendingcnt [pendingpri])
2686 { 2766 {
2687 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2767 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2688 2768
2689 p->w->pending = 0; 2769 p->w->pending = 0;
2690 EV_CB_INVOKE (p->w, p->events); 2770 EV_CB_INVOKE (p->w, p->events);
2691 EV_FREQUENT_CHECK; 2771 EV_FREQUENT_CHECK;
2692 } 2772 }
… …
2787{ 2867{
2788 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2789 2869
2790 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2870 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2791 { 2871 {
2792 int feed_count = 0;
2793
2794 do 2872 do
2795 { 2873 {
2796 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2874 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2797 2875
2798 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2876 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3241 EV_FREQUENT_CHECK; 3319 EV_FREQUENT_CHECK;
3242 3320
3243 ev_start (EV_A_ (W)w, 1); 3321 ev_start (EV_A_ (W)w, 1);
3244 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3322 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3245 wlist_add (&anfds[fd].head, (WL)w); 3323 wlist_add (&anfds[fd].head, (WL)w);
3324
3325 /* common bug, apparently */
3326 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3246 3327
3247 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3328 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3248 w->events &= ~EV__IOFDSET; 3329 w->events &= ~EV__IOFDSET;
3249 3330
3250 EV_FREQUENT_CHECK; 3331 EV_FREQUENT_CHECK;

Diff Legend

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