commit 8355ec982eb3ff51a6a8042fe760138638ca550b
author Jim Flynn <jim.flynn@arm.com> Tue Sep 17 12:29:50 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Sep 18 15:13:43 2019 +0000
tree 23150be7ae10712db7af3d6e18f1a381d945344a
parent 0bd586ceb2a1e3f8132d009cf48dc46c76ae09e4

IVGCVSW-3432 Fix a multithread store conflict

* Unit test was using the same CaptureData object across 50 threads

Change-Id: I0249b5a8e0bb05e3d3efdd855f5b34b1d5ef3dc9
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/profiling/Holder.cpp

diff --git a/src/profiling/Holder.cpp b/src/profiling/Holder.cpp
index 9def49d..5916017 100644
--- a/src/profiling/Holder.cpp
+++ b/src/profiling/Holder.cpp
@@ -24,7 +24,7 @@
     m_CapturePeriod = capturePeriod;
 }
 
-void CaptureData::SetCounterIds(std::vector<uint16_t>& counterIds)
+void CaptureData::SetCounterIds(const std::vector<uint16_t>& counterIds)
 {
     m_CounterIds = counterIds;
 }
@@ -45,7 +45,7 @@
     return m_CaptureData;
 }
 
-void Holder::SetCaptureData(uint32_t capturePeriod, std::vector<uint16_t>& counterIds)
+void Holder::SetCaptureData(uint32_t capturePeriod, const std::vector<uint16_t>& counterIds)
 {
     std::lock_guard<std::mutex> lockGuard(m_CaptureThreadMutex);
     m_CaptureData.SetCapturePeriod(capturePeriod);
@@ -54,4 +54,4 @@
 
 } // namespace profiling
 
-} // namespace armnn
\ No newline at end of file
+} // namespace armnn