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

Comparing libev/ev.c (file contents):
Revision 1.421 by root, Wed Apr 18 06:06:04 2012 UTC vs.
Revision 1.446 by root, Mon Jun 11 12:50:50 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
… …
359#endif 360#endif
360 361
361/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
362/* which makes programs even slower. might work on other unices, too. */ 363/* which makes programs even slower. might work on other unices, too. */
363#if EV_USE_CLOCK_SYSCALL 364#if EV_USE_CLOCK_SYSCALL
364# include <syscall.h> 365# include <sys/syscall.h>
365# ifdef SYS_clock_gettime 366# ifdef SYS_clock_gettime
366# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 367# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
367# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
368# define EV_USE_MONOTONIC 1 369# define EV_USE_MONOTONIC 1
369# else 370# else
… …
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_CPP11 (__cplusplus >= 201103L)
565
545/*****************************************************************************/ 566/*****************************************************************************/
546 567
547/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 568/* 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 */ 569/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
549 570
550#if ECB_NO_THREADS 571#if ECB_NO_THREADS
551# define ECB_NO_SMP 1 572 #define ECB_NO_SMP 1
552#endif 573#endif
553 574
554#if ECB_NO_THREADS || ECB_NO_SMP 575#if ECB_NO_SMP
555 #define ECB_MEMORY_FENCE do { } while (0) 576 #define ECB_MEMORY_FENCE do { } while (0)
556#endif 577#endif
557 578
558#ifndef ECB_MEMORY_FENCE 579#ifndef ECB_MEMORY_FENCE
559 #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
560 #if __i386 || __i386__ 581 #if __i386 || __i386__
561 #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")
562 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 583 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
563 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 584 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
564 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 585 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
565 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 586 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
566 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 587 #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 */ 588 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
568 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 589 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
569 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 590 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
570 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 591 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
571 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 592 || 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") 593 #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__ \ 594 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
574 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 595 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
575 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 596 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
576 #elif __sparc || __sparc__ 597 #elif __sparc || __sparc__
577 #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")
578 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 599 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
579 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 600 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
580 #elif defined __s390__ || defined __s390x__ 601 #elif defined __s390__ || defined __s390x__
581 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 602 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
582 #elif defined __mips__ 603 #elif defined __mips__
583 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 604 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
584 #elif defined __alpha__ 605 #elif defined __alpha__
585 #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")
586 #endif 612 #endif
587 #endif 613 #endif
588#endif 614#endif
589 615
590#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)
591 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 623 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
592 #define ECB_MEMORY_FENCE __sync_synchronize () 624 #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 */ 625 #elif _MSC_VER >= 1400 /* VC++ 2005 */
596 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 626 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
597 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 627 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
598 #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 */
599 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 629 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
609 #define ECB_MEMORY_FENCE __sync () 639 #define ECB_MEMORY_FENCE __sync ()
610 #endif 640 #endif
611#endif 641#endif
612 642
613#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
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 *
… …
1430 w_->pending = ++pendingcnt [pri]; 1483 w_->pending = ++pendingcnt [pri];
1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1484 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1432 pendings [pri][w_->pending - 1].w = w_; 1485 pendings [pri][w_->pending - 1].w = w_;
1433 pendings [pri][w_->pending - 1].events = revents; 1486 pendings [pri][w_->pending - 1].events = revents;
1434 } 1487 }
1488
1489 pendingpri = NUMPRI - 1;
1435} 1490}
1436 1491
1437inline_speed void 1492inline_speed void
1438feed_reverse (EV_P_ W w) 1493feed_reverse (EV_P_ W w)
1439{ 1494{
… …
1844} 1899}
1845 1900
1846inline_speed void 1901inline_speed void
1847evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1902evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1848{ 1903{
1904 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1905
1849 if (expect_true (*flag)) 1906 if (expect_true (*flag))
1850 return; 1907 return;
1851 1908
1852 *flag = 1; 1909 *flag = 1;
1853
1854 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 */
1855 1911
1856 pipe_write_skipped = 1; 1912 pipe_write_skipped = 1;
1857 1913
1858 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 */
1859 1915
1860 if (pipe_write_wanted) 1916 if (pipe_write_wanted)
1861 { 1917 {
1862 int old_errno; 1918 int old_errno;
1863 1919
1864 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1920 pipe_write_skipped = 0;
1921 ECB_MEMORY_FENCE_RELEASE;
1865 1922
1866 old_errno = errno; /* save errno because write will clobber it */ 1923 old_errno = errno; /* save errno because write will clobber it */
1867 1924
1868#if EV_USE_EVENTFD 1925#if EV_USE_EVENTFD
1869 if (evfd >= 0) 1926 if (evfd >= 0)
… …
1872 write (evfd, &counter, sizeof (uint64_t)); 1929 write (evfd, &counter, sizeof (uint64_t));
1873 } 1930 }
1874 else 1931 else
1875#endif 1932#endif
1876 { 1933 {
1877 /* win32 people keep sending patches that change this write() to send() */ 1934#ifdef _WIN32
1878 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1935 WSABUF buf;
1879 /* so when you think this write should be a send instead, please find out */ 1936 DWORD sent;
1880 /* where your send() is from - it's definitely not the microsoft send, and */ 1937 buf.buf = &buf;
1881 /* tell me. thank you. */ 1938 buf.len = 1;
1882 /* 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);
1883 /* check the ev documentation on how to use this flag */ 1940#else
1884 write (evpipe [1], &(evpipe [1]), 1); 1941 write (evpipe [1], &(evpipe [1]), 1);
1942#endif
1885 } 1943 }
1886 1944
1887 errno = old_errno; 1945 errno = old_errno;
1888 } 1946 }
1889} 1947}
… …
1904 read (evfd, &counter, sizeof (uint64_t)); 1962 read (evfd, &counter, sizeof (uint64_t));
1905 } 1963 }
1906 else 1964 else
1907#endif 1965#endif
1908 { 1966 {
1909 char dummy; 1967 char dummy[4];
1910 /* 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
1911 read (evpipe [0], &dummy, 1); 1976 read (evpipe [0], &dummy, sizeof (dummy));
1977#endif
1912 } 1978 }
1913 } 1979 }
1914 1980
1915 pipe_write_skipped = 0; 1981 pipe_write_skipped = 0;
1982
1983 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1916 1984
1917#if EV_SIGNAL_ENABLE 1985#if EV_SIGNAL_ENABLE
1918 if (sig_pending) 1986 if (sig_pending)
1919 { 1987 {
1920 sig_pending = 0; 1988 sig_pending = 0;
1989
1990 ECB_MEMORY_FENCE;
1921 1991
1922 for (i = EV_NSIG - 1; i--; ) 1992 for (i = EV_NSIG - 1; i--; )
1923 if (expect_false (signals [i].pending)) 1993 if (expect_false (signals [i].pending))
1924 ev_feed_signal_event (EV_A_ i + 1); 1994 ev_feed_signal_event (EV_A_ i + 1);
1925 } 1995 }
… …
1927 1997
1928#if EV_ASYNC_ENABLE 1998#if EV_ASYNC_ENABLE
1929 if (async_pending) 1999 if (async_pending)
1930 { 2000 {
1931 async_pending = 0; 2001 async_pending = 0;
2002
2003 ECB_MEMORY_FENCE;
1932 2004
1933 for (i = asynccnt; i--; ) 2005 for (i = asynccnt; i--; )
1934 if (asyncs [i]->sent) 2006 if (asyncs [i]->sent)
1935 { 2007 {
1936 asyncs [i]->sent = 0; 2008 asyncs [i]->sent = 0;
2009 ECB_MEMORY_FENCE_RELEASE;
1937 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2010 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1938 } 2011 }
1939 } 2012 }
1940#endif 2013#endif
1941} 2014}
… …
1972void noinline 2045void noinline
1973ev_feed_signal_event (EV_P_ int signum) EV_THROW 2046ev_feed_signal_event (EV_P_ int signum) EV_THROW
1974{ 2047{
1975 WL w; 2048 WL w;
1976 2049
1977 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2050 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1978 return; 2051 return;
1979 2052
1980 --signum; 2053 --signum;
1981 2054
1982#if EV_MULTIPLICITY 2055#if EV_MULTIPLICITY
… …
1986 if (expect_false (signals [signum].loop != EV_A)) 2059 if (expect_false (signals [signum].loop != EV_A))
1987 return; 2060 return;
1988#endif 2061#endif
1989 2062
1990 signals [signum].pending = 0; 2063 signals [signum].pending = 0;
2064 ECB_MEMORY_FENCE_RELEASE;
1991 2065
1992 for (w = signals [signum].head; w; w = w->next) 2066 for (w = signals [signum].head; w; w = w->next)
1993 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2067 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1994} 2068}
1995 2069
… …
2319 } 2393 }
2320} 2394}
2321 2395
2322/* free up a loop structure */ 2396/* free up a loop structure */
2323void ecb_cold 2397void ecb_cold
2324ev_loop_destroy (EV_P) EV_THROW 2398ev_loop_destroy (EV_P)
2325{ 2399{
2326 int i; 2400 int i;
2327 2401
2328#if EV_MULTIPLICITY 2402#if EV_MULTIPLICITY
2329 /* mimic free (0) */ 2403 /* mimic free (0) */
… …
2339 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2340 } 2414 }
2341#endif 2415#endif
2342 2416
2343#if EV_CHILD_ENABLE 2417#if EV_CHILD_ENABLE
2344 if (ev_is_active (&childev)) 2418 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2345 { 2419 {
2346 ev_ref (EV_A); /* child watcher */ 2420 ev_ref (EV_A); /* child watcher */
2347 ev_signal_stop (EV_A_ &childev); 2421 ev_signal_stop (EV_A_ &childev);
2348 } 2422 }
2349#endif 2423#endif
… …
2476 EV_WIN32_CLOSE_FD (evpipe [1]); 2550 EV_WIN32_CLOSE_FD (evpipe [1]);
2477 } 2551 }
2478 2552
2479#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 2553#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2480 evpipe_init (EV_A); 2554 evpipe_init (EV_A);
2481 /* now iterate over everything, in case we missed something */ 2555 /* iterate over everything, in case we missed something before */
2482 pipecb (EV_A_ &pipe_w, EV_READ); 2556 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2483#endif 2557#endif
2484 } 2558 }
2485 2559
2486 postfork = 0; 2560 postfork = 0;
2487} 2561}
… …
2545void ecb_cold 2619void ecb_cold
2546ev_verify (EV_P) EV_THROW 2620ev_verify (EV_P) EV_THROW
2547{ 2621{
2548#if EV_VERIFY 2622#if EV_VERIFY
2549 int i; 2623 int i;
2550 WL w; 2624 WL w, w2;
2551 2625
2552 assert (activecnt >= -1); 2626 assert (activecnt >= -1);
2553 2627
2554 assert (fdchangemax >= fdchangecnt); 2628 assert (fdchangemax >= fdchangecnt);
2555 for (i = 0; i < fdchangecnt; ++i) 2629 for (i = 0; i < fdchangecnt; ++i)
2556 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2630 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2557 2631
2558 assert (anfdmax >= 0); 2632 assert (anfdmax >= 0);
2559 for (i = 0; i < anfdmax; ++i) 2633 for (i = 0; i < anfdmax; ++i)
2634 {
2635 int j = 0;
2636
2560 for (w = anfds [i].head; w; w = w->next) 2637 for (w = w2 = anfds [i].head; w; w = w->next)
2561 { 2638 {
2562 verify_watcher (EV_A_ (W)w); 2639 verify_watcher (EV_A_ (W)w);
2640
2641 if (j++ & 1)
2642 {
2643 assert (("libev: io watcher list contains a loop", w != w2));
2644 w2 = w2->next;
2645 }
2646
2563 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));
2564 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));
2565 } 2649 }
2650 }
2566 2651
2567 assert (timermax >= timercnt); 2652 assert (timermax >= timercnt);
2568 verify_heap (EV_A_ timers, timercnt); 2653 verify_heap (EV_A_ timers, timercnt);
2569 2654
2570#if EV_PERIODIC_ENABLE 2655#if EV_PERIODIC_ENABLE
… …
2651} 2736}
2652 2737
2653void 2738void
2654ev_loop_fork (EV_P) EV_THROW 2739ev_loop_fork (EV_P) EV_THROW
2655{ 2740{
2656 postfork = 1; /* must be in line with ev_default_fork */ 2741 postfork = 1;
2657} 2742}
2658 2743
2659/*****************************************************************************/ 2744/*****************************************************************************/
2660 2745
2661void 2746void
… …
2677} 2762}
2678 2763
2679void noinline 2764void noinline
2680ev_invoke_pending (EV_P) 2765ev_invoke_pending (EV_P)
2681{ 2766{
2682 int pri; 2767 pendingpri = NUMPRI;
2683 2768
2684 for (pri = NUMPRI; pri--; ) 2769 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2770 {
2771 --pendingpri;
2772
2685 while (pendingcnt [pri]) 2773 while (pendingcnt [pendingpri])
2686 { 2774 {
2687 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2775 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2688 2776
2689 p->w->pending = 0; 2777 p->w->pending = 0;
2690 EV_CB_INVOKE (p->w, p->events); 2778 EV_CB_INVOKE (p->w, p->events);
2691 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2692 } 2780 }
2781 }
2693} 2782}
2694 2783
2695#if EV_IDLE_ENABLE 2784#if EV_IDLE_ENABLE
2696/* make idle watchers pending. this handles the "call-idle */ 2785/* make idle watchers pending. this handles the "call-idle */
2697/* only when higher priorities are idle" logic */ 2786/* only when higher priorities are idle" logic */
… …
2787{ 2876{
2788 EV_FREQUENT_CHECK; 2877 EV_FREQUENT_CHECK;
2789 2878
2790 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2879 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2791 { 2880 {
2792 int feed_count = 0;
2793
2794 do 2881 do
2795 { 2882 {
2796 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2883 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2797 2884
2798 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/ 2885 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
3057 backend_poll (EV_A_ waittime); 3144 backend_poll (EV_A_ waittime);
3058 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3145 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3059 3146
3060 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3147 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3061 3148
3149 ECB_MEMORY_FENCE_ACQUIRE;
3062 if (pipe_write_skipped) 3150 if (pipe_write_skipped)
3063 { 3151 {
3064 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3152 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3065 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3153 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3066 } 3154 }
… …
3241 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3242 3330
3243 ev_start (EV_A_ (W)w, 1); 3331 ev_start (EV_A_ (W)w, 1);
3244 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3332 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3245 wlist_add (&anfds[fd].head, (WL)w); 3333 wlist_add (&anfds[fd].head, (WL)w);
3334
3335 /* common bug, apparently */
3336 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3246 3337
3247 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3338 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3248 w->events &= ~EV__IOFDSET; 3339 w->events &= ~EV__IOFDSET;
3249 3340
3250 EV_FREQUENT_CHECK; 3341 EV_FREQUENT_CHECK;

Diff Legend

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