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

Merge pull request #73460 from myaaaaaaaaa/merge-unordered 

Fix PagedArray.merge_unordered() sometimes dropping pages
This commit is contained in:
Rémi Verschelde 2023-02-17 13:42:01 +01:00 committed by GitHub
parent b51290383f 6b0f253a45
commit e80e21b5e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/templates/paged_array.h
View File

@ -278,10 +278,10 @@ public:
count -= remainder; count -= remainder;
uint32_t src_pages = p_array._get_pages_in_use(); uint32_t src_page_index = 0;
uint32_t page_size = page_size_mask + 1; uint32_t page_size = page_size_mask + 1;
for (uint32_t i = 0; i < src_pages; i++) { while (p_array.count > 0) {
uint32_t page_count = _get_pages_in_use(); uint32_t page_count = _get_pages_in_use();
uint32_t new_page_count = page_count + 1; uint32_t new_page_count = page_count + 1;
@ -289,16 +289,14 @@ public:
_grow_page_array(); //keep out of inline _grow_page_array(); //keep out of inline
} }
page_data[page_count] = p_array.page_data[i]; page_data[page_count] = p_array.page_data[src_page_index];
page_ids[page_count] = p_array.page_ids[i]; page_ids[page_count] = p_array.page_ids[src_page_index];
if (i == src_pages - 1) {
//last page, only increment with remainder uint32_t take = MIN(p_array.count, page_size); //pages to take away
count += p_array.count & page_size_mask; p_array.count -= take;
} else { count += take;
count += page_size; src_page_index++;
}
} }
p_array.count = 0; //take away the other array pages
//handle the remainder page if exists //handle the remainder page if exists
if (remainder_page) { if (remainder_page) {

51
tests/core/templates/test_paged_array.h
View File

@ -148,6 +148,57 @@ TEST_CASE("[PagedArray] Shared pool fill, including merging") {
array2.reset(); //reset so pagepool can be reset array2.reset(); //reset so pagepool can be reset
pool.reset(); pool.reset();
} }
TEST_CASE("[PagedArray] Extensive merge_unordered() test") {
for (int page_size = 1; page_size <= 128; page_size *= 2) {
PagedArrayPool<uint32_t> pool(page_size);
PagedArray<uint32_t> array1;
PagedArray<uint32_t> array2;
array1.set_page_pool(&pool);
array2.set_page_pool(&pool);
const int max_count = 123;
// Test merging arrays of lengths 0+123, 1+122, 2+121, ..., 123+0
for (uint32_t j = 0; j < max_count; j++) {
CHECK(array1.size() == 0);
CHECK(array2.size() == 0);
uint32_t sum = 12345;
for (uint32_t i = 0; i < j; i++) {
// Hashing the addend makes it extremely unlikely for any values
// other than the original inputs to produce a matching sum
uint32_t addend = hash_murmur3_one_32(i) + i;
array1.push_back(addend);
sum += addend;
}
for (uint32_t i = j; i < max_count; i++) {
// See above
uint32_t addend = hash_murmur3_one_32(i) + i;
array2.push_back(addend);
sum += addend;
}
CHECK(array1.size() == j);
CHECK(array2.size() == max_count - j);
array1.merge_unordered(array2);
CHECK_MESSAGE(array1.size() == max_count, "merge_unordered() added/dropped elements while merging");
// If any elements were altered during merging, the sum will not match up.
for (uint32_t i = 0; i < array1.size(); i++) {
sum -= array1[i];
}
CHECK_MESSAGE(sum == 12345, "merge_unordered() altered elements while merging");
array1.clear();
}
array1.reset();
array2.reset();
pool.reset();
}
}
} // namespace TestPagedArray } // namespace TestPagedArray
#endif // TEST_PAGED_ARRAY_H #endif // TEST_PAGED_ARRAY_H