nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Do not use global thread pool

Browse Source
This commit is contained in:
Dušan Poizl
2025-01-12 10:59:12 +01:00
parent 236f66ed2f
commit 2b96da60de
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageringlist.cpp
+18 -15
View File
@@ -22,13 +22,13 @@ Image::Image(const QString name, int number, ImageRingList *ringList) :
{
}
void Image::load()
void Image::load(QThreadPool *pool)
{
if(!m_rawImage && !m_loading)
{
m_loading = true;
m_released = false;
QThreadPool::globalInstance()->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
pool->start(new LoadRunable(m_name, this, m_ringList->analyzeLevel()));
}
if(!m_loading && m_rawImage)
emit pixmapLoaded(this);
@@ -110,7 +110,10 @@ ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter,
{
connect(&m_fileSystemWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
m_nameFilter.replaceInStrings(QRegularExpression("^"), "*.");
m_loadPool = new QThreadPool(this);
m_loadPool->setThreadPriority(QThread::LowPriority);
m_thumbPool = new QThreadPool(this);
m_thumbPool->setThreadPriority(QThread::LowPriority);
m_slideShowTimer = new QTimer(this);
connect(m_slideShowTimer, &QTimer::timeout, this, static_cast<void (ImageRingList::*)()>(&ImageRingList::increment));
@@ -123,10 +126,10 @@ ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter,
ImageRingList::~ImageRingList()
{
QThreadPool::globalInstance()->clear();
m_loadPool->clear();
m_thumbPool->clear();
QThreadPool::globalInstance()->waitForDone();
m_loadPool->waitForDone();
m_thumbPool->waitForDone();
}
@@ -199,9 +202,9 @@ void ImageRingList::increment()
(*m_firstImage)->release();
m_firstImage = increment(m_firstImage);
m_currImage = increment(m_currImage);
(*m_currImage)->load();
(*m_currImage)->load(m_loadPool);
m_lastImage = increment(m_lastImage);
(*m_lastImage)->load();
(*m_lastImage)->load(m_loadPool);
}
}
@@ -212,9 +215,9 @@ void ImageRingList::decrement()
(*m_lastImage)->release();
m_firstImage = decrement(m_firstImage);
m_currImage = decrement(m_currImage);
(*m_currImage)->load();
(*m_currImage)->load(m_loadPool);
m_lastImage = decrement(m_lastImage);
(*m_firstImage)->load();
(*m_firstImage)->load(m_loadPool);
}
}
@@ -268,7 +271,7 @@ void ImageRingList::loadFile(int row)
if(m_images.empty())
return;
(*m_currImage)->load();
(*m_currImage)->load(m_loadPool);
m_width = DEFAULT_WIDTH<m_images.size()/2 ? DEFAULT_WIDTH : m_images.size()/2;
if(m_liveMode)
@@ -277,9 +280,9 @@ void ImageRingList::loadFile(int row)
for(int i=0; i<m_width; i++)
{
m_firstImage = decrement(m_firstImage);
(*m_firstImage)->load();
(*m_firstImage)->load(m_loadPool);
m_lastImage = increment(m_lastImage);
(*m_lastImage)->load();
(*m_lastImage)->load(m_loadPool);
}
if(m_lastImage != m_firstImage)
{
@@ -403,9 +406,9 @@ void ImageRingList::setPreload(int width)
for(int i = newWidth - m_width; i>0; i--)
{
m_firstImage = decrement(m_firstImage);
(*m_firstImage)->load();
(*m_firstImage)->load(m_loadPool);
m_lastImage = increment(m_lastImage);
(*m_lastImage)->load();
(*m_lastImage)->load(m_loadPool);
}
}
if(newWidth < m_width)
@@ -460,9 +463,9 @@ void ImageRingList::toggleSlideshow(bool start)
void ImageRingList::setFiles(const QStringList files, const QString &currentFile)
{
QThreadPool::globalInstance()->clear();
m_loadPool->clear();
m_thumbPool->clear();
QThreadPool::globalInstance()->waitForDone();
m_loadPool->waitForDone();
m_thumbPool->waitForDone();
beginResetModel();
m_images.clear();