Renamed str-test to hashfunc-test, because that's what it is.

diff --git a/lib/Makefile b/lib/Makefile
index c1090baf40ca1b7d096f46bb469b3b13614c07a9..3b3f259f6ab00eac5c560757c372f6dbd11024ba 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -87,7 +87,7 @@ $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
 $(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
 $(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW)
 $(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW)
-$(o)/lib/str-test: $(o)/lib/str-test.o $(LIBUCW)
+$(o)/lib/hashfunc-test: $(o)/lib/hashfunc-test.o $(LIBUCW)
 $(o)/lib/asort-test: $(o)/lib/asort-test.o $(LIBUCW)
 $(o)/lib/redblack-test: $(o)/lib/redblack-test.o $(LIBUCW)
 $(o)/lib/binheap-test: $(o)/lib/binheap-test.o $(LIBUCW)

diff --git a/lib/hashfunc-test.c b/lib/hashfunc-test.c
new file mode 100644 (file)
index 0000000..e289258
--- /dev/null
+++ b/lib/hashfunc-test.c
@@ -0,0 +1,132 @@
+/*
+ *     Checking the correctness of str_len() and hash_*() and proving, that
+ *     it is faster than the classical version ;-)
+ */
+
+#include "lib/hashfunc.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+
+/* It will be divided by (10 + strlen()).  */
+#define TEST_TIME      1000000
+
+/* The shift of the string according to the alignment.  */
+static uns alignment = 0;
+
+static void
+random_string(byte *str, int len)
+{
+       int i;
+       for (i=0; i<len; i++)
+               str[i] = random() % 255 + 1;
+       str[len] = 0;
+}
+
+static uns
+elapsed_time(void)
+{
+       static struct timeval last_tv, tv;
+       uns elapsed;
+       gettimeofday(&tv, NULL);
+       elapsed = (tv.tv_sec - last_tv.tv_sec) * 1000000 + (tv.tv_usec - last_tv.tv_usec);
+       last_tv = tv;
+       return elapsed;
+}
+
+int
+main(int argc, char **argv)
+{
+       byte *strings[] = {
+               "",
+               "a",
+               "aa",
+               "aaa",
+               "aaaa",
+               "aaaaa",
+               "aaaaaa",
+               "aaaaaaa",
+               "aaaaaaaa",
+               "aaaaaaaaa",
+               "aaaaaaaaaa",
+               "AHOJ",
+               "\200aaaa",
+               "\200",
+               "\200\200",
+               "\200\200\200",
+               "\200\200\200\200",
+               "\200\200\200\200\200",
+               "kelapS treboR",
+               "Robert Spalek",
+               "uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu",
+               "********************************",
+               "****************************************************************",
+               NULL
+       };
+       int lengths[] = {
+               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+               11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+               30, 40, 50, 60, 70, 80, 90, 100,
+               200, 300, 400, 500, 600, 700, 800, 900, 1000,
+               2000, 4000, 8000, 16000, 32000, 64000,
+               -1
+       };
+       int i;
+       if (argc > 1)
+               alignment = atoi(argv[1]);
+       printf("Alignment set to %d\n", alignment);
+       for (i=0; strings[i]; i++)
+               if (strlen(strings[i]) != str_len(strings[i]))
+                       die("Internal str_len() error on string %d", i);
+       printf("%d strings tested OK\n", i);
+       for (i=0; strings[i]; i++)
+       {
+               uns h1, h2;
+               h1 = hash_string(strings[i]);
+               h2 = hash_string_nocase(strings[i]);
+               if (h1 != hash_block(strings[i], str_len(strings[i])))
+                       die("Internal hash_string() error on string %d", i);
+               printf("hash %2d = %08x %08x", i, h1, h2);
+               if (h1 == h2)
+                       printf(" upper case?");
+               printf("\n");
+       }
+       for (i=0; lengths[i] >= 0; i++)
+       {
+               byte str[lengths[i] + 1 + alignment];
+               uns count = TEST_TIME / (lengths[i] + 10);
+               uns el1 = 0, el2 = 0, elh = 0, elhn = 0;
+               uns tot1 = 0, tot2 = 0, hash = 0, hashn = 0;
+               uns j;
+               for (j=0; j<count; j++)
+               {
+                       random_string(str + alignment, lengths[i]);
+                       elapsed_time();
+                       /* Avoid "optimizing" by gcc, since the functions are
+                        * attributed PURE.  */
+                       tot1 += strlen(str + alignment);
+                       el1 += elapsed_time();
+                       tot2 += str_len(str + alignment);
+                       el2 += elapsed_time();
+                       hash ^= hash_string(str + alignment);
+                       elh += elapsed_time();
+                       hashn ^= hash_string_nocase(str + alignment);
+                       elhn += elapsed_time();
+               }
+               if (tot1 != tot2)
+                       die("Internal error during test %d", i);
+               printf("Test %d: strlen = %d, passes = %d, classical = %d usec, speedup = %.4f\n",
+                       i, lengths[i], count, el1, (el1 + 0.) / el2);
+               printf("\t\t total hash = %08x/%08x, hash time = %d/%d usec\n", hash, hashn, elh, elhn);
+       }
+/*
+       printf("test1: %d\n", hash_modify(10000000, 10000000, 99777555));
+       printf("test1: %d, %d\n", i, hash_modify(i, lengths[i-2], 99777333));
+       printf("test1: %d, %d\n", i, hash_modify(lengths[i-2], i, 99777333));
+       printf("test1: %d,%d,%d->%d\n", i, i*3-2, i*i, hash_modify(4587, i*3-2, i*i));
+       printf("test1: %d\n", hash_modify(lengths[5], 345, i));
+*/
+       return 0;
+}

diff --git a/lib/str-test.c b/lib/str-test.c
deleted file mode 100644 (file)
index e289258..0000000
--- a/lib/str-test.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *     Checking the correctness of str_len() and hash_*() and proving, that
- *     it is faster than the classical version ;-)
- */
-
-#include "lib/hashfunc.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
-/* It will be divided by (10 + strlen()).  */
-#define TEST_TIME      1000000
-
-/* The shift of the string according to the alignment.  */
-static uns alignment = 0;
-
-static void
-random_string(byte *str, int len)
-{
-       int i;
-       for (i=0; i<len; i++)
-               str[i] = random() % 255 + 1;
-       str[len] = 0;
-}
-
-static uns
-elapsed_time(void)
-{
-       static struct timeval last_tv, tv;
-       uns elapsed;
-       gettimeofday(&tv, NULL);
-       elapsed = (tv.tv_sec - last_tv.tv_sec) * 1000000 + (tv.tv_usec - last_tv.tv_usec);
-       last_tv = tv;
-       return elapsed;
-}
-
-int
-main(int argc, char **argv)
-{
-       byte *strings[] = {
-               "",
-               "a",
-               "aa",
-               "aaa",
-               "aaaa",
-               "aaaaa",
-               "aaaaaa",
-               "aaaaaaa",
-               "aaaaaaaa",
-               "aaaaaaaaa",
-               "aaaaaaaaaa",
-               "AHOJ",
-               "\200aaaa",
-               "\200",
-               "\200\200",
-               "\200\200\200",
-               "\200\200\200\200",
-               "\200\200\200\200\200",
-               "kelapS treboR",
-               "Robert Spalek",
-               "uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu",
-               "********************************",
-               "****************************************************************",
-               NULL
-       };
-       int lengths[] = {
-               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-               11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-               30, 40, 50, 60, 70, 80, 90, 100,
-               200, 300, 400, 500, 600, 700, 800, 900, 1000,
-               2000, 4000, 8000, 16000, 32000, 64000,
-               -1
-       };
-       int i;
-       if (argc > 1)
-               alignment = atoi(argv[1]);
-       printf("Alignment set to %d\n", alignment);
-       for (i=0; strings[i]; i++)
-               if (strlen(strings[i]) != str_len(strings[i]))
-                       die("Internal str_len() error on string %d", i);
-       printf("%d strings tested OK\n", i);
-       for (i=0; strings[i]; i++)
-       {
-               uns h1, h2;
-               h1 = hash_string(strings[i]);
-               h2 = hash_string_nocase(strings[i]);
-               if (h1 != hash_block(strings[i], str_len(strings[i])))
-                       die("Internal hash_string() error on string %d", i);
-               printf("hash %2d = %08x %08x", i, h1, h2);
-               if (h1 == h2)
-                       printf(" upper case?");
-               printf("\n");
-       }
-       for (i=0; lengths[i] >= 0; i++)
-       {
-               byte str[lengths[i] + 1 + alignment];
-               uns count = TEST_TIME / (lengths[i] + 10);
-               uns el1 = 0, el2 = 0, elh = 0, elhn = 0;
-               uns tot1 = 0, tot2 = 0, hash = 0, hashn = 0;
-               uns j;
-               for (j=0; j<count; j++)
-               {
-                       random_string(str + alignment, lengths[i]);
-                       elapsed_time();
-                       /* Avoid "optimizing" by gcc, since the functions are
-                        * attributed PURE.  */
-                       tot1 += strlen(str + alignment);
-                       el1 += elapsed_time();
-                       tot2 += str_len(str + alignment);
-                       el2 += elapsed_time();
-                       hash ^= hash_string(str + alignment);
-                       elh += elapsed_time();
-                       hashn ^= hash_string_nocase(str + alignment);
-                       elhn += elapsed_time();
-               }
-               if (tot1 != tot2)
-                       die("Internal error during test %d", i);
-               printf("Test %d: strlen = %d, passes = %d, classical = %d usec, speedup = %.4f\n",
-                       i, lengths[i], count, el1, (el1 + 0.) / el2);
-               printf("\t\t total hash = %08x/%08x, hash time = %d/%d usec\n", hash, hashn, elh, elhn);
-       }
-/*
-       printf("test1: %d\n", hash_modify(10000000, 10000000, 99777555));
-       printf("test1: %d, %d\n", i, hash_modify(i, lengths[i-2], 99777333));
-       printf("test1: %d, %d\n", i, hash_modify(lengths[i-2], i, 99777333));
-       printf("test1: %d,%d,%d->%d\n", i, i*3-2, i*i, hash_modify(4587, i*3-2, i*i));
-       printf("test1: %d\n", hash_modify(lengths[5], 345, i));
-*/
-       return 0;
-}