Changeset 7320ca6 in mainline

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:

1d5424a

Parents:

f67b4ef

git-author:

Dzejrou <dzejrou@…> (2018-04-23 20:33:48)

git-committer:

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

Message:

cpp: added bucket operations and changed clear to only deallocate bucket lists, but not to reallocate the bucket array

File:

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

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

@@ -81 +81 @@
         Size size() const noexcept
         {
-            // TODO: implement
+            auto current = head;
+            Size res{};
+
+            do
+            {
+                ++res;
+                current = current->next;
+            }
+            while (current != head);
+
+            return res;
         }
 
@@ -92 +102 @@
         }
 
+        void clear()
+        {
+            auto current = head;
+            do
+            {
+                auto tmp = current;
+                current = current->next;
+                delete tmp;
+            }
+            while (current != head);
+
+            head = nullptr;
+        }
+
         ~hash_table_bucket()
         {
-            // TODO: deallocate the entire list
+            clear();
         }
     };
@@ -758 +782 @@
             void clear() noexcept
             {
-                delete[] table_;
-
+                for (size_type i = 0; i < bucket_count_; ++i)
+                    table_[i].clear();
                 size_ = size_type{};
-                table_ = new hash_table_bucket<value_type, size_type>[bucket_count_];
             }