-// Copyright (C) 2010-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2013 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#define _OBJECTPOOL_HXX_
#include <vector>
-#include <stack>
+//#include <stack>
#include <iostream>
+namespace
+{
+ // assure deallocation of memory of a vector
+ template<class Y> void clearVector(std::vector<Y>& v )
+ {
+ std::vector<Y> emptyVec; v.swap( emptyVec );
+ }
+}
+
template<class X> class ObjectPool
{
int _nextFree;
int _maxAvail;
int _chunkSize;
+ int _maxOccupied;
+ int _nbHoles;
int getNextFree()
{
+ // Don't iterate on the _freeList if all the "holes"
+ // are filled. Go straight to the last occupied ID + 1
+ if ( _nbHoles == 0 )
+ return std::min(_maxOccupied + 1, _maxAvail);
+
for (int i = _nextFree; i < _maxAvail; i++)
if (_freeList[i] == true)
{
_chunkSize = nblk;
_nextFree = 0;
_maxAvail = 0;
+ _maxOccupied = 0;
+ _nbHoles = 0;
_chunkList.clear();
_freeList.clear();
}
virtual ~ObjectPool()
{
- for (int i = 0; i < _chunkList.size(); i++)
+ for (size_t i = 0; i < _chunkList.size(); i++)
delete[] _chunkList[i];
}
_freeList[_nextFree] = false;
obj = _chunkList[chunkId] + rank; // &_chunkList[chunkId][rank];
}
+ if (_nextFree < _maxOccupied)
+ {
+ _nbHoles-=1;
+ }
+ else
+ {
+ _maxOccupied = _nextFree;
+ }
//obj->init();
return obj;
}
void destroy(X* obj)
{
long adrobj = (long) (obj);
- for (int i = 0; i < _chunkList.size(); i++)
+ for (size_t i = 0; i < _chunkList.size(); i++)
{
X* chunk = _chunkList[i];
long adrmin = (long) (chunk);
_freeList[toFree] = true;
if (toFree < _nextFree)
_nextFree = toFree;
+ if (toFree < _maxOccupied)
+ _nbHoles += 1;
//obj->clean();
//checkDelete(i); compactage non fait
break;
}
}
+ void clear()
+ {
+ _nextFree = 0;
+ _maxAvail = 0;
+ _maxOccupied = 0;
+ _nbHoles = 0;
+ for (size_t i = 0; i < _chunkList.size(); i++)
+ delete[] _chunkList[i];
+ clearVector( _chunkList );
+ clearVector( _freeList );
+ }
+
// void destroy(int toFree)
// {
// // no control 0<= toFree < _freeList.size()