diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-22 19:38:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-22 19:38:22 +0100 |
commit | 9664a769d8b9493d120ce70f82e555567d33c98c (patch) | |
tree | 2b2e0424462d71af79fcc0a616edeb5d45f2ce83 /persistence/src | |
parent | 0af9c17779cb4ceb81c27f1e93c19e76da646751 (diff) | |
parent | 696ee4a7d60370b93613bfe2d3e786e3be5a1ac5 (diff) |
Merge branch 'master' into toregge/port-to-gcc-8
Diffstat (limited to 'persistence/src')
-rw-r--r-- | persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp index 12f91bf0fb6..adce60e3a66 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp @@ -24,15 +24,14 @@ DummyBucketExecutor::~DummyBucketExecutor() { std::unique_ptr<BucketTask> DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask> task) { - { - std::unique_lock guard(_lock); - // Use contains when dropping support for gcc 8. - while (_inFlight.count(bucket.getBucket()) != 0) { - _cond.wait(guard); - } - _inFlight.insert(bucket.getBucket()); - } _executor->execute(makeLambdaTask([this, bucket, bucketTask=std::move(task)]() { + { + std::unique_lock guard(_lock); + while (_inFlight.count(bucket.getBucket()) != 0) { + _cond.wait(guard); + } + _inFlight.insert(bucket.getBucket()); + } bucketTask->run(bucket, makeLambdaCallback([this, bucket]() { std::unique_lock guard(_lock); // Use contains when dropping support for gcc 8. |