diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/src/vespa/config/retriever/configretriever.cpp | 4 | ||||
| -rw-r--r-- | config/src/vespa/config/retriever/configretriever.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config/src/vespa/config/retriever/configretriever.cpp b/config/src/vespa/config/retriever/configretriever.cpp index f144cf9aa99..f34ee6f70af 100644 --- a/config/src/vespa/config/retriever/configretriever.cpp +++ b/config/src/vespa/config/retriever/configretriever.cpp @@ -52,7 +52,7 @@ ConfigRetriever::getConfigs(const ConfigKeySet & keySet, milliseconds timeoutInM if (keySet != _lastKeySet) { _lastKeySet = keySet; { - vespalib::LockGuard guard(_lock); + std::lock_guard guard(_lock); if (_closed) return ConfigSnapshot(); _configSubscriber = std::make_unique<GenericConfigSubscriber>(_context); @@ -83,7 +83,7 @@ ConfigRetriever::getConfigs(const ConfigKeySet & keySet, milliseconds timeoutInM void ConfigRetriever::close() { - vespalib::LockGuard guard(_lock); + std::lock_guard guard(_lock); _closed = true; _bootstrapSubscriber.close(); if (_configSubscriber) diff --git a/config/src/vespa/config/retriever/configretriever.h b/config/src/vespa/config/retriever/configretriever.h index 14e3171fc62..9ef67edd7b8 100644 --- a/config/src/vespa/config/retriever/configretriever.h +++ b/config/src/vespa/config/retriever/configretriever.h @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include "configkeyset.h" #include "configsnapshot.h" #include "genericconfigsubscriber.h" #include "fixedconfigsubscriber.h" @@ -94,7 +93,7 @@ public: private: FixedConfigSubscriber _bootstrapSubscriber; std::unique_ptr<GenericConfigSubscriber> _configSubscriber; - vespalib::Lock _lock; + std::mutex _lock; std::vector<ConfigSubscription::SP> _subscriptionList; ConfigKeySet _lastKeySet; IConfigContext::SP _context; |