Changeset 963037b0 in mainline

Timestamp:

2018-03-14T18:25:33Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

30f1a25

Parents:

948222e4

Message:

Do not consider the bucket head as a table element

Files:

• kernel/generic/src/adt/hash_table.c (modified) (1 diff)
• uspace/lib/c/generic/adt/hash_table.c (modified) (1 diff)

kernel/generic/src/adt/hash_table.c

@@ -274 +274 @@
         assert(h && h->bucket);
 
+        size_t idx = h->op->hash(item) % h->bucket_cnt;
+
         /* Traverse the circular list until we reach the starting item again. */
         for (link_t *cur = item->link.next; cur != &item->link; cur = cur->next) {
                 assert(cur);
+
+                if (cur == &h->bucket[idx].head)
+                        continue;
+
                 ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
                 /*

uspace/lib/c/generic/adt/hash_table.c

@@ -274 +274 @@
         assert(h && h->bucket);
 
+        size_t idx = h->op->hash(item) % h->bucket_cnt;
+
         /* Traverse the circular list until we reach the starting item again. */
         for (link_t *cur = item->link.next; cur != &item->link; cur = cur->next) {
                 assert(cur);
+
+                if (cur == &h->bucket[idx].head)
+                        continue;
+
                 ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
                 /*