Use vespalib::Lock -> std::mutex

7 files changed, 24 insertions, 27 deletions

diff --git a/storage/src/tests/common/dummystoragelink.cpp b/storage/src/tests/common/dummystoragelink.cpp
index 05ef0df432a..ab70bff3409 100644
--- a/storage/src/tests/common/dummystoragelink.cpp
+++ b/storage/src/tests/common/dummystoragelink.cpp
@@ -37,7 +37,7 @@ DummyStorageLink::~DummyStorageLink()
 bool
 DummyStorageLink::handleInjectedReply()
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     if (!_injected.empty()) {
         sendUp(*_injected.begin());
         _injected.pop_front();
@@ -65,7 +65,7 @@ bool DummyStorageLink::onDown(const api::StorageMessage::SP& cmd)
     if (isBottom()) {
         vespalib::MonitorGuard lock(_waitMonitor);
         {
-            vespalib::LockGuard guard(_lock);
+            std::lock_guard guard(_lock);
             _commands.push_back(cmd);
         }
         lock.broadcast();
@@ -78,7 +78,7 @@ bool DummyStorageLink::onUp(const api::StorageMessage::SP& reply) {
     if (isTop()) {
         vespalib::MonitorGuard lock(_waitMonitor);
         {
-            vespalib::LockGuard guard(_lock);
+            std::lock_guard guard(_lock);
             _replies.push_back(reply);
         }
         lock.broadcast();
@@ -91,13 +91,13 @@ bool DummyStorageLink::onUp(const api::StorageMessage::SP& reply) {
 void DummyStorageLink::injectReply(api::StorageReply* reply)
 {
     assert(reply);
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     _injected.push_back(std::shared_ptr<api::StorageReply>(reply));
 }
 
 void DummyStorageLink::reset() {
     vespalib::MonitorGuard lock(_waitMonitor);
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     _commands.clear();
     _replies.clear();
     _injected.clear();
diff --git a/storage/src/tests/common/dummystoragelink.h b/storage/src/tests/common/dummystoragelink.h
index 174f8219560..46a1d4ea25f 100644
--- a/storage/src/tests/common/dummystoragelink.h
+++ b/storage/src/tests/common/dummystoragelink.h
@@ -18,7 +18,7 @@ namespace storage {
 
 class DummyStorageLink : public StorageLink {
 
-    mutable vespalib::Lock _lock; // to protect below containers:
+    mutable std::mutex _lock; // to protect below containers:
     std::vector<api::StorageMessage::SP> _commands;
     std::vector<api::StorageMessage::SP> _replies;
     std::list<api::StorageMessage::SP> _injected;
@@ -31,7 +31,7 @@ class DummyStorageLink : public StorageLink {
 
 public:
     DummyStorageLink();
-    ~DummyStorageLink();
+    ~DummyStorageLink() override;
 
     bool onDown(const api::StorageMessage::SP&) override;
     bool onUp(const api::StorageMessage::SP&) override;
@@ -63,21 +63,21 @@ public:
     void waitForMessage(const api::MessageType&, int timeout = -1);
 
     api::StorageMessage::SP getCommand(size_t i) const {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         api::StorageMessage::SP ret = _commands[i];
         return ret;
     }
     api::StorageMessage::SP getReply(size_t i) const {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         api::StorageMessage::SP ret = _replies[i];
         return ret;
     }
     size_t getNumCommands() const {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         return _commands.size();
     }
     size_t getNumReplies() const {
-        vespalib::LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         return _replies.size();
     }
 
@@ -90,7 +90,7 @@ public:
         vespalib::MonitorGuard lock(_waitMonitor);
         std::vector<api::StorageMessage::SP> retval;
         {
-            vespalib::LockGuard guard(_lock);
+            std::lock_guard guard(_lock);
             retval.swap(_commands);
         }
         return retval;
@@ -100,7 +100,7 @@ public:
         vespalib::MonitorGuard lock(_waitMonitor);
         std::vector<api::StorageMessage::SP> retval;
         {
-            vespalib::LockGuard guard(_lock);
+            std::lock_guard guard(_lock);
             retval.swap(_replies);
         }
         return retval;
diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp
index c03e17138e0..f2989f88765 100644
--- a/storage/src/tests/common/teststorageapp.cpp
+++ b/storage/src/tests/common/teststorageapp.cpp
@@ -257,7 +257,7 @@ TestDistributorApp::~TestDistributorApp() = default;
 api::Timestamp
 TestDistributorApp::getUniqueTimestamp()
 {
-    vespalib::LockGuard guard(_accessLock);
+    std::lock_guard guard(_accessLock);
     uint64_t timeNow(getClock().getTimeInSeconds().getTime());
     if (timeNow == _lastUniqueTimestampRequested) {
         ++_uniqueTimestampCounter;
diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h
index 218e7352f04..03936d37788 100644
--- a/storage/src/tests/common/teststorageapp.h
+++ b/storage/src/tests/common/teststorageapp.h
@@ -141,16 +141,16 @@ class TestDistributorApp : public TestStorageApp,
                            public UniqueTimeCalculator
 {
     DistributorComponentRegisterImpl& _compReg;
-    vespalib::Lock _accessLock;
+    std::mutex _accessLock;
     uint64_t _lastUniqueTimestampRequested;
     uint32_t _uniqueTimestampCounter;
 
     void configure(vespalib::stringref configId);
 
 public:
-    TestDistributorApp(vespalib::stringref configId = "");
-    TestDistributorApp(NodeIndex index, vespalib::stringref configId = "");
-    ~TestDistributorApp();
+    explicit TestDistributorApp(vespalib::stringref configId = "");
+    explicit TestDistributorApp(NodeIndex index, vespalib::stringref configId = "");
+    ~TestDistributorApp() override;
 
     DistributorComponentRegisterImpl& getComponentRegister() {
         return _compReg;
diff --git a/storage/src/tests/storageserver/testvisitormessagesession.h b/storage/src/tests/storageserver/testvisitormessagesession.h
index a9d83ca6c1a..1cea1c78d74 100644
--- a/storage/src/tests/storageserver/testvisitormessagesession.h
+++ b/storage/src/tests/storageserver/testvisitormessagesession.h
@@ -45,7 +45,7 @@ public:
 
 struct TestVisitorMessageSessionFactory : public VisitorMessageSessionFactory
 {
-    vespalib::Lock _accessLock;
+    std::mutex _accessLock;
     std::vector<TestVisitorMessageSession*> _visitorSessions;
     mbus::Error _autoReplyError;
     bool _createAutoReplyVisitorSessions;
@@ -56,11 +56,10 @@ struct TestVisitorMessageSessionFactory : public VisitorMessageSessionFactory
           _priConverter(configId) {}
 
     VisitorMessageSession::UP createSession(Visitor& v, VisitorThread& vt) override {
-        vespalib::LockGuard lock(_accessLock);
-        TestVisitorMessageSession::UP session(new TestVisitorMessageSession(vt, v, _autoReplyError,
-                                                                            _createAutoReplyVisitorSessions));
+        std::lock_guard lock(_accessLock);
+        auto session = std::make_unique<TestVisitorMessageSession>(vt, v, _autoReplyError, _createAutoReplyVisitorSessions);
         _visitorSessions.push_back(session.get());
-        return VisitorMessageSession::UP(std::move(session));
+        return session;
     }
 
     documentapi::Priority::Value toDocumentPriority(uint8_t storagePriority) const override {
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index 20934d04eaa..0ce305fb8bb 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -223,7 +223,7 @@ VisitorManagerTest::getSession(uint32_t n)
     framework::MilliSecTime endTime(clock.getTimeInMillis() + framework::MilliSecTime(30 * 1000));
     while (true) {
         {
-            vespalib::LockGuard lock(_messageSessionFactory->_accessLock);
+            std::lock_guard lock(_messageSessionFactory->_accessLock);
             if (sessions.size() > n) {
                 return *sessions[n];
             }
diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp
index 16b2fca77ae..ee6b8fa3d38 100644
--- a/storage/src/tests/visiting/visitortest.cpp
+++ b/storage/src/tests/visiting/visitortest.cpp
@@ -1,9 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/document/datatype/datatype.h>
 #include <vespa/document/fieldvalue/intfieldvalue.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
-#include <vespa/document/fieldvalue/rawfieldvalue.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storageapi/message/datagram.h>
 #include <vespa/storageapi/message/persistence.h>
@@ -259,7 +257,7 @@ VisitorTest::getSession(uint32_t n)
             clock.getTimeInMillis() + framework::MilliSecTime(30 * 1000));
     while (true) {
         {
-            vespalib::LockGuard lock(_messageSessionFactory->_accessLock);
+            std::lock_guard lock(_messageSessionFactory->_accessLock);
             if (sessions.size() > n) {
                 return *sessions[n];
             }