Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CORE: fixed pool allocator for hashmaps with 1 entry

master
Martin Gerhardy 2022-05-18 07:08:51 +02:00
parent 1bf62a06dd
commit 88f6ca67a5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/core/collection/Map.h
View File

@ -76,14 +76,17 @@ private:
HASHER _hasher;
public:
Map(std::initializer_list<KeyValue> other, int maxSize = 4096) {
_allocator.init(maxSize);
core_assert_msg(maxSize > 0, "Max size must be greater than 0 - but is %i", maxSize);
core_assert_msg(maxSize >= (int)other.size(), "Max size must be greater than the initializer list: %i vs %i", maxSize, (int)other.size());
_allocator.init(core_max(2, maxSize));
_buckets.fill(nullptr);
for (auto i = other.begin(); i != other.end(); ++i) {
put(i->key, i->value);
}
}
Map(int maxSize = 4096) {
_allocator.init(maxSize);
core_assert_msg(maxSize > 0, "Max size must be greater than 0 - but is %i", maxSize);
_allocator.init(core_max(2, maxSize));
_buckets.fill(nullptr);
}
Map(const Map& other) {
@ -251,7 +254,7 @@ public:
if (entry == nullptr) {
entry = _allocator.alloc(key, value);
core_assert_msg(entry != nullptr, "Failed to allocate for hash: %i", (int)hashValue);
core_assert_msg(entry != nullptr, "Failed to allocate for hash: %i (size: %i/%i)", (int)hashValue, (int)size(), (int)capacity());
if (prev == nullptr) {
_buckets[hashValue % BUCKETSIZE] = entry;
} else {