Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make Bandwidth.children a std::vector (#2197)

Browse Source
This commit is contained in:
Charles Kerr
2021-11-20 10:58:47 -06:00
committed by GitHub
parent f7b729a350
commit ec457551ab
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libtransmission/bandwidth.cc
View File

@@ -94,22 +94,37 @@ Bandwidth::Bandwidth(Bandwidth* new_parent)
**** ****
***/ ***/
static void remove_child(std::vector<Bandwidth*>& v, Bandwidth* remove_me)
{
auto it = std::find(std::begin(v), std::end(v), remove_me);
if (it == std::end(v))
{
return;
}
// the list isn't sorted -- so instead of erase()ing `it`,
// do the cheaper option of overwriting it with the final item
*it = v.back();
v.resize(v.size() - 1);
}
void Bandwidth::setParent(Bandwidth* new_parent) void Bandwidth::setParent(Bandwidth* new_parent)
{ {
TR_ASSERT(this != new_parent); TR_ASSERT(this != new_parent);
if (this->parent_ != nullptr) if (this->parent_ != nullptr)
{ {
this->parent_->children_.erase(this); remove_child(this->parent_->children_, this);
this->parent_ = nullptr; this->parent_ = nullptr;
} }
if (new_parent != nullptr) if (new_parent != nullptr)
{ {
TR_ASSERT(new_parent->parent_ != this); TR_ASSERT(new_parent->parent_ != this);
TR_ASSERT(new_parent->children_.find(this) == new_parent->children_.end()); // does not exist auto& children = new_parent->children_;
TR_ASSERT(std::find(std::begin(children), std::end(children), this) == std::end(children)); // not already there
new_parent->children_.insert(this); new_parent->children_.push_back(this);
this->parent_ = new_parent; this->parent_ = new_parent;
} }
} }

3
libtransmission/bandwidth.h
View File

@@ -13,7 +13,6 @@
#endif #endif
#include <array> #include <array>
#include <unordered_set>
#include <vector> #include <vector>
#include "transmission.h" #include "transmission.h"
@@ -247,7 +246,7 @@ private:
mutable std::array<Band, 2> band_ = {}; mutable std::array<Band, 2> band_ = {};
Bandwidth* parent_ = nullptr; Bandwidth* parent_ = nullptr;
std::unordered_set<Bandwidth*> children_; std::vector<Bandwidth*> children_;
tr_peerIo* peer_ = nullptr; tr_peerIo* peer_ = nullptr;
tr_priority_t priority_ = 0; tr_priority_t priority_ = 0;
}; };