From 2b6ccbc17f106a95a95fc04524c1334af10bd524 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 1 Mar 2021 12:26:16 +0100 Subject: [PATCH] renamed receivers list, functions protected --- datapoollocal/LocalDataPoolManager.cpp | 14 +++++++------- datapoollocal/LocalDataPoolManager.h | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/datapoollocal/LocalDataPoolManager.cpp b/datapoollocal/LocalDataPoolManager.cpp index 19e23588..c15182d2 100644 --- a/datapoollocal/LocalDataPoolManager.cpp +++ b/datapoollocal/LocalDataPoolManager.cpp @@ -98,7 +98,7 @@ ReturnValue_t LocalDataPoolManager::initializeHousekeepingPoolEntriesOnce() { ReturnValue_t LocalDataPoolManager::performHkOperation() { ReturnValue_t status = HasReturnvaluesIF::RETURN_OK; - for(auto& receiver: hkReceiversMap) { + for(auto& receiver: hkReceivers) { switch(receiver.reportingType) { case(ReportingType::PERIODIC): { if(receiver.dataType == DataType::LOCAL_POOL_VARIABLE) { @@ -375,7 +375,7 @@ ReturnValue_t LocalDataPoolManager::subscribeForPeriodicPacket(sid_t sid, owner->getPeriodicOperationFrequency(), isDiagnostics); } - hkReceiversMap.push_back(hkReceiver); + hkReceivers.push_back(hkReceiver); return HasReturnvaluesIF::RETURN_OK; } @@ -404,7 +404,7 @@ ReturnValue_t LocalDataPoolManager::subscribeForUpdatePacket(sid_t sid, LocalPoolDataSetAttorney::setDiagnostic(*dataSet, isDiagnostics); } - hkReceiversMap.push_back(hkReceiver); + hkReceivers.push_back(hkReceiver); handleHkUpdateResetListInsertion(hkReceiver.dataType, hkReceiver.dataId); return HasReturnvaluesIF::RETURN_OK; @@ -425,7 +425,7 @@ ReturnValue_t LocalDataPoolManager::subscribeForSetUpdateMessage( hkReceiver.reportingType = ReportingType::UPDATE_NOTIFICATION; } - hkReceiversMap.push_back(hkReceiver); + hkReceivers.push_back(hkReceiver); handleHkUpdateResetListInsertion(hkReceiver.dataType, hkReceiver.dataId); return HasReturnvaluesIF::RETURN_OK; @@ -446,7 +446,7 @@ ReturnValue_t LocalDataPoolManager::subscribeForVariableUpdateMessage( hkReceiver.reportingType = ReportingType::UPDATE_NOTIFICATION; } - hkReceiversMap.push_back(hkReceiver); + hkReceivers.push_back(hkReceiver); handleHkUpdateResetListInsertion(hkReceiver.dataType, hkReceiver.dataId); return HasReturnvaluesIF::RETURN_OK; @@ -829,8 +829,8 @@ ReturnValue_t LocalDataPoolManager::generateSetStructurePacket(sid_t sid, } void LocalDataPoolManager::clearReceiversList() { - // clear the vector completely and releases allocated memory. - HkReceivers().swap(hkReceiversMap); + /* Clear the vector completely and releases allocated memory. */ + HkReceivers().swap(hkReceivers); } MutexIF* LocalDataPoolManager::getLocalPoolMutex() { diff --git a/datapoollocal/LocalDataPoolManager.h b/datapoollocal/LocalDataPoolManager.h index fdfd9d23..24147258 100644 --- a/datapoollocal/LocalDataPoolManager.h +++ b/datapoollocal/LocalDataPoolManager.h @@ -271,7 +271,9 @@ public: MutexIF* getMutexHandle(); virtual LocalDataPoolManager* getPoolManagerHandle() override; -private: + +protected: + localpool::DataPool localPoolMap; /** Every housekeeping data manager has a mutex to protect access to it's data pool. */ @@ -307,7 +309,7 @@ private: /** This vector will contain the list of HK receivers. */ using HkReceivers = std::vector; - HkReceivers hkReceiversMap; + HkReceivers hkReceivers; struct HkUpdateResetHelper { DataType dataType = DataType::DATA_SET;