Changeset 0ca7286 in mainline for uspace/lib/nic/src/nic_wol_virtues.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/lib/nic/src/nic_wol_virtues.c (modified) (4 diffs)

uspace/lib/nic/src/nic_wol_virtues.c

@@ -40 +40 @@
 #include <errno.h>
 
-#define NIC_WV_HASH_COUNT 32
-
-/**
- * Hash table helper function
- */
-static int nic_wv_compare(unsigned long key[], hash_count_t keys,
-        link_t *item)
+
+/*
+ * Hash table helper functions
+ */
+
+static size_t nic_wv_key_hash(unsigned long keys[])
+{
+        return keys[0];
+}
+
+static size_t nic_wv_hash(const link_t *item)
+{
+        nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item;
+        unsigned long key = virtue->id;
+        return nic_wv_key_hash(&key);
+}
+
+static bool nic_wv_match(unsigned long key[], size_t keys, const link_t *item)
 {
         nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item;
@@ -53 +64 @@
 
 /**
- * Hash table helper function
- */
-static void nic_wv_rc(link_t *item)
-{
-}
-
-/**
- * Hash table helper function
- */
-static hash_index_t nic_wv_hash(unsigned long keys[])
-{
-        return keys[0] % NIC_WV_HASH_COUNT;
-}
-
-/**
  * Initializes the WOL virtues structure
  *
@@ -77 +73 @@
 int nic_wol_virtues_init(nic_wol_virtues_t *wvs)
 {
-        bzero(wvs, sizeof (nic_wol_virtues_t));
-        wvs->table_operations.compare = nic_wv_compare;
+        bzero(wvs, sizeof(nic_wol_virtues_t));
         wvs->table_operations.hash = nic_wv_hash;
-        wvs->table_operations.remove_callback = nic_wv_rc;
-        if (!hash_table_create(&wvs->table, NIC_WV_HASH_COUNT, 1,
-                &wvs->table_operations)) {
+        wvs->table_operations.key_hash = nic_wv_key_hash;
+        wvs->table_operations.match = nic_wv_match;
+        wvs->table_operations.equal = 0;
+        wvs->table_operations.remove_callback = 0;
+        
+        if (!hash_table_create(&wvs->table, 0, 1, &wvs->table_operations)) {
                 return ENOMEM;
         }
@@ -172 +170 @@
         } while (NULL !=
                 hash_table_find(&wvs->table, (unsigned long *) &virtue->id));
-        hash_table_insert(&wvs->table,
-                (unsigned long *) &virtue->id, &virtue->item);
+        hash_table_insert(&wvs->table, &virtue->item);
         virtue->next = wvs->lists[virtue->type];
         wvs->lists[virtue->type] = virtue;