🪲 Fix a potential race condition

cosmoscout · Mar 21, 2024 · 5280a86 · 5280a86
1 parent e7904f5
commit 5280a86
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/plugins/csp-lod-bodies/src/TreeManager.cpp b/plugins/csp-lod-bodies/src/TreeManager.cpp
@@ -121,11 +121,13 @@ void TreeManager::request(std::vector<TileId> const& tileIds) {
   // load the tile.
   // In the case of async loading, register @c onDataLoaded as the callback
   // that the source invokes when the tile is ready.
-  std::unique_lock<std::mutex> lck(mPendingMtx);
 
   for (auto const& tileId : tileIds) {
+    mPendingMtx.lock();
+
     if (mPendingTiles.count(tileId) == 0) {
       mPendingTiles[tileId] = new TileNode(tileId);
+      mPendingMtx.unlock();
 
       for (auto const& src : mTileDataSources.mChannels) {
         if (src) {
@@ -138,6 +140,8 @@ void TreeManager::request(std::vector<TileId> const& tileIds) {
           }
         }
       }
+    } else {
+      mPendingMtx.unlock();
     }
   }
 }
@@ -344,6 +348,8 @@ void TreeManager::merge() {
   for (std::size_t i = 0; i < mUnmergedNodes.size();) {
     TileNode* node = mUnmergedNodes[i].mNode;
 
+    std::unique_lock<std::mutex> lck(mPendingMtx);
+
     if (insertNode(&mTree, node)) {
       // insert succeeded, remove from pending and unmerged and
       // associate render data with node