summaryrefslogtreecommitdiffstats
path: root/common/genericresource.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'common/genericresource.cpp')
-rw-r--r--common/genericresource.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 8f08f3d..39bd39e 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -57,12 +57,8 @@ class CommandProcessor : public QObject
57 SINK_DEBUG_AREA("commandprocessor") 57 SINK_DEBUG_AREA("commandprocessor")
58 58
59public: 59public:
60 CommandProcessor(Sink::Pipeline *pipeline, QList<MessageQueue *> commandQueues) : QObject(), mPipeline(pipeline), mCommandQueues(commandQueues), mProcessingLock(false) 60 CommandProcessor(Sink::Pipeline *pipeline, QList<MessageQueue *> commandQueues) : QObject(), mPipeline(pipeline), mCommandQueues(commandQueues), mProcessingLock(false), mLowerBoundRevision(0)
61 { 61 {
62 mPipeline->startTransaction();
63 mLowerBoundRevision = mPipeline->revision();
64 mPipeline->commit();
65
66 for (auto queue : mCommandQueues) { 62 for (auto queue : mCommandQueues) {
67 const bool ret = connect(queue, &MessageQueue::messageReady, this, &CommandProcessor::process); 63 const bool ret = connect(queue, &MessageQueue::messageReady, this, &CommandProcessor::process);
68 Q_UNUSED(ret); 64 Q_UNUSED(ret);
@@ -191,10 +187,7 @@ private slots:
191 auto time = QSharedPointer<QTime>::create(); 187 auto time = QSharedPointer<QTime>::create();
192 time->start(); 188 time->start();
193 mPipeline->startTransaction(); 189 mPipeline->startTransaction();
194 SinkTrace() << "Cleaning up from " << mPipeline->cleanedUpRevision() + 1 << " to " << mLowerBoundRevision; 190 mPipeline->cleanupRevisions(mLowerBoundRevision);
195 for (qint64 revision = mPipeline->cleanedUpRevision() + 1; revision <= mLowerBoundRevision; revision++) {
196 mPipeline->cleanupRevision(revision);
197 }
198 mPipeline->commit(); 191 mPipeline->commit();
199 SinkTrace() << "Cleanup done." << Log::TraceTime(time->elapsed()); 192 SinkTrace() << "Cleanup done." << Log::TraceTime(time->elapsed());
200 193
@@ -280,7 +273,6 @@ GenericResource::GenericResource(const ResourceContext &resourceContext, const Q
280 auto ret = QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated); 273 auto ret = QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated);
281 Q_ASSERT(ret); 274 Q_ASSERT(ret);
282 } 275 }
283 mClientLowerBoundRevision = mPipeline->cleanedUpRevision();
284 276
285 mCommitQueueTimer.setInterval(sCommitInterval); 277 mCommitQueueTimer.setInterval(sCommitInterval);
286 mCommitQueueTimer.setSingleShot(true); 278 mCommitQueueTimer.setSingleShot(true);