From c56cff5eaea42c6442cd469ad53205db6b33cc58 Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Fri, 17 Nov 2023 09:27:15 +0100
Subject: [PATCH] switch from static mutex to member mutex
---
.../libraries/armem_vision/client/occupancy_grid/Writer.cpp | 4 +---
.../libraries/armem_vision/client/occupancy_grid/Writer.h | 4 +++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.cpp b/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.cpp
index 9c06db1e5..ca80477eb 100644
--- a/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.cpp
@@ -13,9 +13,7 @@ namespace armarx::armem::vision::occupancy_grid::client
const std::string& providerName,
const std::int64_t& timestamp)
{
- static std::mutex mutex;
-
- std::lock_guard g{mutex};
+ std::lock_guard g{writeMutex};
const auto result = memoryWriter().addSegment(properties().coreSegmentName, providerName);
diff --git a/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.h b/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.h
index df5e02cea..7f950eab8 100644
--- a/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.h
+++ b/source/RobotAPI/libraries/armem_vision/client/occupancy_grid/Writer.h
@@ -55,8 +55,10 @@ namespace armarx::armem::vision::occupancy_grid::client
protected:
std::string propertyPrefix() const override;
Properties defaultProperties() const override;
- };
+ private:
+ std::mutex writeMutex;
+ };
} // namespace armarx::armem::vision::occupancy_grid::client
--
GitLab