Changes in uspace/srv/ns/service.c [4e00f87:b72efe8] in mainline

File:

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

uspace/srv/ns/service.c

@@ -40 +40 @@
 #include "ns.h"
 
+#define SERVICE_HASH_TABLE_CHAINS  20
 
 /** Service hash table item. */
 typedef struct {
-        ht_link_t link;
+        link_t link;
         sysarg_t service;        /**< Service ID. */
         sysarg_t phone;          /**< Phone registered with the service. */
@@ -49 +50 @@
 } hashed_service_t;
 
-
-static size_t service_key_hash(void *key)
-{
-        return *(sysarg_t*)key;
-}
-
-static size_t service_hash(const ht_link_t *item)
-{
-        hashed_service_t *hs = hash_table_get_inst(item, hashed_service_t, link);
-        return hs->service;
-}
-
-static bool service_key_equal(void *key, const ht_link_t *item)
-{
-        hashed_service_t *hs = hash_table_get_inst(item, hashed_service_t, link);
-        return hs->service == *(sysarg_t*)key;
+/** 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 hash_index_t service_hash(unsigned long key[])
+{
+        assert(key);
+        return (key[0] % SERVICE_HASH_TABLE_CHAINS);
+}
+
+/** 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 int service_compare(unsigned long key[], hash_count_t keys, 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));
 }
 
 /** Operations for service hash table. */
-static hash_table_ops_t service_hash_table_ops = {
+static hash_table_operations_t service_hash_table_ops = {
         .hash = service_hash,
-        .key_hash = service_key_hash,
-        .key_equal = service_key_equal,
-        .equal = NULL,
-        .remove_callback = NULL
+        .compare = service_compare,
+        .remove_callback = service_remove
 };
 
@@ -92 +127 @@
 int service_init(void)
 {
-        if (!hash_table_create(&service_hash_table, 0, 0, &service_hash_table_ops)) {
+        if (!hash_table_create(&service_hash_table, SERVICE_HASH_TABLE_CHAINS,
+            3, &service_hash_table_ops)) {
                 printf(NAME ": No memory available for services\n");
                 return ENOMEM;
@@ -109 +145 @@
                 pending_conn_t *pr = list_get_instance(cur, pending_conn_t, link);
                 
-                ht_link_t *link = hash_table_find(&service_hash_table, &pr->service);
+                unsigned long keys[3] = {
+                        pr->service,
+                        0,
+                        0
+                };
+                
+                link_t *link = hash_table_find(&service_hash_table, keys);
                 if (!link)
                         continue;
                 
-                hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
+                hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
                 (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
                     pr->arg3, 0, IPC_FF_NONE);
@@ -134 +176 @@
 int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
 {
-        if (hash_table_find(&service_hash_table, &service))
+        unsigned long keys[3] = {
+                service,
+                call->in_phone_hash,
+                0
+        };
+        
+        if (hash_table_find(&service_hash_table, keys))
                 return EEXISTS;
         
@@ -141 +189 @@
                 return ENOMEM;
         
+        link_initialize(&hs->link);
         hs->service = service;
         hs->phone = phone;
         hs->in_phone_hash = call->in_phone_hash;
-        hash_table_insert(&service_hash_table, &hs->link);
+        hash_table_insert(&service_hash_table, keys, &hs->link);
         
         return EOK;
@@ -161 +210 @@
 {
         sysarg_t retval;
-        
-        ht_link_t *link = hash_table_find(&service_hash_table, &service);
+        unsigned long keys[3] = {
+                service,
+                0,
+                0
+        };
+        
+        link_t *link = hash_table_find(&service_hash_table, keys);
         if (!link) {
                 if (IPC_GET_ARG4(*call) & IPC_FLAG_BLOCKING) {
@@ -185 +239 @@
         }
         
-        hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
+        hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
         (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);