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

Comparing libev/ev.c (file contents):
Revision 1.441 by root, Wed May 30 15:45:40 2012 UTC vs.
Revision 1.456 by root, Thu Jul 4 22:32:23 2013 UTC

… …
357 357
358#ifndef EV_HEAP_CACHE_AT 358#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
360#endif 360#endif
361 361
362#ifdef ANDROID
363/* supposedly, android doesn't typedef fd_mask */
364# undef EV_USE_SELECT
365# define EV_USE_SELECT 0
366/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
367# undef EV_USE_CLOCK_SYSCALL
368# define EV_USE_CLOCK_SYSCALL 0
369#endif
370
371/* aix's poll.h seems to cause lots of trouble */
372#ifdef _AIX
373/* AIX has a completely broken poll.h header */
374# undef EV_USE_POLL
375# define EV_USE_POLL 0
376#endif
377
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 378/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
363/* which makes programs even slower. might work on other unices, too. */ 379/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 380#if EV_USE_CLOCK_SYSCALL
365# include <sys/syscall.h> 381# include <sys/syscall.h>
366# ifdef SYS_clock_gettime 382# ifdef SYS_clock_gettime
… …
372# define EV_USE_CLOCK_SYSCALL 0 388# define EV_USE_CLOCK_SYSCALL 0
373# endif 389# endif
374#endif 390#endif
375 391
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 392/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377
378#ifdef _AIX
379/* AIX has a completely broken poll.h header */
380# undef EV_USE_POLL
381# define EV_USE_POLL 0
382#endif
383 393
384#ifndef CLOCK_MONOTONIC 394#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 395# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 396# define EV_USE_MONOTONIC 0
387#endif 397#endif
… …
505 515
506#ifndef ECB_H 516#ifndef ECB_H
507#define ECB_H 517#define ECB_H
508 518
509/* 16 bits major, 16 bits minor */ 519/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010001 520#define ECB_VERSION 0x00010003
511 521
512#ifdef _WIN32 522#ifdef _WIN32
513 typedef signed char int8_t; 523 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 524 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 525 typedef signed short int16_t;
… …
530 #else 540 #else
531 #define ECB_PTRSIZE 4 541 #define ECB_PTRSIZE 4
532 typedef uint32_t uintptr_t; 542 typedef uint32_t uintptr_t;
533 typedef int32_t intptr_t; 543 typedef int32_t intptr_t;
534 #endif 544 #endif
535 typedef intptr_t ptrdiff_t;
536#else 545#else
537 #include <inttypes.h> 546 #include <inttypes.h>
538 #if UINTMAX_MAX > 0xffffffffU 547 #if UINTMAX_MAX > 0xffffffffU
539 #define ECB_PTRSIZE 8 548 #define ECB_PTRSIZE 8
540 #else 549 #else
541 #define ECB_PTRSIZE 4 550 #define ECB_PTRSIZE 4
551 #endif
552#endif
553
554/* work around x32 idiocy by defining proper macros */
555#if __x86_64 || _M_AMD64
556 #if __ILP32
557 #define ECB_AMD64_X32 1
558 #else
559 #define ECB_AMD64 1
542 #endif 560 #endif
543#endif 561#endif
544 562
545/* many compilers define _GNUC_ to some versions but then only implement 563/* many compilers define _GNUC_ to some versions but then only implement
546 * what their idiot authors think are the "more important" extensions, 564 * what their idiot authors think are the "more important" extensions,
… …
559 577
560#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */ 578#define ECB_C (__STDC__+0) /* this assumes that __STDC__ is either empty or a number */
561#define ECB_C99 (__STDC_VERSION__ >= 199901L) 579#define ECB_C99 (__STDC_VERSION__ >= 199901L)
562#define ECB_C11 (__STDC_VERSION__ >= 201112L) 580#define ECB_C11 (__STDC_VERSION__ >= 201112L)
563#define ECB_CPP (__cplusplus+0) 581#define ECB_CPP (__cplusplus+0)
564#define ECB_CPP98 (__cplusplus >= 199711L)
565#define ECB_CPP11 (__cplusplus >= 201103L) 582#define ECB_CPP11 (__cplusplus >= 201103L)
583
584#if ECB_CPP
585 #define ECB_EXTERN_C extern "C"
586 #define ECB_EXTERN_C_BEG ECB_EXTERN_C {
587 #define ECB_EXTERN_C_END }
588#else
589 #define ECB_EXTERN_C extern
590 #define ECB_EXTERN_C_BEG
591 #define ECB_EXTERN_C_END
592#endif
566 593
567/*****************************************************************************/ 594/*****************************************************************************/
568 595
569/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */ 596/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
570/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */ 597/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
… …
600 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 627 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
601 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 628 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
602 #elif defined __s390__ || defined __s390x__ 629 #elif defined __s390__ || defined __s390x__
603 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 630 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
604 #elif defined __mips__ 631 #elif defined __mips__
632 /* GNU/Linux emulates sync on mips1 architectures, so we force it's use */
633 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
605 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 634 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
606 #elif defined __alpha__ 635 #elif defined __alpha__
607 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 636 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
608 #elif defined __hppa__ 637 #elif defined __hppa__
609 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
610 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 639 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
… …
614 #endif 643 #endif
615#endif 644#endif
616 645
617#ifndef ECB_MEMORY_FENCE 646#ifndef ECB_MEMORY_FENCE
618 #if ECB_GCC_VERSION(4,7) 647 #if ECB_GCC_VERSION(4,7)
619 /* see comment below about the C11 memory model. in short - avoid */ 648 /* see comment below (stdatomic.h) about the C11 memory model. */
620 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST) 649 #define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
650
651 /* The __has_feature syntax from clang is so misdesigned that we cannot use it
652 * without risking compile time errors with other compilers. We *could*
653 * define our own ecb_clang_has_feature, but I just can't be bothered to work
654 * around this shit time and again.
621 #elif defined __clang && __has_feature (cxx_atomic) 655 * #elif defined __clang && __has_feature (cxx_atomic)
622 /* see above */ 656 * // see comment below (stdatomic.h) about the C11 memory model.
623 #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST) 657 * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
658 */
659
624 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__ 660 #elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
625 #define ECB_MEMORY_FENCE __sync_synchronize () 661 #define ECB_MEMORY_FENCE __sync_synchronize ()
626 #elif _MSC_VER >= 1400 /* VC++ 2005 */ 662 #elif _MSC_VER >= 1400 /* VC++ 2005 */
627 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier) 663 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
628 #define ECB_MEMORY_FENCE _ReadWriteBarrier () 664 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
… …
644#ifndef ECB_MEMORY_FENCE 680#ifndef ECB_MEMORY_FENCE
645 #if ECB_C11 && !defined __STDC_NO_ATOMICS__ 681 #if ECB_C11 && !defined __STDC_NO_ATOMICS__
646 /* we assume that these memory fences work on all variables/all memory accesses, */ 682 /* we assume that these memory fences work on all variables/all memory accesses, */
647 /* not just C11 atomics and atomic accesses */ 683 /* not just C11 atomics and atomic accesses */
648 #include <stdatomic.h> 684 #include <stdatomic.h>
649 /* unfortunately, the C11 memory model seems to be very limited, and unable to express */ 685 /* Unfortunately, neither gcc 4.7 nor clang 3.1 generate any instructions for */
650 /* simple barrier semantics. That means we need to take out thor's hammer. */ 686 /* any fence other than seq_cst, which isn't very efficient for us. */
687 /* Why that is, we don't know - either the C11 memory model is quite useless */
688 /* for most usages, or gcc and clang have a bug */
689 /* I *currently* lean towards the latter, and inefficiently implement */
690 /* all three of ecb's fences as a seq_cst fence */
651 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst) 691 #define ECB_MEMORY_FENCE atomic_thread_fence (memory_order_seq_cst)
652 #endif 692 #endif
653#endif 693#endif
654 694
655#ifndef ECB_MEMORY_FENCE 695#ifndef ECB_MEMORY_FENCE
… …
932 ecb_inline void ecb_unreachable (void) ecb_noreturn; 972 ecb_inline void ecb_unreachable (void) ecb_noreturn;
933 ecb_inline void ecb_unreachable (void) { } 973 ecb_inline void ecb_unreachable (void) { }
934#endif 974#endif
935 975
936/* try to tell the compiler that some condition is definitely true */ 976/* try to tell the compiler that some condition is definitely true */
937#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0) 977#define ecb_assume(cond) if (!(cond)) ecb_unreachable (); else 0
938 978
939ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const; 979ecb_inline unsigned char ecb_byteorder_helper (void) ecb_const;
940ecb_inline unsigned char 980ecb_inline unsigned char
941ecb_byteorder_helper (void) 981ecb_byteorder_helper (void)
942{ 982{
943 const uint32_t u = 0x11223344; 983 /* the union code still generates code under pressure in gcc, */
944 return *(unsigned char *)&u; 984 /* but less than using pointers, and always seems to */
985 /* successfully return a constant. */
986 /* the reason why we have this horrible preprocessor mess */
987 /* is to avoid it in all cases, at least on common architectures */
988 /* or when using a recent enough gcc version (>= 4.6) */
989#if __i386 || __i386__ || _M_X86 || __amd64 || __amd64__ || _M_X64
990 return 0x44;
991#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
992 return 0x44;
993#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
994 return 0x11;
995#else
996 union
997 {
998 uint32_t i;
999 uint8_t c;
1000 } u = { 0x11223344 };
1001 return u.c;
1002#endif
945} 1003}
946 1004
947ecb_inline ecb_bool ecb_big_endian (void) ecb_const; 1005ecb_inline ecb_bool ecb_big_endian (void) ecb_const;
948ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; } 1006ecb_inline ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
949ecb_inline ecb_bool ecb_little_endian (void) ecb_const; 1007ecb_inline ecb_bool ecb_little_endian (void) ecb_const;
… …
980 } 1038 }
981#else 1039#else
982 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0])) 1040 #define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
983#endif 1041#endif
984 1042
1043/*******************************************************************************/
1044/* floating point stuff, can be disabled by defining ECB_NO_LIBM */
1045
1046/* basically, everything uses "ieee pure-endian" floating point numbers */
1047/* the only noteworthy exception is ancient armle, which uses order 43218765 */
1048#if 0 \
1049 || __i386 || __i386__ \
1050 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \
1051 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
1052 || defined __arm__ && defined __ARM_EABI__ \
1053 || defined __s390__ || defined __s390x__ \
1054 || defined __mips__ \
1055 || defined __alpha__ \
1056 || defined __hppa__ \
1057 || defined __ia64__ \
1058 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1059 #define ECB_STDFP 1
1060 #include <string.h> /* for memcpy */
1061#else
1062 #define ECB_STDFP 0
1063 #include <math.h> /* for frexp*, ldexp* */
1064#endif
1065
1066#ifndef ECB_NO_LIBM
1067
1068 /* convert a float to ieee single/binary32 */
1069 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1070 ecb_function_ uint32_t
1071 ecb_float_to_binary32 (float x)
1072 {
1073 uint32_t r;
1074
1075 #if ECB_STDFP
1076 memcpy (&r, &x, 4);
1077 #else
1078 /* slow emulation, works for anything but -0 */
1079 uint32_t m;
1080 int e;
1081
1082 if (x == 0e0f ) return 0x00000000U;
1083 if (x > +3.40282346638528860e+38f) return 0x7f800000U;
1084 if (x < -3.40282346638528860e+38f) return 0xff800000U;
1085 if (x != x ) return 0x7fbfffffU;
1086
1087 m = frexpf (x, &e) * 0x1000000U;
1088
1089 r = m & 0x80000000U;
1090
1091 if (r)
1092 m = -m;
1093
1094 if (e <= -126)
1095 {
1096 m &= 0xffffffU;
1097 m >>= (-125 - e);
1098 e = -126;
1099 }
1100
1101 r |= (e + 126) << 23;
1102 r |= m & 0x7fffffU;
1103 #endif
1104
1105 return r;
1106 }
1107
1108 /* converts an ieee single/binary32 to a float */
1109 ecb_function_ float ecb_binary32_to_float (uint32_t x) ecb_const;
1110 ecb_function_ float
1111 ecb_binary32_to_float (uint32_t x)
1112 {
1113 float r;
1114
1115 #if ECB_STDFP
1116 memcpy (&r, &x, 4);
1117 #else
1118 /* emulation, only works for normals and subnormals and +0 */
1119 int neg = x >> 31;
1120 int e = (x >> 23) & 0xffU;
1121
1122 x &= 0x7fffffU;
1123
1124 if (e)
1125 x |= 0x800000U;
1126 else
1127 e = 1;
1128
1129 /* we distrust ldexpf a bit and do the 2**-24 scaling by an extra multiply */
1130 r = ldexpf (x * (0.5f / 0x800000U), e - 126);
1131
1132 r = neg ? -r : r;
1133 #endif
1134
1135 return r;
1136 }
1137
1138 /* convert a double to ieee double/binary64 */
1139 ecb_function_ uint64_t ecb_double_to_binary64 (double x) ecb_const;
1140 ecb_function_ uint64_t
1141 ecb_double_to_binary64 (double x)
1142 {
1143 uint64_t r;
1144
1145 #if ECB_STDFP
1146 memcpy (&r, &x, 8);
1147 #else
1148 /* slow emulation, works for anything but -0 */
1149 uint64_t m;
1150 int e;
1151
1152 if (x == 0e0 ) return 0x0000000000000000U;
1153 if (x > +1.79769313486231470e+308) return 0x7ff0000000000000U;
1154 if (x < -1.79769313486231470e+308) return 0xfff0000000000000U;
1155 if (x != x ) return 0X7ff7ffffffffffffU;
1156
1157 m = frexp (x, &e) * 0x20000000000000U;
1158
1159 r = m & 0x8000000000000000;;
1160
1161 if (r)
1162 m = -m;
1163
1164 if (e <= -1022)
1165 {
1166 m &= 0x1fffffffffffffU;
1167 m >>= (-1021 - e);
1168 e = -1022;
1169 }
1170
1171 r |= ((uint64_t)(e + 1022)) << 52;
1172 r |= m & 0xfffffffffffffU;
1173 #endif
1174
1175 return r;
1176 }
1177
1178 /* converts an ieee double/binary64 to a double */
1179 ecb_function_ double ecb_binary64_to_double (uint64_t x) ecb_const;
1180 ecb_function_ double
1181 ecb_binary64_to_double (uint64_t x)
1182 {
1183 double r;
1184
1185 #if ECB_STDFP
1186 memcpy (&r, &x, 8);
1187 #else
1188 /* emulation, only works for normals and subnormals and +0 */
1189 int neg = x >> 63;
1190 int e = (x >> 52) & 0x7ffU;
1191
1192 x &= 0xfffffffffffffU;
1193
1194 if (e)
1195 x |= 0x10000000000000U;
1196 else
1197 e = 1;
1198
1199 /* we distrust ldexp a bit and do the 2**-53 scaling by an extra multiply */
1200 r = ldexp (x * (0.5 / 0x10000000000000U), e - 1022);
1201
1202 r = neg ? -r : r;
1203 #endif
1204
1205 return r;
1206 }
1207
1208#endif
1209
985#endif 1210#endif
986 1211
987/* ECB.H END */ 1212/* ECB.H END */
988 1213
989#if ECB_MEMORY_FENCE_NEEDS_PTHREADS 1214#if ECB_MEMORY_FENCE_NEEDS_PTHREADS
… …
1188} 1413}
1189 1414
1190static void * 1415static void *
1191ev_realloc_emul (void *ptr, long size) EV_THROW 1416ev_realloc_emul (void *ptr, long size) EV_THROW
1192{ 1417{
1193#if __GLIBC__
1194 return realloc (ptr, size);
1195#else
1196 /* some systems, notably openbsd and darwin, fail to properly 1418 /* some systems, notably openbsd and darwin, fail to properly
1197 * implement realloc (x, 0) (as required by both ansi c-89 and 1419 * implement realloc (x, 0) (as required by both ansi c-89 and
1198 * the single unix specification, so work around them here. 1420 * the single unix specification, so work around them here.
1421 * recently, also (at least) fedora and debian started breaking it,
1422 * despite documenting it otherwise.
1199 */ 1423 */
1200 1424
1201 if (size) 1425 if (size)
1202 return realloc (ptr, size); 1426 return realloc (ptr, size);
1203 1427
1204 free (ptr); 1428 free (ptr);
1205 return 0; 1429 return 0;
1206#endif
1207} 1430}
1208 1431
1209static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1432static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1210 1433
1211void ecb_cold 1434void ecb_cold
… …
1866static void noinline ecb_cold 2089static void noinline ecb_cold
1867evpipe_init (EV_P) 2090evpipe_init (EV_P)
1868{ 2091{
1869 if (!ev_is_active (&pipe_w)) 2092 if (!ev_is_active (&pipe_w))
1870 { 2093 {
2094 int fds [2];
2095
1871# if EV_USE_EVENTFD 2096# if EV_USE_EVENTFD
2097 fds [0] = -1;
1872 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 2098 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1873 if (evfd < 0 && errno == EINVAL) 2099 if (fds [1] < 0 && errno == EINVAL)
1874 evfd = eventfd (0, 0); 2100 fds [1] = eventfd (0, 0);
1875 2101
1876 if (evfd >= 0) 2102 if (fds [1] < 0)
1877 {
1878 evpipe [0] = -1;
1879 fd_intern (evfd); /* doing it twice doesn't hurt */
1880 ev_io_set (&pipe_w, evfd, EV_READ);
1881 }
1882 else
1883# endif 2103# endif
1884 { 2104 {
1885 while (pipe (evpipe)) 2105 while (pipe (fds))
1886 ev_syserr ("(libev) error creating signal/async pipe"); 2106 ev_syserr ("(libev) error creating signal/async pipe");
1887 2107
1888 fd_intern (evpipe [0]); 2108 fd_intern (fds [0]);
1889 fd_intern (evpipe [1]);
1890 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1891 } 2109 }
1892 2110
2111 evpipe [0] = fds [0];
2112
2113 if (evpipe [1] < 0)
2114 evpipe [1] = fds [1]; /* first call, set write fd */
2115 else
2116 {
2117 /* on subsequent calls, do not change evpipe [1] */
2118 /* so that evpipe_write can always rely on its value. */
2119 /* this branch does not do anything sensible on windows, */
2120 /* so must not be executed on windows */
2121
2122 dup2 (fds [1], evpipe [1]);
2123 close (fds [1]);
2124 }
2125
2126 fd_intern (evpipe [1]);
2127
2128 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1893 ev_io_start (EV_A_ &pipe_w); 2129 ev_io_start (EV_A_ &pipe_w);
1894 ev_unref (EV_A); /* watcher should not keep loop alive */ 2130 ev_unref (EV_A); /* watcher should not keep loop alive */
1895 } 2131 }
1896} 2132}
1897 2133
… …
1918 ECB_MEMORY_FENCE_RELEASE; 2154 ECB_MEMORY_FENCE_RELEASE;
1919 2155
1920 old_errno = errno; /* save errno because write will clobber it */ 2156 old_errno = errno; /* save errno because write will clobber it */
1921 2157
1922#if EV_USE_EVENTFD 2158#if EV_USE_EVENTFD
1923 if (evfd >= 0) 2159 if (evpipe [0] < 0)
1924 { 2160 {
1925 uint64_t counter = 1; 2161 uint64_t counter = 1;
1926 write (evfd, &counter, sizeof (uint64_t)); 2162 write (evpipe [1], &counter, sizeof (uint64_t));
1927 } 2163 }
1928 else 2164 else
1929#endif 2165#endif
1930 { 2166 {
1931#ifdef _WIN32 2167#ifdef _WIN32
… …
1951 int i; 2187 int i;
1952 2188
1953 if (revents & EV_READ) 2189 if (revents & EV_READ)
1954 { 2190 {
1955#if EV_USE_EVENTFD 2191#if EV_USE_EVENTFD
1956 if (evfd >= 0) 2192 if (evpipe [0] < 0)
1957 { 2193 {
1958 uint64_t counter; 2194 uint64_t counter;
1959 read (evfd, &counter, sizeof (uint64_t)); 2195 read (evpipe [1], &counter, sizeof (uint64_t));
1960 } 2196 }
1961 else 2197 else
1962#endif 2198#endif
1963 { 2199 {
1964 char dummy[4]; 2200 char dummy[4];
… …
2014 2250
2015void 2251void
2016ev_feed_signal (int signum) EV_THROW 2252ev_feed_signal (int signum) EV_THROW
2017{ 2253{
2018#if EV_MULTIPLICITY 2254#if EV_MULTIPLICITY
2255 EV_P;
2256 ECB_MEMORY_FENCE_ACQUIRE;
2019 EV_P = signals [signum - 1].loop; 2257 EV_A = signals [signum - 1].loop;
2020 2258
2021 if (!EV_A) 2259 if (!EV_A)
2022 return; 2260 return;
2023#endif 2261#endif
2024 2262
2025 if (!ev_active (&pipe_w))
2026 return;
2027
2028 signals [signum - 1].pending = 1; 2263 signals [signum - 1].pending = 1;
2029 evpipe_write (EV_A_ &sig_pending); 2264 evpipe_write (EV_A_ &sig_pending);
2030} 2265}
2031 2266
2032static void 2267static void
… …
2042void noinline 2277void noinline
2043ev_feed_signal_event (EV_P_ int signum) EV_THROW 2278ev_feed_signal_event (EV_P_ int signum) EV_THROW
2044{ 2279{
2045 WL w; 2280 WL w;
2046 2281
2047 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2282 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2048 return; 2283 return;
2049 2284
2050 --signum; 2285 --signum;
2051 2286
2052#if EV_MULTIPLICITY 2287#if EV_MULTIPLICITY
… …
2350#if EV_ASYNC_ENABLE 2585#if EV_ASYNC_ENABLE
2351 async_pending = 0; 2586 async_pending = 0;
2352#endif 2587#endif
2353 pipe_write_skipped = 0; 2588 pipe_write_skipped = 0;
2354 pipe_write_wanted = 0; 2589 pipe_write_wanted = 0;
2590 evpipe [0] = -1;
2591 evpipe [1] = -1;
2355#if EV_USE_INOTIFY 2592#if EV_USE_INOTIFY
2356 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2593 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2357#endif 2594#endif
2358#if EV_USE_SIGNALFD 2595#if EV_USE_SIGNALFD
2359 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2596 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2422 if (ev_is_active (&pipe_w)) 2659 if (ev_is_active (&pipe_w))
2423 { 2660 {
2424 /*ev_ref (EV_A);*/ 2661 /*ev_ref (EV_A);*/
2425 /*ev_io_stop (EV_A_ &pipe_w);*/ 2662 /*ev_io_stop (EV_A_ &pipe_w);*/
2426 2663
2427#if EV_USE_EVENTFD
2428 if (evfd >= 0)
2429 close (evfd);
2430#endif
2431
2432 if (evpipe [0] >= 0)
2433 {
2434 EV_WIN32_CLOSE_FD (evpipe [0]); 2664 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2435 EV_WIN32_CLOSE_FD (evpipe [1]); 2665 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2436 }
2437 } 2666 }
2438 2667
2439#if EV_USE_SIGNALFD 2668#if EV_USE_SIGNALFD
2440 if (ev_is_active (&sigfd_w)) 2669 if (ev_is_active (&sigfd_w))
2441 close (sigfd); 2670 close (sigfd);
… …
2527#endif 2756#endif
2528#if EV_USE_INOTIFY 2757#if EV_USE_INOTIFY
2529 infy_fork (EV_A); 2758 infy_fork (EV_A);
2530#endif 2759#endif
2531 2760
2761#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2532 if (ev_is_active (&pipe_w)) 2762 if (ev_is_active (&pipe_w))
2533 { 2763 {
2534 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2764 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2535 2765
2536 ev_ref (EV_A); 2766 ev_ref (EV_A);
2537 ev_io_stop (EV_A_ &pipe_w); 2767 ev_io_stop (EV_A_ &pipe_w);
2538 2768
2539#if EV_USE_EVENTFD
2540 if (evfd >= 0)
2541 close (evfd);
2542#endif
2543
2544 if (evpipe [0] >= 0) 2769 if (evpipe [0] >= 0)
2545 {
2546 EV_WIN32_CLOSE_FD (evpipe [0]); 2770 EV_WIN32_CLOSE_FD (evpipe [0]);
2547 EV_WIN32_CLOSE_FD (evpipe [1]);
2548 }
2549 2771
2550#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2551 evpipe_init (EV_A); 2772 evpipe_init (EV_A);
2552 /* now iterate over everything, in case we missed something */ 2773 /* iterate over everything, in case we missed something before */
2553 pipecb (EV_A_ &pipe_w, EV_READ); 2774 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2554#endif
2555 } 2775 }
2776#endif
2556 2777
2557 postfork = 0; 2778 postfork = 0;
2558} 2779}
2559 2780
2560#if EV_MULTIPLICITY 2781#if EV_MULTIPLICITY
… …
2759} 2980}
2760 2981
2761void noinline 2982void noinline
2762ev_invoke_pending (EV_P) 2983ev_invoke_pending (EV_P)
2763{ 2984{
2764 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2985 pendingpri = NUMPRI;
2986
2987 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2988 {
2989 --pendingpri;
2990
2765 while (pendingcnt [pendingpri]) 2991 while (pendingcnt [pendingpri])
2766 { 2992 {
2767 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 2993 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2768 2994
2769 p->w->pending = 0; 2995 p->w->pending = 0;
2770 EV_CB_INVOKE (p->w, p->events); 2996 EV_CB_INVOKE (p->w, p->events);
2771 EV_FREQUENT_CHECK; 2997 EV_FREQUENT_CHECK;
2772 } 2998 }
2999 }
2773} 3000}
2774 3001
2775#if EV_IDLE_ENABLE 3002#if EV_IDLE_ENABLE
2776/* make idle watchers pending. this handles the "call-idle */ 3003/* make idle watchers pending. this handles the "call-idle */
2777/* only when higher priorities are idle" logic */ 3004/* only when higher priorities are idle" logic */
… …
3135 backend_poll (EV_A_ waittime); 3362 backend_poll (EV_A_ waittime);
3136 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 3363 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
3137 3364
3138 pipe_write_wanted = 0; /* just an optimisation, no fence needed */ 3365 pipe_write_wanted = 0; /* just an optimisation, no fence needed */
3139 3366
3140 MEMORY_FENCE_ACQUIRE; 3367 ECB_MEMORY_FENCE_ACQUIRE;
3141 if (pipe_write_skipped) 3368 if (pipe_write_skipped)
3142 { 3369 {
3143 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w))); 3370 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
3144 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3371 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3145 } 3372 }
… …
3523#if EV_MULTIPLICITY 3750#if EV_MULTIPLICITY
3524 assert (("libev: a signal must not be attached to two different loops", 3751 assert (("libev: a signal must not be attached to two different loops",
3525 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3752 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3526 3753
3527 signals [w->signum - 1].loop = EV_A; 3754 signals [w->signum - 1].loop = EV_A;
3755 ECB_MEMORY_FENCE_RELEASE;
3528#endif 3756#endif
3529 3757
3530 EV_FREQUENT_CHECK; 3758 EV_FREQUENT_CHECK;
3531 3759
3532#if EV_USE_SIGNALFD 3760#if EV_USE_SIGNALFD
… …
3687# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3915# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3688 3916
3689static void noinline 3917static void noinline
3690infy_add (EV_P_ ev_stat *w) 3918infy_add (EV_P_ ev_stat *w)
3691{ 3919{
3692 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 3920 w->wd = inotify_add_watch (fs_fd, w->path,
3921 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3922 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3923 | IN_DONT_FOLLOW | IN_MASK_ADD);
3693 3924
3694 if (w->wd >= 0) 3925 if (w->wd >= 0)
3695 { 3926 {
3696 struct statfs sfs; 3927 struct statfs sfs;
3697 3928
… …
3701 3932
3702 if (!fs_2625) 3933 if (!fs_2625)
3703 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3934 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3704 else if (!statfs (w->path, &sfs) 3935 else if (!statfs (w->path, &sfs)
3705 && (sfs.f_type == 0x1373 /* devfs */ 3936 && (sfs.f_type == 0x1373 /* devfs */
3937 || sfs.f_type == 0x4006 /* fat */
3938 || sfs.f_type == 0x4d44 /* msdos */
3706 || sfs.f_type == 0xEF53 /* ext2/3 */ 3939 || sfs.f_type == 0xEF53 /* ext2/3 */
3940 || sfs.f_type == 0x72b6 /* jffs2 */
3941 || sfs.f_type == 0x858458f6 /* ramfs */
3942 || sfs.f_type == 0x5346544e /* ntfs */
3707 || sfs.f_type == 0x3153464a /* jfs */ 3943 || sfs.f_type == 0x3153464a /* jfs */
3944 || sfs.f_type == 0x9123683e /* btrfs */
3708 || sfs.f_type == 0x52654973 /* reiser3 */ 3945 || sfs.f_type == 0x52654973 /* reiser3 */
3709 || sfs.f_type == 0x01021994 /* tempfs */ 3946 || sfs.f_type == 0x01021994 /* tmpfs */
3710 || sfs.f_type == 0x58465342 /* xfs */)) 3947 || sfs.f_type == 0x58465342 /* xfs */))
3711 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3948 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3712 else 3949 else
3713 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3950 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3714 } 3951 }

Diff Legend

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