From 74ea640f40285220dfa93492a143a35426b867d1 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 14 Feb 2015 17:36:03 +0100 Subject: Add binary tree implementation. NOT TESTED, FULL OF BUGS. --- src/common/include/hashtbl.h | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'src/common/include/hashtbl.h') diff --git a/src/common/include/hashtbl.h b/src/common/include/hashtbl.h index 46f2978..818cfa0 100644 --- a/src/common/include/hashtbl.h +++ b/src/common/include/hashtbl.h @@ -1,42 +1,30 @@ #pragma once -#include -#include -#include +#include // Simple hashtable structure (key -> void*) -// Supports adding, seeking, removing +// Supports adding, seeking, removing, iterating // When adding a binding to the table, the previous binding for same key (if exists) is removed // The hashtbl is allocated with malloc/free -// The keys are not copied in any way by the hashtbl, but there might still be something -// to free, so the create_hashtbl function is given a key freeing function, usually -// null when no freeing is required, or the standard free function. +// The keys/values are not copied by the hastbl, but when a key/value pair is removed from the +// table some operations may be required (freeing memory), so a kv_iter_fun_t is passed when the +// table is created which will be called whenever a k/v is released (on hashtbl_remove and delete_hashtbl) + +// A hashtbl may have only one binding for a given key (on add, previous binding is removed if necessary) struct hashtbl; typedef struct hashtbl hashtbl_t; -typedef size_t hash_t; -typedef hash_t (*hash_fun_t)(const void*); -typedef bool (*key_eq_fun_t)(const void*, const void*); -typedef void (*kv_iter_fun_t)(void* key, void* value); - -hashtbl_t* create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, kv_iter_fun_t on_release); // 0 -> default size +hashtbl_t* create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, kv_iter_fun_t on_release); void delete_hashtbl(hashtbl_t* ht); bool hashtbl_add(hashtbl_t* ht, void* key, void* v); // true = ok, false on error (OOM for instance) -void* hashtbl_find(hashtbl_t* ht, const void* key); // null when not found void hashtbl_remove(hashtbl_t* ht, const void* key); -size_t hashtbl_count(hashtbl_t* ht); -void hashtbl_iter(hashtbl_t* ht, kv_iter_fun_t f); -hash_t id_hash_fun(const void* v); -hash_t str_hash_fun(const void* v); -bool id_key_eq_fun(const void* a, const void* b); -bool str_key_eq_fun(const void* a, const void* b); +void* hashtbl_find(hashtbl_t* ht, const void* key); // null when not found +void hashtbl_iter(hashtbl_t* ht, kv_iter_fun_t f); -void free_key(void* key, void* val); -void free_val(void* key, void* val); -void free_key_val(void* key, void* val); +size_t hashtbl_count(hashtbl_t* ht); /* vim: set ts=4 sw=4 tw=0 noet :*/ -- cgit v1.2.3