dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Collection: Always use Idle priority for watcher

Browse Source
This commit is contained in:
Jonas Kvinge
2023-03-26 00:10:29 +01:00
parent 9bb051b4eb
commit ffe6a81b9a
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/collection/collection.cpp
View File

@@ -58,8 +58,6 @@ SCollection::SCollection(Application *app, QObject *parent)
watcher_(nullptr), watcher_(nullptr),
watcher_thread_(nullptr), watcher_thread_(nullptr),
original_thread_(nullptr), original_thread_(nullptr),
io_priority_(Utilities::IoPriority::IOPRIO_CLASS_IDLE),
thread_priority_(QThread::Priority::IdlePriority),
save_playcounts_to_files_(false), save_playcounts_to_files_(false),
save_ratings_to_files_(false) { save_ratings_to_files_(false) {
@@ -96,17 +94,13 @@ void SCollection::Init() {
watcher_ = new CollectionWatcher(Song::Source::Collection); watcher_ = new CollectionWatcher(Song::Source::Collection);
watcher_thread_ = new Thread(this); watcher_thread_ = new Thread(this);
#ifndef Q_OS_WIN32 watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
if (io_priority_ != Utilities::IoPriority::IOPRIO_CLASS_NONE) {
watcher_thread_->SetIoPriority(io_priority_);
}
#endif
watcher_->moveToThread(watcher_thread_); watcher_->moveToThread(watcher_thread_);
qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_ << "with I/O priority" << static_cast<int>(io_priority_) << "and thread priority" << thread_priority_; qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
watcher_thread_->start(thread_priority_); watcher_thread_->start(QThread::IdlePriority);
watcher_->set_backend(backend_); watcher_->set_backend(backend_);
watcher_->set_task_manager(app_->task_manager()); watcher_->set_task_manager(app_->task_manager());
@@ -186,8 +180,6 @@ void SCollection::ReloadSettings() {
QSettings s; QSettings s;
s.beginGroup(CollectionSettingsPage::kSettingsGroup); s.beginGroup(CollectionSettingsPage::kSettingsGroup);
io_priority_ = static_cast<Utilities::IoPriority>(s.value("io_priority", static_cast<int>(Utilities::IoPriority::IOPRIO_CLASS_IDLE)).toInt());
thread_priority_ = static_cast<QThread::Priority>(s.value("thread_priority", QThread::Priority::IdlePriority).toInt());
save_playcounts_to_files_ = s.value("save_playcounts", false).toBool(); save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
save_ratings_to_files_ = s.value("save_ratings", false).toBool(); save_ratings_to_files_ = s.value("save_ratings", false).toBool();
s.endGroup(); s.endGroup();

5
src/collection/collection.h
View File

@@ -28,11 +28,10 @@
#include <QList> #include <QList>
#include <QHash> #include <QHash>
#include <QString> #include <QString>
#include <QThread>
#include "core/song.h" #include "core/song.h"
#include "utilities/threadutils.h"
class QThread;
class Application; class Application;
class Thread; class Thread;
class CollectionBackend; class CollectionBackend;
@@ -99,8 +98,6 @@ class SCollection : public QObject {
QList<QObject*> wait_for_exit_; QList<QObject*> wait_for_exit_;
Utilities::IoPriority io_priority_;
QThread::Priority thread_priority_;
bool save_playcounts_to_files_; bool save_playcounts_to_files_;
bool save_ratings_to_files_; bool save_ratings_to_files_;
}; };