noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make use of our "Chunk" and "ChunkVector" aliases better

Browse source
This commit is contained in:
Rasmus Karlsson 2019-06-22 13:03:57 +02:00
parent 8d85b9c071
commit c631434cee
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/messages/LimitedQueue.hpp
View file

@ -28,8 +28,8 @@ template <typename T>
class LimitedQueue class LimitedQueue
{ {
protected: protected:
typedef std::shared_ptr<std::vector<T>> Chunk; using Chunk = std::vector<T>;
typedef std::shared_ptr<std::vector<Chunk>> ChunkVector; using ChunkVector = std::vector<std::shared_ptr<Chunk>>;
public: public:
LimitedQueue(size_t limit = 1000) LimitedQueue(size_t limit = 1000)
@ -42,9 +42,8 @@ public:
{ {
std::lock_guard<std::mutex> lock(this->mutex_); std::lock_guard<std::mutex> lock(this->mutex_);
this->chunks_ = this->chunks_ = std::make_shared<ChunkVector>();
std::make_shared<std::vector<std::shared_ptr<std::vector<T>>>>(); auto chunk = std::make_shared<Chunk>();
Chunk chunk = std::make_shared<std::vector<T>>();
chunk->resize(this->chunkSize_); chunk->resize(this->chunkSize_);
this->chunks_->push_back(chunk); this->chunks_->push_back(chunk);
this->firstChunkOffset_ = 0; this->firstChunkOffset_ = 0;
@ -57,23 +56,21 @@ public:
{ {
std::lock_guard<std::mutex> lock(this->mutex_); std::lock_guard<std::mutex> lock(this->mutex_);
Chunk lastChunk = this->chunks_->back(); auto lastChunk = this->chunks_->back();
// still space in the last chunk
if (lastChunk->size() <= this->lastChunkEnd_) if (lastChunk->size() <= this->lastChunkEnd_)
{ {
// create new chunk vector // Last chunk is full, create a new one and rebuild our chunk vector
ChunkVector newVector = std::make_shared< auto newVector = std::make_shared<ChunkVector>();
std::vector<std::shared_ptr<std::vector<T>>>>();
// copy chunks // copy chunks
for (Chunk &chunk : *this->chunks_) for (auto &chunk : *this->chunks_)
{ {
newVector->push_back(chunk); newVector->push_back(chunk);
} }
// push back new chunk // push back new chunk
Chunk newChunk = std::make_shared<std::vector<T>>(); auto newChunk = std::make_shared<Chunk>();
newChunk->resize(this->chunkSize_); newChunk->resize(this->chunkSize_);
newVector->push_back(newChunk); newVector->push_back(newChunk);
@ -98,8 +95,7 @@ public:
std::lock_guard<std::mutex> lock(this->mutex_); std::lock_guard<std::mutex> lock(this->mutex_);
// create new vector to clone chunks into // create new vector to clone chunks into
ChunkVector newChunks = std::make_shared< auto newChunks = std::make_shared<ChunkVector>();
std::vector<std::shared_ptr<std::vector<T>>>>();
newChunks->resize(this->chunks_->size()); newChunks->resize(this->chunks_->size());
@ -112,7 +108,7 @@ public:
// create new chunk for the first one // create new chunk for the first one
size_t offset = size_t offset =
std::min(this->space(), static_cast<qsizetype>(items.size())); std::min(this->space(), static_cast<qsizetype>(items.size()));
Chunk newFirstChunk = std::make_shared<std::vector<T>>(); auto newFirstChunk = std::make_shared<Chunk>();
newFirstChunk->resize(this->chunks_->front()->size() + offset); newFirstChunk->resize(this->chunks_->front()->size() + offset);
for (size_t i = 0; i < offset; i++) for (size_t i = 0; i < offset; i++)
@ -150,7 +146,7 @@ public:
for (size_t i = 0; i < this->chunks_->size(); i++) for (size_t i = 0; i < this->chunks_->size(); i++)
{ {
Chunk &chunk = this->chunks_->at(i); auto &chunk = this->chunks_->at(i);
size_t start = i == 0 ? this->firstChunkOffset_ : 0; size_t start = i == 0 ? this->firstChunkOffset_ : 0;
size_t end = size_t end =
@ -160,7 +156,7 @@ public:
{ {
if (chunk->at(j) == item) if (chunk->at(j) == item)
{ {
Chunk newChunk = std::make_shared<std::vector<T>>(); auto newChunk = std::make_shared<Chunk>();
newChunk->resize(chunk->size()); newChunk->resize(chunk->size());
for (size_t k = 0; k < chunk->size(); k++) for (size_t k = 0; k < chunk->size(); k++)
@ -189,7 +185,7 @@ public:
for (size_t i = 0; i < this->chunks_->size(); i++) for (size_t i = 0; i < this->chunks_->size(); i++)
{ {
Chunk &chunk = this->chunks_->at(i); auto &chunk = this->chunks_->at(i);
size_t start = i == 0 ? this->firstChunkOffset_ : 0; size_t start = i == 0 ? this->firstChunkOffset_ : 0;
size_t end = size_t end =
@ -199,7 +195,7 @@ public:
{ {
if (x == index) if (x == index)
{ {
Chunk newChunk = std::make_shared<std::vector<T>>(); auto newChunk = std::make_shared<Chunk>();
newChunk->resize(chunk->size()); newChunk->resize(chunk->size());
for (size_t k = 0; k < chunk->size(); k++) for (size_t k = 0; k < chunk->size(); k++)
@ -233,7 +229,7 @@ private:
qsizetype space() qsizetype space()
{ {
size_t totalSize = 0; size_t totalSize = 0;
for (Chunk &chunk : *this->chunks_) for (auto &chunk : *this->chunks_)
{ {
totalSize += chunk->size(); totalSize += chunk->size();
} }
@ -263,12 +259,11 @@ private:
if (this->firstChunkOffset_ == this->chunks_->front()->size() - 1) if (this->firstChunkOffset_ == this->chunks_->front()->size() - 1)
{ {
// copy the chunk vector // copy the chunk vector
ChunkVector newVector = std::make_shared< auto newVector = std::make_shared<ChunkVector>();
std::vector<std::shared_ptr<std::vector<T>>>>();
// delete first chunk // delete first chunk
bool first = true; bool first = true;
for (Chunk &chunk : *this->chunks_) for (auto &chunk : *this->chunks_)
{ {
if (!first) if (!first)
{ {
@ -283,12 +278,12 @@ private:
return true; return true;
} }
ChunkVector chunks_; std::shared_ptr<ChunkVector> chunks_;
std::mutex mutex_; std::mutex mutex_;
size_t firstChunkOffset_; size_t firstChunkOffset_;
size_t lastChunkEnd_; size_t lastChunkEnd_;
size_t limit_; const size_t limit_;
const size_t chunkSize_ = 100; const size_t chunkSize_ = 100;
}; };