Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [4e00f87:b33870b] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (14 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -50 +50 @@
 #include <sys/types.h>
 #include <adt/hash_table.h>
-#include <adt/hash.h>
 #include <as.h>
 #include <libfs.h>
@@ -56 +55 @@
 #define min(a, b)               ((a) < (b) ? (a) : (b))
 #define max(a, b)               ((a) > (b) ? (a) : (b))
+
+#define NODES_BUCKETS   256
 
 /** All root nodes have index 0. */
@@ -141 +142 @@
 hash_table_t nodes;
 
-/* 
- * Implementation of hash table interface for the nodes hash table. 
- */
-
-typedef struct {
-        service_id_t service_id;
-        fs_index_t index;
-} node_key_t;
-
-static size_t nodes_key_hash(void *k)
-{
-        node_key_t *key = (node_key_t *)k;
-        return hash_combine(key->service_id, key->index);
-}
-
-static size_t nodes_hash(const ht_link_t *item)
-{
-        tmpfs_node_t *nodep = hash_table_get_inst(item, tmpfs_node_t, nh_link);
-        return hash_combine(nodep->service_id, nodep->index);
-}
-
-static bool nodes_key_equal(void *key_arg, const ht_link_t *item)
-{
-        tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link);
-        node_key_t *key = (node_key_t *)key_arg;
-        
-        return key->service_id == node->service_id && key->index == node->index;
-}
-
-static void nodes_remove_callback(ht_link_t *item)
-{
-        tmpfs_node_t *nodep = hash_table_get_inst(item, tmpfs_node_t, nh_link);
+#define NODES_KEY_DEV   0       
+#define NODES_KEY_INDEX 1
+
+/* Implementation of hash table interface for the nodes hash table. */
+static hash_index_t nodes_hash(unsigned long key[])
+{
+        return key[NODES_KEY_INDEX] % NODES_BUCKETS;
+}
+
+static int nodes_compare(unsigned long key[], hash_count_t keys, link_t *item)
+{
+        tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
+            nh_link);
+        
+        switch (keys) {
+        case 1:
+                return (nodep->service_id == key[NODES_KEY_DEV]);
+        case 2: 
+                return ((nodep->service_id == key[NODES_KEY_DEV]) &&
+                    (nodep->index == key[NODES_KEY_INDEX]));
+        default:
+                assert((keys == 1) || (keys == 2));
+        }
+
+        return 0;
+}
+
+static void nodes_remove_callback(link_t *item)
+{
+        tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
+            nh_link);
 
         while (!list_empty(&nodep->cs_list)) {
@@ -192 +192 @@
 
 /** TMPFS nodes hash table operations. */
-hash_table_ops_t nodes_ops = {
+hash_table_operations_t nodes_ops = {
         .hash = nodes_hash,
-        .key_hash = nodes_key_hash,
-        .key_equal = nodes_key_equal,
-        .equal = NULL,
+        .compare = nodes_compare,
         .remove_callback = nodes_remove_callback
 };
@@ -209 +207 @@
         nodep->size = 0;
         nodep->data = NULL;
+        link_initialize(&nodep->nh_link);
         list_initialize(&nodep->cs_list);
 }
@@ -221 +220 @@
 bool tmpfs_init(void)
 {
-        if (!hash_table_create(&nodes, 0, 0, &nodes_ops))
+        if (!hash_table_create(&nodes, NODES_BUCKETS, 2, &nodes_ops))
                 return false;
         
@@ -239 +238 @@
 }
 
-static bool rm_service_id_nodes(ht_link_t *item, void *arg)
-{
-        service_id_t sid = *(service_id_t*)arg;
-        tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link);
-        
-        if (node->service_id == sid) {
-                hash_table_remove_item(&nodes, &node->nh_link);
-        }
-        return true;
-}
-
 static void tmpfs_instance_done(service_id_t service_id)
-{       
-        hash_table_apply(&nodes, rm_service_id_nodes, &service_id);
+{
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id
+        };
+        /*
+         * Here we are making use of one special feature of our hash table
+         * implementation, which allows to remove more items based on a partial
+         * key match. In the following, we are going to remove all nodes
+         * matching our device handle. The nodes_remove_callback() function will
+         * take care of resource deallocation.
+         */
+        hash_table_remove(&nodes, key, 1);
 }
 
@@ -274 +272 @@
 int tmpfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
 {
-        node_key_t key = {
-                .service_id = service_id,
-                .index = index
-        };
-        
-        ht_link_t *lnk = hash_table_find(&nodes, &key);
-        
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
+                [NODES_KEY_INDEX] = index
+        };
+        link_t *lnk = hash_table_find(&nodes, key);
         if (lnk) {
                 tmpfs_node_t *nodep;
-                nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
+                nodep = hash_table_get_instance(lnk, tmpfs_node_t, nh_link);
                 *rfn = FS_NODE(nodep);
         } else {
@@ -335 +331 @@
 
         /* Insert the new node into the nodes hash table. */
-        hash_table_insert(&nodes, &nodep->nh_link);
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = nodep->service_id,
+                [NODES_KEY_INDEX] = nodep->index
+        };
+        hash_table_insert(&nodes, key, &nodep->nh_link);
         *rfn = FS_NODE(nodep);
         return EOK;
@@ -346 +346 @@
         assert(!nodep->lnkcnt);
         assert(list_empty(&nodep->cs_list));
-        
-        hash_table_remove_item(&nodes, &nodep->nh_link);
+
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = nodep->service_id,
+                [NODES_KEY_INDEX] = nodep->index
+        };
+        hash_table_remove(&nodes, key, 2);
 
         /*
@@ -472 +476 @@
          * Lookup the respective TMPFS node.
          */
-        node_key_t key = {
-                .service_id = service_id,
-                .index = index
-        };
-        
-        ht_link_t *hlp = hash_table_find(&nodes, &key);
+        link_t *hlp;
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
+                [NODES_KEY_INDEX] = index
+        };
+        hlp = hash_table_find(&nodes, key);
         if (!hlp)
                 return ENOENT;
-        
-        tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link);
+        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+            nh_link);
         
         /*
@@ -534 +538 @@
          * Lookup the respective TMPFS node.
          */
-        node_key_t key = {
-                .service_id = service_id,
-                .index = index
-        };
-        
-        ht_link_t *hlp = hash_table_find(&nodes, &key);
-        
+        link_t *hlp;
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
+                [NODES_KEY_INDEX] = index
+        };
+        hlp = hash_table_find(&nodes, key);
         if (!hlp)
                 return ENOENT;
-        
-        tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link);
+        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+            nh_link);
 
         /*
@@ -597 +600 @@
          * Lookup the respective TMPFS node.
          */
-        node_key_t key = {
-                .service_id = service_id,
-                .index = index
-        };
-        
-        ht_link_t *hlp = hash_table_find(&nodes, &key);
-        
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
+                [NODES_KEY_INDEX] = index
+        };
+        link_t *hlp = hash_table_find(&nodes, key);
         if (!hlp)
                 return ENOENT;
-        tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link);
+        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t, nh_link);
         
         if (size == nodep->size)
@@ -635 +636 @@
 static int tmpfs_destroy(service_id_t service_id, fs_index_t index)
 {
-        node_key_t key = {
-                .service_id = service_id,
-                .index = index
-        };
-        
-        ht_link_t *hlp = hash_table_find(&nodes, &key);
+        link_t *hlp;
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
+                [NODES_KEY_INDEX] = index
+        };
+        hlp = hash_table_find(&nodes, key);
         if (!hlp)
                 return ENOENT;
-        tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t,
+        tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
             nh_link);
         return tmpfs_destroy_node(FS_NODE(nodep));