Refactor allocation policies.

src/splay-tree.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 30 matching lines @@
 //   typedef Value: the value type
 //   static const kNoKey: the dummy key used when no key is set
 //   static const kNoValue: the dummy value used to initialize nodes
 //   int (Compare)(Key& a, Key& b) -> {-1, 0, 1}: comparison function
 //
 // The tree is also parameterized by an allocation policy
 // (Allocator). The policy is used for allocating lists in the C free
 // store or the zone; see zone.h.
 
 // Forward defined as
-// template <typename Config, class Allocator = FreeStoreAllocationPolicy>
+// template <typename Config, class Allocator = FreeStoreAllocator>
 //     class SplayTree;
 template <typename Config, class Allocator>
 class SplayTree {
  public:
   typedef typename Config::Key Key;
   typedef typename Config::Value Value;
 
   class Locator;
 
-  SplayTree() : root_(NULL) { }
+  explicit SplayTree(const Allocator& allocator = Allocator())
+      : allocator_(allocator), root_(NULL) { }
   ~SplayTree();
 
   INLINE(void* operator new(size_t size)) {
-    return Allocator::New(static_cast<int>(size));
+    return Allocator().New(static_cast<int>(size));
   }
-  INLINE(void operator delete(void* p, size_t)) { return Allocator::Delete(p); }
+  INLINE(void operator delete(void* p, size_t)) {
+    return Allocator().Delete(p);
+  }
 
   // Inserts the given key in this tree with the given value.  Returns
   // true if a node was inserted, otherwise false.  If found the locator
   // is enabled and provides access to the mapping for the key.
   bool Insert(const Key& key, Locator* locator);
 
   // Looks up the key in this tree and returns true if it was found,
   // otherwise false.  If the node is found the locator is enabled and
   // provides access to the mapping for the key.
   bool Find(const Key& key, Locator* locator);
@@ skipping 27 matching lines @@
   void Splay(const Key& key);
 
   class Node {
    public:
     Node(const Key& key, const Value& value)
         : key_(key),
           value_(value),
           left_(NULL),
           right_(NULL) { }
 
-    INLINE(void* operator new(size_t size)) {
-      return Allocator::New(static_cast<int>(size));
+    INLINE(void* operator new(size_t size, Allocator* allocator)) {
+      return allocator->New(static_cast<int>(size));
     }
-    INLINE(void operator delete(void* p, size_t)) {
-      return Allocator::Delete(p);
+    static void Delete(Allocator* allocator, Node* node) {
+      node->~Node();
+      allocator->Delete(node);
     }
 
     Key key() { return key_; }
     Value value() { return value_; }
     Node* left() { return left_; }
     Node* right() { return right_; }
    private:
+    void operator delete(void* p, size_t);
 
     friend class SplayTree;
     friend class Locator;
     Key key_;
     Value value_;
     Node* left_;
     Node* right_;
   };
 
   // A locator provides access to a node in the tree without actually
@@ skipping 39 matching lines @@
     }
 
    private:
     Callback* callback_;
 
     DISALLOW_COPY_AND_ASSIGN(NodeToPairAdaptor);
   };
 
   class NodeDeleter BASE_EMBEDDED {
    public:
-    NodeDeleter() { }
-    void Call(Node* node) { delete node; }
+    explicit NodeDeleter(Allocator* allocator) : allocator_(allocator) { }
+    void Call(Node* node) { Node::Delete(allocator_, node); }
 
    private:
+    Allocator* allocator_;
 
     DISALLOW_COPY_AND_ASSIGN(NodeDeleter);
   };
 
   template <class Callback>
   void ForEachNode(Callback* callback);
 
+  Allocator allocator_;
   Node* root_;
 
   DISALLOW_COPY_AND_ASSIGN(SplayTree);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPLAY_TREE_H_