X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=crc%2Ftest.c;h=bca46f243cf25077ddc4f43b596dc7fca2c19ab6;hb=6b37db5bd2e57871691ee9e83264d98f20d28a01;hp=39ffac0baaaad0d5a378cf373aeaccb34a869092;hpb=f83ffd0288ddb6de8e5d1631ae619fd385e6d400;p=fio.git

diff --git a/crc/test.c b/crc/test.c
index 39ffac0b..bca46f24 100644
--- a/crc/test.c
+++ b/crc/test.c
@@ -18,6 +18,7 @@
 #include "../crc/sha512.h"
 #include "../crc/xxhash.h"
 #include "../crc/murmur3.h"
+#include "../crc/fnv.h"
 #include "../hash.h"
 
 #include "test.h"
@@ -45,6 +46,7 @@ enum {
 	T_XXHASH	= 1U << 9,
 	T_MURMUR3	= 1U << 10,
 	T_JHASH		= 1U << 11,
+	T_FNV		= 1U << 12,
 };
 
 static void t_md5(struct test_type *t, void *buf, size_t size)
@@ -55,10 +57,10 @@ static void t_md5(struct test_type *t, void *buf, size_t size)
 
 	fio_md5_init(&ctx);
 
-	for (i = 0; i < NR_CHUNKS; i++)
+	for (i = 0; i < NR_CHUNKS; i++) {
 		fio_md5_update(&ctx, buf, size);
-
-	fio_md5_final(&ctx);
+		fio_md5_final(&ctx);
+	}
 }
 
 static void t_crc64(struct test_type *t, void *buf, size_t size)
@@ -121,10 +123,10 @@ static void t_sha256(struct test_type *t, void *buf, size_t size)
 
 	fio_sha256_init(&ctx);
 
-	for (i = 0; i < NR_CHUNKS; i++)
+	for (i = 0; i < NR_CHUNKS; i++) {
 		fio_sha256_update(&ctx, buf, size);
-
-	fio_sha256_final(&ctx);
+		fio_sha256_final(&ctx);
+	}
 }
 
 static void t_sha512(struct test_type *t, void *buf, size_t size)
@@ -155,6 +157,14 @@ static void t_jhash(struct test_type *t, void *buf, size_t size)
 		t->output += jhash(buf, size, 0x8989);
 }
 
+static void t_fnv(struct test_type *t, void *buf, size_t size)
+{
+	int i;
+
+	for (i = 0; i < NR_CHUNKS; i++)
+		t->output += fnv(buf, size, 0x8989);
+}
+
 static void t_xxhash(struct test_type *t, void *buf, size_t size)
 {
 	void *state;
@@ -229,6 +239,11 @@ static struct test_type t[] = {
 		.mask = T_JHASH,
 		.fn = t_jhash,
 	},
+	{
+		.name = "fnv",
+		.mask = T_FNV,
+		.fn = t_fnv,
+	},
 	{
 		.name = NULL,
 	},