summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/CMakeLists.txt1
-rw-r--r--src/lib/hashtable.c221
-rw-r--r--src/lib/tests/CMakeLists.txt1
-rw-r--r--src/lib/tests/hashtable_test.c129
4 files changed, 0 insertions, 352 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 8dbedcff..c5be9946 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -202,7 +202,6 @@ set(SOURCE_FILES_COMMON
btree.c
crc32.c
hash.c
- hashtable.c
list.c
lockfile.c
logs.c
diff --git a/src/lib/hashtable.c b/src/lib/hashtable.c
deleted file mode 100644
index ffff1d73..00000000
--- a/src/lib/hashtable.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2020
- *
- * Hash table with separate chaining on collisions
- *
- * Dimitri Staessens <dimitri.staessens@ugent.be>
- * Sander Vrijders <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., http://www.fsf.org/about/contact/.
- */
-
-#if defined(__linux__) || defined(__CYGWIN__)
-#define _DEFAULT_SOURCE
-#endif
-
-#include <ouroboros/hashtable.h>
-#include <ouroboros/list.h>
-#include <ouroboros/errno.h>
-#include <ouroboros/hash.h>
-
-#include <assert.h>
-#include <string.h>
-
-struct htable_entry {
- struct list_head next;
- uint64_t key;
- void * val;
- size_t len;
-};
-
-struct htable {
- struct list_head * buckets;
- bool hash_key;
- uint64_t buckets_size;
-};
-
-struct htable * htable_create(uint64_t buckets,
- bool hash_key)
-{
- struct htable * tmp;
- unsigned int i;
-
- if (buckets == 0)
- return NULL;
-
- buckets--;
- buckets |= buckets >> 1;
- buckets |= buckets >> 2;
- buckets |= buckets >> 4;
- buckets |= buckets >> 8;
- buckets |= buckets >> 16;
- buckets |= buckets >> 32;
- buckets++;
-
- tmp = malloc(sizeof(*tmp));
- if (tmp == NULL)
- return NULL;
-
- tmp->hash_key = hash_key;
- tmp->buckets_size = buckets;
-
- tmp->buckets = malloc(buckets * sizeof(*tmp->buckets));
- if (tmp->buckets == NULL) {
- free(tmp);
- return NULL;
- }
-
- for (i = 0; i < buckets; i++)
- list_head_init(&(tmp->buckets[i]));
-
- return tmp;
-}
-
-void htable_destroy(struct htable * table)
-{
- assert(table);
- assert(table->buckets);
-
- htable_flush(table);
- free(table->buckets);
- free(table);
-}
-
-void htable_flush(struct htable * table)
-{
- unsigned int i;
- struct list_head * pos = NULL;
- struct list_head * n = NULL;
- struct htable_entry * entry;
-
- assert(table);
-
- for (i = 0; i < table->buckets_size; i++) {
- list_for_each_safe(pos, n, &(table->buckets[i])) {
- entry = list_entry(pos, struct htable_entry, next);
- list_del(&entry->next);
- free(entry->val);
- free(entry);
- }
- }
-}
-
-static uint64_t hash(uint64_t key)
-{
- void * res;
- uint64_t ret;
- uint8_t keys[4];
-
- memcpy(keys, &key, 4);
-
- mem_hash(HASH_MD5, &res, keys, 4);
-
- ret = (* (uint64_t *) res);
-
- free(res);
-
- return ret;
-}
-
-static uint64_t calc_key(struct htable * table,
- uint64_t key)
-{
- if (table->hash_key)
- key = hash(key);
-
- return (key & (table->buckets_size - 1));
-}
-
-int htable_insert(struct htable * table,
- uint64_t key,
- void * val,
- size_t len)
-{
- struct htable_entry * entry;
- uint64_t lookup_key;
- struct list_head * pos = NULL;
-
- assert(table);
-
- lookup_key = calc_key(table, key);
-
- list_for_each(pos, &(table->buckets[lookup_key])) {
- entry = list_entry(pos, struct htable_entry, next);
- if (entry->key == key)
- return -1;
- }
-
- entry = malloc(sizeof(*entry));
- if (entry == NULL)
- return -ENOMEM;
-
- entry->key = key;
- entry->val = val;
- entry->len = len;
- list_head_init(&entry->next);
-
- list_add(&entry->next, &(table->buckets[lookup_key]));
-
- return 0;
-}
-
-int htable_lookup(struct htable * table,
- uint64_t key,
- void ** val,
- size_t * len)
-{
- struct htable_entry * entry;
- struct list_head * pos = NULL;
- uint64_t lookup_key;
-
- assert(table);
-
- lookup_key = calc_key(table, key);
-
- list_for_each(pos, &(table->buckets[lookup_key])) {
- entry = list_entry(pos, struct htable_entry, next);
- if (entry->key == key) {
- *val = entry->val;
- *len = entry->len;
- return 0;
- }
- }
-
- return -1;
-}
-
-int htable_delete(struct htable * table,
- uint64_t key)
-{
- struct htable_entry * entry;
- uint64_t lookup_key;
- struct list_head * pos = NULL;
- struct list_head * n = NULL;
-
- assert(table);
-
- lookup_key = calc_key(table, key);
-
- list_for_each_safe(pos, n, &(table->buckets[lookup_key])) {
- entry = list_entry(pos, struct htable_entry, next);
- if (entry->key == key) {
- list_del(&entry->next);
- free(entry->val);
- free(entry);
- return 0;
- }
- }
-
- return -1;
-}
diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index c887626a..9e23b0ee 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -6,7 +6,6 @@ create_test_sourcelist(${PARENT_DIR}_tests test_suite.c
bitmap_test.c
btree_test.c
crc32_test.c
- hashtable_test.c
md5_test.c
sha3_test.c
shm_rbuff_test.c
diff --git a/src/lib/tests/hashtable_test.c b/src/lib/tests/hashtable_test.c
deleted file mode 100644
index f84fee63..00000000
--- a/src/lib/tests/hashtable_test.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2020
- *
- * Test of the hash table
- *
- * Dimitri Staessens <dimitri.staessens@ugent.be>
- * Sander Vrijders <sander.vrijders@ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., http://www.fsf.org/about/contact/.
- */
-
-#include "hashtable.c"
-
-#include <stdio.h>
-
-#define HASHTABLE_SIZE 256
-#define INT_TEST 4
-
-int hashtable_test(int argc, char ** argv)
-{
- struct htable * table;
- int i;
- int * j;
- void * el;
- size_t len;
-
- (void) argc;
- (void) argv;
-
- table = htable_create(HASHTABLE_SIZE, true);
- if (table == NULL) {
- printf("Failed to create.\n");
- return -1;
- }
-
- htable_destroy(table);
-
- table = htable_create(HASHTABLE_SIZE, false);
- if (table == NULL) {
- printf("Failed to create.\n");
- return -1;
- }
-
- for (i = 0; i < HASHTABLE_SIZE + INT_TEST + 2; i++) {
- j = malloc(sizeof(*j));
- if (j == NULL) {
- printf("Failed to malloc.\n");
- htable_destroy(table);
- return -1;
- }
- *j = i;
-
- if (htable_insert(table, i, (void *) j, 1)) {
- printf("Failed to insert.\n");
- htable_destroy(table);
- free(j);
- return -1;
- }
- }
-
- if (htable_lookup(table, INT_TEST, &el, &len)) {
- printf("Failed to lookup.\n");
- htable_destroy(table);
- return -1;
- }
-
- j = (int *) el;
- if (*j != INT_TEST) {
- printf("Lookup returned wrong value (%d != %d).\n",
- INT_TEST, *j);
- htable_destroy(table);
- return -1;
- }
-
- if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) {
- printf("Failed to lookup.\n");
- htable_destroy(table);
- return -1;
- }
-
- j = (int *) el;
- if (*j != HASHTABLE_SIZE + INT_TEST) {
- printf("Lookup returned wrong value (%d != %d).\n",
- INT_TEST, *j);
- htable_destroy(table);
- return -1;
- }
-
- if (htable_delete(table, INT_TEST)) {
- printf("Failed to delete.\n");
- htable_destroy(table);
- return -1;
- }
-
- if (htable_lookup(table, INT_TEST, &el, &len) == 0) {
- printf("Failed to delete properly.\n");
- htable_destroy(table);
- return -1;
- }
-
- if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) {
- printf("Failed to lookup after deletion.\n");
- htable_destroy(table);
- return -1;
- }
-
- j = (int *) el;
- if (*j != HASHTABLE_SIZE + INT_TEST) {
- printf("Lookup returned wrong value (%d != %d).\n",
- INT_TEST, *j);
- htable_destroy(table);
- return -1;
- }
-
- htable_destroy(table);
-
- return 0;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 22:16:23 +0000