Changeset 281

Timestamp:

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

Author:

pooh

Message:

• Added allocator features.

Location:

to-imperative/trunk/libp++

Files:

• pxx_allocator.hh (modified) (4 diffs)
• pxx_default_allocator.ih (modified) (1 diff)
• pxx_heap_allocator.cc (modified) (1 diff)

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

@@ -30 +30 @@
 {
 
+#define ALLOCATOR_HAS_GET_REAL_SIZE             0x0001
+#define ALLOCATOR_HAS_GET_BLOCK                 0x0002
+#define ALLOCATOR_HAS_GET_BLOCK_WITH_SIZE       0x0004
+
 //
 // Generic allocator interface
@@ -36 +40 @@
 
 protected:
+  //
+  // Allocator features
+  unsigned features ;
+  //
   NO_COPY_CTOR(Allocator)
   NO_ASSIGN(Allocator)
@@ -43 +51 @@
   //
   // Constructor
-  Allocator () {}
+  Allocator (unsigned _features = 0) : features (_features) {}
   //
   // Virtual destructor
@@ -67 +75 @@
   // The same as previous, but using block size
   virtual void* get_block (void* _ptr, size_t _size) = 0 ;
+  //
+  // Get allocator features
+  unsigned get_features () const { return features; }
 
 };

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

@@ -90 +90 @@
 inline void DefaultAllocator::set (Allocator& _allocator)
 {
-  if (allocator == null)
+  if (allocator == null) {
     allocator = &_allocator;
-  else if (allocator == &default_malloc_allocator)
+    features = _allocator.get_features();
+  } else if (allocator == &default_malloc_allocator)
     FATAL("Default malloc allocator already was used");
   else

to-imperative/trunk/libp++/pxx_heap_allocator.cc

@@ -41 +41 @@
   int _fd /* = -1 */
 ) :
+  Allocator (
+    ALLOCATOR_HAS_GET_REAL_SIZE |
+    ALLOCATOR_HAS_GET_BLOCK | ALLOCATOR_HAS_GET_BLOCK_WITH_SIZE
+  ),
   Heap (_init_size, _max_size, _start, _fd)
 {