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

Comparing libev/ev.c (file contents):
Revision 1.476 by root, Fri May 1 17:23:34 2015 UTC vs.
Revision 1.478 by root, Sun Oct 11 13:38:44 2015 UTC

667 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \ 667 #elif defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ \
668 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__ 668 || defined __ARM_ARCH_7M__ || defined __ARM_ARCH_7R__
669 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory") 669 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb" : : : "memory")
670 #elif __aarch64__ 670 #elif __aarch64__
671 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory") 671 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dmb ish" : : : "memory")
672 #elif (__sparc || __sparc__) && !__sparcv8 672 #elif (__sparc || __sparc__) && !(__sparc_v8__ || defined __sparcv8)
673 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory") 673 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
674 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 674 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
675 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 675 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
676 #elif defined __s390__ || defined __s390x__ 676 #elif defined __s390__ || defined __s390x__
677 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 677 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
2916#if EV_USE_INOTIFY 2916#if EV_USE_INOTIFY
2917 infy_fork (EV_A); 2917 infy_fork (EV_A);
2918#endif 2918#endif
2919 2919
2920#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 2920#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2921 if (ev_is_active (&pipe_w)) 2921 if (ev_is_active (&pipe_w) && postfork != 2)
2922 { 2922 {
2923 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2923 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2924 2924
2925 ev_ref (EV_A); 2925 ev_ref (EV_A);
2926 ev_io_stop (EV_A_ &pipe_w); 2926 ev_io_stop (EV_A_ &pipe_w);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines