Changes in uspace/srv/fs/locfs/locfs_ops.c [9d58539:bc216a0] in mainline

File:

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

uspace/srv/fs/locfs/locfs_ops.c

@@ -61 +61 @@
         async_sess_t *sess;       /**< If NULL, the structure is incomplete. */
         size_t refcount;
-        link_t link;
+        ht_link_t link;
         fibril_condvar_t cv;      /**< Broadcast when completed. */
 } service_t;
@@ -71 +71 @@
 static FIBRIL_MUTEX_INITIALIZE(services_mutex);
 
-#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)
-{
-        service_t *dev = hash_table_get_instance(item, service_t, link);
-        return (dev->service_id == (service_id_t) key[SERVICES_KEY_HANDLE]);
-}
-
-static void services_remove_callback(link_t *item)
-{
-        free(hash_table_get_instance(item, service_t, link));
-}
-
-static hash_table_operations_t services_ops = {
+
+static size_t services_key_hash(void *key)
+{
+        return *(service_id_t*)key;
+}
+
+static size_t services_hash(const ht_link_t *item)
+{
+        service_t *dev = hash_table_get_inst(item, service_t, link);
+        return dev->service_id;
+}
+
+static bool services_key_equal(void *key, const ht_link_t *item)
+{
+        service_t *dev = hash_table_get_inst(item, service_t, link);
+        return (dev->service_id == *(service_id_t*)key);
+}
+
+static void services_remove_callback(ht_link_t *item)
+{
+        free(hash_table_get_inst(item, service_t, link));
+}
+
+static hash_table_ops_t services_ops = {
         .hash = services_hash,
-        .compare = services_compare,
+        .key_hash = services_key_hash,
+        .key_equal = services_key_equal,
+        .equal = 0, 
         .remove_callback = services_remove_callback
 };
@@ -229 +234 @@
                 /* Device node */
                 
-                unsigned long key[] = {
-                        [SERVICES_KEY_HANDLE] = (unsigned long) node->service_id
-                };
-                link_t *lnk;
-                
                 fibril_mutex_lock(&services_mutex);
+                ht_link_t *lnk;
 restart:
-                lnk = hash_table_find(&services, key);
+                lnk = hash_table_find(&services, &node->service_id);
                 if (lnk == NULL) {
                         service_t *dev = (service_t *) malloc(sizeof(service_t));
@@ -256 +257 @@
                          * below.
                          */
-                        hash_table_insert(&services, key, &dev->link);
+                        hash_table_insert(&services, &dev->link);
                         
                         /*
@@ -279 +280 @@
                                  * entry and free the device structure.
                                  */
-                                hash_table_remove(&services, key, SERVICES_KEYS);
+                                hash_table_remove(&services, &node->service_id);
                                 fibril_mutex_unlock(&services_mutex);
                                 
@@ -288 +289 @@
                         dev->sess = sess;
                 } else {
-                        service_t *dev = hash_table_get_instance(lnk, service_t, link);
+                        service_t *dev = hash_table_get_inst(lnk, service_t, link);
                         
                         if (!dev->sess) {
@@ -450 +451 @@
 bool locfs_init(void)
 {
-        if (!hash_table_create(&services, SERVICES_BUCKETS,
-            SERVICES_KEYS, &services_ops))
+        if (!hash_table_create(&services, 0,  0, &services_ops))
                 return false;
         
@@ -555 +555 @@
                 /* Device node */
                 
-                unsigned long key[] = {
-                        [SERVICES_KEY_HANDLE] = (unsigned long) index
-                };
-                
                 fibril_mutex_lock(&services_mutex);
-                link_t *lnk = hash_table_find(&services, key);
+                ht_link_t *lnk = hash_table_find(&services, &index);
                 if (lnk == NULL) {
                         fibril_mutex_unlock(&services_mutex);
@@ -566 +562 @@
                 }
                 
-                service_t *dev = hash_table_get_instance(lnk, service_t, link);
+                service_t *dev = hash_table_get_inst(lnk, service_t, link);
                 assert(dev->sess);
                 
@@ -621 +617 @@
         if (type == LOC_OBJECT_SERVICE) {
                 /* Device node */
-                unsigned long key[] = {
-                        [SERVICES_KEY_HANDLE] = (unsigned long) index
-                };
                 
                 fibril_mutex_lock(&services_mutex);
-                link_t *lnk = hash_table_find(&services, key);
+                ht_link_t *lnk = hash_table_find(&services, &index);
                 if (lnk == NULL) {
                         fibril_mutex_unlock(&services_mutex);
@@ -632 +625 @@
                 }
                 
-                service_t *dev = hash_table_get_instance(lnk, service_t, link);
+                service_t *dev = hash_table_get_inst(lnk, service_t, link);
                 assert(dev->sess);
                 
@@ -691 +684 @@
         
         if (type == LOC_OBJECT_SERVICE) {
-                unsigned long key[] = {
-                        [SERVICES_KEY_HANDLE] = (unsigned long) index
-                };
                 
                 fibril_mutex_lock(&services_mutex);
-                link_t *lnk = hash_table_find(&services, key);
+                ht_link_t *lnk = hash_table_find(&services, &index);
                 if (lnk == NULL) {
                         fibril_mutex_unlock(&services_mutex);
@@ -702 +692 @@
                 }
                 
-                service_t *dev = hash_table_get_instance(lnk, service_t, link);
+                service_t *dev = hash_table_get_inst(lnk, service_t, link);
                 assert(dev->sess);
                 dev->refcount--;
@@ -708 +698 @@
                 if (dev->refcount == 0) {
                         async_hangup(dev->sess);
-                        hash_table_remove(&services, key, SERVICES_KEYS);
+                        hash_table_remove(&services, &index);
                 }
                 
@@ -732 +722 @@
         
         if (type == LOC_OBJECT_SERVICE) {
-                unsigned long key[] = {
-                        [SERVICES_KEY_HANDLE] = (unsigned long) index
-                };
-                
+
                 fibril_mutex_lock(&services_mutex);
-                link_t *lnk = hash_table_find(&services, key);
+                ht_link_t *lnk = hash_table_find(&services, &index);
                 if (lnk == NULL) {
                         fibril_mutex_unlock(&services_mutex);
@@ -743 +730 @@
                 }
                 
-                service_t *dev = hash_table_get_instance(lnk, service_t, link);
+                service_t *dev = hash_table_get_inst(lnk, service_t, link);
                 assert(dev->sess);