From fba68592d8c15ba4c910c0cdf2b7ca6976169f43 Mon Sep 17 00:00:00 2001
From: James Horsley <jbhorsley@gmail.com>
Date: Fri, 30 Jun 2023 03:06:20 +0100
Subject: [PATCH] Switch from deprecated tbb::mutex to std::mutex

Signed-off-by: James Horsley <jbhorsley@gmail.com>
---
 lib/scene/rdl2/SceneContext.cc | 18 +++++++++---------
 lib/scene/rdl2/SceneContext.h  |  5 ++---
 lib/scene/rdl2/Shader.h        |  6 +++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/scene/rdl2/SceneContext.cc b/lib/scene/rdl2/SceneContext.cc
index 811f55e..d9135b8 100644
--- a/lib/scene/rdl2/SceneContext.cc
+++ b/lib/scene/rdl2/SceneContext.cc
@@ -31,7 +31,6 @@
 #include <scene_rdl2/render/logging/logging.h>
 
 #include <tbb/concurrent_hash_map.h>
-#include <tbb/mutex.h>
 #include <tbb/parallel_for_each.h>
 
 #include <algorithm>
@@ -41,6 +40,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include <mutex>
 
 #include <dirent.h>
 #include <errno.h>
@@ -185,7 +185,7 @@ const rdl2::Camera*
 SceneContext::getPrimaryCamera() const
 {
     // Prevent possible race condition with mCameras.push_back() in createSceneObject().
-    tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+    std::scoped_lock lock(mCreateSceneObjectMutex);
 
     if (mCameras.size() == 0) {
         return nullptr;
@@ -205,7 +205,7 @@ std::vector<const rdl2::Camera*>
 SceneContext::getCameras() const
 {
     // Prevent possible race condition with mCameras.push_back() in createSceneObject().
-    tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+    std::scoped_lock lock(mCreateSceneObjectMutex);
 
     std::vector<const rdl2::Camera*> cameras;
 
@@ -236,7 +236,7 @@ std::vector<const rdl2::Camera*>
 SceneContext::getActiveCameras(void) const
 {
     // Prevent possible race condition with mCameras.push_back() in createSceneObject().
-    tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+    std::scoped_lock lock(mCreateSceneObjectMutex);
 
     std::vector<const rdl2::Camera*> cameras;
 
@@ -447,16 +447,16 @@ SceneContext::createSceneObject(const std::string& className,
 
         // Do any type-specific setup.
         if (obj->isA<Geometry>()) {
-            tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+            std::scoped_lock lock(mCreateSceneObjectMutex);
             mGeometries.push_back(obj->asA<Geometry>());
         } else if (obj->isA<GeometrySet>()) {
-            tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+            std::scoped_lock lock(mCreateSceneObjectMutex);
             mGeometrySets.push_back(obj->asA<GeometrySet>());
         } else if (obj->isA<Camera>()) {
-            tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+            std::scoped_lock lock(mCreateSceneObjectMutex);
             mCameras.push_back(obj->asA<Camera>());
         } else if (obj->isA<RenderOutput>()) {
-            tbb::mutex::scoped_lock lock(mCreateSceneObjectMutex);
+            std::scoped_lock lock(mCreateSceneObjectMutex);
             mRenderOutputs.push_back(obj->asA<RenderOutput>());
         } 
 
@@ -770,7 +770,7 @@ SceneContext::computeTimeRescalingCoeffs(float shutterOpen, float shutterClose,
 {
     // See declaration of TimeRescalingCoeffs in Types.h for details.
 
-    tbb::mutex::scoped_lock lock(mTimeRescalingCoeffsMutex);
+    std::scoped_lock lock(mTimeRescalingCoeffsMutex);
 
     MNRY_ASSERT_REQUIRE(motionSteps.size() >= 1 && motionSteps.size() <= 2);
     if (motionSteps.size() == 1  ||  motionSteps[0] == motionSteps[1]) {
diff --git a/lib/scene/rdl2/SceneContext.h b/lib/scene/rdl2/SceneContext.h
index 8b7c9ce..4735b13 100644
--- a/lib/scene/rdl2/SceneContext.h
+++ b/lib/scene/rdl2/SceneContext.h
@@ -13,7 +13,6 @@
 #include <scene_rdl2/render/util/Alloc.h>
 #include <scene_rdl2/common/platform/Platform.h>
 #include <tbb/concurrent_hash_map.h>
-#include <tbb/mutex.h>
 
 #include <string>
 
@@ -382,7 +381,7 @@ class SceneContext
     // it's being updated. In other words, doing an interpolated get() against
     // ANY object while the camera's shutter interval or SceneVariables motion
     // steps are being updated is a recipe for threading errors.
-    tbb::mutex mTimeRescalingCoeffsMutex;
+    std::mutex mTimeRescalingCoeffsMutex;
 
     // All cameras in the rdl context (including the primary camera).
     // This is in creation order.  The primary camera can't be assumed to be
@@ -414,7 +413,7 @@ class SceneContext
     // Mutex to sync write access to thread unsafe vectors like mGeometries only in
     // conditioning time. Those vectors will remain lock free for reading and reading / writing
     // at the same time is not allowed or protected in any way
-    mutable tbb::mutex mCreateSceneObjectMutex;
+    mutable std::mutex mCreateSceneObjectMutex;
 
     RenderOutputVector mRenderOutputs;
     std::string mDsoPath;
diff --git a/lib/scene/rdl2/Shader.h b/lib/scene/rdl2/Shader.h
index bb21139..265a761 100644
--- a/lib/scene/rdl2/Shader.h
+++ b/lib/scene/rdl2/Shader.h
@@ -86,7 +86,7 @@ class Shader : public SceneObject
 
     // Copy existing attributes into a cache
     void cacheAttributes() const {
-        tbb::mutex::scoped_lock lock(mCachedAttributesMutex);
+        std::scoped_lock lock(mCachedAttributesMutex);
 
         mCachedRequiredAttributes.clear();
         if (!mRequiredAttributes.empty()) {
@@ -127,7 +127,7 @@ class Shader : public SceneObject
     }
 
     void clearCachedAttributes() const {
-        tbb::mutex::scoped_lock lock(mCachedAttributesMutex);
+        std::scoped_lock lock(mCachedAttributesMutex);
 
         mCachedRequiredAttributes.clear();
         mCachedOptionalAttributes.clear();
@@ -176,7 +176,7 @@ class Shader : public SceneObject
     /**
      * Mutex to protect the attribute caches.
      */
-    mutable tbb::mutex mCachedAttributesMutex;
+    mutable std::mutex mCachedAttributesMutex;
 };
 
 template <>