From a589be7c746d9f44b3ef3b47fceaa2ae3cd8412e Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 23 Jun 2020 11:06:54 +0200
Subject: [PATCH] took over imrpvements

---
 ...tStoreAccessor.cpp => ConstStorageAccessor.cpp} | 14 ++++----------
 ...ConstStoreAccessor.h => ConstStorageAccessor.h} |  6 +++---
 storagemanager/PoolManager.h                       |  3 +++
 storagemanager/PoolManager.tpp                     |  6 +++---
 storagemanager/StorageAccessor.h                   |  2 +-
 5 files changed, 14 insertions(+), 17 deletions(-)
 rename storagemanager/{ConstStoreAccessor.cpp => ConstStorageAccessor.cpp} (87%)
 rename storagemanager/{ConstStoreAccessor.h => ConstStorageAccessor.h} (94%)

diff --git a/storagemanager/ConstStoreAccessor.cpp b/storagemanager/ConstStorageAccessor.cpp
similarity index 87%
rename from storagemanager/ConstStoreAccessor.cpp
rename to storagemanager/ConstStorageAccessor.cpp
index 84f400534..0bfde58c1 100644
--- a/storagemanager/ConstStoreAccessor.cpp
+++ b/storagemanager/ConstStorageAccessor.cpp
@@ -1,6 +1,7 @@
-#include <framework/storagemanager/ConstStoreAccessor.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include <framework/storagemanager/ConstStorageAccessor.h>
 #include <framework/storagemanager/StorageManagerIF.h>
+#include <framework/globalfunctions/arrayprinter.h>
 
 ConstStorageAccessor::ConstStorageAccessor(store_address_t storeId):
 		storeId(storeId) {}
@@ -73,18 +74,11 @@ store_address_t ConstStorageAccessor::getId() const {
 }
 
 void ConstStorageAccessor::print() const {
-	if(internalState == AccessState::UNINIT) {
+	if(internalState == AccessState::UNINIT or constDataPointer == nullptr) {
 		sif::warning << "StorageAccessor: Not initialized!" << std::endl;
 		return;
 	}
-	sif::info << "StorageAccessor: Printing data: [";
-	for(uint16_t iPool = 0; iPool < size_; iPool++) {
-		sif::info << std::hex << (int)constDataPointer[iPool];
-		if(iPool < size_ - 1){
-			sif::info << " , ";
-		}
-	}
-	sif::info << " ] " << std::endl;
+	arrayprinter::print(constDataPointer, size_);
 }
 
 void ConstStorageAccessor::assignStore(StorageManagerIF* store) {
diff --git a/storagemanager/ConstStoreAccessor.h b/storagemanager/ConstStorageAccessor.h
similarity index 94%
rename from storagemanager/ConstStoreAccessor.h
rename to storagemanager/ConstStorageAccessor.h
index 2420893c1..cf8ca08fe 100644
--- a/storagemanager/ConstStoreAccessor.h
+++ b/storagemanager/ConstStorageAccessor.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_STORAGEMANAGER_CONSTSTOREACCESSOR_H_
-#define FRAMEWORK_STORAGEMANAGER_CONSTSTOREACCESSOR_H_
+#ifndef FRAMEWORK_STORAGEMANAGER_CONSTSTORAGEACCESSOR_H_
+#define FRAMEWORK_STORAGEMANAGER_CONSTSTORAGEACCESSOR_H_
 
 #include <framework/storagemanager/storeAddress.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
@@ -113,4 +113,4 @@ protected:
 };
 
 
-#endif /* FRAMEWORK_STORAGEMANAGER_CONSTSTOREACCESSOR_H_ */
+#endif /* FRAMEWORK_STORAGEMANAGER_CONSTSTORAGEACCESSOR_H_ */
diff --git a/storagemanager/PoolManager.h b/storagemanager/PoolManager.h
index 7c2e8a719..3c1c12176 100644
--- a/storagemanager/PoolManager.h
+++ b/storagemanager/PoolManager.h
@@ -29,6 +29,9 @@ public:
 			store_address_t* storeId = nullptr) override;
 
 protected:
+	//! Default mutex timeout value to prevent permanent blocking.
+	static constexpr uint32_t mutexTimeout = 50;
+
 	ReturnValue_t reserveSpace(const uint32_t size, store_address_t* address,
 			bool ignoreFault) override;
 
diff --git a/storagemanager/PoolManager.tpp b/storagemanager/PoolManager.tpp
index a364f5a2b..4ca22b858 100644
--- a/storagemanager/PoolManager.tpp
+++ b/storagemanager/PoolManager.tpp
@@ -21,7 +21,7 @@ inline PoolManager<NUMBER_OF_POOLS>::~PoolManager(void) {
 template<uint8_t NUMBER_OF_POOLS>
 inline ReturnValue_t PoolManager<NUMBER_OF_POOLS>::reserveSpace(
 		const uint32_t size, store_address_t* address, bool ignoreFault) {
-	MutexHelper mutexHelper(mutex,MutexIF::NO_TIMEOUT);
+	MutexHelper mutexHelper(mutex, mutexTimeout);
 	ReturnValue_t status = LocalPool<NUMBER_OF_POOLS>::reserveSpace(size,
 			address,ignoreFault);
 	return status;
@@ -33,7 +33,7 @@ inline ReturnValue_t PoolManager<NUMBER_OF_POOLS>::deleteData(
 	// debug << "PoolManager( " << translateObject(getObjectId()) <<
 	//       " )::deleteData from store " << packet_id.pool_index <<
 	//       ". id is "<< packet_id.packet_index << std::endl;
-	MutexHelper mutexHelper(mutex,MutexIF::NO_TIMEOUT);
+	MutexHelper mutexHelper(mutex, mutexTimeout);
 	ReturnValue_t status = LocalPool<NUMBER_OF_POOLS>::deleteData(packet_id);
 	return status;
 }
@@ -41,7 +41,7 @@ inline ReturnValue_t PoolManager<NUMBER_OF_POOLS>::deleteData(
 template<uint8_t NUMBER_OF_POOLS>
 inline ReturnValue_t PoolManager<NUMBER_OF_POOLS>::deleteData(uint8_t* buffer,
 		size_t size, store_address_t* storeId) {
-	MutexHelper mutexHelper(mutex,MutexIF::NO_TIMEOUT);
+	MutexHelper mutexHelper(mutex, mutexTimeout);
 	ReturnValue_t status = LocalPool<NUMBER_OF_POOLS>::deleteData(buffer,
 			size, storeId);
 	return status;
diff --git a/storagemanager/StorageAccessor.h b/storagemanager/StorageAccessor.h
index bcefe24dc..c5e383065 100644
--- a/storagemanager/StorageAccessor.h
+++ b/storagemanager/StorageAccessor.h
@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_STORAGEMANAGER_STORAGEACCESSOR_H_
 #define FRAMEWORK_STORAGEMANAGER_STORAGEACCESSOR_H_
 
-#include <framework/storagemanager/ConstStoreAccessor.h>
+#include <framework/storagemanager/ConstStorageAccessor.h>
 
 class StorageManagerIF;