Changeset bc216a0 in mainline for uspace/lib/nic/src/nic_wol_virtues.c

Timestamp:

2012-08-07T22:13:44Z (13 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/lib/nic/src/nic_wol_virtues.c (modified) (7 diffs)

uspace/lib/nic/src/nic_wol_virtues.c

@@ -37 +37 @@
 
 #include "nic_wol_virtues.h"
+#include "nic.h"
 #include <assert.h>
 #include <errno.h>
@@ -45 +46 @@
  */
 
-static size_t nic_wv_key_hash(unsigned long keys[])
-{
-        return keys[0];
-}
-
-static size_t nic_wv_hash(const link_t *item)
+static size_t nic_wv_key_hash(void *key)
+{
+        return *(nic_wv_id_t*) key;
+}
+
+static size_t nic_wv_hash(const ht_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)
+        return virtue->id;
+}
+
+static bool nic_wv_key_equal(void *key, const ht_link_t *item)
 {
         nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item;
-        return (virtue->id == (nic_wv_id_t) key[0]);
+        return (virtue->id == *(nic_wv_id_t*) key);
 }
 
@@ -76 +76 @@
         wvs->table_operations.hash = nic_wv_hash;
         wvs->table_operations.key_hash = nic_wv_key_hash;
-        wvs->table_operations.match = nic_wv_match;
+        wvs->table_operations.key_equal = nic_wv_key_equal;
         wvs->table_operations.equal = 0;
         wvs->table_operations.remove_callback = 0;
         
-        if (!hash_table_create(&wvs->table, 0, 1, &wvs->table_operations)) {
+        if (!hash_table_create(&wvs->table, 0, 0, &wvs->table_operations)) {
                 return ENOMEM;
         }
@@ -168 +168 @@
         do {
                 virtue->id = wvs->next_id++;
-        } while (NULL !=
-                hash_table_find(&wvs->table, (unsigned long *) &virtue->id));
+        } while (NULL != hash_table_find(&wvs->table, &virtue->id));
         hash_table_insert(&wvs->table, &virtue->item);
         virtue->next = wvs->lists[virtue->type];
@@ -188 +187 @@
 nic_wol_virtue_t *nic_wol_virtues_remove(nic_wol_virtues_t *wvs, nic_wv_id_t id)
 {
-        nic_wol_virtue_t *virtue = (nic_wol_virtue_t *)
-                hash_table_find(&wvs->table, (unsigned long *) &id);
+        nic_wol_virtue_t *virtue = 
+                (nic_wol_virtue_t *) hash_table_find(&wvs->table, &id);
         if (virtue == NULL) {
                 return NULL;
@@ -195 +194 @@
 
         /* Remove from filter_table */
-        hash_table_remove(&wvs->table, (unsigned long *) &id, 1);
+        hash_table_remove_item(&wvs->table, &virtue->item);
 
         /* Remove from filter_types */
@@ -232 +231 @@
          * constant virtue the retyping is correct.
          */
-        link_t *virtue = hash_table_find(
-                &((nic_wol_virtues_t *) wvs)->table, (unsigned long *) &id);
+        ht_link_t *virtue = hash_table_find(&((nic_wol_virtues_t *) wvs)->table, &id);
         return (const nic_wol_virtue_t *) virtue;
 }