Changeset 0ca7286 in mainline for uspace/srv/ns/service.c

Timestamp:

2012-07-21T11:19:27Z (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:

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/ns/service.c (modified) (6 diffs)

uspace/srv/ns/service.c

@@ -40 +40 @@
 #include "ns.h"
 
-#define SERVICE_HASH_TABLE_CHAINS  20
 
 /** Service hash table item. */
@@ -58 +57 @@
  *
  */
-static hash_index_t service_hash(unsigned long key[])
+static size_t service_key_hash(unsigned long key[])
 {
         assert(key);
-        return (key[0] % SERVICE_HASH_TABLE_CHAINS);
+        return key[0];
+}
+
+static size_t service_hash(const 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);
 }
 
@@ -79 +85 @@
  *
  */
-static int service_compare(unsigned long key[], hash_count_t keys, link_t *item)
+static bool service_match(unsigned long key[], size_t keys, const link_t *item)
 {
         assert(key);
@@ -105 +111 @@
 
 /** Operations for service hash table. */
-static hash_table_operations_t service_hash_table_ops = {
+static hash_table_ops_t service_hash_table_ops = {
         .hash = service_hash,
-        .compare = service_compare,
+        .key_hash = service_key_hash,
+        .match = service_match,
+        .equal = 0,
         .remove_callback = service_remove
 };
@@ -127 +135 @@
 int service_init(void)
 {
-        if (!hash_table_create(&service_hash_table, SERVICE_HASH_TABLE_CHAINS,
-            3, &service_hash_table_ops)) {
+        if (!hash_table_create(&service_hash_table, 0, 3, &service_hash_table_ops)) {
                 printf(NAME ": No memory available for services\n");
                 return ENOMEM;
@@ -193 +200 @@
         hs->phone = phone;
         hs->in_phone_hash = call->in_phone_hash;
-        hash_table_insert(&service_hash_table, keys, &hs->link);
+        hash_table_insert(&service_hash_table, &hs->link);
         
         return EOK;