Changeset bc216a0 in mainline for uspace/srv/ns/service.c

Timestamp:

2012-08-07T22:13:44Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

da68871a

Parents:

b17518e

Message:

Refactored any users of hash_table to use opaque void* keys instead of the cumbersome unsigned long[] keys. Switched from the ad hoc computations of hashes of multiple values to hash_combine().

File:

• uspace/srv/ns/service.c (modified) (9 diffs)

uspace/srv/ns/service.c

@@ -43 +43 @@
 /** Service hash table item. */
 typedef struct {
-        link_t link;
+        ht_link_t link;
         sysarg_t service;        /**< Service ID. */
         sysarg_t phone;          /**< Phone registered with the service. */
@@ -49 +49 @@
 } hashed_service_t;
 
-/** Compute hash index into service hash table.
- *
- * @param key Pointer keys. However, only the first key (i.e. service number)
- *            is used to compute the hash index.
- *
- * @return Hash index corresponding to key[0].
- *
- */
-static size_t service_key_hash(unsigned long key[])
+
+static size_t service_key_hash(void *key)
 {
-        assert(key);
-        return key[0];
+        return *(sysarg_t*)key;
 }
 
-static size_t service_hash(const link_t *item)
+static size_t service_hash(const ht_link_t *item)
 {
-        hashed_service_t *hs = hash_table_get_instance(item, hashed_service_t, link);
-        unsigned long key = hs->service;
-        return service_key_hash(&key);
+        hashed_service_t *hs = hash_table_get_inst(item, hashed_service_t, link);
+        return hs->service;
 }
 
-/** Compare a key with hashed item.
- *
- * This compare function always ignores the third key.
- * It exists only to make it possible to remove records
- * originating from connection with key[1] in_phone_hash
- * value. Note that this is close to being classified
- * as a nasty hack.
- *
- * @param key  Array of keys.
- * @param keys Must be lesser or equal to 3.
- * @param item Pointer to a hash table item.
- *
- * @return Non-zero if the key matches the item, zero otherwise.
- *
- */
-static bool service_match(unsigned long key[], size_t keys, const link_t *item)
+static bool service_key_equal(void *key, const ht_link_t *item)
 {
-        assert(key);
-        assert(keys <= 3);
-        assert(item);
-        
-        hashed_service_t *hs = hash_table_get_instance(item, hashed_service_t, link);
-        
-        if (keys == 2)
-                return ((key[0] == hs->service) && (key[1] == hs->in_phone_hash));
-        else
-                return (key[0] == hs->service);
-}
-
-/** Perform actions after removal of item from the hash table.
- *
- * @param item Item that was removed from the hash table.
- *
- */
-static void service_remove(link_t *item)
-{
-        assert(item);
-        free(hash_table_get_instance(item, hashed_service_t, link));
+        hashed_service_t *hs = hash_table_get_inst(item, hashed_service_t, link);
+        return hs->service == *(sysarg_t*)key;
 }
 
@@ -114 +71 @@
         .hash = service_hash,
         .key_hash = service_key_hash,
-        .match = service_match,
+        .key_equal = service_key_equal,
         .equal = 0,
-        .remove_callback = service_remove
+        .remove_callback = 0
 };
 
@@ -135 +92 @@
 int service_init(void)
 {
-        if (!hash_table_create(&service_hash_table, 0, 3, &service_hash_table_ops)) {
+        if (!hash_table_create(&service_hash_table, 0, 0, &service_hash_table_ops)) {
                 printf(NAME ": No memory available for services\n");
                 return ENOMEM;
@@ -152 +109 @@
                 pending_conn_t *pr = list_get_instance(cur, pending_conn_t, link);
                 
-                unsigned long keys[3] = {
-                        pr->service,
-                        0,
-                        0
-                };
-                
-                link_t *link = hash_table_find(&service_hash_table, keys);
+                ht_link_t *link = hash_table_find(&service_hash_table, &pr->service);
                 if (!link)
                         continue;
                 
-                hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
+                hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
                 (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
                     pr->arg3, 0, IPC_FF_NONE);
@@ -183 +134 @@
 int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
 {
-        unsigned long keys[3] = {
-                service,
-                call->in_phone_hash,
-                0
-        };
-        
-        if (hash_table_find(&service_hash_table, keys))
+        if (hash_table_find(&service_hash_table, &service))
                 return EEXISTS;
         
@@ -196 +141 @@
                 return ENOMEM;
         
-        link_initialize(&hs->link);
         hs->service = service;
         hs->phone = phone;
@@ -217 +161 @@
 {
         sysarg_t retval;
-        unsigned long keys[3] = {
-                service,
-                0,
-                0
-        };
         
-        link_t *link = hash_table_find(&service_hash_table, keys);
+        ht_link_t *link = hash_table_find(&service_hash_table, &service);
         if (!link) {
                 if (IPC_GET_ARG4(*call) & IPC_FLAG_BLOCKING) {
@@ -246 +185 @@
         }
         
-        hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
+        hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
         (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);