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

Comparing libev/ev.c (file contents):
Revision 1.379 by root, Sun Jun 19 17:55:13 2011 UTC vs.
Revision 1.392 by root, Thu Aug 4 14:37:49 2011 UTC

… …
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468 468
469/* the following are taken from libecb */ 469/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
470/* ecb.h start */ 470/* ECB.H BEGIN */
471/*
472 * libecb - http://software.schmorp.de/pkg/libecb
473 *
474 * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de>
475 * Copyright (©) 2011 Emanuele Giaquinta
476 * All rights reserved.
477 *
478 * Redistribution and use in source and binary forms, with or without modifica-
479 * tion, are permitted provided that the following conditions are met:
480 *
481 * 1. Redistributions of source code must retain the above copyright notice,
482 * this list of conditions and the following disclaimer.
483 *
484 * 2. Redistributions in binary form must reproduce the above copyright
485 * notice, this list of conditions and the following disclaimer in the
486 * documentation and/or other materials provided with the distribution.
487 *
488 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
489 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
490 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
491 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
492 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
493 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
494 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
495 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
496 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
497 * OF THE POSSIBILITY OF SUCH DAMAGE.
498 */
499
500#ifndef ECB_H
501#define ECB_H
502
503#ifdef _WIN32
504 typedef signed char int8_t;
505 typedef unsigned char uint8_t;
506 typedef signed short int16_t;
507 typedef unsigned short uint16_t;
508 typedef signed int int32_t;
509 typedef unsigned int uint32_t;
510 #if __GNUC__
511 typedef signed long long int64_t;
512 typedef unsigned long long uint64_t;
513 #else /* _MSC_VER || __BORLANDC__ */
514 typedef signed __int64 int64_t;
515 typedef unsigned __int64 uint64_t;
516 #endif
517#else
518 #include <inttypes.h>
519#endif
471 520
472/* many compilers define _GNUC_ to some versions but then only implement 521/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions, 522 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers. 523 * causing enormous grief in return for some better fake benchmark numbers.
475 * or so. 524 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have 525 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place. 526 * an issue with that they should have done it right in the first place.
478 */ 527 */
479#ifndef ECB_GCC_VERSION 528#ifndef ECB_GCC_VERSION
… …
482 #else 531 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) 532 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif 533 #endif
485#endif 534#endif
486 535
536/*****************************************************************************/
537
538/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
539/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
540
541#if ECB_NO_THREADS || ECB_NO_SMP
542 #define ECB_MEMORY_FENCE do { } while (0)
543 #define ECB_MEMORY_FENCE_ACQUIRE do { } while (0)
544 #define ECB_MEMORY_FENCE_RELEASE do { } while (0)
545#endif
546
547#ifndef ECB_MEMORY_FENCE
548 #if ECB_GCC_VERSION(2,5)
549 #if __x86
550 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
551 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
552 #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
553 #elif __amd64
554 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
555 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
556 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
557 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
558 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
559 #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
560 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__) \
561 || defined(__ARM_ARCH_7__ ) || defined(__ARM_ARCH_7A__ ) \
562 || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7R__ )
563 #define ECB_MEMORY_FENCE \
564 do { \
565 int null = 0; \
566 __asm__ __volatile__ ("mcr p15,0,%0,c6,c10,5", : "=&r" (null) : : "memory"); \
567 while (0)
568 #endif
569 #endif
570#endif
571
572#ifndef ECB_MEMORY_FENCE
573 #if ECB_GCC_VERSION(4,4) || defined(__INTEL_COMPILER)
574 #define ECB_MEMORY_FENCE __sync_synchronize ()
575 /*#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) */
576 /*#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) */
577 #elif _MSC_VER >= 1400 /* VC++ 2005 */
578 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
579 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
580 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
581 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
582 #elif defined(_WIN32)
583 #include <WinNT.h>
584 #define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
585 #endif
586#endif
587
588#ifndef ECB_MEMORY_FENCE
589 #if !ECB_AVOID_PTHREADS
590 /*
591 * if you get undefined symbol references to pthread_mutex_lock,
592 * or failure to find pthread.h, then you should implement
593 * the ECB_MEMORY_FENCE operations for your cpu/compiler
594 * OR provide pthread.h and link against the posix thread library
595 * of your system.
596 */
597 #include <pthread.h>
598 #define ECB_NEEDS_PTHREADS 1
599 #define ECB_MEMORY_FENCE_NEEDS_PTHREADS 1
600
601 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
602 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
603 #endif
604#endif
605
606#if !defined(ECB_MEMORY_FENCE_ACQUIRE) && defined(ECB_MEMORY_FENCE)
607 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
608#endif
609
610#if !defined(ECB_MEMORY_FENCE_RELEASE) && defined(ECB_MEMORY_FENCE)
611 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
612#endif
613
614/*****************************************************************************/
615
616#define ECB_C99 (__STDC_VERSION__ >= 199901L)
617
487#if __cplusplus 618#if __cplusplus
488 #define ecb_inline static inline 619 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5) 620#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__ 621 #define ecb_inline static __inline__
491#elif ECB_C99 622#elif ECB_C99
492 #define ecb_inline static inline 623 #define ecb_inline static inline
493#else 624#else
494 #define ecb_inline static 625 #define ecb_inline static
495#endif 626#endif
627
628#if ECB_GCC_VERSION(3,3)
629 #define ecb_restrict __restrict__
630#elif ECB_C99
631 #define ecb_restrict restrict
632#else
633 #define ecb_restrict
634#endif
635
636typedef int ecb_bool;
637
638#define ECB_CONCAT_(a, b) a ## b
639#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
640#define ECB_STRINGIFY_(a) # a
641#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
642
643#define ecb_function_ ecb_inline
496 644
497#if ECB_GCC_VERSION(3,1) 645#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist) 646 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr) 647 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value)) 648 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
… …
504 #define ecb_is_constant(expr) 0 652 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr) 653 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality) 654 #define ecb_prefetch(addr,rw,locality)
507#endif 655#endif
508 656
657/* no emulation for ecb_decltype */
658#if ECB_GCC_VERSION(4,5)
659 #define ecb_decltype(x) __decltype(x)
660#elif ECB_GCC_VERSION(3,0)
661 #define ecb_decltype(x) __typeof(x)
662#endif
663
509#define ecb_noinline ecb_attribute ((__noinline__)) 664#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__)) 665#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__)) 666#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__)) 667#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__)) 668#define ecb_pure ecb_attribute ((__pure__))
… …
525/* put around conditional expressions if you are very sure that the */ 680/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */ 681/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */ 682/* booleans, not the expression. */
528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0) 683#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1) 684#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */ 685/* for compatibility to the rest of the world */
686#define ecb_likely(expr) ecb_expect_true (expr)
687#define ecb_unlikely(expr) ecb_expect_false (expr)
688
689/* count trailing zero bits and count # of one bits */
690#if ECB_GCC_VERSION(3,4)
691 /* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
692 #define ecb_ld32(x) (__builtin_clz (x) ^ 31)
693 #define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
694 #define ecb_ctz32(x) __builtin_ctz (x)
695 #define ecb_ctz64(x) __builtin_ctzll (x)
696 #define ecb_popcount32(x) __builtin_popcount (x)
697 /* no popcountll */
698#else
699 ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
700 ecb_function_ int
701 ecb_ctz32 (uint32_t x)
702 {
703 int r = 0;
704
705 x &= ~x + 1; /* this isolates the lowest bit */
706
707#if ECB_branchless_on_i386
708 r += !!(x & 0xaaaaaaaa) << 0;
709 r += !!(x & 0xcccccccc) << 1;
710 r += !!(x & 0xf0f0f0f0) << 2;
711 r += !!(x & 0xff00ff00) << 3;
712 r += !!(x & 0xffff0000) << 4;
713#else
714 if (x & 0xaaaaaaaa) r += 1;
715 if (x & 0xcccccccc) r += 2;
716 if (x & 0xf0f0f0f0) r += 4;
717 if (x & 0xff00ff00) r += 8;
718 if (x & 0xffff0000) r += 16;
719#endif
720
721 return r;
722 }
723
724 ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
725 ecb_function_ int
726 ecb_ctz64 (uint64_t x)
727 {
728 int shift = x & 0xffffffffU ? 0 : 32;
729 return ecb_ctz32 (x >> shift) + shift;
730 }
731
732 ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
733 ecb_function_ int
734 ecb_popcount32 (uint32_t x)
735 {
736 x -= (x >> 1) & 0x55555555;
737 x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
738 x = ((x >> 4) + x) & 0x0f0f0f0f;
739 x *= 0x01010101;
740
741 return x >> 24;
742 }
743
744 ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
745 ecb_function_ int ecb_ld32 (uint32_t x)
746 {
747 int r = 0;
748
749 if (x >> 16) { x >>= 16; r += 16; }
750 if (x >> 8) { x >>= 8; r += 8; }
751 if (x >> 4) { x >>= 4; r += 4; }
752 if (x >> 2) { x >>= 2; r += 2; }
753 if (x >> 1) { r += 1; }
754
755 return r;
756 }
757
758 ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
759 ecb_function_ int ecb_ld64 (uint64_t x)
760 {
761 int r = 0;
762
763 if (x >> 32) { x >>= 32; r += 32; }
764
765 return r + ecb_ld32 (x);
766 }
767#endif
768
769/* popcount64 is only available on 64 bit cpus as gcc builtin */
770/* so for this version we are lazy */
771ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
772ecb_function_ int
773ecb_popcount64 (uint64_t x)
774{
775 return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
776}
777
778ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
779ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
780ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
781ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
782ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
783ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
784ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
785ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
786
787ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) | (x << count); }
788ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) | (x >> count); }
789ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) | (x << count); }
790ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) | (x >> count); }
791ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) | (x << count); }
792ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) | (x >> count); }
793ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) | (x << count); }
794ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) | (x >> count); }
795
796#if ECB_GCC_VERSION(4,3)
797 #define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
798 #define ecb_bswap32(x) __builtin_bswap32 (x)
799 #define ecb_bswap64(x) __builtin_bswap64 (x)
800#else
801 ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
802 ecb_function_ uint16_t
803 ecb_bswap16 (uint16_t x)
804 {
805 return ecb_rotl16 (x, 8);
806 }
807
808 ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
809 ecb_function_ uint32_t
810 ecb_bswap32 (uint32_t x)
811 {
812 return (((uint32_t)ecb_bswap16 (x)) << 16) | ecb_bswap16 (x >> 16);
813 }
814
815 ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
816 ecb_function_ uint64_t
817 ecb_bswap64 (uint64_t x)
818 {
819 return (((uint64_t)ecb_bswap32 (x)) << 32) | ecb_bswap32 (x >> 32);
820 }
821#endif
822
823#if ECB_GCC_VERSION(4,5)
824 #define ecb_unreachable() __builtin_unreachable ()
825#else
826 /* this seems to work fine, but gcc always emits a warning for it :/ */
827 ecb_function_ void ecb_unreachable (void) ecb_noreturn;
828 ecb_function_ void ecb_unreachable (void) { }
829#endif
830
831/* try to tell the compiler that some condition is definitely true */
832#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
833
834ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
835ecb_function_ unsigned char
836ecb_byteorder_helper (void)
837{
838 const uint32_t u = 0x11223344;
839 return *(unsigned char *)&u;
840}
841
842ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
843ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
844ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
845ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
846
847#if ECB_GCC_VERSION(3,0) || ECB_C99
848 #define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
849#else
850 #define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
851#endif
852
853#if ecb_cplusplus_does_not_suck
854 /* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
855 template<typename T, int N>
856 static inline int ecb_array_length (const T (&arr)[N])
857 {
858 return N;
859 }
860#else
861 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
862#endif
863
864#endif
865
866/* ECB.H END */
867
868#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
869# undef ECB_MEMORY_FENCE
870# undef ECB_MEMORY_FENCE_ACQUIRE
871# undef ECB_MEMORY_FENCE_RELEASE
872#endif
531 873
532#define expect_false(cond) ecb_expect_false (cond) 874#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond) 875#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline 876#define noinline ecb_noinline
535 877
… …
964 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1306 memset ((void *)(base), 0, sizeof (*(base)) * (count))
965 1307
966#define array_needsize(type,base,cur,cnt,init) \ 1308#define array_needsize(type,base,cur,cnt,init) \
967 if (expect_false ((cnt) > (cur))) \ 1309 if (expect_false ((cnt) > (cur))) \
968 { \ 1310 { \
969 int ocur_ = (cur); \ 1311 int ecb_unused ocur_ = (cur); \
970 (base) = (type *)array_realloc \ 1312 (base) = (type *)array_realloc \
971 (sizeof (type), (base), &(cur), (cnt)); \ 1313 (sizeof (type), (base), &(cur), (cnt)); \
972 init ((base) + (ocur_), (cur) - ocur_); \ 1314 init ((base) + (ocur_), (cur) - ocur_); \
973 } 1315 }
974 1316
… …
1417 ev_io_start (EV_A_ &pipe_w); 1759 ev_io_start (EV_A_ &pipe_w);
1418 ev_unref (EV_A); /* watcher should not keep loop alive */ 1760 ev_unref (EV_A); /* watcher should not keep loop alive */
1419 } 1761 }
1420} 1762}
1421 1763
1422inline_size void 1764inline_speed void
1423evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1765evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1424{ 1766{
1425 if (!*flag) 1767 if (expect_true (*flag))
1426 { 1768 return;
1769
1427 *flag = 1; 1770 *flag = 1;
1428 1771
1772 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1773
1429 pipe_write_skipped = 1; 1774 pipe_write_skipped = 1;
1430 1775
1776 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1777
1431 if (pipe_write_wanted) 1778 if (pipe_write_wanted)
1779 {
1780 int old_errno;
1781
1782 pipe_write_skipped = 0; /* just an optimisation, no fence needed */
1783
1784 old_errno = errno; /* save errno because write will clobber it */
1785
1786#if EV_USE_EVENTFD
1787 if (evfd >= 0)
1432 { 1788 {
1433 int old_errno = errno; /* save errno because write will clobber it */
1434 char dummy;
1435
1436 pipe_write_skipped = 0;
1437
1438#if EV_USE_EVENTFD
1439 if (evfd >= 0)
1440 {
1441 uint64_t counter = 1; 1789 uint64_t counter = 1;
1442 write (evfd, &counter, sizeof (uint64_t)); 1790 write (evfd, &counter, sizeof (uint64_t));
1443 }
1444 else
1445#endif
1446 {
1447 /* win32 people keep sending patches that change this write() to send() */
1448 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1449 /* so when you think this write should be a send instead, please find out */
1450 /* where your send() is from - it's definitely not the microsoft send, and */
1451 /* tell me. thank you. */
1452 write (evpipe [1], &dummy, 1);
1453 }
1454
1455 errno = old_errno;
1456 } 1791 }
1792 else
1793#endif
1794 {
1795 /* win32 people keep sending patches that change this write() to send() */
1796 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1797 /* so when you think this write should be a send instead, please find out */
1798 /* where your send() is from - it's definitely not the microsoft send, and */
1799 /* tell me. thank you. */
1800 write (evpipe [1], &(evpipe [1]), 1);
1801 }
1802
1803 errno = old_errno;
1457 } 1804 }
1458} 1805}
1459 1806
1460/* called whenever the libev signal pipe */ 1807/* called whenever the libev signal pipe */
1461/* got some events (signal, async) */ 1808/* got some events (signal, async) */
… …
1519 1866
1520 if (!EV_A) 1867 if (!EV_A)
1521 return; 1868 return;
1522#endif 1869#endif
1523 1870
1524 evpipe_init (EV_A); 1871 if (!ev_active (&pipe_w))
1872 return;
1525 1873
1526 signals [signum - 1].pending = 1; 1874 signals [signum - 1].pending = 1;
1527 evpipe_write (EV_A_ &sig_pending); 1875 evpipe_write (EV_A_ &sig_pending);
1528} 1876}
1529 1877
… …
2571 time_update (EV_A_ 1e100); 2919 time_update (EV_A_ 1e100);
2572 2920
2573 /* from now on, we want a pipe-wake-up */ 2921 /* from now on, we want a pipe-wake-up */
2574 pipe_write_wanted = 1; 2922 pipe_write_wanted = 1;
2575 2923
2924 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2925
2576 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 2926 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2577 { 2927 {
2578 waittime = MAX_BLOCKTIME; 2928 waittime = MAX_BLOCKTIME;
2579 2929
2580 if (timercnt) 2930 if (timercnt)
… …
2621#endif 2971#endif
2622 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2972 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2623 backend_poll (EV_A_ waittime); 2973 backend_poll (EV_A_ waittime);
2624 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2974 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2625 2975
2626 pipe_write_wanted = 0; 2976 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2627 2977
2628 if (pipe_write_skipped) 2978 if (pipe_write_skipped)
2629 { 2979 {
2630 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 2980 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2631 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 2981 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
… …
3981 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4331 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3982#endif 4332#endif
3983 4333
3984#if EV_IDLE_ENABLE 4334#if EV_IDLE_ENABLE
3985 if (types & EV_IDLE) 4335 if (types & EV_IDLE)
3986 for (j = NUMPRI; i--; ) 4336 for (j = NUMPRI; j--; )
3987 for (i = idlecnt [j]; i--; ) 4337 for (i = idlecnt [j]; i--; )
3988 cb (EV_A_ EV_IDLE, idles [j][i]); 4338 cb (EV_A_ EV_IDLE, idles [j][i]);
3989#endif 4339#endif
3990 4340
3991#if EV_FORK_ENABLE 4341#if EV_FORK_ENABLE

Diff Legend

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