Dusk/GitAddonsManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

delegate: add assert to check calling thread and improve requeuing.

Browse Source
This commit is contained in:
woblight
2018-06-20 19:48:36 +02:00
parent 0138cc9207
commit bcc9a459f7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addon.cpp
+2 -2
View File
@@ -503,6 +503,7 @@ void Addon::openRepo()
void Addon::delegate(QString taskname, auto work, auto callback) void Addon::delegate(QString taskname, auto work, auto callback)
{ {
Q_ASSERT_X(QThread::currentThread() == thread(), "delegate", "Attempt to delegate from another thread.");
if (status() != Status::Ready) { if (status() != Status::Ready) {
qInfo() << name() << "Enqueueing" << taskname; qInfo() << name() << "Enqueueing" << taskname;
m_tasks.enqueue({taskname, [this, taskname, work, callback](){delegate(taskname, work,callback);}}); m_tasks.enqueue({taskname, [this, taskname, work, callback](){delegate(taskname, work,callback);}});
@@ -525,8 +526,7 @@ void Addon::delegate(QString taskname, auto work, auto callback)
else else
callback(fw->result()); callback(fw->result());
while(!old.isEmpty()) m_tasks.append(old);
m_tasks.enqueue(old.dequeue());
if (!m_tasks.isEmpty() && status() != Status::Busy) if (!m_tasks.isEmpty() && status() != Status::Busy)
m_tasks.dequeue().second(); m_tasks.dequeue().second();
control.cpp
+2 -2
View File
@@ -39,6 +39,7 @@ Control::Control(QObject *parent) : QObject(parent), m_progress(0), m_total(0),
void Control::delegate(QString taskname, auto work, auto callback) void Control::delegate(QString taskname, auto work, auto callback)
{ {
Q_ASSERT_X(QThread::currentThread() == thread(), "delegate", "Attempt to delegate from another thread.");
if (status() != Status::Ready) { if (status() != Status::Ready) {
qInfo() << "Enqueueing" << taskname; qInfo() << "Enqueueing" << taskname;
m_tasks.enqueue({taskname, [this, taskname, work, callback](){delegate(taskname, work,callback);}}); m_tasks.enqueue({taskname, [this, taskname, work, callback](){delegate(taskname, work,callback);}});
@@ -62,8 +63,7 @@ void Control::delegate(QString taskname, auto work, auto callback)
else else
callback(fw->result()); callback(fw->result());
while(!old.isEmpty()) m_tasks.append(old);
m_tasks.enqueue(old.dequeue());
if (!m_tasks.isEmpty() && status() != Status::Busy) if (!m_tasks.isEmpty() && status() != Status::Busy)
m_tasks.dequeue().second(); m_tasks.dequeue().second();