aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/LoadedNetwork.hpp
diff options
context:
space:
mode:
authorMatthew Bentham <matthew.bentham@arm.com>2019-03-19 10:11:01 +0000
committerMatthew Bentham <matthew.bentham@arm.com>2019-03-19 10:14:31 +0000
commit2a326b5bbff91ffaedd9017f388aa45862047743 (patch)
tree3d91e97fd04c8e966c4792a42e20cbd1c61ab642 /src/armnn/LoadedNetwork.hpp
parent3e14a9d2033530df49546ab0da63ad4b6470f551 (diff)
downloadarmnn-2a326b5bbff91ffaedd9017f388aa45862047743.tar.gz
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>
Diffstat (limited to 'src/armnn/LoadedNetwork.hpp')
-rw-r--r--src/armnn/LoadedNetwork.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp
index 03a741fb75..9c0fe0b108 100644
--- a/src/armnn/LoadedNetwork.hpp
+++ b/src/armnn/LoadedNetwork.hpp
@@ -47,10 +47,11 @@ public:
// 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 @@ private:
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;
};