From bf44aeaf5cd7f03d3bd842c8046b7346c5035f06 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sat, 14 Feb 2009 19:18:33 +0000 Subject: Remove dict, hash and rbtree from libparserutils svn path=/trunk/libparserutils/; revision=6512 --- test/INDEX | 3 -- test/Makefile | 2 +- test/dict.c | 54 ------------------------------------ test/hash.c | 56 ------------------------------------- test/rbtree.c | 88 ----------------------------------------------------------- 5 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 test/dict.c delete mode 100644 test/hash.c delete mode 100644 test/rbtree.c (limited to 'test') diff --git a/test/INDEX b/test/INDEX index f055717..d89e3fa 100644 --- a/test/INDEX +++ b/test/INDEX @@ -9,9 +9,6 @@ cscodec-utf8 UTF-8 charset codec implementation cscodec-utf8 cscodec-utf16 UTF-16 charset codec implementation cscodec-utf16 cscodec-ext8 Extended 8bit charset codec cscodec-ext8 cscodec-8859 ISO-8859-n codec cscodec-8859 -dict Dictionary handling -hash Hashtable implementation -rbtree Red-black tree implementation filter Input stream filtering inputstream Inputstream handling input diff --git a/test/Makefile b/test/Makefile index aeffc1e..e864cb3 100644 --- a/test/Makefile +++ b/test/Makefile @@ -36,7 +36,7 @@ CFLAGS := $(CFLAGS) -I$(TOP)/src/ -I$(d) # Tests TESTS_$(d) := aliases cscodec-8859 cscodec-ext8 cscodec-utf8 cscodec-utf16 \ - charset dict filter hash inputstream parserutils rbtree + charset filter inputstream parserutils TESTS_$(d) := $(TESTS_$(d)) regression/cscodec-segv regression/filter-segv \ regression/stream-nomem regression/filter-badenc-segv diff --git a/test/dict.c b/test/dict.c deleted file mode 100644 index cb25a8e..0000000 --- a/test/dict.c +++ /dev/null @@ -1,54 +0,0 @@ -#include -#include -#include - -#include - -#include "testutils.h" - -extern void parserutils_dict_dump(parserutils_dict *dict); - -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - -int main(int argc, char **argv) -{ - parserutils_dict *dict; - uint8_t buf[256]; - - UNUSED(argc); - UNUSED(argv); - - /* Seed buffer with printable ascii */ - for (int i = 0; i < (int) sizeof(buf); i++) { - buf[i] = 97 + (int) (26.0 * (rand() / (RAND_MAX + 1.0))); - } - buf[sizeof(buf) - 1] = '\0'; - - assert(parserutils_dict_create(myrealloc, NULL, &dict) == - PARSERUTILS_OK); - - for (int i = 0; i < (int) sizeof(buf); i++) { - uint8_t *s = buf; - - while (s - buf <= i) { - const parserutils_dict_entry *e; - - parserutils_dict_insert(dict, - s, (size_t) (sizeof(buf) - i), &e); - - s++; - } - } - - parserutils_dict_destroy(dict); - - printf("PASS\n"); - - return 0; -} - diff --git a/test/hash.c b/test/hash.c deleted file mode 100644 index 8504cbd..0000000 --- a/test/hash.c +++ /dev/null @@ -1,56 +0,0 @@ -#include -#include -#include - -#include - -#include "testutils.h" - -extern void parserutils_hash_dump(parserutils_hash *hash); - -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - -int main(int argc, char **argv) -{ - parserutils_hash *hash; - uint8_t buf[256]; - - UNUSED(argc); - UNUSED(argv); - - /* Seed buffer with printable ascii */ - for (int i = 0; i < (int) sizeof(buf); i++) { - buf[i] = 97 + (int) (26.0 * (rand() / (RAND_MAX + 1.0))); - } - buf[sizeof(buf) - 1] = '\0'; - - assert(parserutils_hash_create(myrealloc, NULL, &hash) == - PARSERUTILS_OK); - - for (int i = 0; i < (int) sizeof(buf); i++) { - uint8_t *s = buf; - - while (s - buf <= i) { - const parserutils_hash_entry *e; - - parserutils_hash_insert(hash, - s, (size_t) (sizeof(buf) - i), &e); - - s++; - } - } - - parserutils_hash_dump(hash); - - parserutils_hash_destroy(hash); - - printf("PASS\n"); - - return 0; -} - diff --git a/test/rbtree.c b/test/rbtree.c deleted file mode 100644 index ac27964..0000000 --- a/test/rbtree.c +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include -#include - -#include "utils/rbtree.h" - -#include "testutils.h" - -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - -static int mycmp(const void *a, const void *b) -{ - return ((intptr_t) a) - ((intptr_t) b); -} - -int main(int argc, char **argv) -{ - parserutils_rbtree *tree; - - UNUSED(argc); - UNUSED(argv); - - assert(parserutils_rbtree_create(mycmp, myrealloc, NULL, &tree) == - PARSERUTILS_OK); - -#define N 40000 -#define G 307 -//#define N 400 -//#define G 7 - - printf("Inserting %d items\n", N); - - for (int i = G, count = 1; i != 0; i = (i + G) % N, count++) { - void *old; - assert(parserutils_rbtree_insert(tree, - (char *) NULL + i, (char *) NULL + i, - &old) == PARSERUTILS_OK); - - if ((count % 10000) == 0) - printf("%d\n", count); - } - - printf("Removing %d items\n", N/2); - - for (int i = 1, count = 1; i < N; i += 2, count++) { - void *key, *value; - assert(parserutils_rbtree_delete(tree, (char *) NULL + i, - &key, &value) == PARSERUTILS_OK); - if ((count % 10000) == 0) - printf("%d\n", count); - } - - printf("Finding %d items\n", N/2); - - for (int i = 2, count = 1; i < N; i += 2, count++) { - void *value = NULL; - assert(parserutils_rbtree_find(tree, (char *) NULL + i, - &value) == PARSERUTILS_OK); - assert(value != NULL && value == (char *) NULL + i); - if ((count % 10000) == 0) - printf("%d\n", count); - } - - printf("Verifying & removing %d items\n", N/2); - - for (int i = 1, count = 1; i < N; i += 2, count++) { - void *key, *value = NULL; - assert(parserutils_rbtree_find(tree, (char *) NULL + i, - &value) == PARSERUTILS_OK); - assert(value == NULL); - assert(parserutils_rbtree_delete(tree, (char *) NULL + i, - &key, &value) == PARSERUTILS_OK); - if ((count % 10000) == 0) - printf("%d\n", count); - } - - parserutils_rbtree_destroy(tree, NULL, NULL); - - printf("PASS\n"); - - return 0; -} - -- cgit v1.2.3