From 9bd1702def81780afb9a8fd69a914345a4150ee9 Mon Sep 17 00:00:00 2001
From: rich_sposato <rich_sposato@7ec92016-0320-0410-acc4-a06ded1c099a>
Date: Thu, 29 Dec 2005 01:54:24 +0000
Subject: [PATCH] Added function to trim excess capacity from Chunk container.

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@388 7ec92016-0320-0410-acc4-a06ded1c099a
---
 src/SmallObj.cpp | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/SmallObj.cpp b/src/SmallObj.cpp
index de82a91..e888219 100644
--- a/src/SmallObj.cpp
+++ b/src/SmallObj.cpp
@@ -259,9 +259,17 @@ namespace Loki
 
         /** Releases the memory used by the empty Chunk.  This will take
          constant time under any situation.
+         @return True if empty chunk found and released, false if none empty.
          */
         bool TrimEmptyChunk( void );
 
+        /** Releases unused spots from ChunkList.  This takes constant time
+         with respect to # of Chunks, but actual time depends on underlying
+         memory allocator.
+         @return False if no unused spots, true if some found and released.
+         */
+        bool TrimChunkList( void );
+
         /** Returns count of empty Chunks held by this allocator.  Complexity
          is O(C) where C is the total number of Chunks - empty or used.
          */
@@ -764,6 +772,24 @@ bool FixedAllocator::TrimEmptyChunk( void )
     return true;
 }
 
+// FixedAllocator::TrimChunkList ----------------------------------------------
+
+bool FixedAllocator::TrimChunkList( void )
+{
+    if ( chunks_.empty() )
+    {
+        assert( NULL == allocChunk_ );
+        assert( NULL == deallocChunk_ );
+    }
+
+    if ( chunks_.size() == chunks_.capacity() )
+        return false;
+    // Use the "make-a-temp-and-swap" trick to remove excess capacity.
+    Chunks( chunks_ ).swap( chunks_ );
+
+    return true;
+}
+
 // FixedAllocator::MakeNewChunk -----------------------------------------------
 
 bool FixedAllocator::MakeNewChunk( void )
@@ -1052,11 +1078,18 @@ bool SmallObjAllocator::TrimExcessMemory( void )
 {
     bool found = false;
     const std::size_t allocCount = GetOffset( GetMaxObjectSize(), GetAlignment() );
-    for ( std::size_t i = 0; i < allocCount; ++i )
+    std::size_t i = 0;
+    for ( ; i < allocCount; ++i )
     {
         if ( pool_[ i ].TrimEmptyChunk() )
             found = true;
     }
+    for ( i = 0; i < allocCount; ++i )
+    {
+        if ( pool_[ i ].TrimChunkList() )
+            found = true;
+    }
+
     return found;
 }
 
@@ -1191,6 +1224,9 @@ bool SmallObjAllocator::IsCorrupt( void ) const
 ////////////////////////////////////////////////////////////////////////////////
 
 // $Log$
+// Revision 1.21  2005/12/29 01:54:24  rich_sposato
+// Added function to trim excess capacity from Chunk container.
+//
 // Revision 1.20  2005/12/28 22:34:53  rich_sposato
 // Replaced literal constants with class static data members.  (for clarity)
 //