X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fstruct%2Fhashtable.c;h=d895fe7559255a6059c3900a816ae4f32edc0a21;hb=4d8a6a97c6c0e15296b51d5f02674079bede1aa0;hp=6f5471dd7fb7680be18e09529033eda7a98d9497;hpb=56bc36208843a05a8879f31a1b1a6bcb0f1de176;p=bertos.git

diff --git a/bertos/struct/hashtable.c b/bertos/struct/hashtable.c
index 6f5471dd..d895fe75 100644
--- a/bertos/struct/hashtable.c
+++ b/bertos/struct/hashtable.c
@@ -78,11 +78,12 @@
  *        the common case (external keys) both can be used.</li>
  *    </ul>
  *
- * \version $Id$
  * \author Giovanni Bajo <rasky@develer.com>
  */
 
 #include "hashtable.h"
+
+#include "cfg/cfg_hashtable.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
 #include <cfg/macros.h> //ROTL(), ROTR();
@@ -284,92 +285,3 @@ const void* ht_find(struct HashTable* ht, const void* key, uint8_t key_length)
 
 	return *node;
 }
-
-
-#if 0
-
-#include <stdlib.h>
-
-bool ht_test(void);
-
-static const void* test_get_key(const void* ptr, uint8_t* length)
-{
-	const char* s = ptr;
-	*length = strlen(s);
-	return s;
-}
-
-#define NUM_ELEMENTS   256
-DECLARE_HASHTABLE_STATIC(test1, 256, test_get_key);
-DECLARE_HASHTABLE_INTERNALKEY_STATIC(test2, 256);
-
-static char data[NUM_ELEMENTS][10];
-static char keydomain[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-static bool single_test(void)
-{
-	int i;
-
-	ht_init(&test1);
-	ht_init(&test2);
-
-	for (i=0;i<NUM_ELEMENTS;i++)
-	{
-		int k;
-		int klen;
-
-		do
-		{
-			klen = (rand() % 8) + 1;
-			for (k=0;k<klen;k++)
-				data[i][k] = keydomain[rand() % (sizeof(keydomain)-1)];
-			data[i][k]=0;
-		} while (ht_find_str(&test1, data[i]) != NULL);
-
-		ASSERT(ht_insert(&test1, data[i]));
-		ASSERT(ht_insert_str(&test2, data[i], data[i]));
-	}
-
-	for (i=0;i<NUM_ELEMENTS;i++)
-	{
-		char *found1, *found2;
-
-		found1 = (char*)ht_find_str(&test1, data[i]);
-		if (strcmp(found1, data[i]) != 0)
-		{
-			ASSERT(strcmp(found1,data[i]) == 0);
-			return false;
-		}
-
-		found2 = (char*)ht_find_str(&test2, data[i]);
-		if (strcmp(found2, data[i]) != 0)
-		{
-			ASSERT(strcmp(found2,data[i]) == 0);
-			return false;
-		}
-	}
-
-	return true;
-}
-
-static uint16_t rand_seeds[] = { 1, 42, 666, 0xDEAD, 0xBEEF, 0x1337, 0xB00B };
-
-bool ht_test(void)
-{
-	int i;
-
-	for (i=0;i<countof(rand_seeds);++i)
-	{
-		srand(rand_seeds[i]);
-		if (!single_test())
-		{
-			kprintf("ht_test failed\n");
-			return false;
-		}
-	}
-
-	kprintf("ht_test successful\n");
-	return true;
-}
-
-#endif