Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Abstract CowData's reallocations into _realloc to consolidate duplicate logic.

Browse Source
This commit is contained in:
Lukas Tenbrink
2024-12-16 16:44:32 +01:00
parent ba2c5c1e61
commit 8483d794ff
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/templates/cowdata.h
View File

@@ -164,6 +164,7 @@ private:
void _ref(const CowData *p_from); void _ref(const CowData *p_from);
void _ref(const CowData &p_from); void _ref(const CowData &p_from);
USize _copy_on_write(); USize _copy_on_write();
Error _realloc(Size p_alloc_size);
public: public:
void operator=(const CowData<T> &p_from) { _ref(p_from); } void operator=(const CowData<T> &p_from) { _ref(p_from); }
@@ -342,7 +343,7 @@ Error CowData<T>::resize(Size p_size) {
} }
// possibly changing size, copy on write // possibly changing size, copy on write
USize rc = _copy_on_write(); _copy_on_write();
USize current_alloc_size = _get_alloc_size(current_size); USize current_alloc_size = _get_alloc_size(current_size);
USize alloc_size; USize alloc_size;
@@ -365,15 +366,10 @@ Error CowData<T>::resize(Size p_size) {
_ptr = _data_ptr; _ptr = _data_ptr;
} else { } else {
uint8_t *mem_new = (uint8_t *)Memory::realloc_static(((uint8_t *)_ptr) - DATA_OFFSET, alloc_size + DATA_OFFSET, false); const Error error = _realloc(alloc_size);
ERR_FAIL_NULL_V(mem_new, ERR_OUT_OF_MEMORY); if (error) {
return error;
SafeNumeric<USize> *_refc_ptr = _get_refcount_ptr(mem_new); }
T *_data_ptr = _get_data_ptr(mem_new);
new (_refc_ptr) SafeNumeric<USize>(rc); //refcount
_ptr = _data_ptr;
} }
} }
@@ -399,15 +395,10 @@ Error CowData<T>::resize(Size p_size) {
} }
if (alloc_size != current_alloc_size) { if (alloc_size != current_alloc_size) {
uint8_t *mem_new = (uint8_t *)Memory::realloc_static(((uint8_t *)_ptr) - DATA_OFFSET, alloc_size + DATA_OFFSET, false); const Error error = _realloc(alloc_size);
ERR_FAIL_NULL_V(mem_new, ERR_OUT_OF_MEMORY); if (error) {
return error;
SafeNumeric<USize> *_refc_ptr = _get_refcount_ptr(mem_new); }
T *_data_ptr = _get_data_ptr(mem_new);
new (_refc_ptr) SafeNumeric<USize>(rc); //refcount
_ptr = _data_ptr;
} }
*_get_size() = p_size; *_get_size() = p_size;
@@ -416,6 +407,21 @@ Error CowData<T>::resize(Size p_size) {
return OK; return OK;
} }
template <typename T>
Error CowData<T>::_realloc(Size p_alloc_size) {
uint8_t *mem_new = (uint8_t *)Memory::realloc_static(((uint8_t *)_ptr) - DATA_OFFSET, p_alloc_size + DATA_OFFSET, false);
ERR_FAIL_NULL_V(mem_new, ERR_OUT_OF_MEMORY);
SafeNumeric<USize> *_refc_ptr = _get_refcount_ptr(mem_new);
T *_data_ptr = _get_data_ptr(mem_new);
// If we realloc, we're guaranteed to be the only reference.
new (_refc_ptr) SafeNumeric<USize>(1);
_ptr = _data_ptr;
return OK;
}
template <typename T> template <typename T>
typename CowData<T>::Size CowData<T>::find(const T &p_val, Size p_from) const { typename CowData<T>::Size CowData<T>::find(const T &p_val, Size p_from) const {
Size ret = -1; Size ret = -1;