King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed unneeded include statements. Changed lines that check for corrupt

Browse source 
Chunk.  Changed assertions when allocating.


git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@313 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2005-10-17 18:06:13 +00:00
parent 2d4f6a82e6
commit c640203744
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/SmallObj.cpp
View file

@ -20,10 +20,8 @@
#include <cassert> #include <cassert>
#include <vector> #include <vector>
#include <algorithm>
#include <functional>
#define DO_EXTRA_LOKI_TESTS //#define DO_EXTRA_LOKI_TESTS
#ifdef DO_EXTRA_LOKI_TESTS #ifdef DO_EXTRA_LOKI_TESTS
#include <iostream> #include <iostream>
@ -354,9 +352,9 @@ bool Chunk::IsCorrupt( unsigned char numBlocks, std::size_t blockSize ) const
{ {
if ( numBlocks < blocksAvailable_ ) return true; if ( numBlocks < blocksAvailable_ ) return true;
if ( 0 == blocksAvailable_ ) return false;
unsigned char index = firstAvailableBlock_; unsigned char index = firstAvailableBlock_;
if ( numBlocks <= index ) return true; if ( numBlocks <= index ) return true;
if ( 0 == blocksAvailable_ ) return false;
#ifdef DO_EXTRA_LOKI_TESTS #ifdef DO_EXTRA_LOKI_TESTS
std::bitset< 256 > foundBlocks; std::bitset< 256 > foundBlocks;
@ -569,16 +567,16 @@ void * FixedAllocator::Allocate( void )
else if ( allocChunk_ == emptyChunk_) else if ( allocChunk_ == emptyChunk_)
// detach emptyChunk_ from allocChunk_, because after // detach emptyChunk_ from allocChunk_, because after
// calling allocChunk_->Allocate(blockSize_); the chunk // calling allocChunk_->Allocate(blockSize_); the chunk
// isn't any more empty // is no longer empty.
emptyChunk_ = NULL; emptyChunk_ = NULL;
assert( allocChunk_ != NULL ); assert( allocChunk_ != NULL );
assert( !allocChunk_->IsFilled() ); assert( !allocChunk_->IsFilled() );
void *place = allocChunk_->Allocate(blockSize_); void * place = allocChunk_->Allocate( blockSize_ );
// prove emptyChunk_ points nowhere. // prove either emptyChunk_ points nowhere, or points to a truly empty Chunk.
assert( NULL == emptyChunk_ ); assert( ( NULL == emptyChunk_ ) || ( emptyChunk_->HasAvailable( numBlocks_ ) ) );
assert( 0 == CountEmptyChunks() ); assert( CountEmptyChunks() < 2 );
return place; return place;
} }
@ -748,6 +746,9 @@ SmallObjAllocator::SmallObjAllocator( std::size_t pageSize,
maxSmallObjectSize_( maxObjectSize ), maxSmallObjectSize_( maxObjectSize ),
objectAlignSize_( objectAlignSize ) objectAlignSize_( objectAlignSize )
{ {
#ifdef DO_EXTRA_LOKI_TESTS
std::cout << "SmallObjAllocator " << this << std::endl;
#endif
assert( 0 != objectAlignSize ); assert( 0 != objectAlignSize );
const std::size_t allocCount = GetOffset( maxObjectSize, objectAlignSize ); const std::size_t allocCount = GetOffset( maxObjectSize, objectAlignSize );
pool_ = new FixedAllocator[ allocCount ]; pool_ = new FixedAllocator[ allocCount ];
@ -759,7 +760,9 @@ SmallObjAllocator::SmallObjAllocator( std::size_t pageSize,
SmallObjAllocator::~SmallObjAllocator( void ) SmallObjAllocator::~SmallObjAllocator( void )
{ {
#ifdef DO_EXTRA_LOKI_TESTS
std::cout << "~SmallObjAllocator " << this << std::endl; std::cout << "~SmallObjAllocator " << this << std::endl;
#endif
delete [] pool_; delete [] pool_;
} }
@ -876,6 +879,10 @@ void SmallObjAllocator::Deallocate( void * p )
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// $Log$ // $Log$
// Revision 1.14 2005/10/17 18:06:13 rich_sposato
// Removed unneeded include statements. Changed lines that check for corrupt
// Chunk. Changed assertions when allocating.
//
// Revision 1.13 2005/10/17 09:44:00 syntheticpp // Revision 1.13 2005/10/17 09:44:00 syntheticpp
// remove debug code // remove debug code
// //