From 40405fe6c753eb484bcc1ea360160700ee233b6e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 14 Mar 2023 18:21:16 +0100 Subject: [PATCH 1/2] add spill option --- src/fsfw/storagemanager/PoolManager.cpp | 4 ++-- src/fsfw/storagemanager/PoolManager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fsfw/storagemanager/PoolManager.cpp b/src/fsfw/storagemanager/PoolManager.cpp index c724aa25..ed92dfef 100644 --- a/src/fsfw/storagemanager/PoolManager.cpp +++ b/src/fsfw/storagemanager/PoolManager.cpp @@ -2,8 +2,8 @@ #include "fsfw/FSFW.h" -PoolManager::PoolManager(object_id_t setObjectId, const LocalPoolConfig& localPoolConfig) - : LocalPool(setObjectId, localPoolConfig, true) { +PoolManager::PoolManager(object_id_t setObjectId, const LocalPoolConfig& localPoolConfig, bool spillToHigherPools) + : LocalPool(setObjectId, localPoolConfig, true, spillToHigherPools) { mutex = MutexFactory::instance()->createMutex(); } diff --git a/src/fsfw/storagemanager/PoolManager.h b/src/fsfw/storagemanager/PoolManager.h index d4bb9f0d..798e92dd 100644 --- a/src/fsfw/storagemanager/PoolManager.h +++ b/src/fsfw/storagemanager/PoolManager.h @@ -21,7 +21,7 @@ */ class PoolManager : public LocalPool { public: - PoolManager(object_id_t setObjectId, const LocalPoolConfig& poolConfig); + PoolManager(object_id_t setObjectId, const LocalPoolConfig& poolConfig, bool spillToHigherPools); /** * @brief In the PoolManager's destructor all allocated memory From 5ba69b169f786881c952716fdd61fff09e233e92 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 14 Mar 2023 18:22:00 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73fd68a..d2ad777a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Rename FW subsystem ID from `PCDU_2` to `POWER_SYSTEM_IF`. - Add new `SWITCH_UNKNOWN` returnvalue in `PowerSwitchIF`. +- Pool Manager now allows enabling the `spillToHigherPools` option. # [v6.0.0]