Changeset e912cdf in mainline for uspace/lib/cpp/include/internal

Timestamp:

2018-07-05T21:41:21Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ae8168

Parents:

ed9df7d

git-author:

Dzejrou <dzejrou@…> (2018-04-25 16:45:01)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:21)

Message:

cpp: refactored unordered_map's insertion functions and moved some logic to the underlying hash table, added rehashing to insertion when it's needed

File:

• uspace/lib/cpp/include/internal/hash_table.hpp (modified) (3 diffs)

uspace/lib/cpp/include/internal/hash_table.hpp

@@ -1002 +1002 @@
             void max_load_factor(float factor)
             {
-                /**
-                 * Note: According to the standard, this function
-                 *       can have no effect.
-                 */
-                // TODO: change max factor and rehash if needed
+                if (factor > 0.f)
+                    max_load_factor_ = factor;
+
+                rehash_if_needed();
             }
 
@@ -1081 +1080 @@
             }
 
-            void set_hint(const_iterator hint)
-            {
-                // TODO: hint_ should be a ptr and we extract it here,
-                //       then set it to nullptr after each operation
-            }
-
             hint_type find_insertion_spot(const key_type& key)
             {
@@ -1129 +1122 @@
             {
                 ++size_;
+
+                rehash_if_needed();
+            }
+
+            void decrement_size()
+            {
+                --size_;
+            }
+
+            node_type* find_node_or_return_head(const key_type& key,
+                                                const hash_table_bucket<value_type, size_type>& bucket)
+            {
+                if (bucket.head)
+                {
+                    auto head = bucket.head;
+                    auto current = bucket.head;
+
+                    do
+                    {
+                        if (keys_equal(key, current->value))
+                            return current;
+                        else
+                            current = current->next;
+                    }
+                    while (current != head);
+
+                    return head;
+                }
+                else
+                    return nullptr;
             }