[Boost-commit] svn:boost r45020 - in sandbox/memory: boost/memory libs/memory/test/memory

From: xushiweizh_at_[hidden]
Date: 2008-05-02 09:11:45

Author: xushiwei
Date: 2008-05-02 09:11:45 EDT (Fri, 02 May 2008)
New Revision: 45020
URL: http://svn.boost.org/trac/boost/changeset/45020

Log:
issue #1885: gc_alloc::_reduceDestroyChain();
Text files modified: 
   sandbox/memory/boost/memory/gc_alloc.hpp                   |    36 ++++++++++++++++++++++++++----------    
   sandbox/memory/libs/memory/test/memory/simple_examples.cpp |     6 +++++-                                  
   2 files changed, 31 insertions(+), 11 deletions(-)

Modified: sandbox/memory/boost/memory/gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/gc_alloc.hpp	(original)
+++ sandbox/memory/boost/memory/gc_alloc.hpp	2008-05-02 09:11:45 EDT (Fri, 02 May 2008)
@@ -157,7 +157,7 @@
         MemBlock* m_blockList;
         PriorityQ m_freeList;
         HugeGCAllocT m_hugeAlloc;
-	size_t m_freeSize, m_GCLimitSize;
+	size_t m_destroyCount, m_freeSize, m_GCLimitSize;
         static FreeMemHeader _null;
 
 private:
@@ -232,8 +232,8 @@
                 _commitCurrentBlock();
                 m_begin = m_end = _null.begin();
 
-		// 0.2. Clear destroy chain
-		m_destroyChain = NULL;
+		// 0.2. Reduce destroy chain
+		_reduceDestroyChain();
 
                 // 0.3. Clear free list
                 m_freeList.clear();
@@ -265,13 +265,6 @@
                                                 m_freeList.push((FreeMemHeader*)it);
                                         if (coll.done())
                                                 break;
-					it = coll.current();
-				}
-				if (it->blkType == nodeAllocedWithDestructor)
-				{
-					MemHeaderEx* itEx = (MemHeaderEx*)it;
-					itEx->pPrev = m_destroyChain;
-					m_destroyChain = itEx;
                                 }
                                 // skip nodes marked with nodeAlloced
                                 coll.next();
@@ -281,7 +274,9 @@
         
         void BOOST_MEMORY_CALL try_gc()
         {
+#if !defined(BOOST_MEMORY_DEBUG_GC)
                 if (m_freeSize >= m_GCLimitSize)
+#endif
                         force_gc();
         }
 
@@ -296,6 +291,22 @@
         }
 
 private:
+	void BOOST_MEMORY_CALL _reduceDestroyChain()
+	{
+        MemHeaderEx** pp = &m_destroyChain;
+        while (m_destroyCount)
+        {
+			MemHeaderEx* curr = *pp;
+			if (curr->blkType == nodeFree) {
+				*pp = curr->pPrev;
+				--m_destroyCount;
+			}
+			else {
+				pp = &curr->pPrev;
+			}
+        }
+	}
+
         void BOOST_MEMORY_CALL _commitCurrentBlock()
         {
                 FreeMemHeader* pNode = (FreeMemHeader*)m_begin - 1;
@@ -320,6 +331,7 @@
                 m_blockList = NULL;
                 m_destroyChain = NULL;
                 m_freeSize = 0;
+		m_destroyCount = 0;
                 m_GCLimitSize = GCLimitSizeDef;
 
                 FreeMemHeader* pNew = _newBlock(MemBlockSize);
@@ -350,6 +362,7 @@
                 std::swap(m_blockList, o.m_blockList);
                 std::swap(m_destroyChain, o.m_destroyChain);
                 std::swap(m_freeSize, o.m_freeSize);
+		std::swap(m_destroyCount, o.m_destroyCount);
                 std::swap(m_GCLimitSize, o.m_GCLimitSize);
                 m_alloc.swap(o.m_alloc);
                 m_freeList.swap(o.m_freeList);
@@ -376,6 +389,7 @@
                 m_blockList = NULL;
                 m_freeList.clear();
                 m_freeSize = 0;
+		m_destroyCount = 0;
         }
 
         void* BOOST_MEMORY_CALL allocate(size_t cbData)
@@ -465,6 +479,7 @@
                 MemHeaderEx* p = (MemHeaderEx*)obj - 1;
                 p->blkType = nodeFree;
                 m_freeSize += sizeof(Type) + sizeof(MemHeaderEx);
+		++m_destroyCount;
         }
 
         template <class Type>
@@ -485,6 +500,7 @@
                 MemHeaderEx* p = (MemHeaderEx*)pData - 1;
                 p->blkType = nodeFree;
                 m_freeSize += Traits::getArrayAllocSize(count) + sizeof(MemHeaderEx);
+		++m_destroyCount;
         }
 
         template <class Type>

Modified: sandbox/memory/libs/memory/test/memory/simple_examples.cpp
==============================================================================
--- sandbox/memory/libs/memory/test/memory/simple_examples.cpp	(original)
+++ sandbox/memory/libs/memory/test/memory/simple_examples.cpp	2008-05-02 09:11:45 EDT (Fri, 02 May 2008)
@@ -9,6 +9,7 @@
 //
 //  See http://www.boost.org/libs/memory/index.htm for documentation.
 //
+#define BOOST_MEMORY_DEBUG_GC
 #include <boost/memory.hpp>
 
 // -------------------------------------------------------------------------
@@ -79,8 +80,11 @@
         alloc.destroyArray(intArray, 10000);
         alloc.destroyArray(allocArray, 10);
 
-	for (int i = 0; i < 1000; ++i)
+	int i;
+	for (i = 0; i < 1000; ++i)
                 BOOST_NEW_ARRAY(alloc, int, 100);
+	for (i = 0; i < 8000; ++i)
+		BOOST_NEW(alloc, int);
 
         boost::gc_alloc alloc2;
         alloc.swap(alloc2);