From cd71a9cc12fc799905f781a0e2453e28590bffe7 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 2 Nov 2020 15:53:08 +0100 Subject: [PATCH] fsfw container taken over --- container/IndexedRingMemoryArray.h | 93 ++++++++++++------------------ container/SharedRingBuffer.cpp | 2 +- container/SharedRingBuffer.h | 10 +++- container/group.h | 8 ++- 4 files changed, 51 insertions(+), 62 deletions(-) diff --git a/container/IndexedRingMemoryArray.h b/container/IndexedRingMemoryArray.h index 0968abfa..0d85b49b 100644 --- a/container/IndexedRingMemoryArray.h +++ b/container/IndexedRingMemoryArray.h @@ -1,34 +1,27 @@ #ifndef FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_ #define FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_ -#include "../container/ArrayList.h" +#include "ArrayList.h" #include "../globalfunctions/CRC.h" #include "../serviceinterface/ServiceInterfaceStream.h" #include "../returnvalues/HasReturnvaluesIF.h" #include "../serialize/SerialArrayListAdapter.h" #include -/** - * Index is the Type used for the list of indices. - * - * @tparam T Type which destribes the index. Needs to be a child of SerializeIF - * to be able to make it persistent - */ template class Index: public SerializeIF{ /** - * + * Index is the Type used for the list of indices. The template parameter is the type which describes the index, it needs to be a child of SerializeIF to be able to make it persistent */ - static_assert(std::is_base_of::value, - "Wrong Type for Index, Type must implement SerializeIF"); + static_assert(std::is_base_of::value,"Wrong Type for Index, Type must implement SerializeIF"); public: Index():blockStartAddress(0),size(0),storedPackets(0){} - Index(uint32_t startAddress):blockStartAddress(startAddress), - size(0),storedPackets(0) { + Index(uint32_t startAddress):blockStartAddress(startAddress),size(0),storedPackets(0){ + } - void setBlockStartAddress(uint32_t newAddress) { + void setBlockStartAddress(uint32_t newAddress){ this->blockStartAddress = newAddress; } @@ -40,7 +33,7 @@ public: return &indexType; } - T* modifyIndexType() { + T* modifyIndexType(){ return &indexType; } /** @@ -135,35 +128,26 @@ private: }; -/** - * @brief Indexed Ring Memory Array is a class for a ring memory with indices. - * @details - * It assumes that the newest data comes in last - * It uses the currentWriteBlock as pointer to the current writing position - * The currentReadBlock must be set manually - * @tparam T - */ + template class IndexedRingMemoryArray: public SerializeIF, public ArrayList, uint32_t>{ /** - * + * Indexed Ring Memory Array is a class for a ring memory with indices. It assumes that the newest data comes in last + * It uses the currentWriteBlock as pointer to the current writing position + * The currentReadBlock must be set manually */ public: - IndexedRingMemoryArray(uint32_t startAddress, uint32_t size, uint32_t bytesPerBlock, - SerializeIF* additionalInfo, bool overwriteOld): - ArrayList,uint32_t>(NULL,(uint32_t)10,(uint32_t)0),totalSize(size), - indexAddress(startAddress),currentReadSize(0),currentReadBlockSizeCached(0), - lastBlockToReadSize(0), additionalInfo(additionalInfo),overwriteOld(overwriteOld) - { + IndexedRingMemoryArray(uint32_t startAddress, uint32_t size, uint32_t bytesPerBlock, SerializeIF* additionalInfo, + bool overwriteOld) :ArrayList,uint32_t>(NULL,(uint32_t)10,(uint32_t)0),totalSize(size),indexAddress(startAddress),currentReadSize(0),currentReadBlockSizeCached(0),lastBlockToReadSize(0), additionalInfo(additionalInfo),overwriteOld(overwriteOld){ + //Calculate the maximum number of indices needed for this blocksize uint32_t maxNrOfIndices = floor(static_cast(size)/static_cast(bytesPerBlock)); //Calculate the Size needeed for the index itself - size_t serializedSize = 0; - if(additionalInfo!=NULL) { + uint32_t serializedSize = 0; + if(additionalInfo!=NULL){ serializedSize += additionalInfo->getSerializedSize(); } - //Size of current iterator type Index tempIndex; serializedSize += tempIndex.getSerializedSize(); @@ -178,7 +162,6 @@ public: error << "IndexedRingMemory: Store is too small for index" << std::endl; } uint32_t useableSize = totalSize - serializedSize; - //Update the totalSize for calculations totalSize = useableSize; @@ -195,10 +178,12 @@ public: this->allocated = true; //Check trueNumberOfBlocks - if(trueNumberOfBlocks<1) { + if(trueNumberOfBlocks<1){ error << "IndexedRingMemory: Invalid Number of Blocks: " << trueNumberOfBlocks; } + + //Fill address into index uint32_t address = trueStartAddress; for (typename IndexedRingMemoryArray::Iterator it = this->begin();it!=this->end();++it) { @@ -208,6 +193,7 @@ public: address += bytesPerBlock; } + //Initialize iterators currentWriteBlock = this->begin(); currentReadBlock = this->begin(); @@ -246,10 +232,10 @@ public: (*typeResetFnc)(it->modifyIndexType()); } - /** + /* * Reading - * @param it */ + void setCurrentReadBlock(typename IndexedRingMemoryArray::Iterator it){ currentReadBlock = it; currentReadBlockSizeCached = it->getSize(); @@ -262,7 +248,6 @@ public: lastBlockToRead = currentWriteBlock; lastBlockToReadSize = currentWriteBlock->getSize(); } - /** * Sets the last block to read to this iterator. * Can be used to dump until block x @@ -307,39 +292,33 @@ public: uint32_t getCurrentReadAddress() const { return getAddressOfCurrentReadBlock() + currentReadSize; } - /** - * Adds readSize to the current size and checks if the read has no more data - * left and advances the read block. + * Adds readSize to the current size and checks if the read has no more data left and advances the read block * @param readSize The size that was read * @return Returns true if the read can go on */ bool addReadSize(uint32_t readSize) { - if(currentReadBlock == lastBlockToRead) { + if(currentReadBlock == lastBlockToRead){ //The current read block is the last to read - if((currentReadSize+readSize) return true currentReadSize += readSize; return true; - } - else { + }else{ //Reached end of read -> return false currentReadSize = lastBlockToReadSize; return false; } - } - else { + }else{ //We are not in the last Block - if((currentReadSize + readSize)::Iterator it(currentReadBlock); //Search if any block between this and the last block is not empty @@ -442,13 +421,13 @@ public: T* modifyCurrentWriteBlockIndexType(){ return currentWriteBlock->modifyIndexType(); } - void updatePreviousWriteSize(uint32_t size, uint32_t storedPackets){ typename IndexedRingMemoryArray::Iterator it = getPreviousBlock(currentWriteBlock); it->addSize(size); it->addStoredPackets(storedPackets); } + /** * Checks if the block has enough space for sizeToWrite * @param sizeToWrite The data to be written in the Block @@ -457,10 +436,7 @@ public: bool hasCurrentWriteBlockEnoughSpace(uint32_t sizeToWrite){ typename IndexedRingMemoryArray::Iterator next = getNextWrite(); uint32_t addressOfNextBlock = next->getBlockStartAddress(); - uint32_t availableSize = - ( ( addressOfNextBlock + totalSize ) - - (getAddressOfCurrentWriteBlock() + getSizeOfCurrentWriteBlock())) - % totalSize; + uint32_t availableSize = ((addressOfNextBlock+totalSize) - (getAddressOfCurrentWriteBlock()+getSizeOfCurrentWriteBlock()))%totalSize; return (sizeToWrite < availableSize); } @@ -550,7 +526,7 @@ public: */ size_t getSerializedSize() const { - size_t size = 0; + uint32_t size = 0; if(additionalInfo!=NULL){ size += additionalInfo->getSerializedSize(); } @@ -718,4 +694,7 @@ private: }; + + + #endif /* FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_ */ diff --git a/container/SharedRingBuffer.cpp b/container/SharedRingBuffer.cpp index 48bdb9df..6ddb3d3e 100644 --- a/container/SharedRingBuffer.cpp +++ b/container/SharedRingBuffer.cpp @@ -18,7 +18,7 @@ SharedRingBuffer::SharedRingBuffer(object_id_t objectId, uint8_t *buffer, } -void SharedRingBuffer::setToUseReceiveSizeFIFO(uint32_t fifoDepth) { +void SharedRingBuffer::setToUseReceiveSizeFIFO(size_t fifoDepth) { this->fifoDepth = fifoDepth; } diff --git a/container/SharedRingBuffer.h b/container/SharedRingBuffer.h index fdc9d626..64d7ee29 100644 --- a/container/SharedRingBuffer.h +++ b/container/SharedRingBuffer.h @@ -27,7 +27,15 @@ public: SharedRingBuffer(object_id_t objectId, const size_t size, bool overwriteOld, size_t maxExcessBytes); - void setToUseReceiveSizeFIFO(uint32_t fifoDepth); + /** + * @brief This function can be used to add an optional FIFO to the class + * @details + * This FIFO will be allocated in the initialize function (and will + * have a fixed maximum size after that). It can be used to store + * values like packet sizes, for example for a shared ring buffer + * used by producer/consumer tasks. + */ + void setToUseReceiveSizeFIFO(size_t fifoDepth); /** * This constructor takes an external buffer with the specified size. diff --git a/container/group.h b/container/group.h index 9c70d523..5a39d34e 100644 --- a/container/group.h +++ b/container/group.h @@ -4,9 +4,11 @@ /** * @defgroup container Container * - * General Purpose Containers to store various elements. - * As opposed to the STL library implementation, these implementations - * don't allocate memory dynamically. + * General Purpose Container to store various elements. + * + * Also contains Adapter classes to print elements to a + * bytestream and to read them from a bytestream, as well + * as an Adapter to swap the endianness. */