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

Comparing libev/ev.c (file contents):
Revision 1.429 by root, Tue May 8 15:50:49 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# 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); }) */ 626 /*#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 ); }) */ 627 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
596 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 628 #elif _MSC_VER >= 1400 /* VC++ 2005 */
597 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 629 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
… …
610 #define ECB_MEMORY_FENCE __sync () 642 #define ECB_MEMORY_FENCE __sync ()
611 #endif 643 #endif
612#endif 644#endif
613 645
614#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
615 #if !ECB_AVOID_PTHREADS 659 #if !ECB_AVOID_PTHREADS
616 /* 660 /*
617 * if you get undefined symbol references to pthread_mutex_lock, 661 * if you get undefined symbol references to pthread_mutex_lock,
618 * or failure to find pthread.h, then you should implement 662 * or failure to find pthread.h, then you should implement
619 * the ECB_MEMORY_FENCE operations for your cpu/compiler 663 * the ECB_MEMORY_FENCE operations for your cpu/compiler
… …
637 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 681 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
638#endif 682#endif
639 683
640/*****************************************************************************/ 684/*****************************************************************************/
641 685
642#define ECB_C99 (__STDC_VERSION__ >= 199901L)
643
644#if __cplusplus 686#if __cplusplus
645 #define ecb_inline static inline 687 #define ecb_inline static inline
646#elif ECB_GCC_VERSION(2,5) 688#elif ECB_GCC_VERSION(2,5)
647 #define ecb_inline static __inline__ 689 #define ecb_inline static __inline__
648#elif ECB_C99 690#elif ECB_C99
… …
686#elif ECB_GCC_VERSION(3,0) 728#elif ECB_GCC_VERSION(3,0)
687 #define ecb_decltype(x) __typeof(x) 729 #define ecb_decltype(x) __typeof(x)
688#endif 730#endif
689 731
690#define ecb_noinline ecb_attribute ((__noinline__)) 732#define ecb_noinline ecb_attribute ((__noinline__))
691#define ecb_noreturn ecb_attribute ((__noreturn__))
692#define ecb_unused ecb_attribute ((__unused__)) 733#define ecb_unused ecb_attribute ((__unused__))
693#define ecb_const ecb_attribute ((__const__)) 734#define ecb_const ecb_attribute ((__const__))
694#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
695 742
696#if ECB_GCC_VERSION(4,3) 743#if ECB_GCC_VERSION(4,3)
697 #define ecb_artificial ecb_attribute ((__artificial__)) 744 #define ecb_artificial ecb_attribute ((__artificial__))
698 #define ecb_hot ecb_attribute ((__hot__)) 745 #define ecb_hot ecb_attribute ((__hot__))
699 #define ecb_cold ecb_attribute ((__cold__)) 746 #define ecb_cold ecb_attribute ((__cold__))
… …
790 837
791 return r + ecb_ld32 (x); 838 return r + ecb_ld32 (x);
792 } 839 }
793#endif 840#endif
794 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
795ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const; 847ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) ecb_const;
796ecb_function_ uint8_t ecb_bitrev8 (uint8_t x) 848ecb_function_ uint8_t ecb_bitrev8 (uint8_t x)
797{ 849{
798 return ( (x * 0x0802U & 0x22110U) 850 return ( (x * 0x0802U & 0x22110U)
799 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16; 851 | (x * 0x8020U & 0x88440U)) * 0x10101U >> 16;
… …
1109#endif 1161#endif
1110 1162
1111static void (*syserr_cb)(const char *msg) EV_THROW; 1163static void (*syserr_cb)(const char *msg) EV_THROW;
1112 1164
1113void ecb_cold 1165void ecb_cold
1114ev_set_syserr_cb (void (*cb)(const char *msg)) EV_THROW 1166ev_set_syserr_cb (void (*cb)(const char *msg) EV_THROW) EV_THROW
1115{ 1167{
1116 syserr_cb = cb; 1168 syserr_cb = cb;
1117} 1169}
1118 1170
1119static void noinline ecb_cold 1171static void noinline ecb_cold
… …
1137 abort (); 1189 abort ();
1138 } 1190 }
1139} 1191}
1140 1192
1141static void * 1193static void *
1142ev_realloc_emul (void *ptr, long size) 1194ev_realloc_emul (void *ptr, long size) EV_THROW
1143{ 1195{
1144#if __GLIBC__ 1196#if __GLIBC__
1145 return realloc (ptr, size); 1197 return realloc (ptr, size);
1146#else 1198#else
1147 /* some systems, notably openbsd and darwin, fail to properly 1199 /* some systems, notably openbsd and darwin, fail to properly
… …
1158} 1210}
1159 1211
1160static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1161 1213
1162void ecb_cold 1214void ecb_cold
1163ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1215ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1164{ 1216{
1165 alloc = cb; 1217 alloc = cb;
1166} 1218}
1167 1219
1168inline_speed void * 1220inline_speed void *
… …
1853 1905
1854 if (expect_true (*flag)) 1906 if (expect_true (*flag))
1855 return; 1907 return;
1856 1908
1857 *flag = 1; 1909 *flag = 1;
1858
1859 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 */
1860 1911
1861 pipe_write_skipped = 1; 1912 pipe_write_skipped = 1;
1862 1913
1863 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 */
1864 1915
1865 if (pipe_write_wanted) 1916 if (pipe_write_wanted)
1866 { 1917 {
1867 int old_errno; 1918 int old_errno;
1868 1919
1869 pipe_write_skipped = 0; /* just an optimisation, no fence needed */ 1920 pipe_write_skipped = 0;
1921 ECB_MEMORY_FENCE_RELEASE;
1870 1922
1871 old_errno = errno; /* save errno because write will clobber it */ 1923 old_errno = errno; /* save errno because write will clobber it */
1872 1924
1873#if EV_USE_EVENTFD 1925#if EV_USE_EVENTFD
1874 if (evfd >= 0) 1926 if (evfd >= 0)
… …
1914 { 1966 {
1915 char dummy[4]; 1967 char dummy[4];
1916#ifdef _WIN32 1968#ifdef _WIN32
1917 WSABUF buf; 1969 WSABUF buf;
1918 DWORD recvd; 1970 DWORD recvd;
1971 DWORD flags = 0;
1919 buf.buf = dummy; 1972 buf.buf = dummy;
1920 buf.len = sizeof (dummy); 1973 buf.len = sizeof (dummy);
1921 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0); 1974 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1922#else 1975#else
1923 read (evpipe [0], &dummy, sizeof (dummy)); 1976 read (evpipe [0], &dummy, sizeof (dummy));
1924#endif 1977#endif
1925 } 1978 }
1926 } 1979 }
… …
1932#if EV_SIGNAL_ENABLE 1985#if EV_SIGNAL_ENABLE
1933 if (sig_pending) 1986 if (sig_pending)
1934 { 1987 {
1935 sig_pending = 0; 1988 sig_pending = 0;
1936 1989
1937 ECB_MEMORY_FENCE_RELEASE; 1990 ECB_MEMORY_FENCE;
1938 1991
1939 for (i = EV_NSIG - 1; i--; ) 1992 for (i = EV_NSIG - 1; i--; )
1940 if (expect_false (signals [i].pending)) 1993 if (expect_false (signals [i].pending))
1941 ev_feed_signal_event (EV_A_ i + 1); 1994 ev_feed_signal_event (EV_A_ i + 1);
1942 } 1995 }
… …
1945#if EV_ASYNC_ENABLE 1998#if EV_ASYNC_ENABLE
1946 if (async_pending) 1999 if (async_pending)
1947 { 2000 {
1948 async_pending = 0; 2001 async_pending = 0;
1949 2002
1950 ECB_MEMORY_FENCE_RELEASE; 2003 ECB_MEMORY_FENCE;
1951 2004
1952 for (i = asynccnt; i--; ) 2005 for (i = asynccnt; i--; )
1953 if (asyncs [i]->sent) 2006 if (asyncs [i]->sent)
1954 { 2007 {
1955 asyncs [i]->sent = 0; 2008 asyncs [i]->sent = 0;
2009 ECB_MEMORY_FENCE_RELEASE;
1956 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2010 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1957 } 2011 }
1958 } 2012 }
1959#endif 2013#endif
1960} 2014}
… …
2005 if (expect_false (signals [signum].loop != EV_A)) 2059 if (expect_false (signals [signum].loop != EV_A))
2006 return; 2060 return;
2007#endif 2061#endif
2008 2062
2009 signals [signum].pending = 0; 2063 signals [signum].pending = 0;
2064 MEMORY_FENCE_RELEASE;
2010 2065
2011 for (w = signals [signum].head; w; w = w->next) 2066 for (w = signals [signum].head; w; w = w->next)
2012 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2067 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
2013} 2068}
2014 2069
… …
2358 EV_INVOKE_PENDING; 2413 EV_INVOKE_PENDING;
2359 } 2414 }
2360#endif 2415#endif
2361 2416
2362#if EV_CHILD_ENABLE 2417#if EV_CHILD_ENABLE
2363 if (ev_is_active (&childev)) 2418 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2364 { 2419 {
2365 ev_ref (EV_A); /* child watcher */ 2420 ev_ref (EV_A); /* child watcher */
2366 ev_signal_stop (EV_A_ &childev); 2421 ev_signal_stop (EV_A_ &childev);
2367 } 2422 }
2368#endif 2423#endif
… …
2815{ 2870{
2816 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2817 2872
2818 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2819 { 2874 {
2820 int feed_count = 0;
2821
2822 do 2875 do
2823 { 2876 {
2824 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2877 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2825 2878
2826 /*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