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

Comparing libev/ev.c (file contents):
Revision 1.422 by root, Wed Apr 18 06:09:29 2012 UTC vs.
Revision 1.448 by root, Tue Jul 24 16:28:08 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__
1144 return realloc (ptr, size);
1145#else
1146 /* some systems, notably openbsd and darwin, fail to properly 1196 /* some systems, notably openbsd and darwin, fail to properly
1147 * implement realloc (x, 0) (as required by both ansi c-89 and 1197 * implement realloc (x, 0) (as required by both ansi c-89 and
1148 * the single unix specification, so work around them here. 1198 * the single unix specification, so work around them here.
1199 * recently, also (at least) fedora and debian started breaking it,
1200 * despite documenting it otherwise.
1149 */ 1201 */
1150 1202
1151 if (size) 1203 if (size)
1152 return realloc (ptr, size); 1204 return realloc (ptr, size);
1153 1205
1154 free (ptr); 1206 free (ptr);
1155 return 0; 1207 return 0;
1156#endif
1157} 1208}
1158 1209
1159static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1210static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1160 1211
1161void ecb_cold 1212void ecb_cold
1162ev_set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW 1213ev_set_allocator (void *(*cb)(void *ptr, long size) EV_THROW) EV_THROW
1163{ 1214{
1164 alloc = cb; 1215 alloc = cb;
1165} 1216}
1166 1217
1167inline_speed void * 1218inline_speed void *
… …
1430 w_->pending = ++pendingcnt [pri]; 1481 w_->pending = ++pendingcnt [pri];
1431 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2); 1482 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
1432 pendings [pri][w_->pending - 1].w = w_; 1483 pendings [pri][w_->pending - 1].w = w_;
1433 pendings [pri][w_->pending - 1].events = revents; 1484 pendings [pri][w_->pending - 1].events = revents;
1434 } 1485 }
1486
1487 pendingpri = NUMPRI - 1;
1435} 1488}
1436 1489
1437inline_speed void 1490inline_speed void
1438feed_reverse (EV_P_ W w) 1491feed_reverse (EV_P_ W w)
1439{ 1492{
… …
1814static void noinline ecb_cold 1867static void noinline ecb_cold
1815evpipe_init (EV_P) 1868evpipe_init (EV_P)
1816{ 1869{
1817 if (!ev_is_active (&pipe_w)) 1870 if (!ev_is_active (&pipe_w))
1818 { 1871 {
1872 int fds [2];
1873
1819# if EV_USE_EVENTFD 1874# if EV_USE_EVENTFD
1875 fds [0] = -1;
1820 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1876 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1821 if (evfd < 0 && errno == EINVAL) 1877 if (fds [1] < 0 && errno == EINVAL)
1822 evfd = eventfd (0, 0); 1878 fds [1] = eventfd (0, 0);
1823 1879
1824 if (evfd >= 0) 1880 if (fds [1] < 0)
1881# endif
1825 { 1882 {
1883 while (pipe (fds))
1884 ev_syserr ("(libev) error creating signal/async pipe");
1885
1886 fd_intern (fds [0]);
1887 }
1888
1889 fd_intern (fds [1]);
1890
1826 evpipe [0] = -1; 1891 evpipe [0] = fds [0];
1827 fd_intern (evfd); /* doing it twice doesn't hurt */ 1892
1828 ev_io_set (&pipe_w, evfd, EV_READ); 1893 if (evpipe [1] < 0)
1894 evpipe [1] = fds [1]; /* first call, set write fd */
1895 else
1896 {
1897 /* on subsequent calls, do not change evpipe [1] */
1898 /* so that evpipe_write can always rely on its value. */
1899 /* this branch does not do anything sensible on windows, */
1900 /* so must not be executed on windows */
1901
1902 dup2 (fds [1], evpipe [1]);
1903 close (fds [1]);
1904 }
1905
1906 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1907 ev_io_start (EV_A_ &pipe_w);
1908 ev_unref (EV_A); /* watcher should not keep loop alive */
1909 }
1910}
1911
1912inline_speed void
1913evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1914{
1915 ECB_MEMORY_FENCE; /* push out the write before this function was called, acquire flag */
1916
1917 if (expect_true (*flag))
1918 return;
1919
1920 *flag = 1;
1921 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1922
1923 pipe_write_skipped = 1;
1924
1925 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1926
1927 if (pipe_write_wanted)
1928 {
1929 int old_errno;
1930
1931 pipe_write_skipped = 0;
1932 ECB_MEMORY_FENCE_RELEASE;
1933
1934 old_errno = errno; /* save errno because write will clobber it */
1935
1936#if EV_USE_EVENTFD
1937 if (evpipe [0] < 0)
1938 {
1939 uint64_t counter = 1;
1940 write (evpipe [1], &counter, sizeof (uint64_t));
1829 } 1941 }
1830 else 1942 else
1831# endif 1943#endif
1832 { 1944 {
1833 while (pipe (evpipe)) 1945#ifdef _WIN32
1834 ev_syserr ("(libev) error creating signal/async pipe"); 1946 WSABUF buf;
1835 1947 DWORD sent;
1836 fd_intern (evpipe [0]); 1948 buf.buf = &buf;
1837 fd_intern (evpipe [1]); 1949 buf.len = 1;
1838 ev_io_set (&pipe_w, evpipe [0], EV_READ); 1950 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1839 } 1951#else
1840
1841 ev_io_start (EV_A_ &pipe_w);
1842 ev_unref (EV_A); /* watcher should not keep loop alive */
1843 }
1844}
1845
1846inline_speed void
1847evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1848{
1849 if (expect_true (*flag))
1850 return;
1851
1852 *flag = 1;
1853
1854 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1855
1856 pipe_write_skipped = 1;
1857
1858 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1859
1860 if (pipe_write_wanted)
1861 {
1862 int old_errno;
1863
1864 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1865
1866 old_errno = errno; /* save errno because write will clobber it */
1867
1868#if EV_USE_EVENTFD
1869 if (evfd >= 0)
1870 {
1871 uint64_t counter = 1;
1872 write (evfd, &counter, sizeof (uint64_t));
1873 }
1874 else
1875#endif
1876 {
1877 /* win32 people keep sending patches that change this write() to send() */
1878 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1879 /* so when you think this write should be a send instead, please find out */
1880 /* where your send() is from - it's definitely not the microsoft send, and */
1881 /* tell me. thank you. */
1882 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */
1883 /* check the ev documentation on how to use this flag */
1884 write (evpipe [1], &(evpipe [1]), 1); 1952 write (evpipe [1], &(evpipe [1]), 1);
1953#endif
1885 } 1954 }
1886 1955
1887 errno = old_errno; 1956 errno = old_errno;
1888 } 1957 }
1889} 1958}
… …
1896 int i; 1965 int i;
1897 1966
1898 if (revents & EV_READ) 1967 if (revents & EV_READ)
1899 { 1968 {
1900#if EV_USE_EVENTFD 1969#if EV_USE_EVENTFD
1901 if (evfd >= 0) 1970 if (evpipe [0] < 0)
1902 { 1971 {
1903 uint64_t counter; 1972 uint64_t counter;
1904 read (evfd, &counter, sizeof (uint64_t)); 1973 read (evpipe [1], &counter, sizeof (uint64_t));
1905 } 1974 }
1906 else 1975 else
1907#endif 1976#endif
1908 { 1977 {
1909 char dummy; 1978 char dummy[4];
1910 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1979#ifdef _WIN32
1980 WSABUF buf;
1981 DWORD recvd;
1982 DWORD flags = 0;
1983 buf.buf = dummy;
1984 buf.len = sizeof (dummy);
1985 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, &flags, 0, 0);
1986#else
1911 read (evpipe [0], &dummy, 1); 1987 read (evpipe [0], &dummy, sizeof (dummy));
1988#endif
1912 } 1989 }
1913 } 1990 }
1914 1991
1915 pipe_write_skipped = 0; 1992 pipe_write_skipped = 0;
1993
1994 ECB_MEMORY_FENCE; /* push out skipped, acquire flags */
1916 1995
1917#if EV_SIGNAL_ENABLE 1996#if EV_SIGNAL_ENABLE
1918 if (sig_pending) 1997 if (sig_pending)
1919 { 1998 {
1920 sig_pending = 0; 1999 sig_pending = 0;
2000
2001 ECB_MEMORY_FENCE;
1921 2002
1922 for (i = EV_NSIG - 1; i--; ) 2003 for (i = EV_NSIG - 1; i--; )
1923 if (expect_false (signals [i].pending)) 2004 if (expect_false (signals [i].pending))
1924 ev_feed_signal_event (EV_A_ i + 1); 2005 ev_feed_signal_event (EV_A_ i + 1);
1925 } 2006 }
… …
1927 2008
1928#if EV_ASYNC_ENABLE 2009#if EV_ASYNC_ENABLE
1929 if (async_pending) 2010 if (async_pending)
1930 { 2011 {
1931 async_pending = 0; 2012 async_pending = 0;
2013
2014 ECB_MEMORY_FENCE;
1932 2015
1933 for (i = asynccnt; i--; ) 2016 for (i = asynccnt; i--; )
1934 if (asyncs [i]->sent) 2017 if (asyncs [i]->sent)
1935 { 2018 {
1936 asyncs [i]->sent = 0; 2019 asyncs [i]->sent = 0;
2020 ECB_MEMORY_FENCE_RELEASE;
1937 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC); 2021 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1938 } 2022 }
1939 } 2023 }
1940#endif 2024#endif
1941} 2025}
… …
1950 2034
1951 if (!EV_A) 2035 if (!EV_A)
1952 return; 2036 return;
1953#endif 2037#endif
1954 2038
1955 if (!ev_active (&pipe_w))
1956 return;
1957
1958 signals [signum - 1].pending = 1; 2039 signals [signum - 1].pending = 1;
1959 evpipe_write (EV_A_ &sig_pending); 2040 evpipe_write (EV_A_ &sig_pending);
1960} 2041}
1961 2042
1962static void 2043static void
… …
1972void noinline 2053void noinline
1973ev_feed_signal_event (EV_P_ int signum) EV_THROW 2054ev_feed_signal_event (EV_P_ int signum) EV_THROW
1974{ 2055{
1975 WL w; 2056 WL w;
1976 2057
1977 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2058 if (expect_false (signum <= 0 || signum >= EV_NSIG))
1978 return; 2059 return;
1979 2060
1980 --signum; 2061 --signum;
1981 2062
1982#if EV_MULTIPLICITY 2063#if EV_MULTIPLICITY
… …
1986 if (expect_false (signals [signum].loop != EV_A)) 2067 if (expect_false (signals [signum].loop != EV_A))
1987 return; 2068 return;
1988#endif 2069#endif
1989 2070
1990 signals [signum].pending = 0; 2071 signals [signum].pending = 0;
2072 ECB_MEMORY_FENCE_RELEASE;
1991 2073
1992 for (w = signals [signum].head; w; w = w->next) 2074 for (w = signals [signum].head; w; w = w->next)
1993 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 2075 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1994} 2076}
1995 2077
… …
2279#if EV_ASYNC_ENABLE 2361#if EV_ASYNC_ENABLE
2280 async_pending = 0; 2362 async_pending = 0;
2281#endif 2363#endif
2282 pipe_write_skipped = 0; 2364 pipe_write_skipped = 0;
2283 pipe_write_wanted = 0; 2365 pipe_write_wanted = 0;
2366 evpipe [0] = -1;
2367 evpipe [1] = -1;
2284#if EV_USE_INOTIFY 2368#if EV_USE_INOTIFY
2285 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2369 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2286#endif 2370#endif
2287#if EV_USE_SIGNALFD 2371#if EV_USE_SIGNALFD
2288 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2372 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2339 EV_INVOKE_PENDING; 2423 EV_INVOKE_PENDING;
2340 } 2424 }
2341#endif 2425#endif
2342 2426
2343#if EV_CHILD_ENABLE 2427#if EV_CHILD_ENABLE
2344 if (ev_is_active (&childev)) 2428 if (ev_is_default_loop (EV_A) && ev_is_active (&childev))
2345 { 2429 {
2346 ev_ref (EV_A); /* child watcher */ 2430 ev_ref (EV_A); /* child watcher */
2347 ev_signal_stop (EV_A_ &childev); 2431 ev_signal_stop (EV_A_ &childev);
2348 } 2432 }
2349#endif 2433#endif
… …
2351 if (ev_is_active (&pipe_w)) 2435 if (ev_is_active (&pipe_w))
2352 { 2436 {
2353 /*ev_ref (EV_A);*/ 2437 /*ev_ref (EV_A);*/
2354 /*ev_io_stop (EV_A_ &pipe_w);*/ 2438 /*ev_io_stop (EV_A_ &pipe_w);*/
2355 2439
2356#if EV_USE_EVENTFD
2357 if (evfd >= 0)
2358 close (evfd);
2359#endif
2360
2361 if (evpipe [0] >= 0)
2362 {
2363 EV_WIN32_CLOSE_FD (evpipe [0]); 2440 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2364 EV_WIN32_CLOSE_FD (evpipe [1]); 2441 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2365 }
2366 } 2442 }
2367 2443
2368#if EV_USE_SIGNALFD 2444#if EV_USE_SIGNALFD
2369 if (ev_is_active (&sigfd_w)) 2445 if (ev_is_active (&sigfd_w))
2370 close (sigfd); 2446 close (sigfd);
… …
2456#endif 2532#endif
2457#if EV_USE_INOTIFY 2533#if EV_USE_INOTIFY
2458 infy_fork (EV_A); 2534 infy_fork (EV_A);
2459#endif 2535#endif
2460 2536
2537#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2461 if (ev_is_active (&pipe_w)) 2538 if (ev_is_active (&pipe_w))
2462 { 2539 {
2463 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2540 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2464 2541
2465 ev_ref (EV_A); 2542 ev_ref (EV_A);
2466 ev_io_stop (EV_A_ &pipe_w); 2543 ev_io_stop (EV_A_ &pipe_w);
2467 2544
2468#if EV_USE_EVENTFD
2469 if (evfd >= 0)
2470 close (evfd);
2471#endif
2472
2473 if (evpipe [0] >= 0) 2545 if (evpipe [0] >= 0)
2474 {
2475 EV_WIN32_CLOSE_FD (evpipe [0]); 2546 EV_WIN32_CLOSE_FD (evpipe [0]);
2476 EV_WIN32_CLOSE_FD (evpipe [1]);
2477 }
2478 2547
2479#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2480 evpipe_init (EV_A); 2548 evpipe_init (EV_A);
2481 /* now iterate over everything, in case we missed something */ 2549 /* iterate over everything, in case we missed something before */
2482 pipecb (EV_A_ &pipe_w, EV_READ); 2550 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2483#endif
2484 } 2551 }
2552#endif
2485 2553
2486 postfork = 0; 2554 postfork = 0;
2487} 2555}
2488 2556
2489#if EV_MULTIPLICITY 2557#if EV_MULTIPLICITY
… …
2545void ecb_cold 2613void ecb_cold
2546ev_verify (EV_P) EV_THROW 2614ev_verify (EV_P) EV_THROW
2547{ 2615{
2548#if EV_VERIFY 2616#if EV_VERIFY
2549 int i; 2617 int i;
2550 WL w; 2618 WL w, w2;
2551 2619
2552 assert (activecnt >= -1); 2620 assert (activecnt >= -1);
2553 2621
2554 assert (fdchangemax >= fdchangecnt); 2622 assert (fdchangemax >= fdchangecnt);
2555 for (i = 0; i < fdchangecnt; ++i) 2623 for (i = 0; i < fdchangecnt; ++i)
2556 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2624 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2557 2625
2558 assert (anfdmax >= 0); 2626 assert (anfdmax >= 0);
2559 for (i = 0; i < anfdmax; ++i) 2627 for (i = 0; i < anfdmax; ++i)
2628 {
2629 int j = 0;
2630
2560 for (w = anfds [i].head; w; w = w->next) 2631 for (w = w2 = anfds [i].head; w; w = w->next)
2561 { 2632 {
2562 verify_watcher (EV_A_ (W)w); 2633 verify_watcher (EV_A_ (W)w);
2634
2635 if (j++ & 1)
2636 {
2637 assert (("libev: io watcher list contains a loop", w != w2));
2638 w2 = w2->next;
2639 }
2640
2563 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2641 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)); 2642 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2565 } 2643 }
2644 }
2566 2645
2567 assert (timermax >= timercnt); 2646 assert (timermax >= timercnt);
2568 verify_heap (EV_A_ timers, timercnt); 2647 verify_heap (EV_A_ timers, timercnt);
2569 2648
2570#if EV_PERIODIC_ENABLE 2649#if EV_PERIODIC_ENABLE
… …
2651} 2730}
2652 2731
2653void 2732void
2654ev_loop_fork (EV_P) EV_THROW 2733ev_loop_fork (EV_P) EV_THROW
2655{ 2734{
2656 postfork = 1; /* must be in line with ev_default_fork */ 2735 postfork = 1;
2657} 2736}
2658 2737
2659/*****************************************************************************/ 2738/*****************************************************************************/
2660 2739
2661void 2740void
… …
2677} 2756}
2678 2757
2679void noinline 2758void noinline
2680ev_invoke_pending (EV_P) 2759ev_invoke_pending (EV_P)
2681{ 2760{
2682 int pri; 2761 pendingpri = NUMPRI;
2683 2762
2684 for (pri = NUMPRI; pri--; ) 2763 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2764 {
2765 --pendingpri;
2766
2685 while (pendingcnt [pri]) 2767 while (pendingcnt [pendingpri])
2686 { 2768 {
2687 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2769 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2688 2770
2689 p->w->pending = 0; 2771 p->w->pending = 0;
2690 EV_CB_INVOKE (p->w, p->events); 2772 EV_CB_INVOKE (p->w, p->events);
2691 EV_FREQUENT_CHECK; 2773 EV_FREQUENT_CHECK;
2692 } 2774 }
2775 }
2693} 2776}
2694 2777
2695#if EV_IDLE_ENABLE 2778#if EV_IDLE_ENABLE
2696/* make idle watchers pending. this handles the "call-idle */ 2779/* make idle watchers pending. this handles the "call-idle */
2697/* only when higher priorities are idle" logic */ 2780/* only when higher priorities are idle" logic */
… …
2787{ 2870{
2788 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2789 2872
2790 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2791 { 2874 {
2792 int feed_count = 0;
2793
2794 do 2875 do
2795 { 2876 {
2796 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2877 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2797 2878
2798 /*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)));*/
… …
3057 backend_poll (EV_A_ waittime); 3138 backend_poll (EV_A_ waittime);
3058 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3139 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3059 3140
3060 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3141 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3061 3142
3143 ECB_MEMORY_FENCE_ACQUIRE;
3062 if (pipe_write_skipped) 3144 if (pipe_write_skipped)
3063 { 3145 {
3064 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3146 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); 3147 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3066 } 3148 }
… …
3241 EV_FREQUENT_CHECK; 3323 EV_FREQUENT_CHECK;
3242 3324
3243 ev_start (EV_A_ (W)w, 1); 3325 ev_start (EV_A_ (W)w, 1);
3244 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3326 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3245 wlist_add (&anfds[fd].head, (WL)w); 3327 wlist_add (&anfds[fd].head, (WL)w);
3328
3329 /* common bug, apparently */
3330 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3246 3331
3247 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3332 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3248 w->events &= ~EV__IOFDSET; 3333 w->events &= ~EV__IOFDSET;
3249 3334
3250 EV_FREQUENT_CHECK; 3335 EV_FREQUENT_CHECK;

Diff Legend

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