Merge pull request swiftlang#2612 from 3405691582/Prefix_ExposeMachAbsoluteTime

[CF] Expose mach_absolute_time for BSD.

Author: compnerd

CoreFoundation/Base.subproj/CoreFoundation_Prefix.h

@@ -161,24 +161,39 @@ typedef int		boolean_t;
 #include <sys/stat.h> // mode_t
 #endif
 
-#if TARGET_OS_LINUX || TARGET_OS_BSD
+#if TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WIN32
 // Implemented in CFPlatform.c
-bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst);
-bool OSAtomicCompareAndSwapLong(long oldl, long newl, long volatile *dst);
-bool OSAtomicCompareAndSwapPtrBarrier(void *oldp, void *newp, void *volatile *dst);
-bool OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
+CF_EXPORT bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst);
+CF_EXPORT bool OSAtomicCompareAndSwapLong(long oldl, long newl, long volatile *dst);
+CF_EXPORT bool OSAtomicCompareAndSwapPtrBarrier(void *oldp, void *newp, void *volatile *dst);
+CF_EXPORT bool OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
+
+CF_EXPORT int32_t OSAtomicDecrement32Barrier(volatile int32_t *dst);
+CF_EXPORT int32_t OSAtomicIncrement32Barrier(volatile int32_t *dst);
+CF_EXPORT int32_t OSAtomicIncrement32(volatile int32_t *theValue);
+CF_EXPORT int32_t OSAtomicDecrement32(volatile int32_t *theValue);
 
-int32_t OSAtomicDecrement32Barrier(volatile int32_t *dst);
-int32_t OSAtomicIncrement32Barrier(volatile int32_t *dst);
-int32_t OSAtomicIncrement32(volatile int32_t *theValue);
-int32_t OSAtomicDecrement32(volatile int32_t *theValue);
+CF_EXPORT int32_t OSAtomicAdd32( int32_t theAmount, volatile int32_t *theValue );
+CF_EXPORT int32_t OSAtomicAdd32Barrier( int32_t theAmount, volatile int32_t *theValue );
+CF_EXPORT bool OSAtomicCompareAndSwap32Barrier( int32_t oldValue, int32_t newValue, volatile int32_t *theValue );
 
-int32_t OSAtomicAdd32( int32_t theAmount, volatile int32_t *theValue );
-int32_t OSAtomicAdd32Barrier( int32_t theAmount, volatile int32_t *theValue );
-bool OSAtomicCompareAndSwap32Barrier( int32_t oldValue, int32_t newValue, volatile int32_t *theValue );
+CF_EXPORT void OSMemoryBarrier();
 
-void OSMemoryBarrier();
-#endif // TARGET_OS_LINUX || TARGET_OS_BSD
+#include <time.h>
+
+CF_INLINE uint64_t mach_absolute_time() {
+#if TARGET_OS_WIN32
+    LARGE_INTEGER count;
+    QueryPerformanceCounter(&count);
+    // mach_absolute_time is unsigned, but this function returns a signed value.
+    return (uint64_t)count.QuadPart;
+#else
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * 1000000000UL;
+#endif
+}
+#endif // TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WIN32
 
 #if TARGET_OS_LINUX || TARGET_OS_WIN32 || defined(__OpenBSD__)
 #define strtod_l(a,b,locale) strtod(a,b)
@@ -219,13 +234,6 @@ CF_INLINE size_t malloc_size(void *memblock) {
     return malloc_usable_size(memblock);
 }
 
-#include <time.h>
-CF_INLINE uint64_t mach_absolute_time() {
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * 1000000000UL;
-}
-
 #define malloc_default_zone() (void *)0
 
 #endif
@@ -341,13 +349,6 @@ CF_INLINE size_t malloc_size(void *memblock) {
     return _msize(memblock);
 }
 
-CF_INLINE uint64_t mach_absolute_time() {
-    LARGE_INTEGER count;
-    QueryPerformanceCounter(&count);
-    // mach_absolute_time is unsigned, but this function returns a signed value.
-    return (uint64_t)count.QuadPart;
-}
-
 CF_INLINE long long llabs(long long v) {
     if (v < 0) return -v;
     return v;
@@ -362,22 +363,6 @@ CF_INLINE long long llabs(long long v) {
 
 #define issetugid() 0
 
-// CF exports these useful atomic operation functions on Windows
-CF_EXPORT bool OSAtomicCompareAndSwapPtr(void *oldp, void *newp, void *volatile *dst);
-CF_EXPORT bool OSAtomicCompareAndSwapLong(long oldl, long newl, long volatile *dst);
-CF_EXPORT bool OSAtomicCompareAndSwapPtrBarrier(void *oldp, void *newp, void *volatile *dst);
-
-CF_EXPORT int32_t OSAtomicDecrement32Barrier(volatile int32_t *dst);
-CF_EXPORT int32_t OSAtomicIncrement32Barrier(volatile int32_t *dst);
-CF_EXPORT int32_t OSAtomicIncrement32(volatile int32_t *theValue);
-CF_EXPORT int32_t OSAtomicDecrement32(volatile int32_t *theValue);
-    
-CF_EXPORT int32_t OSAtomicAdd32( int32_t theAmount, volatile int32_t *theValue );
-CF_EXPORT int32_t OSAtomicAdd32Barrier( int32_t theAmount, volatile int32_t *theValue );
-CF_EXPORT bool OSAtomicCompareAndSwap32Barrier( int32_t oldValue, int32_t newValue, volatile int32_t *theValue );
-
-void OSMemoryBarrier();
-
 #include <io.h>
 #include <fcntl.h>
 #include <errno.h>