Changeset 19365 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Feb 2, 2007, 9:57:28 AM (18 years ago)

Author:

darin

Message:

Reviewed by Anders.

• fix copying and assigning a ListHashSet

No test because the code path with bugs I am fixing is not used yet.

• wtf/ListHashSet.h: Tweaked ListHashSetNodeAllocator a little bit for clarity. Changed m_allocator to be an OwnPtr instead of doing an explicit delete. Fixed bug in copy constructor where we'd have an uninitialized m_allocator. Fixed bug in assignment operator where it would swap only the hash table, and not the head, tail, and allocator pointers.

File:

• trunk/JavaScriptCore/wtf/ListHashSet.h (modified) (16 diffs)

trunk/JavaScriptCore/wtf/ListHashSet.h

@@ -23 +23 @@
 #define WTF_ListHashSet_h
 
-#include "HashTable.h"
 #include "HashSet.h"
+#include "OwnPtr.h"
 
 namespace WTF {
@@ -76 +76 @@
         ~ListHashSet();
 
+        void swap(ListHashSet&);
+
         int size() const;
         int capacity() const;
@@ -109 +111 @@
         Node* m_head;
         Node* m_tail;
-        NodeAllocator* m_allocator;
-    };
-
+        OwnPtr<NodeAllocator> m_allocator;
+    };
 
     template<typename ValueArg> struct ListHashSetNodeAllocator {
@@ -120 +121 @@
             : m_freeList(pool())
         { 
-            memset(m_pool.pool, 0, sizeof(m_pool));  
-        }
-
-        Node* allocate() 
+            memset(m_pool.pool, 0, sizeof(m_pool.pool));
+        }
+
+        Node* allocate()
         { 
             Node* result = m_freeList;
@@ -148 +149 @@
             fastFree(node);
         }
-        
 
     private:
         Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-        bool inPool(Node* node) 
-        { 
-            return reinterpret_cast<char*>(node) >= m_pool.pool && reinterpret_cast<char*>(node) < m_pool.pool + sizeof(m_pool.pool); 
+
+        bool inPool(Node* node)
+        {
+            return node >= pool() && node < pool() + m_poolSize;
         }
 
@@ -186 +187 @@
     };
 
-    template<typename ValueArg, typename HashArg> class ListHashSetIterator
-    {
+    template<typename ValueArg, typename HashArg> class ListHashSetIterator {
     private:
         typedef ListHashSet<ValueArg, HashArg> ListHashSetType;
@@ -230 +230 @@
     };
 
-    template<typename ValueArg, typename HashArg> class ListHashSetConstIterator
-    {
+    template<typename ValueArg, typename HashArg> class ListHashSetConstIterator {
     private:
         typedef ListHashSet<ValueArg, HashArg> ListHashSetType;
@@ -255 +254 @@
         }
 
-        // default copy, assignment and destructor are OK if CHECK_HASHTABLE_ITERATORS is 0
-
         PointerType get() const
         {
@@ -326 +323 @@
         : m_head(0)
         , m_tail(0)
+        , m_allocator(new NodeAllocator)
     {
         const_iterator end = other.end();
@@ -336 +334 @@
     {
         ListHashSet tmp(other);
-        m_impl.swap(tmp.m_impl); 
+        swap(tmp);
         return *this;
     }
 
     template<typename T, typename U>
+    inline void ListHashSet<T, U>::swap(ListHashSet& other)
+    {
+        m_impl.swap(other.m_impl);
+        std::swap(m_head, other.m_head);
+        std::swap(m_tail, other.m_tail);
+        m_allocator.swap(other.m_allocator);
+        return *this;
+    }
+
+    template<typename T, typename U>
     inline ListHashSet<T, U>::~ListHashSet()
     {
         deleteAllNodes();
-        delete m_allocator;
     }
 
@@ -396 +403 @@
         if (it == m_impl.end())
             return end();
-
         return makeIterator(*it); 
     }
@@ -407 +413 @@
         if (it == m_impl.end())
             return end();
-        return makeConstIterator(*(m_impl.template find<ValueType, Translator>(value))); 
+        return makeConstIterator(*it);
     }
 
@@ -421 +427 @@
     {
         typedef ListHashSetTranslator<ValueType, HashFunctions> Translator;
-        pair<typename ImplType::iterator, bool> result =  m_impl.template add<ValueType, NodeAllocator*, Translator>(value, m_allocator);
+        pair<typename ImplType::iterator, bool> result = m_impl.template add<ValueType, NodeAllocator*, Translator>(value, m_allocator.get());
         if (result.second)
-            appendNode(*(result.first));
-
-        return std::make_pair(makeIterator(*(result.first)), result.second);
+            appendNode(*result.first);
+        return std::make_pair(makeIterator(*result.first), result.second);
     }
 
@@ -433 +438 @@
         if (it == end())
             return;
-
         m_impl.remove(it.node());
         unlinkAndDelete(it.node());
@@ -472 +476 @@
         }
 
-        node->destroy(m_allocator);
+        node->destroy(m_allocator.get());
     }
 
@@ -499 +503 @@
 
         for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : 0)
-            node->destroy(m_allocator);
+            node->destroy(m_allocator.get());
     }