diff options
Diffstat (limited to 'vespamalloc/src/vespamalloc/malloc/datasegment.hpp')
| -rw-r--r-- | vespamalloc/src/vespamalloc/malloc/datasegment.hpp | 76 |
1 files changed, 43 insertions, 33 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/datasegment.hpp b/vespamalloc/src/vespamalloc/malloc/datasegment.hpp index 80a70b6b5bc..051773df21f 100644 --- a/vespamalloc/src/vespamalloc/malloc/datasegment.hpp +++ b/vespamalloc/src/vespamalloc/malloc/datasegment.hpp @@ -26,7 +26,7 @@ DataSegment<MemBlockPtrT>::DataSegment() : size_t wanted(0x1000000000ul); //64G void * everything = _osMemory.reserve(wanted); if (everything) { - for (size_t i = blockId(everything), m = blockId(everything)+(wanted/BlockSize); i < m; i++) { + for (BlockIdT i = blockId(everything), m = blockId(everything) + (wanted / BlockSize); i < m; i++) { if (i > BlockCount) { abort(); } @@ -47,9 +47,9 @@ DataSegment<MemBlockPtrT>::freeSize() const { template<typename MemBlockPtrT> void * DataSegment<MemBlockPtrT>::getBlock(size_t & oldBlockSize, SizeClassT sc) { - const size_t minBlockSize = std::max(size_t(BlockSize), _osMemory.getMinBlockSize()); + const size_t minBlockSize = std::max(BlockSize, _osMemory.getMinBlockSize()); oldBlockSize = ((oldBlockSize + (minBlockSize-1))/minBlockSize)*minBlockSize; - size_t numBlocks((oldBlockSize + (BlockSize-1))/BlockSize); + BlockIdT numBlocks((oldBlockSize + (BlockSize - 1)) / BlockSize); size_t blockSize = BlockSize * numBlocks; void * newBlock(nullptr); { @@ -58,8 +58,8 @@ void * DataSegment<MemBlockPtrT>::getBlock(size_t & oldBlockSize, SizeClassT sc) if ( newBlock == nullptr ) { newBlock = _unMappedList.sub(numBlocks); if ( newBlock == nullptr ) { - size_t nextBlock(blockId(end())); - size_t startBlock = _freeList.lastBlock(nextBlock); + BlockIdT nextBlock = blockId(end()); + BlockIdT startBlock = _freeList.lastBlock(nextBlock); if (startBlock) { size_t adjustedBlockSize = blockSize - BlockSize*(nextBlock-startBlock); newBlock = _osMemory.get(adjustedBlockSize); @@ -91,7 +91,7 @@ void * DataSegment<MemBlockPtrT>::getBlock(size_t & oldBlockSize, SizeClassT sc) // assumes _osMemory.get will always return a value that does not make // "i" overflow the _blockList array; this will break when hitting the // 2T address space boundary. - for (size_t i = blockId(newBlock), m = blockId(newBlock)+numBlocks; i < m; i++) { + for (BlockIdT i = blockId(newBlock), m = blockId(newBlock) + numBlocks; i < m; i++) { _blockList[i].sizeClass(sc); _blockList[i].freeChainLength(m-i); _blockList[i].realNumBlocks(m-i); @@ -129,17 +129,17 @@ void DataSegment<MemBlockPtrT>::checkAndLogBigSegment() template<typename MemBlockPtrT> void DataSegment<MemBlockPtrT>::returnBlock(void *ptr) { - size_t bId(blockId(ptr)); + BlockIdT bId(blockId(ptr)); SizeClassT sc = _blockList[bId].sizeClass(); size_t bsz = MemBlockPtrT::classSize(sc); if (bsz >= BlockSize) { - size_t numBlocks = bsz / BlockSize; + BlockIdT numBlocks = bsz / BlockSize; if (numBlocks > _blockList[bId].realNumBlocks()) { numBlocks = _blockList[bId].realNumBlocks(); } assert(_blockList[bId].freeChainLength() >= numBlocks); if ((_unmapSize < bsz) && _osMemory.release(ptr, numBlocks*BlockSize)) { - for(size_t i=0; i < numBlocks; i++) { + for(BlockIdT i=0; i < numBlocks; i++) { BlockT & b = _blockList[bId + i]; b.sizeClass(UNMAPPED_BLOCK); b.freeChainLength(numBlocks - i); @@ -149,7 +149,7 @@ void DataSegment<MemBlockPtrT>::returnBlock(void *ptr) _unMappedList.add(bId); } } else { - for(size_t i=0; i < numBlocks; i++) { + for(BlockIdT i=0; i < numBlocks; i++) { BlockT & b = _blockList[bId + i]; b.sizeClass(FREE_BLOCK); b.freeChainLength(numBlocks - i); @@ -349,12 +349,17 @@ DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::FreeListT(BlockT * blockList) : template<typename MemBlockPtrT> template <int MaxCount> -void DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::add(size_t startIndex) +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::~FreeListT() = default; + +template<typename MemBlockPtrT> +template <int MaxCount> +void +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::add(Index startIndex) { - size_t i(0); - size_t numBlocks(_blockList[startIndex].freeChainLength()); + Index i(0); + Index numBlocks(_blockList[startIndex].freeChainLength()); for (i=0; (i < _count) && (_freeStartIndex[i] < startIndex); i++) { } - size_t prevIndex(0), nextIndex(0); + Index prevIndex(0), nextIndex(0); BlockT * prev(nullptr), * next(nullptr); if (i > 0) { prevIndex = _freeStartIndex[i-1]; @@ -373,12 +378,12 @@ void DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::add(size_t startIndex) // Join with freeChain that follows. _freeStartIndex[i] = startIndex; nextIndex = startIndex; - size_t oldNextCount = next->freeChainLength(); + Index oldNextCount = next->freeChainLength(); next = & _blockList[startIndex]; next->freeChainLength(oldNextCount + numBlocks); } else { // Insert. - for(size_t j=0; j < (_count-i); j++) { + for(Index j=0; j < (_count-i); j++) { _freeStartIndex[_count-j] = _freeStartIndex[_count-j-1]; } _count++; @@ -388,7 +393,7 @@ void DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::add(size_t startIndex) if (prev && next && (prevIndex + prev->freeChainLength() == nextIndex)) { prev->freeChainLength(prev->freeChainLength() + next->freeChainLength()); _count--; - for(size_t j=i; j < _count; j++) { + for(Index j=i; j < _count; j++) { _freeStartIndex[j] = _freeStartIndex[j+1]; } _freeStartIndex[_count] = -1; @@ -397,7 +402,8 @@ void DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::add(size_t startIndex) template<typename MemBlockPtrT> template <int MaxCount> -void * DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::sub(size_t numBlocks) +void * +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::sub(Index numBlocks) { void * block(nullptr); size_t bestFitIndex(_count); @@ -419,11 +425,12 @@ void * DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::sub(size_t numBlocks) template<typename MemBlockPtrT> template <int MaxCount> -size_t DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::lastBlock(size_t nextBlock) +uint32_t +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::lastBlock(Index nextBlock) { - size_t lastIndex(0); + Index lastIndex(0); if (_count > 0) { - size_t index(_freeStartIndex[_count-1]); + Index index(_freeStartIndex[_count-1]); BlockT & b = _blockList[index]; if (index + b.freeChainLength() == nextBlock) { lastIndex = index; @@ -434,23 +441,25 @@ size_t DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::lastBlock(size_t nextBloc template<typename MemBlockPtrT> template <int MaxCount> -void DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::info(FILE * os) +void +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::info(FILE * os) { - for (size_t i=0; i < _count; i++) { - size_t index(_freeStartIndex[i]); + for (Index i=0; i < _count; i++) { + Index index(_freeStartIndex[i]); const BlockT & b = _blockList[index]; - fprintf(os, "Free #%3ld block #%5ld chainlength %5d size %10lu\n", - i, index, b.freeChainLength(), size_t(b.freeChainLength())*BlockSize); + fprintf(os, "Free #%3d block #%5d chainlength %5d size %10lu\n", + i, index, b.freeChainLength(), b.freeChainLength()*BlockSize); } } template<typename MemBlockPtrT> template <int MaxCount> -size_t DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::numFreeBlocks() const +uint32_t +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::numFreeBlocks() const { - size_t freeBlockCount(0); - for (size_t i=0; i < _count; i++) { - size_t index(_freeStartIndex[i]); + Index freeBlockCount(0); + for (Index i=0; i < _count; i++) { + Index index(_freeStartIndex[i]); const BlockT & b = _blockList[index]; freeBlockCount += b.freeChainLength(); } @@ -459,17 +468,18 @@ size_t DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::numFreeBlocks() const template<typename MemBlockPtrT> template <int MaxCount> -void * DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::linkOut(size_t findex, size_t left) +void * +DataSegment<MemBlockPtrT>::FreeListT<MaxCount>::linkOut(Index findex, Index left) { size_t index(_freeStartIndex[findex]); BlockT & b = _blockList[index]; - size_t startIndex = index + left; + Index startIndex = index + left; void *block = fromBlockId(startIndex); if (left > 0) { b.freeChainLength(left); } else { _count--; - for(size_t j=findex; j < (_count); j++) { + for(Index j=findex; j < (_count); j++) { _freeStartIndex[j] = _freeStartIndex[j+1]; } _freeStartIndex[_count] = -1; |