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

Timestamp:

2012-10-09T21:16:13Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6659037, 7d248e3

Parents:

d1ef4a1 (diff), 97b199b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/gsoc2012-uspace-hash-table-from-adam.

File:

• uspace/lib/nic/src/nic_wol_virtues.c (modified) (6 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>
 
-#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(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;
-        return (virtue->id == (nic_wv_id_t) key[0]);
-}
-
-/**
- * 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;
+        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);
 }
 
@@ -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.key_equal = nic_wv_key_equal;
+        wvs->table_operations.equal = 0;
+        wvs->table_operations.remove_callback = 0;
+        
+        if (!hash_table_create(&wvs->table, 0, 0, &wvs->table_operations)) {
                 return ENOMEM;
         }
@@ -170 +168 @@
         do {
                 virtue->id = wvs->next_id++;
-        } while (NULL !=
-                hash_table_find(&wvs->table, (unsigned long *) &virtue->id));
-        hash_table_insert(&wvs->table,
-                (unsigned long *) &virtue->id, &virtue->item);
+        } while (NULL != hash_table_find(&wvs->table, &virtue->id));
+        hash_table_insert(&wvs->table, &virtue->item);
         virtue->next = wvs->lists[virtue->type];
         wvs->lists[virtue->type] = virtue;
@@ -191 +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;
@@ -198 +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 */
@@ -235 +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;
 }