Back to mutex

indra/llcommon/llapr.cpp

@@ -146,7 +146,7 @@ LLVolatileAPRPool::LLVolatileAPRPool(std::string name, BOOL is_local, apr_pool_t
 				  mNumTotalRef(0)
 {
 	//create mutex for thread safe.
-	mMutexp = std::make_unique<std::shared_mutex>();
+	mMutexp = std::make_unique<std::mutex>();
 }
 
 LLVolatileAPRPool::~LLVolatileAPRPool()

indra/llcommon/llapr.h

@@ -119,7 +119,7 @@ class LL_COMMON_API LLVolatileAPRPool final : public LLAPRPool
 	S32 mNumActiveRef ; //number of active pointers pointing to the apr_pool.
 	S32 mNumTotalRef ;  //number of total pointers pointing to the apr_pool since last creating.  
 
-	std::unique_ptr<std::shared_mutex> mMutexp;
+	std::unique_ptr<std::mutex> mMutexp;
 } ;
 
 // File IO convenience functions.

indra/llcommon/llinstancetracker.h

@@ -52,7 +52,7 @@ namespace LLInstanceTrackerPrivate
     struct StaticBase
     {
         // We need to be able to lock static data while manipulating it.
-        std::shared_mutex mMutex;
+        std::mutex mMutex;
     };
 
     void logerrs(const char* cls, const std::string&, const std::string&, const std::string&);

indra/llcommon/llmutex.cpp

@@ -94,7 +94,7 @@ void LLCondition::broadcast()
 //
 // LLScopedLock
 //
-LLScopedLock::LLScopedLock(std::shared_mutex* mutex) : mMutex(mutex)
+LLScopedLock::LLScopedLock(std::mutex* mutex) : mMutex(mutex)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
 	if(mutex)

indra/llcommon/llmutex.h

@@ -198,7 +198,7 @@ class LL_COMMON_API LLScopedLock : private boost::noncopyable
     * @param mutex An allocated mutex. If you pass in NULL,
     * this wrapper will not lock.
     */
-    LLScopedLock(std::shared_mutex* mutex);
+    LLScopedLock(std::mutex* mutex);
 
     /**
     * @brief Destructor which unlocks the mutex if still locked.
@@ -217,7 +217,7 @@ class LL_COMMON_API LLScopedLock : private boost::noncopyable
 
 protected:
     bool mLocked;
-    std::shared_mutex* mMutex;
+    std::mutex* mMutex;
 };
 
 #endif // LL_LLMUTEX_H