Use std::mutex over vespalib::Lock and reduce code visibility.

12 files changed, 22 insertions, 24 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp
index 378f12b5138..01245843e3b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp
@@ -60,7 +60,7 @@ DocumentRouteSelectorPolicy::configure(std::unique_ptr<messagebus::protocol::Doc
         }
         config[string(route.name)] = selector;
     }
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     _config.swap(config);
     _error.swap(error);
 }
@@ -68,7 +68,7 @@ DocumentRouteSelectorPolicy::configure(std::unique_ptr<messagebus::protocol::Doc
 const string &
 DocumentRouteSelectorPolicy::getError() const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     return _error;
 }
 
@@ -84,7 +84,7 @@ DocumentRouteSelectorPolicy::select(mbus::RoutingContext &context)
 
     // Invoke private select method for each candidate recipient.
     {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         if (!_error.empty()) {
             context.setError(DocumentProtocol::ERROR_POLICY_FAILURE, _error);
             return;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h
index 6e13f615a35..02e8e4ff282 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h
@@ -5,7 +5,6 @@
 #include <vespa/document/select/node.h>
 #include <map>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
-#include <vespa/vespalib/util/sync.h>
 #include <vespa/documentapi/common.h>
 #include <vespa/config/config.h>
 #include <vespa/config/helper/configfetcher.h>
@@ -33,7 +32,7 @@ private:
     typedef std::map<string, SelectorPtr> ConfigMap;
 
     const document::DocumentTypeRepo &_repo;
-    vespalib::Lock                    _lock;
+    mutable std::mutex                _lock;
     ConfigMap                         _config;
     string                            _error;
     config::ConfigFetcher             _fetcher;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp
index 6c4523fa34f..25112a00b99 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp
@@ -118,7 +118,7 @@ ExternPolicy::merge(mbus::RoutingContext &ctx)
 mbus::Hop
 ExternPolicy::getRecipient()
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     update();
     if (_recipients.empty()) {
         return mbus::Hop();
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h
index c56f8f214ec..cb0c4428e60 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h
@@ -4,9 +4,8 @@
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <vespa/slobrok/imirrorapi.h>
-#include <vector>
-#include <vespa/vespalib/util/sync.h>
 #include <vespa/documentapi/common.h>
+#include <mutex>
 
 class FRT_Supervisor;
 class FNET_Transport;
@@ -21,7 +20,7 @@ namespace documentapi {
 class ExternPolicy : public mbus::IRoutingPolicy {
 private:
     using IMirrorAPI = slobrok::api::IMirrorAPI;
-    vespalib::Lock                      _lock;
+    std::mutex                          _lock;
     std::unique_ptr<FastOS_ThreadPool>  _threadPool;
     std::unique_ptr<FNET_Transport>     _transport;
     std::unique_ptr<FRT_Supervisor>     _orb;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp
index e82a184d8b2..800aa8c4520 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp
@@ -2,6 +2,7 @@
 
 #include "externslobrokpolicy.h"
 #include <vespa/messagebus/routing/routingcontext.h>
+#include <vespa/config/common/configcontext.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/util/time.h>
 #include <vespa/fnet/frt/frt.h>
@@ -61,8 +62,8 @@ string ExternSlobrokPolicy::init() {
     } else if (_configSources.size() != 0) {
         slobrok::ConfiguratorFactory config(
             config::ConfigUri(_slobrokConfigId,
-                             std::make_unique<config::ConfigContext>(config::ServerSpec(_configSources))));
-        _mirror.reset(new MirrorAPI(*_orb, config));
+                             std::make_shared<config::ConfigContext>(config::ServerSpec(_configSources))));
+        _mirror = std::make_unique<MirrorAPI>(*_orb, config);
     }
 
     if (_mirror.get()) {
@@ -74,7 +75,7 @@ string ExternSlobrokPolicy::init() {
 
 IMirrorAPI::SpecList
 ExternSlobrokPolicy::lookup(mbus::RoutingContext& context, const string& pattern) {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
 
     const IMirrorAPI& mirror(_mirror.get()? *_mirror : context.getMirror());
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
index d2966f852d5..61c79eb0a41 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
@@ -23,7 +23,7 @@ class ExternSlobrokPolicy : public AsyncInitializationPolicy
 protected:
     bool   _firstTry;
     config::ServerSpec::HostSpecList          _configSources;
-    vespalib::Lock                            _lock;
+    std::mutex                                _lock;
     std::unique_ptr<FastOS_ThreadPool>        _threadPool;
     std::unique_ptr<FNET_Transport>           _transport;
     std::unique_ptr<FRT_Supervisor>           _orb;
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
index 7db941a12f2..9b23d593e82 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.cpp
@@ -49,7 +49,7 @@ LocalServicePolicy::getCacheKey(const mbus::RoutingContext &ctx) const
 mbus::Hop
 LocalServicePolicy::getRecipient(mbus::RoutingContext &ctx)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     CacheEntry &entry = update(ctx);
     if (entry._recipients.empty()) {
         mbus::Hop hop = ctx.getRoute().getHop(0);
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h
index 4dd22a77069..c188c9f5c4b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h
@@ -4,9 +4,9 @@
 #include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
-#include <vespa/vespalib/util/sync.h>
 #include <vector>
 #include <map>
+#include <mutex>
 
 namespace documentapi {
 
@@ -26,7 +26,7 @@ private:
         CacheEntry();
     };
 
-    vespalib::Lock                    _lock;
+    std::mutex                   _lock;
     string                       _address;
     std::map<string, CacheEntry> _cache;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
index 6f778a3e4d0..a58f3439df2 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
@@ -56,7 +56,7 @@ RoundRobinPolicy::getCacheKey(const mbus::RoutingContext &ctx) const
 mbus::Hop
 RoundRobinPolicy::getRecipient(mbus::RoutingContext &ctx)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     CacheEntry &entry = update(ctx);
     if (entry._recipients.empty()) {
         return mbus::Hop();
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
index 0bfd2f04ea7..98e61fd1a1c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
@@ -4,8 +4,8 @@
 #include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
-#include <vespa/vespalib/util/sync.h>
 #include <map>
+#include <mutex>
 
 namespace documentapi {
 
@@ -25,7 +25,7 @@ private:
         CacheEntry();
     };
 
-    vespalib::Lock                    _lock;
+    std::mutex                   _lock;
     std::map<string, CacheEntry> _cache;
 
     /**
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
index 7e324468ae5..375cdc23ba2 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.cpp
@@ -64,7 +64,7 @@ SubsetServicePolicy::getRecipient(mbus::RoutingContext &ctx)
 {
     mbus::Hop hop;
     if (_subsetSize > 0) {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         CacheEntry &entry = update(ctx);
         if (!entry._recipients.empty()) {
             if (++entry._offset >= entry._recipients.size()) {
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h
index bf44afa318f..a6c2e0d6cae 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h
@@ -4,9 +4,8 @@
 #include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
-#include <vespa/vespalib/util/sync.h>
-#include <vector>
 #include <map>
+#include <mutex>
 
 namespace documentapi {
 
@@ -26,8 +25,8 @@ private:
         CacheEntry();
     };
 
-    vespalib::Lock                    _lock;
-    uint32_t                          _subsetSize;
+    std::mutex                   _lock;
+    uint32_t                     _subsetSize;
     std::map<string, CacheEntry> _cache;
 
     /**