Changeset 61eb2ce2 in mainline for uspace/lib/c

Timestamp:

2023-02-05T22:03:19Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

b596d0d

Parents:

07700ed

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-05 22:01:46)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-05 22:03:19)

Message:

Make hash table operations immutable, because global mutable state is evil

Location:

uspace/lib/c

Files:

• generic/adt/hash_table.c (modified) (6 diffs)
• generic/async/ports.c (modified) (2 diffs)
• generic/async/server.c (modified) (2 diffs)
• include/adt/hash_table.h (modified) (2 diffs)

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

@@ -91 +91 @@
  */
 bool hash_table_create(hash_table_t *h, size_t init_size, size_t max_load,
-    hash_table_ops_t *op)
+    const hash_table_ops_t *op)
 {
         assert(h);
@@ -111 +111 @@
         h->apply_ongoing = false;
 
-        if (h->op->remove_callback == NULL) {
-                h->op->remove_callback = nop_remove_callback;
-        }
-
         return true;
 }
@@ -172 +168 @@
         if (h->item_cnt == 0)
                 return;
+
+        void (*remove_cb)(ht_link_t *) = h->op->remove_callback ? h->op->remove_callback : nop_remove_callback;
 
         for (size_t idx = 0; idx < h->bucket_cnt; ++idx) {
@@ -179 +177 @@
 
                         list_remove(cur);
-                        h->op->remove_callback(cur_link);
+                        remove_cb(cur_link);
                 }
         }
@@ -322 +320 @@
                         ++removed;
                         list_remove(cur);
-                        h->op->remove_callback(cur_link);
+
+                        if (h->op->remove_callback)
+                                h->op->remove_callback(cur_link);
                 }
         }
@@ -341 +341 @@
         list_remove(&item->link);
         --h->item_cnt;
-        h->op->remove_callback(item);
+
+        if (h->op->remove_callback)
+                h->op->remove_callback(item);
         shrink_if_needed(h);
 }

uspace/lib/c/generic/async/ports.c

@@ -123 +123 @@
 
 /** Operations for the port hash table. */
-static hash_table_ops_t interface_hash_table_ops = {
+static const hash_table_ops_t interface_hash_table_ops = {
         .hash = interface_hash,
         .key_hash = interface_key_hash,
@@ -151 +151 @@
 
 /** Operations for the port hash table. */
-static hash_table_ops_t port_hash_table_ops = {
+static const hash_table_ops_t port_hash_table_ops = {
         .hash = port_hash,
         .key_hash = port_key_hash,

uspace/lib/c/generic/async/server.c

@@ -250 +250 @@
 
 /** Operations for the client hash table. */
-static hash_table_ops_t client_hash_table_ops = {
+static const hash_table_ops_t client_hash_table_ops = {
         .hash = client_hash,
         .key_hash = client_key_hash,
@@ -511 +511 @@
 
 /** Operations for the notification hash table. */
-static hash_table_ops_t notification_hash_table_ops = {
+static const hash_table_ops_t notification_hash_table_ops = {
         .hash = notification_hash,
         .key_hash = notification_key_hash,

uspace/lib/c/include/adt/hash_table.h

@@ -73 +73 @@
 /** Hash table structure. */
 typedef struct {
-        hash_table_ops_t *op;
+        const hash_table_ops_t *op;
         list_t *bucket;
         size_t bucket_cnt;
@@ -86 +86 @@
 
 extern bool hash_table_create(hash_table_t *, size_t, size_t,
-    hash_table_ops_t *);
+    const hash_table_ops_t *);
 extern void hash_table_destroy(hash_table_t *);