Changeset 282

Timestamp:

Dec 10, 2002, 8:11:14 PM (18 years ago)

Author:

pooh

Message:

• Use allocator features.

Location:

to-imperative/trunk/libp++

Files:

• pxx_chunk_allocator.hh (modified) (1 diff)
• pxx_chunk_allocator.ih (modified) (8 diffs)

to-imperative/trunk/libp++/pxx_chunk_allocator.hh

@@ -89 +89 @@
 
 
-  Allocator& block_allocator ;
+  Allocator& allocator ;
 
   BlockHeader block_list ;

to-imperative/trunk/libp++/pxx_chunk_allocator.ih

@@ -57 +57 @@
   Allocator& _allocator /* = default_allocator */
 ) :
-  block_allocator (_allocator),
+  allocator (_allocator),
   block_list (&block_list, &block_list),
   chunk_size (size_align(sizeof(type_t), 2 * sizeof(void*))),
@@ -75 +75 @@
   Allocator& _allocator /* = default_allocator */
 ) :
-  block_allocator (_allocator),
+  allocator (_allocator),
   block_list (&block_list, &block_list),
   chunk_size (size_align(sizeof(type_t), 2 * sizeof(void*))),
@@ -84 +84 @@
     _allocator.get_real_size(_nchunks * chunk_size + sizeof(BlockHeader));
 printf("block_size: %u\n", block_size);
+printf("features: %08x\n", allocator.get_features());
   nchunks = (block_size - sizeof(BlockHeader))/chunk_size;
 }
@@ -94 +95 @@
     void* q = p;
     p = p->next;
-    block_allocator.deallocate(q);
+    allocator.deallocate(q);
   }
 }
@@ -108 +109 @@
     return (type_t*)p;
   } else {
-    BlockHeader* p = (BlockHeader*)block_allocator.allocate(block_size);
+    BlockHeader* p = (BlockHeader*)allocator.allocate(block_size);
 //printf("Allocated block at %p\n", p);
     init_block(p);
@@ -213 +214 @@
 //printf("Deallocating block at %p\n", b);
     b->remove();
-    root = node_remove(root, b);
-    block_allocator.deallocate(b);
+    if ((allocator.get_features() & ALLOCATOR_HAS_GET_BLOCK_WITH_SIZE) == 0) {
+      root = node_remove(root, b);
+    }
+    allocator.deallocate(b);
   }
 }
@@ -221 +224 @@
 inline BlockHeader* ChunkAllocator<type_t>::get_block (void* _ptr)
 {
-  void* p = block_allocator.get_block(_ptr, block_size);
-  if (p != null) return (BlockHeader*)p;
-  else {
+  if ((allocator.get_features() & ALLOCATOR_HAS_GET_BLOCK_WITH_SIZE) != 0) {
+    return (BlockHeader*)(allocator.get_block(_ptr, block_size));
+  } else {
     BlockHeader* node = root;
     do {
@@ -370 +373 @@
   p->next = &free_list;
   free_list.prev = p;
-  {
+  if ((allocator.get_features() & ALLOCATOR_HAS_GET_BLOCK_WITH_SIZE) == 0) {
     _ptr->left = _ptr->right = null;
     _ptr->balance = 0;