mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

refactor: intern tr_torrent.bandwidth_group_ (#3000)

Browse source 
Most use cases involve either (a) using the default group or (b) sharing
a group with other torrents. In both cases, using a tr_quark is cheaper
than a std::string.
This commit is contained in:
Charles Kerr 2022-04-27 10:41:28 -05:00 committed by GitHub
parent a818ac9b13
commit 304fffa6b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libtransmission/resume.cc
View file

@ -138,14 +138,14 @@ static auto loadLabels(tr_variant* dict, tr_torrent* tor)
static void saveGroup(tr_variant* dict, tr_torrent const* tor) static void saveGroup(tr_variant* dict, tr_torrent const* tor)
{ {
tr_variantDictAddStrView(dict, TR_KEY_group, tor->group); tr_variantDictAddStrView(dict, TR_KEY_group, tor->bandwidthGroup());
} }
static auto loadGroup(tr_variant* dict, tr_torrent* tor) static auto loadGroup(tr_variant* dict, tr_torrent* tor)
{ {
if (std::string_view groupName; tr_variantDictFindStrView(dict, TR_KEY_group, &groupName) && !groupName.empty()) if (std::string_view group_name; tr_variantDictFindStrView(dict, TR_KEY_group, &group_name) && !std::empty(group_name))
{ {
tor->setGroup(groupName); tor->setBandwidthGroup(group_name);
return tr_resume::Group; return tr_resume::Group;
} }

4
libtransmission/rpcimpl.cc
View file

@ -562,7 +562,7 @@ static void initField(tr_torrent const* const tor, tr_stat const* const st, tr_v
break; break;
case TR_KEY_group: case TR_KEY_group:
tr_variantInitStrView(initme, tor->group); tr_variantInitStrView(initme, tor->bandwidthGroup().sv());
break; break;
case TR_KEY_hashString: case TR_KEY_hashString:
@ -1162,7 +1162,7 @@ static char const* torrentSet(
if (std::string_view group; tr_variantDictFindStrView(args_in, TR_KEY_group, &group)) if (std::string_view group; tr_variantDictFindStrView(args_in, TR_KEY_group, &group))
{ {
tor->setGroup(group); tor->setBandwidthGroup(group);
} }
if (errmsg == nullptr && tr_variantDictFindList(args_in, TR_KEY_labels, &tmp_variant)) if (errmsg == nullptr && tr_variantDictFindList(args_in, TR_KEY_labels, &tmp_variant))

12
libtransmission/torrent.cc
View file

@ -1932,21 +1932,21 @@ void tr_torrent::setLabels(tr_quark const* new_labels, size_t n_labels)
**** ****
***/ ***/
void tr_torrent::setGroup(std::string_view group_name) void tr_torrent::setBandwidthGroup(std::string_view bandwidth_group) noexcept
{ {
group_name = tr_strvStrip(group_name); bandwidth_group = tr_strvStrip(bandwidth_group);
auto const lock = this->unique_lock(); auto const lock = this->unique_lock();
if (std::empty(group_name)) if (std::empty(bandwidth_group))
{ {
this->group = ""sv; this->bandwidth_group_ = tr_interned_string{};
this->bandwidth_.setParent(&this->session->top_bandwidth_); this->bandwidth_.setParent(&this->session->top_bandwidth_);
} }
else else
{ {
this->group = group_name; this->bandwidth_group_ = bandwidth_group;
this->bandwidth_.setParent(&this->session->getBandwidthGroup(group_name)); this->bandwidth_.setParent(&this->session->getBandwidthGroup(bandwidth_group));
} }
this->setDirty(); this->setDirty();

9
libtransmission/torrent.h
View file

@ -716,7 +716,13 @@ public:
using labels_t = std::vector<tr_quark>; using labels_t = std::vector<tr_quark>;
labels_t labels; labels_t labels;
std::string group; void setBandwidthGroup(std::string_view group_name) noexcept;
[[nodiscard]] constexpr tr_interned_string const& bandwidthGroup() const noexcept
{
return bandwidth_group_;
}
/* Set the bandwidth group the torrent belongs to */ /* Set the bandwidth group the torrent belongs to */
void setGroup(std::string_view groupName); void setGroup(std::string_view groupName);
@ -733,6 +739,7 @@ public:
tr_bitfield checked_pieces_ = tr_bitfield{ 0 }; tr_bitfield checked_pieces_ = tr_bitfield{ 0 };
private: private:
tr_interned_string bandwidth_group_;
tr_verify_state verify_state_ = TR_VERIFY_NONE; tr_verify_state verify_state_ = TR_VERIFY_NONE;
float verify_progress_ = -1; float verify_progress_ = -1;