mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-23 17:56:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Optimize conversion of time points from libtorrent to Qt clocks

Browse source 
Obtain current date time of Qt and libtorrent clocks only once
for processing entire current libtorrent alerts bunch.

PR #21764.
This commit is contained in:
Vladimir Golovnev 2024-11-05 16:43:43 +03:00 committed by GitHub
parent 051d7137ea
commit 75d1ac8889
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/base/bittorrent/sessionimpl.cpp
View file

@ -5504,6 +5504,11 @@ void SessionImpl::setTorrentContentLayout(const TorrentContentLayout value)
// Read alerts sent by libtorrent session // Read alerts sent by libtorrent session
void SessionImpl::readAlerts() void SessionImpl::readAlerts()
{ {
// cache current datetime of Qt and libtorrent clocks in order
// to optimize conversion of time points from lt to Qt clocks
m_ltNow = lt::clock_type::now();
m_qNow = QDateTime::currentDateTime();
const std::vector<lt::alert *> alerts = getPendingAlerts(); const std::vector<lt::alert *> alerts = getPendingAlerts();
Q_ASSERT(m_loadedTorrents.isEmpty()); Q_ASSERT(m_loadedTorrents.isEmpty());
@ -6373,3 +6378,9 @@ void SessionImpl::handleRemovedTorrent(const TorrentID &torrentID, const QString
m_removingTorrents.erase(removingTorrentDataIter); m_removingTorrents.erase(removingTorrentDataIter);
} }
QDateTime SessionImpl::fromLTTimePoint32(const libtorrent::time_point32 &timePoint) const
{
const auto secsSinceNow = lt::duration_cast<lt::seconds>(timePoint - m_ltNow + lt::milliseconds(500)).count();
return m_qNow.addSecs(secsSinceNow);
}

5
src/base/bittorrent/sessionimpl.h
View file

@ -476,6 +476,8 @@ namespace BitTorrent
void addMappedPorts(const QSet<quint16> &ports); void addMappedPorts(const QSet<quint16> &ports);
void removeMappedPorts(const QSet<quint16> &ports); void removeMappedPorts(const QSet<quint16> &ports);
QDateTime fromLTTimePoint32(const lt::time_point32 &timePoint) const;
template <typename Func> template <typename Func>
void invoke(Func &&func) void invoke(Func &&func)
{ {
@ -826,6 +828,9 @@ namespace BitTorrent
QList<TorrentImpl *> m_pendingFinishedTorrents; QList<TorrentImpl *> m_pendingFinishedTorrents;
QDateTime m_qNow;
lt::clock_type::time_point m_ltNow;
friend void Session::initInstance(); friend void Session::initInstance();
friend void Session::freeInstance(); friend void Session::freeInstance();
friend Session *Session::instance(); friend Session *Session::instance();

21
src/base/bittorrent/torrentimpl.cpp
View file

@ -92,22 +92,15 @@ namespace
return entry; return entry;
} }
QDateTime fromLTTimePoint32(const lt::time_point32 &timePoint)
{
const auto ltNow = lt::clock_type::now();
const auto qNow = QDateTime::currentDateTime();
const auto secsSinceNow = lt::duration_cast<lt::seconds>(timePoint - ltNow + lt::milliseconds(500)).count();
return qNow.addSecs(secsSinceNow);
}
QString toString(const lt::tcp::endpoint &ltTCPEndpoint) QString toString(const lt::tcp::endpoint &ltTCPEndpoint)
{ {
return QString::fromStdString((std::stringstream() << ltTCPEndpoint).str()); return QString::fromStdString((std::stringstream() << ltTCPEndpoint).str());
} }
template <typename FromLTTimePoint32Func>
void updateTrackerEntryStatus(TrackerEntryStatus &trackerEntryStatus, const lt::announce_entry &nativeEntry void updateTrackerEntryStatus(TrackerEntryStatus &trackerEntryStatus, const lt::announce_entry &nativeEntry
, const QSet<int> &btProtocols, const QHash<lt::tcp::endpoint, QMap<int, int>> &updateInfo) , const QSet<int> &btProtocols, const QHash<lt::tcp::endpoint, QMap<int, int>> &updateInfo
, const FromLTTimePoint32Func &fromLTTimePoint32)
{ {
Q_ASSERT(trackerEntryStatus.url == QString::fromStdString(nativeEntry.url)); Q_ASSERT(trackerEntryStatus.url == QString::fromStdString(nativeEntry.url));
@ -1769,7 +1762,13 @@ TrackerEntryStatus TorrentImpl::updateTrackerEntryStatus(const lt::announce_entr
#else #else
const QSet<int> btProtocols {1}; const QSet<int> btProtocols {1};
#endif #endif
::updateTrackerEntryStatus(*it, announceEntry, btProtocols, updateInfo);
const auto fromLTTimePoint32 = [this](const lt::time_point32 &timePoint)
{
return m_session->fromLTTimePoint32(timePoint);
};
::updateTrackerEntryStatus(*it, announceEntry, btProtocols, updateInfo, fromLTTimePoint32);
return *it; return *it;
} }