mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 18:25:35 +00:00
Code Issues Releases Wiki Activity

perf: avoid std::string temporaries in sessionLoadTorrent() (#3165)

Browse source
This commit is contained in:
Charles Kerr 2022-05-31 10:53:46 -05:00 committed by GitHub
parent d1030b58b1
commit d9f70f51dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libtransmission/session.cc
View file

@ -2045,14 +2045,11 @@ static void sessionLoadTorrents(struct sessionLoadTorrentsData* const data)
auto const path = tr_pathbuf{ dirname_sv, "/"sv, name }; auto const path = tr_pathbuf{ dirname_sv, "/"sv, name };
// is a magnet link? // is a magnet link?
if (!tr_ctorSetMetainfoFromFile(data->ctor, std::string{ path }, nullptr)) if (!tr_ctorSetMetainfoFromFile(data->ctor, path.sv(), nullptr))
{ {
if (auto buf = std::vector<char>{}; tr_loadFile(path, buf)) if (auto buf = std::vector<char>{}; tr_loadFile(path, buf))
{ {
tr_ctorSetMetainfoFromMagnetLink( tr_ctorSetMetainfoFromMagnetLink(data->ctor, std::string_view{ std::data(buf), std::size(buf) }, nullptr);
data->ctor,
std::string{ std::data(buf), std::size(buf) }.c_str(),
nullptr);
} }
} }

11
libtransmission/torrent-ctor.cc
View file

@ -66,7 +66,7 @@ struct tr_ctor
**** ****
***/ ***/
bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string const& filename, tr_error** error) bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string_view filename, tr_error** error)
{ {
if (std::empty(filename)) if (std::empty(filename))
{ {
@ -97,11 +97,16 @@ bool tr_ctorSetMetainfo(tr_ctor* ctor, char const* metainfo, size_t len, tr_erro
return ctor->metainfo.parseBenc(contents_sv, error); return ctor->metainfo.parseBenc(contents_sv, error);
} }
bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, char const* magnet_link, tr_error** error) bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, std::string_view magnet_link, tr_error** error)
{ {
ctor->torrent_filename.clear(); ctor->torrent_filename.clear();
ctor->metainfo = {}; ctor->metainfo = {};
return ctor->metainfo.parseMagnet(magnet_link != nullptr ? magnet_link : "", error); return ctor->metainfo.parseMagnet(magnet_link, error);
}
bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, char const* magnet_link, tr_error** error)
{
return tr_ctorSetMetainfoFromMagnetLink(ctor, std::string_view{ magnet_link != nullptr ? magnet_link : "" }, error);
} }
char const* tr_ctorGetSourceFile(tr_ctor const* ctor) char const* tr_ctorGetSourceFile(tr_ctor const* ctor)

4
libtransmission/torrent.h
View file

@ -774,8 +774,8 @@ tr_peer_id_t const& tr_torrentGetPeerId(tr_torrent* tor);
tr_torrent_metainfo tr_ctorStealMetainfo(tr_ctor* ctor); tr_torrent_metainfo tr_ctorStealMetainfo(tr_ctor* ctor);
bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string const& filename, tr_error** error); bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string_view filename, tr_error** error);
bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, std::string const& filename, tr_error** error); bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, std::string_view filename, tr_error** error);
void tr_ctorSetLabels(tr_ctor* ctor, tr_quark const* labels, size_t n_labels); void tr_ctorSetLabels(tr_ctor* ctor, tr_quark const* labels, size_t n_labels);
tr_torrent::labels_t const& tr_ctorGetLabels(tr_ctor const* ctor); tr_torrent::labels_t const& tr_ctorGetLabels(tr_ctor const* ctor);