diff options
Diffstat (limited to 'src/runtime')
-rw-r--r-- | src/runtime/MemoryManagerOnDemand.cpp | 45 | ||||
-rw-r--r-- | src/runtime/PoolManager.cpp | 30 |
2 files changed, 45 insertions, 30 deletions
diff --git a/src/runtime/MemoryManagerOnDemand.cpp b/src/runtime/MemoryManagerOnDemand.cpp index 4dfa28bddb..d9803a8caf 100644 --- a/src/runtime/MemoryManagerOnDemand.cpp +++ b/src/runtime/MemoryManagerOnDemand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -29,33 +29,15 @@ #include <memory> -using namespace arm_compute; - +namespace arm_compute +{ MemoryManagerOnDemand::MemoryManagerOnDemand(std::shared_ptr<ILifetimeManager> lifetime_manager, std::shared_ptr<IPoolManager> pool_manager) - : _lifetime_mgr(std::move(lifetime_manager)), _pool_mgr(std::move(pool_manager)), _allocator(nullptr), _is_finalized(false), _num_pools(1) + : _lifetime_mgr(std::move(lifetime_manager)), _pool_mgr(std::move(pool_manager)) { ARM_COMPUTE_ERROR_ON_MSG(!_lifetime_mgr, "Lifetime manager not specified correctly!"); ARM_COMPUTE_ERROR_ON_MSG(!_pool_mgr, "Pool manager not specified correctly!"); } -bool MemoryManagerOnDemand::is_finalized() const -{ - return _is_finalized; -} - -void MemoryManagerOnDemand::set_num_pools(unsigned int num_pools) -{ - ARM_COMPUTE_ERROR_ON(num_pools == 0); - _num_pools = num_pools; -} - -void MemoryManagerOnDemand::set_allocator(IAllocator *allocator) -{ - ARM_COMPUTE_ERROR_ON_MSG(is_finalized(), "Memory manager is already finalized!"); - ARM_COMPUTE_ERROR_ON(allocator == nullptr); - _allocator = allocator; -} - ILifetimeManager *MemoryManagerOnDemand::lifetime_manager() { return _lifetime_mgr.get(); @@ -66,23 +48,26 @@ IPoolManager *MemoryManagerOnDemand::pool_manager() return _pool_mgr.get(); } -void MemoryManagerOnDemand::finalize() +void MemoryManagerOnDemand::populate(arm_compute::IAllocator &allocator, size_t num_pools) { - ARM_COMPUTE_ERROR_ON_MSG(is_finalized(), "Memory manager is already finalized!"); ARM_COMPUTE_ERROR_ON(!_lifetime_mgr); ARM_COMPUTE_ERROR_ON(!_pool_mgr); - ARM_COMPUTE_ERROR_ON_MSG(!_lifetime_mgr->are_all_finalized(), "All the objects have not been finalized! "); - ARM_COMPUTE_ERROR_ON(_allocator == nullptr); + ARM_COMPUTE_ERROR_ON_MSG(!_lifetime_mgr->are_all_finalized(), "All the objects have not been finalized!"); + ARM_COMPUTE_ERROR_ON_MSG(_pool_mgr->num_pools() != 0, "Pool manager already contains pools!"); // Create pools - auto pool_template = _lifetime_mgr->create_pool(_allocator); - for(int i = _num_pools; i > 1; --i) + auto pool_template = _lifetime_mgr->create_pool(&allocator); + for(int i = num_pools; i > 1; --i) { auto pool = pool_template->duplicate(); _pool_mgr->register_pool(std::move(pool)); } _pool_mgr->register_pool(std::move(pool_template)); +} - // Set finalized to true - _is_finalized = true; +void MemoryManagerOnDemand::clear() +{ + ARM_COMPUTE_ERROR_ON_MSG(!_pool_mgr, "Pool manager not specified correctly!"); + _pool_mgr->clear_pools(); } +} //namespace arm_compute diff --git a/src/runtime/PoolManager.cpp b/src/runtime/PoolManager.cpp index 293241d6f4..5ec2ce92c1 100644 --- a/src/runtime/PoolManager.cpp +++ b/src/runtime/PoolManager.cpp @@ -73,6 +73,36 @@ void PoolManager::register_pool(std::unique_ptr<IMemoryPool> pool) _sem = arm_compute::support::cpp14::make_unique<arm_compute::Semaphore>(_free_pools.size()); } +std::unique_ptr<IMemoryPool> PoolManager::release_pool() +{ + std::lock_guard<arm_compute::Mutex> lock(_mtx); + ARM_COMPUTE_ERROR_ON_MSG(!_occupied_pools.empty(), "All pools should be free in order to release one!"); + + if(!_free_pools.empty()) + { + std::unique_ptr<IMemoryPool> pool = std::move(_free_pools.front()); + ARM_COMPUTE_ERROR_ON(_free_pools.front() != nullptr); + _free_pools.pop_front(); + + // Update semaphore + _sem = arm_compute::support::cpp14::make_unique<arm_compute::Semaphore>(_free_pools.size()); + + return pool; + } + + return nullptr; +} + +void PoolManager::clear_pools() +{ + std::lock_guard<arm_compute::Mutex> lock(_mtx); + ARM_COMPUTE_ERROR_ON_MSG(!_occupied_pools.empty(), "All pools should be free in order to clear the PoolManager!"); + _free_pools.clear(); + + // Update semaphore + _sem = nullptr; +} + size_t PoolManager::num_pools() const { std::lock_guard<arm_compute::Mutex> lock(_mtx); |