summaryrefslogtreecommitdiffstats
path: root/src/core/jobs/task.cpp
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2017-08-25 10:14:49 +0200
committerLars Knoll <lars.knoll@qt.io>2017-09-06 18:10:13 +0000
commitd5926d26e2b39920acd1ecd22a33bc65c3cf49ad (patch)
treee1d244723c345763c04eddc7bc81d38fae3d2029 /src/core/jobs/task.cpp
parente9e3208dd7c2e2f755948b1838faa94c2802cc30 (diff)
Improve dependency look-up
Simplify the dependency look-up by moving the dependers directly into the dependee runnable, each task is then responsible for updating their dependers and queue them up when they are free to be run. Change-Id: I96295d47cecd507a864965e1fb65f2ff9af68111 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/jobs/task.cpp')
-rw-r--r--src/core/jobs/task.cpp24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp
index ca3c8b65a..6e053eb73 100644
--- a/src/core/jobs/task.cpp
+++ b/src/core/jobs/task.cpp
@@ -43,7 +43,6 @@
#include <QtCore/QElapsedTimer>
#include <QtCore/QMutexLocker>
-#include <Qt3DCore/private/dependencyhandler_p.h>
#include <Qt3DCore/private/qthreadpooler_p.h>
QT_BEGIN_NAMESPACE
@@ -57,8 +56,7 @@ RunnableInterface::~RunnableInterface()
// Aspect task
AspectTaskRunnable::AspectTaskRunnable()
- : m_dependencyHandler(nullptr)
- , m_pooler(nullptr)
+ : m_pooler(nullptr)
, m_reserved(false)
{
}
@@ -94,16 +92,6 @@ void AspectTaskRunnable::run()
m_pooler->taskFinished(this);
}
-void AspectTaskRunnable::setDependencyHandler(DependencyHandler *handler)
-{
- m_dependencyHandler = handler;
-}
-
-DependencyHandler *AspectTaskRunnable::dependencyHandler()
-{
- return m_dependencyHandler;
-}
-
// Synchronized task
SyncTaskRunnable::SyncTaskRunnable(QAbstractAspectJobManager::JobFunction func,
@@ -137,16 +125,6 @@ void SyncTaskRunnable::run()
m_pooler->taskFinished(this);
}
-void SyncTaskRunnable::setDependencyHandler(DependencyHandler *handler)
-{
- Q_UNUSED(handler);
-}
-
-DependencyHandler *SyncTaskRunnable::dependencyHandler()
-{
- return nullptr;
-}
-
} // namespace Qt3DCore {
QT_END_NAMESPACE