mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-12 14:31:50 +00:00
update array_queue memory management
This commit is contained in:
parent
5c64d56766
commit
117199a3ec
1 changed files with 13 additions and 13 deletions
|
|
@ -9,19 +9,20 @@ namespace util {
|
||||||
class array_queue {
|
class array_queue {
|
||||||
public:
|
public:
|
||||||
array_queue(size_t initCapacity = 8)
|
array_queue(size_t initCapacity = 8)
|
||||||
: _capacity(initCapacity),
|
: _capacity(initCapacity),
|
||||||
_size(0),
|
_size(0),
|
||||||
_front(0),
|
_front(0),
|
||||||
_back(0),
|
_back(0),
|
||||||
_data(new T[_capacity]) {
|
_data(std::make_unique<T[]>(_capacity)) {
|
||||||
if (initCapacity == 0 || (initCapacity & (initCapacity - 1)) != 0) {
|
if (initCapacity == 0 || (initCapacity & (initCapacity - 1)) != 0) {
|
||||||
throw std::invalid_argument("initCapacity must be positive power of 2");
|
throw std::invalid_argument("initCapacity must be positive power of 2");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
~array_queue() {
|
~array_queue() {
|
||||||
// todo
|
while (!empty()) {
|
||||||
delete[] _data;
|
pop();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void push(T&& value) {
|
void push(T&& value) {
|
||||||
|
|
@ -56,20 +57,19 @@ namespace util {
|
||||||
size_t _size;
|
size_t _size;
|
||||||
size_t _front;
|
size_t _front;
|
||||||
size_t _back;
|
size_t _back;
|
||||||
T* _data;
|
std::unique_ptr<T[]> _data;
|
||||||
|
|
||||||
void grow() {
|
void grow() {
|
||||||
size_t newCapacity = _capacity * 2;
|
size_t newCapacity = _capacity * 2;
|
||||||
T* newData = new T[newCapacity];
|
auto newData = std::make_unique<T[]>(newCapacity);
|
||||||
|
|
||||||
std::move(_data + _front, _data + _capacity, newData);
|
std::move(_data.get() + _front, _data.get() + _capacity, newData.get());
|
||||||
std::move(_data, _data + _front, newData + (_capacity - _front));
|
std::move(_data.get(), _data.get() + _front, newData.get() + (_capacity - _front));
|
||||||
|
|
||||||
_back = _size;
|
_back = _size;
|
||||||
_front = 0;
|
_front = 0;
|
||||||
|
|
||||||
delete[] _data;
|
_data.reset(newData.release());
|
||||||
_data = newData;
|
|
||||||
_capacity = newCapacity;
|
_capacity = newCapacity;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue