Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save torrents queue w/o blocking calls #17988

Merged
merged 1 commit into from
Nov 8, 2022
Merged

Save torrents queue w/o blocking calls #17988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions src/base/bittorrent/sessionimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,15 @@ SessionImpl::SessionImpl(QObject *parent)

SessionImpl::~SessionImpl()
{
m_nativeSession->pause();

if (m_torrentsQueueChanged)
glassez marked this conversation as resolved.
Show resolved Hide resolved
{
m_nativeSession->post_torrent_updates({});
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = true;
}

// Do some bittorrent related saving
// After this, (ideally) no more important alerts will be generated/handled
saveResumeData();
Expand Down Expand Up @@ -2335,7 +2344,7 @@ void SessionImpl::increaseTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop();
}

saveTorrentsQueue();
m_torrentsQueueChanged = true;
}

void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids)
Expand Down Expand Up @@ -2363,7 +2372,7 @@ void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids)
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i)
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));

saveTorrentsQueue();
m_torrentsQueueChanged = true;
}

void SessionImpl::topTorrentsQueuePos(const QVector<TorrentID> &ids)
Expand All @@ -2388,7 +2397,7 @@ void SessionImpl::topTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop();
}

saveTorrentsQueue();
m_torrentsQueueChanged = true;
}

void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids)
Expand Down Expand Up @@ -2418,7 +2427,7 @@ void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids)
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i)
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));

saveTorrentsQueue();
m_torrentsQueueChanged = true;
}

void SessionImpl::handleTorrentNeedSaveResumeData(const TorrentImpl *torrent)
Expand Down Expand Up @@ -2891,12 +2900,6 @@ void SessionImpl::generateResumeData()
// Called on exit
void SessionImpl::saveResumeData()
{
// Pause session
m_nativeSession->pause();

if (isQueueingSystemEnabled())
saveTorrentsQueue();

for (const TorrentImpl *torrent : asConst(m_torrents))
{
torrent->nativeHandle().save_resume_data(lt::torrent_handle::only_if_modified);
Expand All @@ -2916,7 +2919,7 @@ void SessionImpl::saveResumeData()
QElapsedTimer timer;
timer.start();

while ((m_numResumeData > 0) || !m_moveStorageQueue.isEmpty())
while ((m_numResumeData > 0) || !m_moveStorageQueue.isEmpty() || m_needSaveTorrentsQueue)
{
const lt::seconds waitTime {5};
const lt::seconds expireTime {30};
Expand All @@ -2936,7 +2939,8 @@ void SessionImpl::saveResumeData()
{
if (const int alertType = a->type();
(alertType == lt::save_resume_data_alert::alert_type) || (alertType == lt::save_resume_data_failed_alert::alert_type)
|| (alertType == lt::storage_moved_alert::alert_type) || (alertType == lt::storage_moved_failed_alert::alert_type))
|| (alertType == lt::storage_moved_alert::alert_type) || (alertType == lt::storage_moved_failed_alert::alert_type)
|| (alertType == lt::state_update_alert::alert_type))
{
hasWantedAlert = true;
}
Expand All @@ -2949,14 +2953,12 @@ void SessionImpl::saveResumeData()
}
}

void SessionImpl::saveTorrentsQueue() const
void SessionImpl::saveTorrentsQueue()
{
QVector<TorrentID> queue;
for (const TorrentImpl *torrent : asConst(m_torrents))
{
// We require actual (non-cached) queue position here!
const int queuePos = LT::toUnderlyingType(torrent->nativeHandle().queue_position());
if (queuePos >= 0)
if (const int queuePos = torrent->queuePosition(); queuePos >= 0)
{
if (queuePos >= queue.size())
queue.resize(queuePos + 1);
Expand All @@ -2965,11 +2967,14 @@ void SessionImpl::saveTorrentsQueue() const
}

m_resumeDataStorage->storeQueue(queue);
m_needSaveTorrentsQueue = false;
}

void SessionImpl::removeTorrentsQueue() const
void SessionImpl::removeTorrentsQueue()
{
m_resumeDataStorage->storeQueue({});
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = false;
}

void SessionImpl::setSavePath(const Path &path)
Expand Down Expand Up @@ -4084,7 +4089,7 @@ void SessionImpl::setQueueingSystemEnabled(const bool enabled)
configureDeferred();

if (enabled)
saveTorrentsQueue();
m_torrentsQueueChanged = true;
Chocobo1 marked this conversation as resolved.
Show resolved Hide resolved
else
removeTorrentsQueue();
}
Expand Down Expand Up @@ -4976,6 +4981,12 @@ void SessionImpl::enqueueRefresh()
{
m_nativeSession->post_torrent_updates();
m_nativeSession->post_session_stats();

if (m_torrentsQueueChanged)
{
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = true;
}
});

m_refreshEnqueued = true;
Expand Down Expand Up @@ -5083,7 +5094,11 @@ void SessionImpl::handleAddTorrentAlerts(const std::vector<lt::alert *> &alerts)
}

if (!loadedTorrents.isEmpty())
{
if (isRestored())
m_torrentsQueueChanged = true;
emit torrentsLoaded(loadedTorrents);
}
}

void SessionImpl::handleAlert(const lt::alert *a)
Expand Down Expand Up @@ -5647,6 +5662,9 @@ void SessionImpl::handleStateUpdateAlert(const lt::state_update_alert *p)
if (!updatedTorrents.isEmpty())
emit torrentsUpdated(updatedTorrents);

if (m_needSaveTorrentsQueue)
saveTorrentsQueue();

if (m_refreshEnqueued)
m_refreshEnqueued = false;
else
Expand Down
6 changes: 4 additions & 2 deletions src/base/bittorrent/sessionimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@ namespace BitTorrent
TorrentImpl *createTorrent(const lt::torrent_handle &nativeHandle, const LoadTorrentParams &params);

void saveResumeData();
void saveTorrentsQueue() const;
void removeTorrentsQueue() const;
void saveTorrentsQueue();
void removeTorrentsQueue();

std::vector<lt::alert *> getPendingAlerts(lt::time_duration time = lt::time_duration::zero()) const;

Expand Down Expand Up @@ -681,6 +681,8 @@ namespace BitTorrent
qint64 m_previouslyUploaded = 0;
qint64 m_previouslyDownloaded = 0;

bool m_torrentsQueueChanged = false;
bool m_needSaveTorrentsQueue = false;
bool m_refreshEnqueued = false;
QTimer *m_seedingLimitTimer = nullptr;
QTimer *m_resumeDataTimer = nullptr;
Expand Down