- GC the last usages of vespalib::Lock.

- Now it is only vespalib::Monitor left

3 files changed, 8 insertions, 10 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.cpp
index 8b303d10e0a..82cda6c773f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.cpp
@@ -41,9 +41,7 @@ AsyncInitializationPolicy::AsyncInitializationPolicy(
 {
 }
 
-AsyncInitializationPolicy::~AsyncInitializationPolicy()
-{
-}
+AsyncInitializationPolicy::~AsyncInitializationPolicy() = default;
 
 void
 AsyncInitializationPolicy::initSynchronous()
@@ -74,7 +72,7 @@ AsyncInitializationPolicy::select(mbus::RoutingContext& context)
     }
 
     {
-        vespalib::MonitorGuard lock(_lock);
+        std::lock_guard lock(_lock);
 
         if (_state == State::NOT_STARTED || _state == State::FAILED) {
             // Only 1 task may be queued to the executor at any point in time.
@@ -88,7 +86,7 @@ AsyncInitializationPolicy::select(mbus::RoutingContext& context)
         }
 
         if (_state != State::DONE) {
-            mbus::Reply::UP reply(new mbus::EmptyReply());
+            auto reply = std::make_unique<mbus::EmptyReply>();
             reply->addError(currentPolicyInitError());
             context.setReply(std::move(reply));
             return;
@@ -117,7 +115,7 @@ AsyncInitializationPolicy::Task::run()
 
     using State = AsyncInitializationPolicy::State;
 
-    vespalib::MonitorGuard lock(_owner._lock);
+    std::lock_guard lock(_owner._lock);
     _owner._error = error;
     _owner._state = error.empty() ? State::DONE : State::FAILED;
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.h
index f056bb3b329..0e30da8e7c8 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/asyncinitializationpolicy.h
@@ -5,15 +5,15 @@
 #include <vespa/messagebus/error.h>
 #include <vespa/vespalib/util/executor.h>
 #include <vespa/documentapi/common.h>
-#include <vespa/vespalib/util/sync.h>
 #include <map>
+#include <mutex>
 
 namespace documentapi {
 
 class AsyncInitializationPolicy : public mbus::IRoutingPolicy {
 public:
     AsyncInitializationPolicy(const std::map<string, string>& parameters);
-    virtual ~AsyncInitializationPolicy();
+    ~AsyncInitializationPolicy() override;
 
     static std::map<string, string> parse(string parameters);
 
@@ -64,7 +64,7 @@ private:
     friend class Task;
 
     std::unique_ptr<vespalib::Executor> _executor;
-    vespalib::Monitor _lock;
+    std::mutex _lock;
 
     enum class State {
         NOT_STARTED,
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
index 61c79eb0a41..865709daf7f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h
@@ -33,7 +33,7 @@ protected:
 
 public:
     ExternSlobrokPolicy(const std::map<string, string>& params);
-    ~ExternSlobrokPolicy();
+    ~ExternSlobrokPolicy() override;
 
     /**
      * @return a pointer to the slobrok mirror owned by this policy, if any.