[haiku-commits] r39598 - haiku/trunk/src/servers/app

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 23 Nov 2010 22:48:32 +0100 (CET)
Author: axeld
Date: 2010-11-23 22:48:32 +0100 (Tue, 23 Nov 2010)
New Revision: 39598
Changeset: http://dev.haiku-os.org/changeset/39598

Modified:
   haiku/trunk/src/servers/app/ClientMemoryAllocator.cpp
Log:
* Implemented deleting completely empty chunks.
* Minor cleanup.


Modified: haiku/trunk/src/servers/app/ClientMemoryAllocator.cpp
===================================================================
--- haiku/trunk/src/servers/app/ClientMemoryAllocator.cpp       2010-11-23 
21:44:37 UTC (rev 39597)
+++ haiku/trunk/src/servers/app/ClientMemoryAllocator.cpp       2010-11-23 
21:48:32 UTC (rev 39598)
@@ -71,7 +71,7 @@
 }
 
 
-void *
+void*
 ClientMemoryAllocator::Allocate(size_t size, void** _address, bool& newArea)
 {
        // Search best matching free block from the list
@@ -124,7 +124,7 @@
 
 
 void
-ClientMemoryAllocator::Free(void *cookie)
+ClientMemoryAllocator::Free(void* cookie)
 {
        if (cookie == NULL)
                return;
@@ -136,13 +136,12 @@
        block_iterator iterator = fFreeBlocks.GetIterator();
        struct block* before = NULL;
        struct block* after = NULL;
-       struct block* block;
 
        // TODO: this could be done better if free blocks are sorted,
        //      and if we had one free blocks list per chunk!
        //      IOW this is a bit slow...
 
-       while ((block = iterator.Next()) != NULL) {
+       while (struct block* block = iterator.Next()) {
                if (block->chunk != freeBlock->chunk)
                        continue;
 
@@ -159,17 +158,30 @@
                fFreeBlocks.Remove(after);
                free(after);
                free(freeBlock);
+               freeBlock = before;
        } else if (before != NULL) {
                before->size += freeBlock->size;
                free(freeBlock);
+               freeBlock = before;
        } else if (after != NULL) {
                after->base -= freeBlock->size;
                after->size += freeBlock->size;
                free(freeBlock);
+               freeBlock = after;
        } else
                fFreeBlocks.Add(freeBlock);
 
-       // TODO: check if the whole chunk is free now (we could delete it then)
+       if (freeBlock->size == freeBlock->chunk->size) {
+               // We can delete the chunk now
+               struct chunk* chunk = freeBlock->chunk;
+
+               fFreeBlocks.Remove(freeBlock);
+               free(freeBlock);
+
+               fChunks.Remove(chunk);
+               delete_area(chunk->area);
+               free(chunk);
+       }
 }
 
 
@@ -237,7 +249,7 @@
 }
 
 
-struct block *
+struct block*
 ClientMemoryAllocator::_AllocateChunk(size_t size, bool& newArea)
 {
        // round up to multiple of page size
[haiku-commits] r39598 - haiku/trunk/src/servers/app

Other related posts:
