MLCE-105 Fix use of std::unique_lock in LoadedNetwork
You can't use a unique_lock to check lock ownership by a
particular thread - it just checks whether the mutex
is locked by that lock.
Change-Id: I28190dc3bea91b3cc68f9b9381751e70fd70f43f
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp
index 03a741f..9c0fe0b 100644
--- a/src/armnn/LoadedNetwork.hpp
+++ b/src/armnn/LoadedNetwork.hpp
@@ -47,10 +47,11 @@
// the shared_ptr's reference counter
const std::shared_ptr<Profiler>& GetProfiler() const { return m_Profiler; }
- void AllocateWorkingMemory();
void FreeWorkingMemory();
private:
+ void AllocateWorkingMemory();
+
LoadedNetwork(std::unique_ptr<OptimizedNetwork> net);
void EnqueueInput(const BindableLayer& layer, ITensorHandle* tensorHandle, const TensorInfo& tensorInfo);
@@ -77,9 +78,7 @@
WorkloadQueue m_OutputQueue;
std::shared_ptr<Profiler> m_Profiler;
- using UniqueMutexLock = std::unique_lock<std::mutex>;
mutable std::mutex m_WorkingMemMutex;
- UniqueMutexLock m_WorkingMemLock;
bool m_IsWorkingMemAllocated=false;
};