Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 23:40:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Hashmaps: Reset state when growing.

Browse Source 
std::move() is by no means guaranteed to clear.
This commit is contained in:
Unknown W. Brackets 2017-12-02 09:47:15 -08:00
parent e9a7bda2d5
commit bbb4987cc0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Common/Hashmaps.h
View File

@ -150,6 +150,11 @@ private:
// This is extremely non-atomic and will need synchronization.
std::vector<Pair> old = std::move(map);
std::vector<BucketState> oldState = std::move(state);
// Can't assume move will clear, it just may clear.
map.clear();
state.clear();
int oldCount = count_;
capacity_ *= factor;
map.resize(capacity_);
state.resize(capacity_);
@ -160,6 +165,7 @@ private:
Insert(old[i].key, old[i].value);
}
}
_assert_msg_(SYSTEM, oldCount == count_, "DenseHashMap: count should not change in Grow()");
}
struct Pair {
Key key;
@ -289,6 +295,11 @@ private:
// This is extremely non-atomic and will need synchronization.
std::vector<Pair> old = std::move(map);
std::vector<BucketState> oldState = std::move(state);
// Can't assume move will clear, it just may clear.
map.clear();
state.clear();
int oldCount = count_;
capacity_ *= factor;
map.resize(capacity_);
state.resize(capacity_);
@ -299,6 +310,7 @@ private:
Insert(old[i].hash, old[i].value);
}
}
_assert_msg_(SYSTEM, oldCount == count_, "PrehashMap: count should not change in Grow()");
}
struct Pair {
uint32_t hash;