Moved mutex into public scope to enable locking of groups of share(..)

Author: robertosfield

include/vsg/utils/SharedObjects.h

@@ -72,10 +72,11 @@ namespace vsg
         /// write out stats of objects held, types of objects and their reference counts
         void report(vsg::LogOutput& output);
 
+        mutable std::recursive_mutex mutex;
+
     protected:
         ~SharedObjects() override;
 
-        mutable std::recursive_mutex _mutex;
         std::map<std::type_index, ref_ptr<Object>> _defaults;
         std::map<std::type_index, std::set<ref_ptr<Object>, DereferenceLess>> _sharedObjects;
     };
@@ -127,7 +128,7 @@ namespace vsg
     template<class T>
     ref_ptr<T> SharedObjects::shared_default()
     {
-        std::scoped_lock<std::recursive_mutex> lock(_mutex);
+        std::scoped_lock<std::recursive_mutex> lock(mutex);
 
         auto id = std::type_index(typeid(T));
         auto& def = _defaults[id];
@@ -155,7 +156,7 @@ namespace vsg
     template<class T>
     void SharedObjects::share(ref_ptr<T>& object)
     {
-        std::scoped_lock<std::recursive_mutex> lock(_mutex);
+        std::scoped_lock<std::recursive_mutex> lock(mutex);
 
         if (suitableForSharing && !suitableForSharing->suitable(object.get())) return;
 
@@ -175,7 +176,7 @@ namespace vsg
     void SharedObjects::share(ref_ptr<T>& object, Func init)
     {
         {
-            std::scoped_lock<std::recursive_mutex> lock(_mutex);
+            std::scoped_lock<std::recursive_mutex> lock(mutex);
 
             auto id = std::type_index(typeid(T));
             auto& shared_objects = _sharedObjects[id];
@@ -189,7 +190,7 @@ namespace vsg
         init(object);
 
         {
-            std::scoped_lock<std::recursive_mutex> lock(_mutex);
+            std::scoped_lock<std::recursive_mutex> lock(mutex);
             auto id = std::type_index(typeid(T));
             auto& shared_objects = _sharedObjects[id];
             if (suitableForSharing && suitableForSharing->suitable(object.get()))

src/vsg/utils/SharedObjects.cpp

@@ -21,7 +21,7 @@ bool SharedObjects::suitable(const Path& filename) const
 
 bool SharedObjects::contains(const Path& filename, ref_ptr<const Options> options) const
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
 
     auto loadedObject_id = std::type_index(typeid(LoadedObject));
     auto itr = _sharedObjects.find(loadedObject_id);
@@ -34,7 +34,7 @@ bool SharedObjects::contains(const Path& filename, ref_ptr<const Options> option
 
 void SharedObjects::add(ref_ptr<Object> object, const Path& filename, ref_ptr<const Options> options)
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
 
     auto loadedObject_id = std::type_index(typeid(LoadedObject));
     auto& loadedObjects = _sharedObjects[loadedObject_id];
@@ -45,7 +45,7 @@ void SharedObjects::add(ref_ptr<Object> object, const Path& filename, ref_ptr<co
 
 bool SharedObjects::remove(const Path& filename, ref_ptr<const Options> options)
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
 
     auto loadedObject_id = std::type_index(typeid(LoadedObject));
     auto itr = _sharedObjects.find(loadedObject_id);
@@ -67,14 +67,14 @@ bool SharedObjects::remove(const Path& filename, ref_ptr<const Options> options)
 
 void SharedObjects::clear()
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
     _defaults.clear();
     _sharedObjects.clear();
 }
 
 void SharedObjects::prune()
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
 
     auto loadedObject_id = std::type_index(typeid(LoadedObject));
 
@@ -156,7 +156,7 @@ void SharedObjects::prune()
 
 void SharedObjects::report(vsg::LogOutput& output)
 {
-    std::scoped_lock<std::recursive_mutex> lock(_mutex);
+    std::scoped_lock<std::recursive_mutex> lock(mutex);
     output("SharedObjects::report(..) ", this, " {");
     output.in();
     output("SharedObjects::_defaults ", _defaults.size(), " {");