X-Git-Url: http://git.droids-corp.org/?p=protos%2Flibecoli.git;a=blobdiff_plain;f=src%2Fecoli_keyval.c;fp=src%2Fecoli_keyval.c;h=0000000000000000000000000000000000000000;hp=a99aaf09cdfd571dcca0e9e7990ec2b55afcbc41;hb=41bf1ba66e15c00f38375d05e49b31aa70f92349;hpb=03fcfd9562d205a050aba4c17902c56bbc817d54

diff --git a/src/ecoli_keyval.c b/src/ecoli_keyval.c
deleted file mode 100644
index a99aaf0..0000000
--- a/src/ecoli_keyval.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include <ecoli_init.h>
-#include <ecoli_malloc.h>
-#include <ecoli_log.h>
-#include <ecoli_test.h>
-#include <ecoli_murmurhash.h>
-#include <ecoli_keyval.h>
-
-#define FACTOR 3
-
-EC_LOG_TYPE_REGISTER(keyval);
-
-static uint32_t ec_keyval_seed;
-
-struct ec_keyval_elt {
-	char *key;
-	void *val;
-	uint32_t hash;
-	ec_keyval_elt_free_t free;
-	unsigned int refcount;
-};
-
-struct ec_keyval_elt_ref {
-	TAILQ_ENTRY(ec_keyval_elt_ref) next;
-	TAILQ_ENTRY(ec_keyval_elt_ref) hnext;
-	struct ec_keyval_elt *elt;
-};
-
-TAILQ_HEAD(ec_keyval_elt_ref_list, ec_keyval_elt_ref);
-
-struct ec_keyval {
-	size_t len;
-	size_t table_size;
-	struct ec_keyval_elt_ref_list list;
-	struct ec_keyval_elt_ref_list *table;
-};
-
-struct ec_keyval *ec_keyval(void)
-{
-	struct ec_keyval *keyval;
-
-	keyval = ec_calloc(1, sizeof(*keyval));
-	if (keyval == NULL)
-		return NULL;
-	TAILQ_INIT(&keyval->list);
-
-	return keyval;
-}
-
-static struct ec_keyval_elt_ref *
-ec_keyval_lookup(const struct ec_keyval *keyval, const char *key)
-{
-	struct ec_keyval_elt_ref *ref;
-	uint32_t h, mask = keyval->table_size - 1;
-
-	if (keyval == NULL || key == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
-	if (keyval->table_size == 0) {
-		errno = ENOENT;
-		return NULL;
-	}
-
-	h = ec_murmurhash3(key, strlen(key), ec_keyval_seed);
-	TAILQ_FOREACH(ref, &keyval->table[h & mask], hnext) {
-		if (strcmp(ref->elt->key, key) == 0)
-			return ref;
-	}
-
-	errno = ENOENT;
-	return NULL;
-}
-
-static void ec_keyval_elt_ref_free(struct ec_keyval_elt_ref *ref)
-{
-	struct ec_keyval_elt *elt;
-
-	if (ref == NULL)
-		return;
-
-	elt = ref->elt;
-	if (elt != NULL && --elt->refcount == 0) {
-		ec_free(elt->key);
-		if (elt->free != NULL)
-			elt->free(elt->val);
-		ec_free(elt);
-	}
-	ec_free(ref);
-}
-
-bool ec_keyval_has_key(const struct ec_keyval *keyval, const char *key)
-{
-	return !!ec_keyval_lookup(keyval, key);
-}
-
-void *ec_keyval_get(const struct ec_keyval *keyval, const char *key)
-{
-	struct ec_keyval_elt_ref *ref;
-
-	ref = ec_keyval_lookup(keyval, key);
-	if (ref == NULL)
-		return NULL;
-
-	return ref->elt->val;
-}
-
-int ec_keyval_del(struct ec_keyval *keyval, const char *key)
-{
-	struct ec_keyval_elt_ref *ref;
-	size_t idx;
-
-	ref = ec_keyval_lookup(keyval, key);
-	if (ref == NULL)
-		return -1;
-
-	/* we could resize table here */
-
-	TAILQ_REMOVE(&keyval->list, ref, next);
-	idx = ref->elt->hash & (keyval->table_size - 1);
-	TAILQ_REMOVE(&keyval->table[idx], ref, hnext);
-	ec_keyval_elt_ref_free(ref);
-	keyval->len--;
-
-	return 0;
-}
-
-static int ec_keyval_table_resize(struct ec_keyval *keyval, size_t new_size)
-{
-	struct ec_keyval_elt_ref_list *new_table;
-	struct ec_keyval_elt_ref *ref;
-	size_t i;
-
-	if (new_size == 0 || (new_size & (new_size - 1))) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	new_table = ec_calloc(new_size, sizeof(*keyval->table));
-	if (new_table == NULL)
-		return -1;
-	for (i = 0; i < new_size; i++)
-		TAILQ_INIT(&new_table[i]);
-
-	TAILQ_FOREACH(ref, &keyval->list, next) {
-		i = ref->elt->hash & (keyval->table_size - 1);
-		TAILQ_REMOVE(&keyval->table[i], ref, hnext);
-		i = ref->elt->hash & (new_size - 1);
-		TAILQ_INSERT_TAIL(&new_table[i], ref, hnext);
-	}
-
-	ec_free(keyval->table);
-	keyval->table = new_table;
-	keyval->table_size = new_size;
-
-	return 0;
-}
-
-static int
-__ec_keyval_set(struct ec_keyval *keyval, struct ec_keyval_elt_ref *ref)
-{
-	size_t new_size;
-	uint32_t mask;
-	int ret;
-
-	/* remove previous entry if any */
-	ec_keyval_del(keyval, ref->elt->key);
-
-	if (keyval->len >= keyval->table_size) {
-		if (keyval->table_size != 0)
-			new_size =  keyval->table_size << FACTOR;
-		else
-			new_size =  1 << FACTOR;
-		ret = ec_keyval_table_resize(keyval, new_size);
-		if (ret < 0)
-			return ret;
-	}
-
-	mask = keyval->table_size - 1;
-	TAILQ_INSERT_TAIL(&keyval->table[ref->elt->hash & mask], ref, hnext);
-	TAILQ_INSERT_TAIL(&keyval->list, ref, next);
-	keyval->len++;
-
-	return 0;
-}
-
-int ec_keyval_set(struct ec_keyval *keyval, const char *key, void *val,
-	ec_keyval_elt_free_t free_cb)
-{
-	struct ec_keyval_elt *elt = NULL;
-	struct ec_keyval_elt_ref *ref = NULL;
-	uint32_t h;
-
-	if (keyval == NULL || key == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	ref = ec_calloc(1, sizeof(*ref));
-	if (ref == NULL)
-		goto fail;
-
-	elt = ec_calloc(1, sizeof(*elt));
-	if (elt == NULL)
-		goto fail;
-
-	ref->elt = elt;
-	elt->refcount = 1;
-	elt->val = val;
-	val = NULL;
-	elt->free = free_cb;
-	elt->key = ec_strdup(key);
-	if (elt->key == NULL)
-		goto fail;
-	h = ec_murmurhash3(key, strlen(key), ec_keyval_seed);
-	elt->hash = h;
-
-	if (__ec_keyval_set(keyval, ref) < 0)
-		goto fail;
-
-	return 0;
-
-fail:
-	if (free_cb != NULL && val != NULL)
-		free_cb(val);
-	ec_keyval_elt_ref_free(ref);
-	return -1;
-}
-
-void ec_keyval_free(struct ec_keyval *keyval)
-{
-	struct ec_keyval_elt_ref *ref;
-	size_t idx;
-
-	if (keyval == NULL)
-		return;
-
-	while (!TAILQ_EMPTY(&keyval->list)) {
-		ref = TAILQ_FIRST(&keyval->list);
-		TAILQ_REMOVE(&keyval->list, ref, next);
-		idx = ref->elt->hash & (keyval->table_size - 1);
-		TAILQ_REMOVE(&keyval->table[idx], ref, hnext);
-		ec_keyval_elt_ref_free(ref);
-	}
-	ec_free(keyval->table);
-	ec_free(keyval);
-}
-
-size_t ec_keyval_len(const struct ec_keyval *keyval)
-{
-	return keyval->len;
-}
-
-struct ec_keyval_elt_ref *
-ec_keyval_iter(const struct ec_keyval *keyval)
-{
-	if (keyval == NULL)
-		return NULL;
-
-	return TAILQ_FIRST(&keyval->list);
-}
-
-struct ec_keyval_elt_ref *
-ec_keyval_iter_next(struct ec_keyval_elt_ref *iter)
-{
-	if (iter == NULL)
-		return NULL;
-
-	return TAILQ_NEXT(iter, next);
-}
-
-const char *
-ec_keyval_iter_get_key(const struct ec_keyval_elt_ref *iter)
-{
-	if (iter == NULL)
-		return NULL;
-
-	return iter->elt->key;
-}
-
-void *
-ec_keyval_iter_get_val(const struct ec_keyval_elt_ref *iter)
-{
-	if (iter == NULL)
-		return NULL;
-
-	return iter->elt->val;
-}
-
-void ec_keyval_dump(FILE *out, const struct ec_keyval *keyval)
-{
-	struct ec_keyval_elt_ref *iter;
-
-	if (keyval == NULL) {
-		fprintf(out, "empty keyval\n");
-		return;
-	}
-
-	fprintf(out, "keyval:\n");
-	for (iter = ec_keyval_iter(keyval);
-	     iter != NULL;
-	     iter = ec_keyval_iter_next(iter)) {
-		fprintf(out, "  %s: %p\n",
-			ec_keyval_iter_get_key(iter),
-			ec_keyval_iter_get_val(iter));
-	}
-}
-
-struct ec_keyval *ec_keyval_dup(const struct ec_keyval *keyval)
-{
-	struct ec_keyval *dup = NULL;
-	struct ec_keyval_elt_ref *ref, *dup_ref = NULL;
-
-	dup = ec_keyval();
-	if (dup == NULL)
-		return NULL;
-
-	TAILQ_FOREACH(ref, &keyval->list, next) {
-		dup_ref = ec_calloc(1, sizeof(*ref));
-		if (dup_ref == NULL)
-			goto fail;
-		dup_ref->elt = ref->elt;
-		ref->elt->refcount++;
-
-		if (__ec_keyval_set(dup, dup_ref) < 0)
-			goto fail;
-	}
-
-	return dup;
-
-fail:
-	ec_keyval_elt_ref_free(dup_ref);
-	ec_keyval_free(dup);
-	return NULL;
-}
-
-static int ec_keyval_init_func(void)
-{
-	int fd;
-	ssize_t ret;
-
-	return 0;//XXX for test reproduceability
-
-	fd = open("/dev/urandom", 0);
-	if (fd == -1) {
-		fprintf(stderr, "failed to open /dev/urandom\n");
-		return -1;
-	}
-	ret = read(fd, &ec_keyval_seed, sizeof(ec_keyval_seed));
-	if (ret != sizeof(ec_keyval_seed)) {
-		fprintf(stderr, "failed to read /dev/urandom\n");
-		return -1;
-	}
-	close(fd);
-	return 0;
-}
-
-static struct ec_init ec_keyval_init = {
-	.init = ec_keyval_init_func,
-	.priority = 50,
-};
-
-EC_INIT_REGISTER(ec_keyval_init);
-
-/* LCOV_EXCL_START */
-static int ec_keyval_testcase(void)
-{
-	struct ec_keyval *keyval, *dup;
-	struct ec_keyval_elt_ref *iter;
-	char *val;
-	size_t i, count;
-	int ret, testres = 0;
-	FILE *f = NULL;
-	char *buf = NULL;
-	size_t buflen = 0;
-
-	keyval = ec_keyval();
-	if (keyval == NULL) {
-		EC_LOG(EC_LOG_ERR, "cannot create keyval\n");
-		return -1;
-	}
-
-	count = 0;
-	for (iter = ec_keyval_iter(keyval);
-	     iter != NULL;
-	     iter = ec_keyval_iter_next(iter)) {
-		count++;
-	}
-	testres |= EC_TEST_CHECK(count == 0, "invalid count in iterator");
-
-	testres |= EC_TEST_CHECK(ec_keyval_len(keyval) == 0, "bad keyval len");
-	ret = ec_keyval_set(keyval, "key1", "val1", NULL);
-	testres |= EC_TEST_CHECK(ret == 0, "cannot set key");
-	ret = ec_keyval_set(keyval, "key2", ec_strdup("val2"), ec_free_func);
-	testres |= EC_TEST_CHECK(ret == 0, "cannot set key");
-	testres |= EC_TEST_CHECK(ec_keyval_len(keyval) == 2, "bad keyval len");
-
-	val = ec_keyval_get(keyval, "key1");
-	testres |= EC_TEST_CHECK(val != NULL && !strcmp(val, "val1"),
-				"invalid keyval value");
-	val = ec_keyval_get(keyval, "key2");
-	testres |= EC_TEST_CHECK(val != NULL && !strcmp(val, "val2"),
-				"invalid keyval value");
-	val = ec_keyval_get(keyval, "key3");
-	testres |= EC_TEST_CHECK(val == NULL, "key3 should be NULL");
-
-	ret = ec_keyval_set(keyval, "key1", "another_val1", NULL);
-	testres |= EC_TEST_CHECK(ret == 0, "cannot set key");
-	ret = ec_keyval_set(keyval, "key2", ec_strdup("another_val2"),
-			ec_free_func);
-	testres |= EC_TEST_CHECK(ret == 0, "cannot set key");
-	testres |= EC_TEST_CHECK(ec_keyval_len(keyval) == 2,
-				"bad keyval len");
-
-	val = ec_keyval_get(keyval, "key1");
-	testres |= EC_TEST_CHECK(val != NULL && !strcmp(val, "another_val1"),
-		"invalid keyval value");
-	val = ec_keyval_get(keyval, "key2");
-	testres |= EC_TEST_CHECK(val != NULL && !strcmp(val, "another_val2"),
-		"invalid keyval value");
-	testres |= EC_TEST_CHECK(ec_keyval_has_key(keyval, "key1"),
-		"key1 should be in keyval");
-
-	f = open_memstream(&buf, &buflen);
-	if (f == NULL)
-		goto fail;
-	ec_keyval_dump(f, NULL);
-	fclose(f);
-	f = NULL;
-	free(buf);
-	buf = NULL;
-
-	f = open_memstream(&buf, &buflen);
-	if (f == NULL)
-		goto fail;
-	ec_keyval_dump(f, keyval);
-	fclose(f);
-	f = NULL;
-	free(buf);
-	buf = NULL;
-
-	ret = ec_keyval_del(keyval, "key1");
-	testres |= EC_TEST_CHECK(ret == 0, "cannot del key1");
-	testres |= EC_TEST_CHECK(ec_keyval_len(keyval) == 1,
-		"invalid keyval len");
-	ret = ec_keyval_del(keyval, "key2");
-	testres |= EC_TEST_CHECK(ret == 0, "cannot del key2");
-	testres |= EC_TEST_CHECK(ec_keyval_len(keyval) == 0,
-		"invalid keyval len");
-
-	for (i = 0; i < 100; i++) {
-		char key[8];
-		snprintf(key, sizeof(key), "k%zd", i);
-		ret = ec_keyval_set(keyval, key, "val", NULL);
-		testres |= EC_TEST_CHECK(ret == 0, "cannot set key");
-	}
-	dup = ec_keyval_dup(keyval);
-	testres |= EC_TEST_CHECK(dup != NULL, "cannot duplicate keyval");
-	if (dup != NULL) {
-		for (i = 0; i < 100; i++) {
-			char key[8];
-			snprintf(key, sizeof(key), "k%zd", i);
-			val = ec_keyval_get(dup, key);
-			testres |= EC_TEST_CHECK(
-				val != NULL && !strcmp(val, "val"),
-				"invalid keyval value");
-		}
-		ec_keyval_free(dup);
-		dup = NULL;
-	}
-
-	count = 0;
-	for (iter = ec_keyval_iter(keyval);
-	     iter != NULL;
-	     iter = ec_keyval_iter_next(iter)) {
-		count++;
-	}
-	testres |= EC_TEST_CHECK(count == 100, "invalid count in iterator");
-
-	/* einval */
-	ret = ec_keyval_set(keyval, NULL, "val1", NULL);
-	testres |= EC_TEST_CHECK(ret == -1, "should not be able to set key");
-	val = ec_keyval_get(keyval, NULL);
-	testres |= EC_TEST_CHECK(val == NULL, "get(NULL) should no success");
-
-	ec_keyval_free(keyval);
-
-	return testres;
-
-fail:
-	ec_keyval_free(keyval);
-	if (f)
-		fclose(f);
-	free(buf);
-	return -1;
-}
-/* LCOV_EXCL_STOP */
-
-static struct ec_test ec_keyval_test = {
-	.name = "keyval",
-	.test = ec_keyval_testcase,
-};
-
-EC_TEST_REGISTER(ec_keyval_test);