Changeset 170995 in webkit

Timestamp:

Jul 11, 2014 1:16:36 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[WTF] Add the move constructor, move assignment operator for HashTable
​https://bugs.webkit.org/show_bug.cgi?id=130772

Reviewed by Darin Adler.

HashTable has both copy constructor and copy assignment operator, meaning that the move constructor
and move assignment operator are implicitly deleted. This patch defines both to avoid unnecessary
copies when moves can be performed.

• wtf/HashTable.h:

(WTF::KeyTraits>::HashTable):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashTable.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-07-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        [WTF] Add the move constructor, move assignment operator for HashTable
+        https://bugs.webkit.org/show_bug.cgi?id=130772
+
+        Reviewed by Darin Adler.
+
+        HashTable has both copy constructor and copy assignment operator, meaning that the move constructor
+        and move assignment operator are implicitly deleted. This patch defines both to avoid unnecessary
+        copies when moves can be performed.
+
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::HashTable):
+
 2014-07-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/HashTable.h

@@ -360 +360 @@
         void swap(HashTable&);
         HashTable& operator=(const HashTable&);
+
+        HashTable(HashTable&&);
+        HashTable& operator=(HashTable&&);
 
         // When the hash table is empty, just return the same iterator for end as for begin.
@@ -1177 +1180 @@
     }
 
+    template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
+    inline HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::HashTable(HashTable&& other)
+#if CHECK_HASHTABLE_ITERATORS
+        : m_iterators(nullptr)
+        , m_mutex(std::make_unique<std::mutex>())
+#endif
+    {
+        other.invalidateIterators();
+
+        m_table = other.m_table;
+        m_tableSize = other.m_tableSize;
+        m_tableSizeMask = other.m_tableSizeMask;
+        m_keyCount = other.m_keyCount;
+        m_deletedCount = other.m_deletedCount;
+
+        other.m_table = nullptr;
+        other.m_tableSize = 0;
+        other.m_tableSizeMask = 0;
+        other.m_keyCount = 0;
+        other.m_deletedCount = 0;
+
+#if DUMP_HASHTABLE_STATS_PER_TABLE
+        m_stats = std::move(other.m_stats);
+#endif
+    }
+
+    template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
+    inline auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::operator=(HashTable&& other) -> HashTable&
+    {
+        invalidateIterators();
+        other.invalidateIterators();
+
+        m_table = other.m_table;
+        m_tableSize = other.m_tableSize;
+        m_tableSizeMask = other.m_tableSizeMask;
+        m_keyCount = other.m_keyCount;
+        m_deletedCount = other.m_deletedCount;
+
+        other.m_table = nullptr;
+        other.m_tableSize = 0;
+        other.m_tableSizeMask = 0;
+        other.m_keyCount = 0;
+        other.m_deletedCount = 0;
+
+#if DUMP_HASHTABLE_STATS_PER_TABLE
+        m_stats = std::move(other.m_stats);
+#endif
+
+        return *this;
+    }
+
 #if !ASSERT_DISABLED