PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adt bugfix - fix copy/move ctor of circular map

This commit is contained in:
Francisco 2021-03-19 13:40:48 +00:00 committed by Francisco Paisana
parent 4869b14de3
commit 5d676199ab
1 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/include/srsran/adt/circular_map.h
View File

@ -82,6 +82,52 @@ public:
size_t idx = 0;
};
static_circular_map() { std::fill(present.begin(), present.end(), false); }
static_circular_map(const static_circular_map<K, T, N>& other) : present(other.present), count(other.count)
{
for (size_t idx = 0; idx < other.size(); ++idx) {
if (present[idx]) {
new (&buffer[idx]) obj_t(other.get_obj_(idx));
}
}
}
static_circular_map(static_circular_map<K, T, N>&& other) noexcept : present(other.present), count(other.count)
{
for (size_t idx = 0; idx < other.size(); ++idx) {
if (present[idx]) {
new (&buffer[idx]) obj_t(std::move(other.get_obj_(idx)));
}
}
other.clear();
}
~static_circular_map() { clear(); }
static_circular_map& operator=(const static_circular_map<K, T, N>& other)
{
if (this == &other) {
return *this;
}
clear();
count = other.count;
present = other.present;
for (size_t idx = 0; idx < other.size(); ++idx) {
if (present[idx]) {
new (&buffer[idx]) obj_t(other.get_obj_(idx));
}
}
}
static_circular_map& operator=(static_circular_map<K, T, N>&& other) noexcept
{
clear();
count = other.count;
present = other.present;
for (size_t idx = 0; idx < other.size(); ++idx) {
if (present[idx]) {
new (&buffer[idx]) obj_t(std::move(other.get_obj_(idx)));
}
}
clear();
}
bool contains(K id)
{
size_t idx = id % N;
@ -182,8 +228,8 @@ private:
const obj_t& get_obj_(size_t idx) const { return reinterpret_cast<obj_t&>(buffer[idx]); }
std::array<obj_storage_t, N> buffer;
std::array<bool, N> present = {false};
size_t count = 0;
std::array<bool, N> present;
size_t count = 0;
};
} // namespace srsran