d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Save torrents queue w/o blocking calls

Browse Source 
PR #17988.
This commit is contained in:
Vladimir Golovnev 2022-11-08 07:00:40 +03:00 committed by GitHub
parent 162273da47
commit 2e4431f0b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/base/bittorrent/sessionimpl.cpp
View File

@ -582,6 +582,15 @@ SessionImpl::SessionImpl(QObject *parent)
SessionImpl::~SessionImpl() SessionImpl::~SessionImpl()
{ {
m_nativeSession->pause();
if (m_torrentsQueueChanged)
{
m_nativeSession->post_torrent_updates({});
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = true;
}
// Do some bittorrent related saving // Do some bittorrent related saving
// After this, (ideally) no more important alerts will be generated/handled // After this, (ideally) no more important alerts will be generated/handled
saveResumeData(); saveResumeData();
@ -2348,7 +2357,7 @@ void SessionImpl::increaseTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop(); torrentQueue.pop();
} }
saveTorrentsQueue(); m_torrentsQueueChanged = true;
} }
void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids) void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids)
@ -2376,7 +2385,7 @@ void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids)
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i) for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i)
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i)); torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));
saveTorrentsQueue(); m_torrentsQueueChanged = true;
} }
void SessionImpl::topTorrentsQueuePos(const QVector<TorrentID> &ids) void SessionImpl::topTorrentsQueuePos(const QVector<TorrentID> &ids)
@ -2401,7 +2410,7 @@ void SessionImpl::topTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop(); torrentQueue.pop();
} }
saveTorrentsQueue(); m_torrentsQueueChanged = true;
} }
void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids) void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids)
@ -2431,7 +2440,7 @@ void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids)
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i) for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i)
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i)); torrentQueuePositionBottom(m_nativeSession->find_torrent(*i));
saveTorrentsQueue(); m_torrentsQueueChanged = true;
} }
void SessionImpl::handleTorrentNeedSaveResumeData(const TorrentImpl *torrent) void SessionImpl::handleTorrentNeedSaveResumeData(const TorrentImpl *torrent)
@ -2904,12 +2913,6 @@ void SessionImpl::generateResumeData()
// Called on exit // Called on exit
void SessionImpl::saveResumeData() void SessionImpl::saveResumeData()
{ {
// Pause session
m_nativeSession->pause();
if (isQueueingSystemEnabled())
saveTorrentsQueue();
for (const TorrentImpl *torrent : asConst(m_torrents)) for (const TorrentImpl *torrent : asConst(m_torrents))
{ {
torrent->nativeHandle().save_resume_data(lt::torrent_handle::only_if_modified); torrent->nativeHandle().save_resume_data(lt::torrent_handle::only_if_modified);
@ -2929,7 +2932,7 @@ void SessionImpl::saveResumeData()
QElapsedTimer timer; QElapsedTimer timer;
timer.start(); 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 waitTime {5};
const lt::seconds expireTime {30}; const lt::seconds expireTime {30};
@ -2949,7 +2952,8 @@ void SessionImpl::saveResumeData()
{ {
if (const int alertType = a->type(); 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::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; hasWantedAlert = true;
} }
@ -2962,14 +2966,12 @@ void SessionImpl::saveResumeData()
} }
} }
void SessionImpl::saveTorrentsQueue() const void SessionImpl::saveTorrentsQueue()
{ {
QVector<TorrentID> queue; QVector<TorrentID> queue;
for (const TorrentImpl *torrent : asConst(m_torrents)) for (const TorrentImpl *torrent : asConst(m_torrents))
{ {
// We require actual (non-cached) queue position here! if (const int queuePos = torrent->queuePosition(); queuePos >= 0)
const int queuePos = LT::toUnderlyingType(torrent->nativeHandle().queue_position());
if (queuePos >= 0)
{ {
if (queuePos >= queue.size()) if (queuePos >= queue.size())
queue.resize(queuePos + 1); queue.resize(queuePos + 1);
@ -2978,11 +2980,14 @@ void SessionImpl::saveTorrentsQueue() const
} }
m_resumeDataStorage->storeQueue(queue); m_resumeDataStorage->storeQueue(queue);
m_needSaveTorrentsQueue = false;
} }
void SessionImpl::removeTorrentsQueue() const void SessionImpl::removeTorrentsQueue()
{ {
m_resumeDataStorage->storeQueue({}); m_resumeDataStorage->storeQueue({});
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = false;
} }
void SessionImpl::setSavePath(const Path &path) void SessionImpl::setSavePath(const Path &path)
@ -4097,7 +4102,7 @@ void SessionImpl::setQueueingSystemEnabled(const bool enabled)
configureDeferred(); configureDeferred();
if (enabled) if (enabled)
saveTorrentsQueue(); m_torrentsQueueChanged = true;
else else
removeTorrentsQueue(); removeTorrentsQueue();
} }
@ -4989,6 +4994,12 @@ void SessionImpl::enqueueRefresh()
{ {
m_nativeSession->post_torrent_updates(); m_nativeSession->post_torrent_updates();
m_nativeSession->post_session_stats(); m_nativeSession->post_session_stats();
if (m_torrentsQueueChanged)
{
m_torrentsQueueChanged = false;
m_needSaveTorrentsQueue = true;
}
}); });
m_refreshEnqueued = true; m_refreshEnqueued = true;
@ -5096,7 +5107,11 @@ void SessionImpl::handleAddTorrentAlerts(const std::vector<lt::alert *> &alerts)
} }
if (!loadedTorrents.isEmpty()) if (!loadedTorrents.isEmpty())
{
if (isRestored())
m_torrentsQueueChanged = true;
emit torrentsLoaded(loadedTorrents); emit torrentsLoaded(loadedTorrents);
}
} }
void SessionImpl::handleAlert(const lt::alert *a) void SessionImpl::handleAlert(const lt::alert *a)
@ -5660,6 +5675,9 @@ void SessionImpl::handleStateUpdateAlert(const lt::state_update_alert *p)
if (!updatedTorrents.isEmpty()) if (!updatedTorrents.isEmpty())
emit torrentsUpdated(updatedTorrents); emit torrentsUpdated(updatedTorrents);
if (m_needSaveTorrentsQueue)
saveTorrentsQueue();
if (m_refreshEnqueued) if (m_refreshEnqueued)
m_refreshEnqueued = false; m_refreshEnqueued = false;
else else

6
src/base/bittorrent/sessionimpl.h
View File

@ -533,8 +533,8 @@ namespace BitTorrent
TorrentImpl *createTorrent(const lt::torrent_handle &nativeHandle, const LoadTorrentParams &params); TorrentImpl *createTorrent(const lt::torrent_handle &nativeHandle, const LoadTorrentParams &params);
void saveResumeData(); void saveResumeData();
void saveTorrentsQueue() const; void saveTorrentsQueue();
void removeTorrentsQueue() const; void removeTorrentsQueue();
std::vector<lt::alert *> getPendingAlerts(lt::time_duration time = lt::time_duration::zero()) const; std::vector<lt::alert *> getPendingAlerts(lt::time_duration time = lt::time_duration::zero()) const;
@ -681,6 +681,8 @@ namespace BitTorrent
qint64 m_previouslyUploaded = 0; qint64 m_previouslyUploaded = 0;
qint64 m_previouslyDownloaded = 0; qint64 m_previouslyDownloaded = 0;
bool m_torrentsQueueChanged = false;
bool m_needSaveTorrentsQueue = false;
bool m_refreshEnqueued = false; bool m_refreshEnqueued = false;
QTimer *m_seedingLimitTimer = nullptr; QTimer *m_seedingLimitTimer = nullptr;
QTimer *m_resumeDataTimer = nullptr; QTimer *m_resumeDataTimer = nullptr;