diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 08:36:58 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 08:36:58 +0000 |
commit | af061e49b017d10f2b162d80b9c5228285c0ef11 (patch) | |
tree | 64a43d89ab272ff07cc34df5d861cc9c9e761e43 /storage/src/tests/common | |
parent | e0956c74c9d0a756140b0cf62468a813cb6d9fd0 (diff) |
Use vespalib::Lock -> std::mutex
Diffstat (limited to 'storage/src/tests/common')
-rw-r--r-- | storage/src/tests/common/dummystoragelink.cpp | 10 | ||||
-rw-r--r-- | storage/src/tests/common/dummystoragelink.h | 16 | ||||
-rw-r--r-- | storage/src/tests/common/teststorageapp.cpp | 2 | ||||
-rw-r--r-- | storage/src/tests/common/teststorageapp.h | 8 |
4 files changed, 18 insertions, 18 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; |