Changeset efdfebc in mainline for uspace/lib/nic/src/nic_addr_db.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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 mainline changes.

File:

• uspace/lib/nic/src/nic_addr_db.c (modified) (10 diffs)

uspace/lib/nic/src/nic_addr_db.c

@@ -35 +35 @@
  * @brief Generic hash-set based database of addresses
  */
+#include "nic_addr_db.h"
+#include "libarch/common.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -40 +42 @@
 #include <errno.h>
 #include <mem.h>
-
-#include "nic_addr_db.h"
-
-/**
- * Hash set helper function
- */
-static int nic_addr_equals(const link_t *item1, const link_t *item2)
-{
-        assert(item1 && item2);
-        size_t addr_len = ((const nic_addr_entry_t *) item1)->addr_len;
-
-        assert(addr_len == ((const nic_addr_entry_t *) item2)->addr_len);
-
-        size_t i;
-        for (i = 0; i < addr_len; ++i) {
-                if (((nic_addr_entry_t *) item1)->addr[i] !=
-                        ((nic_addr_entry_t *) item2)->addr[i])
-                        return false;
+#include <adt/hash_table.h>
+#include <macros.h>
+#include <stdint.h>
+
+
+/**
+ * Helper structure for keeping the address in the hash set.
+ */
+typedef struct nic_addr_entry {
+        ht_link_t link;
+        uint8_t len;
+        uint8_t addr[1];
+} nic_addr_entry_t;
+
+
+/* 
+ * Hash table helper functions 
+ */
+typedef struct {
+        size_t len;
+        const uint8_t *addr;
+} addr_key_t;
+
+static bool nic_addr_key_equal(void *key_arg, const ht_link_t *item)
+{
+        addr_key_t *key = (addr_key_t*)key_arg;
+        nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
+        
+        return 0 == bcmp(entry->addr, key->addr, entry->len);
+}
+
+static size_t addr_hash(size_t len, const uint8_t *addr)
+{
+        size_t hash = 0;
+        
+        for (size_t i = 0; i < len; ++i) {
+                hash = (hash << 5) ^ addr[i];
         }
-        return true;
-}
-
-/**
- * Hash set helper function
- */
-static unsigned long nic_addr_hash(const link_t *item)
-{
-        assert(item);
-        const nic_addr_entry_t *entry = (const nic_addr_entry_t *) item;
-        unsigned long hash = 0;
-
-        size_t i;
-        for (i = 0; i < entry->addr_len; ++i) {
-                hash = (hash << 8) ^ (hash >> 24) ^ entry->addr[i];
-        }
+        
         return hash;
 }
 
-/**
- * Helper wrapper
- */
-static void nic_addr_destroy(link_t *item, void *unused)
-{
-        free(item);
-}
+static size_t nic_addr_key_hash(void *k)
+{
+        addr_key_t *key = (addr_key_t*)k;
+        return addr_hash(key->len, key->addr);
+}
+
+static size_t nic_addr_hash(const ht_link_t *item)
+{
+        nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
+        return addr_hash(entry->len, entry->addr);
+}
+
+static void nic_addr_removed(ht_link_t *item)
+{
+        nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
+        
+        free(entry);
+}
+
+static hash_table_ops_t set_ops = {
+        .hash = nic_addr_hash,
+        .key_hash = nic_addr_key_hash,
+        .key_equal = nic_addr_key_equal,
+        .equal = NULL,
+        .remove_callback = nic_addr_removed
+};
 
 /**
@@ -99 +124 @@
 {
         assert(db);
-        if (addr_len > NIC_ADDR_MAX_LENGTH) {
+        
+        if (addr_len > UCHAR_MAX)
                 return EINVAL;
-        }
-        if (!hash_set_init(&db->set, nic_addr_hash, nic_addr_equals,
-                NIC_ADDR_DB_INIT_SIZE)) {
+        
+        if (!hash_table_create(&db->set, 0, 0, &set_ops))
                 return ENOMEM;
-        }
+        
         db->addr_len = addr_len;
         return EOK;
@@ -118 +143 @@
 {
         assert(db);
-        hash_set_clear(&db->set, nic_addr_destroy, NULL);
+        hash_table_clear(&db->set);
 }
 
@@ -129 +154 @@
 {
         assert(db);
-        hash_set_apply(&db->set, nic_addr_destroy, NULL);
-        hash_set_destroy(&db->set);
-}
-
-/**
- * Get number of addresses in the db
- *
- * @param       db
- *
- * @return Number of adresses
- */
-size_t nic_addr_db_count(const nic_addr_db_t *db)
-{
-        assert(db);
-        return hash_set_count(&db->set);
-}
+        hash_table_destroy(&db->set);
+}
+
 
 /**
@@ -160 +172 @@
 {
         assert(db && addr);
-        nic_addr_entry_t *entry = malloc(sizeof (nic_addr_entry_t));
-        if (entry == NULL) {
+
+        addr_key_t key = {
+                .len = db->addr_len,
+                .addr = addr
+        };
+        
+        if (hash_table_find(&db->set, &key))
+                return EEXIST;
+        
+        nic_addr_entry_t *entry = malloc(sizeof(nic_addr_entry_t) + db->addr_len - 1);
+        if (entry == NULL) 
                 return ENOMEM;
-        }
-        entry->addr_len = db->addr_len;
+
+        entry->len = (uint8_t) db->addr_len;
         memcpy(entry->addr, addr, db->addr_len);
-
-        return hash_set_insert(&db->set, &entry->item) ? EOK : EEXIST;
+        
+        hash_table_insert(&db->set, &entry->link);
+        return EOK;
 }
 
@@ -182 +204 @@
 {
         assert(db && addr);
-        nic_addr_entry_t entry;
-        entry.addr_len = db->addr_len;
-        memcpy(entry.addr, addr, db->addr_len);
-
-        link_t *removed = hash_set_remove(&db->set, &entry.item);
-        free(removed);
-        return removed != NULL ? EOK : ENOENT;
+        
+        addr_key_t key = {
+                .len = db->addr_len,
+                .addr = addr
+        };
+        
+        if (hash_table_remove(&db->set, &key))
+                return EOK;
+        else
+                return ENOENT;
 }
 
@@ -202 +227 @@
 {
         assert(db && addr);
-        nic_addr_entry_t entry;
-        entry.addr_len = db->addr_len;
-        memcpy(entry.addr, addr, db->addr_len);
-
-        return hash_set_contains(&db->set, &entry.item);
+        
+        addr_key_t key = {
+                .len = db->addr_len,
+                .addr = addr
+        };
+        
+        return 0 != hash_table_find(&db->set, &key);
 }
 
@@ -220 +247 @@
  * Helper function for nic_addr_db_foreach
  */
-static void nic_addr_db_fe_helper(link_t *item, void *arg) {
+static bool nic_addr_db_fe_helper(ht_link_t *item, void *arg) 
+{
         nic_addr_db_fe_arg_t *hs = (nic_addr_db_fe_arg_t *) arg;
-        hs->func(((nic_addr_entry_t *) item)->addr, hs->arg);
+        nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
+        hs->func(entry->addr, hs->arg);
+        return true;
 }
 
@@ -237 +267 @@
 {
         nic_addr_db_fe_arg_t hs = { .func = func, .arg = arg };
-        hash_set_apply((hash_set_t *) &db->set, nic_addr_db_fe_helper, &hs);
-}
-
-/**
- * Helper structure for nic_addr_db_remove_selected
- */
-typedef struct {
-        int (*func)(const uint8_t *, void *);
-        void *arg;
-} nic_addr_db_rs_arg_t;
-
-/**
- * Helper function for nic_addr_db_foreach
- */
-static int nic_addr_db_rs_helper(link_t *item, void *arg) {
-        nic_addr_db_rs_arg_t *hs = (nic_addr_db_rs_arg_t *) arg;
-        int retval = hs->func(((nic_addr_entry_t *) item)->addr, hs->arg);
-        if (retval) {
-                free(item);
-        }
-        return retval;
-}
-
-/**
- * Removes all addresses for which the function returns non-zero.
- *
- * @param       db
- * @param       func    User-defined function
- * @param       arg             Custom argument passed to the function
- */
-void nic_addr_db_remove_selected(nic_addr_db_t *db,
-        int (*func)(const uint8_t *, void *), void *arg)
-{
-        nic_addr_db_rs_arg_t hs = { .func = func, .arg = arg };
-        hash_set_remove_selected(&db->set, nic_addr_db_rs_helper, &hs);
+        hash_table_apply((hash_table_t*)&db->set, nic_addr_db_fe_helper, &hs);
 }