From 711ebafa710f9097d6e0d3dbfb5f4b39f6283701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 11 Jul 2017 14:26:34 +0200 Subject: Revert "Improve reliability of memory stats" --- core/safe_refcount.cpp | 67 -------------------------------------------------- 1 file changed, 67 deletions(-) (limited to 'core/safe_refcount.cpp') diff --git a/core/safe_refcount.cpp b/core/safe_refcount.cpp index 95a274cda7..e4a5a994e6 100644 --- a/core/safe_refcount.cpp +++ b/core/safe_refcount.cpp @@ -57,30 +57,6 @@ uint32_t atomic_decrement(register uint32_t *pw) { return *pw; } -uint64_t atomic_conditional_increment(register uint64_t *pw) { - - if (*pw == 0) - return 0; - - (*pw)++; - - return *pw; -} - -uint64_t atomic_increment(register uint64_t *pw) { - - (*pw)++; - - return *pw; -} - -uint64_t atomic_decrement(register uint64_t *pw) { - - (*pw)--; - - return *pw; -} - #else #ifdef _MSC_VER @@ -108,28 +84,6 @@ uint32_t atomic_decrement(register uint32_t *pw) { uint32_t atomic_increment(register uint32_t *pw) { return InterlockedIncrement((LONG volatile *)pw); } - -uint64_t atomic_conditional_increment(register uint64_t *pw) { - - /* try to increment until it actually works */ - // taken from boost - - while (true) { - uint64_t tmp = static_cast(*pw); - if (tmp == 0) - return 0; // if zero, can't add to it anymore - if (InterlockedCompareExchange64((LONGLONG volatile *)pw, tmp + 1, tmp) == tmp) - return tmp + 1; - } -} - -uint64_t atomic_decrement(register uint64_t *pw) { - return InterlockedDecrement64((LONGLONG volatile *)pw); -} - -uint64_t atomic_increment(register uint64_t *pw) { - return InterlockedIncrement64((LONGLONG volatile *)pw); -} #elif defined(__GNUC__) uint32_t atomic_conditional_increment(register uint32_t *pw) { @@ -153,27 +107,6 @@ uint32_t atomic_increment(register uint32_t *pw) { return __sync_add_and_fetch(pw, 1); } -uint64_t atomic_conditional_increment(register uint64_t *pw) { - - while (true) { - uint64_t tmp = static_cast(*pw); - if (tmp == 0) - return 0; // if zero, can't add to it anymore - if (__sync_val_compare_and_swap(pw, tmp, tmp + 1) == tmp) - return tmp + 1; - } -} - -uint64_t atomic_decrement(register uint64_t *pw) { - - return __sync_sub_and_fetch(pw, 1); -} - -uint64_t atomic_increment(register uint64_t *pw) { - - return __sync_add_and_fetch(pw, 1); -} - #else //no threads supported? #error Must provide atomic functions for this platform or compiler! -- cgit v1.2.3