shared_timed_mutex -> shared_mutex

4 files changed, 11 insertions, 11 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 08c7186e8c7..dbd5690093b 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -635,7 +635,7 @@ AttributeVector::onInitSave(vespalib::stringref)
 bool
 AttributeVector::hasActiveEnumGuards()
 {
-    std::unique_lock<std::shared_timed_mutex> lock(_enumLock, std::defer_lock);
+    std::unique_lock<std::shared_mutex> lock(_enumLock, std::defer_lock);
     for (size_t i = 0; i < 1000; ++i) {
         // Note: Need to run this in loop as try_lock() is allowed to fail spuriously and return false
         // even if the mutex is not currently locked by any other thread.
@@ -735,10 +735,10 @@ class ReadGuard : public attribute::AttributeReadGuard
 {
     using GenerationHandler = vespalib::GenerationHandler;
     GenerationHandler::Guard _generationGuard;
-    using EnumGuard = std::shared_lock<std::shared_timed_mutex>;
+    using EnumGuard = std::shared_lock<std::shared_mutex>;
     EnumGuard _enumGuard;
 public:
-    ReadGuard(const attribute::IAttributeVector *attr, GenerationHandler::Guard &&generationGuard, std::shared_timed_mutex *enumLock)
+    ReadGuard(const attribute::IAttributeVector *attr, GenerationHandler::Guard &&generationGuard, std::shared_mutex *enumLock)
         : attribute::AttributeReadGuard(attr),
           _generationGuard(std::move(generationGuard)),
           _enumGuard(enumLock != nullptr ? EnumGuard(*enumLock) : EnumGuard())
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 75699868691..d8bdda911fd 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -232,9 +232,9 @@ protected:
 public:
     class EnumModifier
     {
-        std::unique_lock<std::shared_timed_mutex> _enumLock;
+        std::unique_lock<std::shared_mutex> _enumLock;
     public:
-        EnumModifier(std::shared_timed_mutex &lock, attribute::InterlockGuard &interlockGuard)
+        EnumModifier(std::shared_mutex &lock, attribute::InterlockGuard &interlockGuard)
             : _enumLock(lock)
         {
             (void) interlockGuard;
@@ -575,7 +575,7 @@ private:
     BaseName                              _baseFileName;
     Config                                _config;
     std::shared_ptr<attribute::Interlock> _interlock;
-    mutable std::shared_timed_mutex       _enumLock;
+    mutable std::shared_mutex       _enumLock;
     GenerationHandler                     _genHandler;
     GenerationHolder                      _genHolder;
     Status                                _status;
@@ -606,7 +606,7 @@ private:
      * Used to regulate access to critical resources. Apply the
      * reader/writer guards.
      */
-    std::shared_timed_mutex & getEnumLock() { return _enumLock; }
+    std::shared_mutex & getEnumLock() { return _enumLock; }
 
     friend class ComponentGuard<AttributeVector>;
     friend class AttributeValueGuard;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
index 34461be05d1..a72731b661e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.cpp
@@ -345,7 +345,7 @@ namespace {
 constexpr double NEVER(-1.0);
 
 void
-writeDomainDir(std::shared_lock<std::shared_timed_mutex> &guard,
+writeDomainDir(std::shared_lock<std::shared_mutex> &guard,
                vespalib::string dir,
                vespalib::string domainList,
                const std::map<vespalib::string, std::shared_ptr<Domain>> &domains)
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
index cd2d004c3cf..e8b8bcb2d81 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h
@@ -79,8 +79,8 @@ private:
     static const Session::SP & getSession(FRT_RPCRequest *req);
 
     using DomainList = std::map<vespalib::string, DomainSP >;
-    using ReadGuard = std::shared_lock<std::shared_timed_mutex>;
-    using WriteGuard = std::unique_lock<std::shared_timed_mutex>;
+    using ReadGuard = std::shared_lock<std::shared_mutex>;
+    using WriteGuard = std::unique_lock<std::shared_mutex>;
 
     vespalib::string                    _name;
     vespalib::string                    _baseDir;
@@ -90,7 +90,7 @@ private:
     std::unique_ptr<FNET_Transport>     _transport;
     std::unique_ptr<FRT_Supervisor>     _supervisor;
     DomainList                          _domains;
-    mutable std::shared_timed_mutex     _domainMutex;;          // Protects _domains
+    mutable std::shared_mutex     _domainMutex;;          // Protects _domains
     std::condition_variable             _domainCondition;
     std::mutex                          _fileLock;      // Protects the creating and deleting domains including file system operations.
     document::Queue<FRT_RPCRequest *>   _reqQ;