Changes in kernel/generic/src/adt/hash_table.c [1b20da0:a35b458] in mainline

File:

• kernel/generic/src/adt/hash_table.c (modified) (19 diffs)

kernel/generic/src/adt/hash_table.c

@@ -96 +96 @@
         assert(h);
         assert(op && op->hash && op->key_hash && op->key_equal);
-        
+
         /* Check for compulsory ops. */
         if (!op || !op->hash || !op->key_hash || !op->key_equal)
                 return false;
-        
+
         h->bucket_cnt = round_up_size(init_size);
-        
+
         if (!alloc_table(h->bucket_cnt, &h->bucket))
                 return false;
-        
+
         h->max_load = (max_load == 0) ? HT_MAX_LOAD : max_load;
         h->item_cnt = 0;
@@ -115 +115 @@
                 h->op->remove_callback = nop_remove_callback;
         }
-        
+
         return true;
 }
@@ -128 +128 @@
         assert(h && h->bucket);
         assert(!h->apply_ongoing);
-        
+
         clear_items(h);
-        
+
         free(h->bucket);
 
@@ -159 +159 @@
         assert(h && h->bucket);
         assert(!h->apply_ongoing);
-        
+
         clear_items(h);
-        
+
         /* Shrink the table to its minimum size if possible. */
         if (HT_MIN_BUCKETS < h->bucket_cnt) {
@@ -173 +173 @@
         if (h->item_cnt == 0)
                 return;
-        
+
         for (size_t idx = 0; idx < h->bucket_cnt; ++idx) {
                 list_foreach_safe(h->bucket[idx], cur, next) {
                         assert(cur);
                         ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
-                        
+
                         list_remove(cur);
                         h->op->remove_callback(cur_link);
                 }
         }
-        
+
         h->item_cnt = 0;
 }
@@ -197 +197 @@
         assert(h && h->bucket);
         assert(!h->apply_ongoing);
-        
+
         size_t idx = h->op->hash(item) % h->bucket_cnt;
-        
+
         list_append(&item->link, &h->bucket[idx]);
         ++h->item_cnt;
@@ -220 +220 @@
         assert(h->op && h->op->hash && h->op->equal);
         assert(!h->apply_ongoing);
-        
+
         size_t idx = h->op->hash(item) % h->bucket_cnt;
-        
+
         /* Check for duplicates. */
         list_foreach(h->bucket[idx], link, ht_link_t, cur_link) {
@@ -232 +232 @@
                         return false;
         }
-        
+
         list_append(&item->link, &h->bucket[idx]);
         ++h->item_cnt;
         grow_if_needed(h);
-        
+
         return true;
 }
@@ -251 +251 @@
 {
         assert(h && h->bucket);
-        
+
         size_t idx = h->op->key_hash(key) % h->bucket_cnt;
 
@@ -264 +264 @@
                 }
         }
-        
+
         return NULL;
 }
@@ -305 +305 @@
         assert(h && h->bucket);
         assert(!h->apply_ongoing);
-        
+
         size_t idx = h->op->key_hash(key) % h->bucket_cnt;
 
         size_t removed = 0;
-        
+
         list_foreach_safe(h->bucket[idx], cur, next) {
                 ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
-                
+
                 if (h->op->key_equal(key, cur_link)) {
                         ++removed;
@@ -322 +322 @@
         h->item_cnt -= removed;
         shrink_if_needed(h);
-        
+
         return removed;
 }
@@ -352 +352 @@
         assert(f);
         assert(h && h->bucket);
-        
+
         if (h->item_cnt == 0)
                 return;
-        
+
         h->apply_ongoing = true;
-        
+
         for (size_t idx = 0; idx < h->bucket_cnt; ++idx) {
                 list_foreach_safe(h->bucket[idx], cur, next) {
@@ -371 +371 @@
 out:
         h->apply_ongoing = false;
-        
+
         shrink_if_needed(h);
         grow_if_needed(h);
@@ -380 +380 @@
 {
         size_t rounded_size = HT_MIN_BUCKETS;
-        
+
         while (rounded_size < size) {
                 rounded_size = 2 * rounded_size + 1;
         }
-        
+
         return rounded_size;
 }
@@ -392 +392 @@
 {
         assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt);
-                
+
         list_t *buckets = malloc(bucket_cnt * sizeof(list_t), FRAME_ATOMIC);
         if (!buckets)
                 return false;
-        
+
         for (size_t i = 0; i < bucket_cnt; i++)
                 list_initialize(&buckets[i]);
@@ -434 +434 @@
         assert(h && h->bucket);
         assert(HT_MIN_BUCKETS <= new_bucket_cnt);
-        
+
         /* We are traversing the table and resizing would mess up the buckets. */
         if (h->apply_ongoing)
                 return;
-        
+
         list_t *new_buckets;
 
@@ -444 +444 @@
         if (!alloc_table(new_bucket_cnt, &new_buckets))
                 return;
-        
+
         if (0 < h->item_cnt) {
                 /* Rehash all the items to the new table. */
@@ -457 +457 @@
                 }
         }
-        
+
         free(h->bucket);
         h->bucket = new_buckets;