renamed
This commit was SVN r720.
Этот коммит содержится в:
Tim Woodall
родитель
1ee559089c
Коммит
ec5fde4566
@ -1,258 +0,0 @@
|
||||
/*
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lam_config.h"
|
||||
#include "lam/stdint.h"
|
||||
#include "lam/constants.h"
|
||||
#include "lam/lfc/hash_table.h"
|
||||
|
||||
/*
|
||||
* lam_hash_table_t
|
||||
*/
|
||||
|
||||
#define HASH_MULTIPLIER 31
|
||||
|
||||
static void lam_hash_table_construct(lam_hash_table_t* ht);
|
||||
static void lam_hash_table_destruct(lam_hash_table_t* ht);
|
||||
|
||||
|
||||
lam_class_info_t lam_hash_table_t_class_info = {
|
||||
"lam_hash_table_t",
|
||||
CLASS_INFO(lam_object_t),
|
||||
(lam_construct_t)lam_hash_table_construct,
|
||||
(lam_destruct_t)lam_hash_table_destruct
|
||||
};
|
||||
|
||||
|
||||
static inline uint32_t lam_hash_value(const unsigned char *key, uint32_t keysize)
|
||||
{
|
||||
uint32_t h, i;
|
||||
const unsigned char *p;
|
||||
|
||||
h = 0;
|
||||
p = key;
|
||||
for (i = 0; i < keysize; i++, p++)
|
||||
h = HASH_MULTIPLIER*h + *p;
|
||||
return h;
|
||||
}
|
||||
|
||||
|
||||
static void lam_hash_table_construct(lam_hash_table_t* ht)
|
||||
{
|
||||
OBJ_CONSTRUCT_SUPER(ht, lam_object_t);
|
||||
OBJ_CONSTRUCT(&ht->ht_nodes, lam_list_t);
|
||||
ht->ht_table = 0;
|
||||
ht->ht_table_size = 0;
|
||||
ht->ht_size = 0;
|
||||
}
|
||||
|
||||
|
||||
static void lam_hash_table_destruct(lam_hash_table_t* ht)
|
||||
{
|
||||
OBJ_DESTRUCT(&ht->ht_nodes);
|
||||
OBJ_DESTRUCT_SUPER(ht, lam_object_t);
|
||||
}
|
||||
|
||||
|
||||
int lam_hash_table_init(lam_hash_table_t* ht, size_t table_size)
|
||||
{
|
||||
size_t i;
|
||||
ht->ht_table = realloc(ht->ht_table, table_size * sizeof(lam_list_t));
|
||||
if(NULL == ht->ht_table)
|
||||
return LAM_ERR_OUT_OF_RESOURCE;
|
||||
for(i=ht->ht_table_size; i<table_size; i++)
|
||||
OBJ_CONSTRUCT(ht->ht_table+i, lam_list_t);
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* lam_uint32_hash_node_t
|
||||
*/
|
||||
|
||||
struct lam_uint32_hash_node_t
|
||||
{
|
||||
lam_list_item_t super;
|
||||
uint32_t hn_key;
|
||||
void *hn_value;
|
||||
};
|
||||
typedef struct lam_uint32_hash_node_t lam_uint32_hash_node_t;
|
||||
|
||||
static void lam_uint32_hash_node_construct(lam_uint32_hash_node_t* hn)
|
||||
{
|
||||
OBJ_CONSTRUCT_SUPER(hn, lam_list_item_t);
|
||||
}
|
||||
|
||||
static void lam_uint32_hash_node_destruct(lam_uint32_hash_node_t* hn)
|
||||
{
|
||||
OBJ_DESTRUCT_SUPER(hn, lam_list_item_t);
|
||||
}
|
||||
|
||||
static lam_class_info_t lam_uint32_hash_node_t_class_info = {
|
||||
"lam_uint32_hash_node_t",
|
||||
&lam_list_item_t_class_info,
|
||||
(lam_construct_t)lam_uint32_hash_node_construct,
|
||||
(lam_destruct_t)lam_uint32_hash_node_destruct
|
||||
};
|
||||
|
||||
|
||||
void* lam_hash_table_get_value_uint32(lam_hash_table_t* ht, uint32_t key)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint32_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint32_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint32_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint32_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
return node->hn_value;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
int lam_hash_table_set_value_uint32(lam_hash_table_t* ht, uint32_t key, void* value)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint32_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint32_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint32_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint32_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
node->hn_value = value;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
node = (lam_uint32_hash_node_t*)lam_list_remove_first(&ht->ht_nodes);
|
||||
if(NULL == node) {
|
||||
node = OBJ_NEW(lam_uint32_hash_node_t);
|
||||
if(NULL == node)
|
||||
return LAM_ERR_OUT_OF_RESOURCE;
|
||||
}
|
||||
node->hn_key = key;
|
||||
node->hn_value = value;
|
||||
lam_list_append(list, (lam_list_item_t*)node);
|
||||
ht->ht_size++;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
int lam_hash_table_remove_value_uint32(lam_hash_table_t* ht, uint32_t key)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint32_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint32_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint32_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint32_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
lam_list_remove_item(list, (lam_list_item_t*)node);
|
||||
lam_list_append(&ht->ht_nodes, (lam_list_item_t*)node);
|
||||
ht->ht_size--;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
}
|
||||
return LAM_ERR_BAD_PARAM;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* lam_uint64_hash_node_t
|
||||
*/
|
||||
|
||||
struct lam_uint64_hash_node_t
|
||||
{
|
||||
lam_list_item_t super;
|
||||
uint64_t hn_key;
|
||||
void* hn_value;
|
||||
};
|
||||
typedef struct lam_uint64_hash_node_t lam_uint64_hash_node_t;
|
||||
|
||||
static void lam_uint64_hash_node_construct(lam_uint64_hash_node_t* hn)
|
||||
{
|
||||
OBJ_CONSTRUCT_SUPER(hn, lam_list_item_t);
|
||||
}
|
||||
|
||||
static void lam_uint64_hash_node_destruct(lam_uint64_hash_node_t* hn)
|
||||
{
|
||||
OBJ_DESTRUCT_SUPER(hn, lam_list_item_t);
|
||||
}
|
||||
|
||||
static lam_class_info_t lam_uint64_hash_node_t_class_info = {
|
||||
"lam_uint64_hash_node_t",
|
||||
CLASS_INFO(lam_list_item_t),
|
||||
(lam_construct_t)lam_uint64_hash_node_construct,
|
||||
(lam_destruct_t)lam_uint64_hash_node_destruct
|
||||
};
|
||||
|
||||
|
||||
void* lam_hash_table_get_value_uint64(lam_hash_table_t* ht, uint64_t key)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint64_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint64_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint64_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint64_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
return node->hn_value;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
int lam_hash_table_set_value_uint64(lam_hash_table_t* ht, uint64_t key, void* value)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint64_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint64_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint64_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint64_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
node->hn_value = value;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
node = (lam_uint64_hash_node_t*)lam_list_remove_first(&ht->ht_nodes);
|
||||
if(NULL == node) {
|
||||
node = OBJ_NEW(lam_uint64_hash_node_t);
|
||||
if(NULL == node)
|
||||
return LAM_ERR_OUT_OF_RESOURCE;
|
||||
}
|
||||
node->hn_key = key;
|
||||
node->hn_value = value;
|
||||
lam_list_append(list, (lam_list_item_t*)node);
|
||||
ht->ht_size++;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
int lam_hash_table_remove_value_uint64(lam_hash_table_t* ht, uint64_t key)
|
||||
{
|
||||
lam_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
lam_uint64_hash_node_t *node;
|
||||
|
||||
for(node = (lam_uint64_hash_node_t*)lam_list_get_first(list);
|
||||
node != (lam_uint64_hash_node_t*)lam_list_get_last(list);
|
||||
node = (lam_uint64_hash_node_t*)lam_list_get_next(list)) {
|
||||
if (node->hn_key == key) {
|
||||
lam_list_remove_item(list, (lam_list_item_t*)node);
|
||||
lam_list_append(&ht->ht_nodes, (lam_list_item_t*)node);
|
||||
ht->ht_size--;
|
||||
return LAM_SUCCESS;
|
||||
}
|
||||
}
|
||||
return LAM_ERR_BAD_PARAM;
|
||||
}
|
||||
|
||||
|
||||
@ -1,173 +0,0 @@
|
||||
/*
|
||||
* $HEADER$
|
||||
*
|
||||
*/
|
||||
|
||||
/** @file
|
||||
*
|
||||
* A hash table that may be indexed with either fixed length (e.g. uint32_t/uint64_t) or arbitrary
|
||||
* size binary key values. However, only one key type may be used in a given table concurrently.
|
||||
*/
|
||||
|
||||
#ifndef LAM_HASH_TABLE_H
|
||||
#define LAM_HASH_TABLE_H
|
||||
|
||||
#include "lam_config.h"
|
||||
#include "lam/stdint.h"
|
||||
#include "lam/types.h"
|
||||
#include "lam/lfc/lam_list.h"
|
||||
|
||||
|
||||
extern lam_class_info_t lam_hash_table_t_class_info;
|
||||
|
||||
struct lam_hash_table_t
|
||||
{
|
||||
lam_object_t super; /**< subclass of lam_object_t */
|
||||
lam_list_t ht_nodes; /**< free list of hash nodes */
|
||||
lam_list_t *ht_table; /**< each item is an array of lam_fhnode_t nodes */
|
||||
size_t ht_table_size; /**< size of table */
|
||||
size_t ht_size; /**< number of values on table */
|
||||
size_t ht_mask;
|
||||
};
|
||||
typedef struct lam_hash_table_t lam_hash_table_t;
|
||||
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Initializes the table size, must be called before using
|
||||
* the table.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param size The size of the table, which will be rounded up
|
||||
* (if required) to the next highest power of two (IN).
|
||||
* @return LAM error code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_init(lam_hash_table_t* ht, size_t table_size);
|
||||
|
||||
|
||||
/**
|
||||
* Returns the number of elements currently stored in the table.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @return The number of elements in the table.
|
||||
*
|
||||
*/
|
||||
|
||||
static inline size_t lam_hash_table_get_size(lam_hash_table_t *ht)
|
||||
{
|
||||
return ht->ht_size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve value via uint32_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
*
|
||||
*/
|
||||
|
||||
void *lam_hash_table_get_value_uint32(lam_hash_table_t* table, uint32_t key);
|
||||
|
||||
/**
|
||||
* Set value based on uint32_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @param value The value to be associated with the key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_set_value_uint32(lam_hash_table_t* table, uint32_t key, void* value);
|
||||
|
||||
/**
|
||||
* Remove value based on uint32_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_remove_value_uint32(lam_hash_table_t* table, uint32_t key);
|
||||
|
||||
/**
|
||||
* Retrieve value via uint64_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
*
|
||||
*/
|
||||
|
||||
void *lam_hash_table_get_value_uint64(lam_hash_table_t *table, uint64_t key);
|
||||
|
||||
/**
|
||||
* Set value based on uint64_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @param value The value to be associated with the key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_set_value_uint64(lam_hash_table_t *table, uint64_t key, void* value);
|
||||
|
||||
/**
|
||||
* Remove value based on uint64_t key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_remove_value_uint64(lam_hash_table_t *table, uint64_t key);
|
||||
|
||||
/**
|
||||
* Retrieve value via arbitrary length binary key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
*
|
||||
*/
|
||||
|
||||
void *lam_hash_table_get_value_ptr(lam_hash_table_t *table, void* key, size_t keylen);
|
||||
|
||||
/**
|
||||
* Set value based on arbitrary length binary key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @param value The value to be associated with the key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_set_value_ptr(lam_hash_table_t *table, void* key, size_t keylen, void* value);
|
||||
|
||||
/**
|
||||
* Remove value based on arbitrary length binary key.
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return LAM return code.
|
||||
*
|
||||
*/
|
||||
|
||||
int lam_hash_table_remove_value_ptr(lam_hash_table_t *table, void* key, size_t keylen);
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* LAM_HASH_TABLE_H */
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
#include "lam/types.h"
|
||||
#include "lam/lfc/lam_list.h"
|
||||
#include "lam/lfc/hash_table.h"
|
||||
#include "lam/lfc/lam_hash_table.h"
|
||||
#include "lam/threads/mutex.h"
|
||||
|
||||
extern const int LAM_REACTOR_NOTIFY_ALL;
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user