seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improve reliability of memory stats"

Browse Source
This commit is contained in:
Rémi Verschelde
2017-07-11 14:26:34 +02:00
committed by GitHub
parent 6758ba0d93
commit 711ebafa71
4 changed files with 52 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
core/safe_refcount.cpp
View File

@ -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<uint64_t const volatile &>(*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<uint64_t const volatile &>(*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!