Changeset 0ca7286 in mainline for uspace/srv/fs/locfs/locfs_ops.c

Timestamp:

2012-07-21T11:19:27Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

2732c94

Parents:

1c1da4b

Message:

Added resizing to user space (single-threaded) hash_table. Resizes in a way to mitigate effects of bad hash functions. Change of interface affected many files.

File:

• uspace/srv/fs/locfs/locfs_ops.c (modified) (4 diffs)

uspace/srv/fs/locfs/locfs_ops.c

@@ -73 +73 @@
 #define SERVICES_KEYS        1
 #define SERVICES_KEY_HANDLE  0
-#define SERVICES_BUCKETS     256
 
 /* Implementation of hash table interface for the nodes hash table. */
-static hash_index_t services_hash(unsigned long key[])
-{
-        return key[SERVICES_KEY_HANDLE] % SERVICES_BUCKETS;
-}
-
-static int services_compare(unsigned long key[], hash_count_t keys, link_t *item)
-{
+
+static size_t services_key_hash(unsigned long key[])
+{
+        return key[SERVICES_KEY_HANDLE];
+}
+
+static size_t services_hash(const link_t *item)
+{
+        service_t *dev = hash_table_get_instance(item, service_t, link);
+        unsigned long key[] = {
+                [SERVICES_KEY_HANDLE] = dev->service_id
+        };
+        
+        return services_key_hash(key);
+}
+
+static bool services_match(unsigned long key[], size_t keys, const link_t *item)
+{
+        assert(keys == 1);
         service_t *dev = hash_table_get_instance(item, service_t, link);
         return (dev->service_id == (service_id_t) key[SERVICES_KEY_HANDLE]);
@@ -92 +103 @@
 }
 
-static hash_table_operations_t services_ops = {
+static hash_table_ops_t services_ops = {
         .hash = services_hash,
-        .compare = services_compare,
+        .key_hash = services_key_hash,
+        .match = services_match,
+        .equal = 0, 
         .remove_callback = services_remove_callback
 };
@@ -256 +269 @@
                          * below.
                          */
-                        hash_table_insert(&services, key, &dev->link);
+                        hash_table_insert(&services, &dev->link);
                         
                         /*
@@ -450 +463 @@
 bool locfs_init(void)
 {
-        if (!hash_table_create(&services, SERVICES_BUCKETS,
-            SERVICES_KEYS, &services_ops))
+        if (!hash_table_create(&services, 0,  SERVICES_KEYS, &services_ops))
                 return false;