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

Comparing libev/ev.c (file contents):
Revision 1.428 by root, Tue May 8 15:44:09 2012 UTC vs.
Revision 1.441 by root, Wed May 30 15:45:40 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# include <winsock2.h>
208# ifndef EV_SELECT_IS_WINSOCKET 208# ifndef EV_SELECT_IS_WINSOCKET
209# define EV_SELECT_IS_WINSOCKET 1 209# define EV_SELECT_IS_WINSOCKET 1
210# endif 210# endif
211# undef EV_AVOID_STDIO 211# undef EV_AVOID_STDIO
212#endif 212#endif
… …
409/* 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 */
410# ifndef IN_DONT_FOLLOW 410# ifndef IN_DONT_FOLLOW
411# undef EV_USE_INOTIFY 411# undef EV_USE_INOTIFY
412# define EV_USE_INOTIFY 0 412# define EV_USE_INOTIFY 0
413# endif 413# endif
414#endif
415
416#if EV_SELECT_IS_WINSOCKET
417# include <winsock.h>
418#endif 414#endif
419 415
420#if EV_USE_EVENTFD 416#if EV_USE_EVENTFD
421/* 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 */
422# include <stdint.h> 418# include <stdint.h>
… …
508 */ 504 */
509 505
510#ifndef ECB_H 506#ifndef ECB_H
511#define ECB_H 507#define ECB_H
512 508
509/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001
511
513#ifdef _WIN32 512#ifdef _WIN32
514 typedef signed char int8_t; 513 typedef signed char int8_t;
515 typedef unsigned char uint8_t; 514 typedef unsigned char uint8_t;
516 typedef signed short int16_t; 515 typedef signed short int16_t;
517 typedef unsigned short uint16_t; 516 typedef unsigned short uint16_t;
… …
522 typedef unsigned long long uint64_t; 521 typedef unsigned long long uint64_t;
523 #else /* _MSC_VER || __BORLANDC__ */ 522 #else /* _MSC_VER || __BORLANDC__ */
524 typedef signed __int64 int64_t; 523 typedef signed __int64 int64_t;
525 typedef unsigned __int64 uint64_t; 524 typedef unsigned __int64 uint64_t;
526 #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;
527#else 536#else
528 #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
529#endif 543#endif
530 544
531/* many compilers define _GNUC_ to some versions but then only implement 545/* many compilers define _GNUC_ to some versions but then only implement
532 * what their idiot authors think are the "more important" extensions, 546 * what their idiot authors think are the "more important" extensions,
533 * causing enormous grief in return for some better fake benchmark numbers. 547 * causing enormous grief in return for some better fake benchmark numbers.
… …
541 #else 555 #else
542 #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)))
543 #endif 557 #endif
544#endif 558#endif
545 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
546/*****************************************************************************/ 567/*****************************************************************************/
547 568
548/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
549/* 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 */
550 571
551#if ECB_NO_THREADS 572#if ECB_NO_THREADS
552# define ECB_NO_SMP 1 573 #define ECB_NO_SMP 1
553#endif 574#endif
554 575
555#if ECB_NO_THREADS || ECB_NO_SMP 576#if ECB_NO_SMP
556 #define ECB_MEMORY_FENCE do { } while (0) 577 #define ECB_MEMORY_FENCE do { } while (0)
557#endif 578#endif
558 579
559#ifndef ECB_MEMORY_FENCE 580#ifndef ECB_MEMORY_FENCE
560 #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
561 #if __i386 || __i386__ 582 #if __i386 || __i386__
562 #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")
563 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */ 584 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
564 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */ 585 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
565 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 586 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
566 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 587 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
567 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 588 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
568 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */ 589 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
569 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 590 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
570 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 591 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
571 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \ 592 #elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
572 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ 593 || defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__
573 #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")
574 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 595 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
575 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 596 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
576 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 597 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
577 #elif __sparc || __sparc__ 598 #elif __sparc || __sparc__
578 #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")
579 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 600 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
580 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 601 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
581 #elif defined __s390__ || defined __s390x__ 602 #elif defined __s390__ || defined __s390x__
582 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 603 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
583 #elif defined __mips__ 604 #elif defined __mips__
584 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 605 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
585 #elif defined __alpha__ 606 #elif defined __alpha__
586 #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")
587 #endif 613 #endif
588 #endif 614 #endif
589#endif 615#endif
590 616
591#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)
592 #if ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
593 #define ECB_MEMORY_FENCE __sync_synchronize () 625 #define ECB_MEMORY_FENCE __sync_synchronize ()
594 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
595 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
596 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 626 #elif _MSC_VER >= 1400 /* VC++ 2005 */
597 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 627 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
598 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 628 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
599 #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 */
600 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier () 630 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
… …
610 #define ECB_MEMORY_FENCE __sync () 640 #define ECB_MEMORY_FENCE __sync ()
611 #endif 641 #endif
612#endif 642#endif
613 643
614#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
615 #if !ECB_AVOID_PTHREADS 656 #if !ECB_AVOID_PTHREADS
616 /* 657 /*
617 * if you get undefined symbol references to pthread_mutex_lock, 658 * if you get undefined symbol references to pthread_mutex_lock,
618 * or failure to find pthread.h, then you should implement 659 * or failure to find pthread.h, then you should implement
619 * the ECB_MEMORY_FENCE operations for your cpu/compiler 660 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
637 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 678 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
638#endif 679#endif
639 680
640/*****************************************************************************/ 681/*****************************************************************************/
641 682
642#define ECB_C99 (__STDC_VERSION__ >= 199901L)
643
644#if __cplusplus 683#if __cplusplus
645 #define ecb_inline static inline 684 #define ecb_inline static inline
646#elif ECB_GCC_VERSION(2,5) 685#elif ECB_GCC_VERSION(2,5)
647 #define ecb_inline static __inline__ 686 #define ecb_inline static __inline__
648#elif ECB_C99 687#elif ECB_C99
… …
686#elif ECB_GCC_VERSION(3,0) 725#elif ECB_GCC_VERSION(3,0)
687 #define ecb_decltype(x) __typeof(x) 726 #define ecb_decltype(x) __typeof(x)
688#endif 727#endif
689 728
690#define ecb_noinline ecb_attribute ((__noinline__)) 729#define ecb_noinline ecb_attribute ((__noinline__))
691#define ecb_noreturn ecb_attribute ((__noreturn__))
692#define ecb_unused ecb_attribute ((__unused__)) 730#define ecb_unused ecb_attribute ((__unused__))
693#define ecb_const ecb_attribute ((__const__)) 731#define ecb_const ecb_attribute ((__const__))
694#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
695 739
696#if ECB_GCC_VERSION(4,3) 740#if ECB_GCC_VERSION(4,3)
697 #define ecb_artificial ecb_attribute ((__artificial__)) 741 #define ecb_artificial ecb_attribute ((__artificial__))
698 #define ecb_hot ecb_attribute ((__hot__)) 742 #define ecb_hot ecb_attribute ((__hot__))
699 #define ecb_cold ecb_attribute ((__cold__)) 743 #define ecb_cold ecb_attribute ((__cold__))
… …
790 834
791 return r + ecb_ld32 (x); 835 return r + ecb_ld32 (x);
792 } 836 }
793#endif 837#endif
794 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
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 844ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
796ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 845ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
797{ 846{
798 return ( (x * 0x0802U & 0x22110U) 847 return ( (x * 0x0802U & 0x22110U)
799 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 848 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
1109#endif 1158#endif
1110 1159
1111static void (*syserr_cb)(const char *msg) EV_THROW; 1160static void (*syserr_cb)(const char *msg) EV_THROW;
1112 1161
1113void ecb_cold 1162void ecb_cold
1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1163ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1115{ 1164{
1116 syserr_cb = cb; 1165 syserr_cb = cb;
1117} 1166}
1118 1167
1119static void noinline ecb_cold 1168static void noinline ecb_cold
… …
1137 abort (); 1186 abort ();
1138 } 1187 }
1139} 1188}
1140 1189
1141static void * 1190static void *
1142ev_realloc_emul (void *ptr, long size) 1191ev_realloc_emul (void *ptr, long size) EV_THROW
1143{ 1192{
1144#if __GLIBC__ 1193#if __GLIBC__
1145 return realloc (ptr, size); 1194 return realloc (ptr, size);
1146#else 1195#else
1147 /* some systems, notably openbsd and darwin, fail to properly 1196 /* some systems, notably openbsd and darwin, fail to properly
… …
1158} 1207}
1159 1208
1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1209static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1161 1210
1162void ecb_cold 1211void ecb_cold
1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1212ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1164{ 1213{
1165 alloc = cb; 1214 alloc = cb;
1166} 1215}
1167 1216
1168inline_speed void * 1217inline_speed void *
… …
1853 1902
1854 if (expect_true (*flag)) 1903 if (expect_true (*flag))
1855 return; 1904 return;
1856 1905
1857 *flag = 1; 1906 *flag = 1;
1858
1859 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 */
1860 1908
1861 pipe_write_skipped = 1; 1909 pipe_write_skipped = 1;
1862 1910
1863 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 */
1864 1912
1865 if (pipe_write_wanted) 1913 if (pipe_write_wanted)
1866 { 1914 {
1867 int old_errno; 1915 int old_errno;
1868 1916
1869 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1917 pipe_write_skipped = 0;
1918 ECB_MEMORY_FENCE_RELEASE;
1870 1919
1871 old_errno = errno; /* save errno because write will clobber it */ 1920 old_errno = errno; /* save errno because write will clobber it */
1872 1921
1873#if EV_USE_EVENTFD 1922#if EV_USE_EVENTFD
1874 if (evfd >= 0) 1923 if (evfd >= 0)
… …
1914 { 1963 {
1915 char dummy[4]; 1964 char dummy[4];
1916#ifdef _WIN32 1965#ifdef _WIN32
1917 WSABUF buf; 1966 WSABUF buf;
1918 DWORD recvd; 1967 DWORD recvd;
1968 DWORD flags = 0;
1919 buf.buf = dummy; 1969 buf.buf = dummy;
1920 buf.len = sizeof (dummy); 1970 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 1971 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1922#else 1972#else
1923 read (evpipe [0], &dummy, sizeof (dummy)); 1973 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif 1974#endif
1925 } 1975 }
1926 } 1976 }
… …
1932#if EV_SIGNAL_ENABLE 1982#if EV_SIGNAL_ENABLE
1933 if (sig_pending) 1983 if (sig_pending)
1934 { 1984 {
1935 sig_pending = 0; 1985 sig_pending = 0;
1936 1986
1937 ECB_MEMORY_FENCE_RELEASE; 1987 ECB_MEMORY_FENCE;
1938 1988
1939 for (i = EV_NSIG - 1; i--; ) 1989 for (i = EV_NSIG - 1; i--; )
1940 if (expect_false (signals [i].pending)) 1990 if (expect_false (signals [i].pending))
1941 ev_feed_signal_event (EV_A_ i + 1); 1991 ev_feed_signal_event (EV_A_ i + 1);
1942 } 1992 }
… …
1945#if EV_ASYNC_ENABLE 1995#if EV_ASYNC_ENABLE
1946 if (async_pending) 1996 if (async_pending)
1947 { 1997 {
1948 async_pending = 0; 1998 async_pending = 0;
1949 1999
1950 ECB_MEMORY_FENCE_RELEASE; 2000 ECB_MEMORY_FENCE;
1951 2001
1952 for (i = asynccnt; i--; ) 2002 for (i = asynccnt; i--; )
1953 if (asyncs [i]->sent) 2003 if (asyncs [i]->sent)
1954 { 2004 {
1955 asyncs [i]->sent = 0; 2005 asyncs [i]->sent = 0;
2006 ECB_MEMORY_FENCE_RELEASE;
1956 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2007 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1957 } 2008 }
1958 } 2009 }
1959#endif 2010#endif
1960} 2011}
… …
2005 if (expect_false (signals [signum].loop != EV_A)) 2056 if (expect_false (signals [signum].loop != EV_A))
2006 return; 2057 return;
2007#endif 2058#endif
2008 2059
2009 signals [signum].pending = 0; 2060 signals [signum].pending = 0;
2061 ECB_MEMORY_FENCE_RELEASE;
2010 2062
2011 for (w = signals [signum].head; w; w = w->next) 2063 for (w = signals [signum].head; w; w = w->next)
2012 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2064 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2013} 2065}
2014 2066
… …
2358 EV_INVOKE_PENDING; 2410 EV_INVOKE_PENDING;
2359 } 2411 }
2360#endif 2412#endif
2361 2413
2362#if EV_CHILD_ENABLE 2414#if EV_CHILD_ENABLE
2363 if (ev_is_active (&childev)) 2415 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2364 { 2416 {
2365 ev_ref (EV_A); /* child watcher */ 2417 ev_ref (EV_A); /* child watcher */
2366 ev_signal_stop (EV_A_ &childev); 2418 ev_signal_stop (EV_A_ &childev);
2367 } 2419 }
2368#endif 2420#endif
… …
2563#if EV_FEATURE_API 2615#if EV_FEATURE_API
2564void ecb_cold 2616void ecb_cold
2565ev_verify (EV_P) EV_THROW 2617ev_verify (EV_P) EV_THROW
2566{ 2618{
2567#if EV_VERIFY 2619#if EV_VERIFY
2568 int i, j; 2620 int i;
2569 WL w, w2; 2621 WL w, w2;
2570 2622
2571 assert (activecnt >= -1); 2623 assert (activecnt >= -1);
2572 2624
2573 assert (fdchangemax >= fdchangecnt); 2625 assert (fdchangemax >= fdchangecnt);
2574 for (i = 0; i < fdchangecnt; ++i) 2626 for (i = 0; i < fdchangecnt; ++i)
2575 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2627 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2576 2628
2577 assert (anfdmax >= 0); 2629 assert (anfdmax >= 0);
2578 for (i = j = 0; i < anfdmax; ++i) 2630 for (i = 0; i < anfdmax; ++i)
2631 {
2632 int j = 0;
2633
2579 for (w = w2 = anfds [i].head; w; w = w->next) 2634 for (w = w2 = anfds [i].head; w; w = w->next)
2580 { 2635 {
2581 verify_watcher (EV_A_ (W)w); 2636 verify_watcher (EV_A_ (W)w);
2582 2637
2583 if (j++ & 1) 2638 if (j++ & 1)
2584 { 2639 {
2585 assert (("libev: io watcher list contains a loop", w != w2)); 2640 assert (("libev: io watcher list contains a loop", w != w2));
2586 w2 = w2->next; 2641 w2 = w2->next;
2587 } 2642 }
2588 2643
2589 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));
2590 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));
2591 } 2646 }
2647 }
2592 2648
2593 assert (timermax >= timercnt); 2649 assert (timermax >= timercnt);
2594 verify_heap (EV_A_ timers, timercnt); 2650 verify_heap (EV_A_ timers, timercnt);
2595 2651
2596#if EV_PERIODIC_ENABLE 2652#if EV_PERIODIC_ENABLE
… …
2677} 2733}
2678 2734
2679void 2735void
2680ev_loop_fork (EV_P) EV_THROW 2736ev_loop_fork (EV_P) EV_THROW
2681{ 2737{
2682 postfork = 1; /* must be in line with ev_default_fork */ 2738 postfork = 1;
2683} 2739}
2684 2740
2685/*****************************************************************************/ 2741/*****************************************************************************/
2686 2742
2687void 2743void
… …
2811{ 2867{
2812 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2813 2869
2814 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2870 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2815 { 2871 {
2816 int feed_count = 0;
2817
2818 do 2872 do
2819 { 2873 {
2820 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2874 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2821 2875
2822 /*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)));*/
… …
3081 backend_poll (EV_A_ waittime); 3135 backend_poll (EV_A_ waittime);
3082 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3136 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3083 3137
3084 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3138 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3085 3139
3140 MEMORY_FENCE_ACQUIRE;
3086 if (pipe_write_skipped) 3141 if (pipe_write_skipped)
3087 { 3142 {
3088 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3143 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3089 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3144 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3090 } 3145 }

Diff Legend

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