X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fzipf.c;h=d8e72b15c6a1e04601e9febdd84eb862f715ae4d;hb=87a0ea3b58ef3d126148cb0279e015177ef9c62f;hp=c348c9c3fd5cbac2eb2985092157a4e29dd72902;hpb=4c9060e3bc8925718264c26a6fa54649c08fd729;p=fio.git

diff --git a/lib/zipf.c b/lib/zipf.c
index c348c9c3..d8e72b15 100644
--- a/lib/zipf.c
+++ b/lib/zipf.c
@@ -11,21 +11,19 @@
 #include "../minmax.h"
 #include "../hash.h"
 
-#define ZIPF_MAX_GEN	10000000
+#define ZIPF_MAX_GEN	10000000UL
 
 static void zipf_update(struct zipf_state *zs)
 {
 	unsigned long to_gen;
 	unsigned int i;
 
-	log_info("fio: generating zetan for theta=%f, ranges=%lu\n", zs->theta, zs->nranges);
-
 	/*
 	 * It can become very costly to generate long sequences. Just cap it at
-	 * 10M max, that should be doable in 1-2s on even slow machines. Precision
-	 * will take a slight hit, but nothing major.
+	 * 10M max, that should be doable in 1-2s on even slow machines.
+	 * Precision will take a slight hit, but nothing major.
 	 */
-	to_gen = min(zs->nranges, ZIPF_MAX_GEN);
+	to_gen = min(zs->nranges, (uint64_t) ZIPF_MAX_GEN);
 
 	for (i = 0; i < to_gen; i++)
 		zs->zetan += pow(1.0 / (double) (i + 1), zs->theta);
@@ -37,7 +35,7 @@ static void shared_rand_init(struct zipf_state *zs, unsigned long nranges,
 	memset(zs, 0, sizeof(*zs));
 	zs->nranges = nranges;
 
-	init_rand_seed(&zs->rand, seed);
+	init_rand_seed(&zs->rand, seed, 0);
 	zs->rand_off = __rand(&zs->rand);
 }
 
@@ -61,7 +59,7 @@ unsigned long long zipf_next(struct zipf_state *zs)
 	alpha = 1.0 / (1.0 - zs->theta);
 	eta = (1.0 - pow(2.0 / n, 1.0 - zs->theta)) / (1.0 - zs->zeta2 / zs->zetan);
 
-	rand_uni = (double) __rand(&zs->rand) / (double) FRAND_MAX;
+	rand_uni = (double) __rand(&zs->rand) / (double) FRAND32_MAX;
 	rand_z = rand_uni * zs->zetan;
 
 	if (rand_z < 1.0)
@@ -71,7 +69,7 @@ unsigned long long zipf_next(struct zipf_state *zs)
 	else
 		val = 1 + (unsigned long long)(n * pow(eta*rand_uni - eta + 1.0, alpha));
 
-	return (__hash_long(val - 1) + zs->rand_off) % zs->nranges;
+	return (__hash_u64(val - 1) + zs->rand_off) % zs->nranges;
 }
 
 void pareto_init(struct zipf_state *zs, unsigned long nranges, double h,
@@ -83,8 +81,8 @@ void pareto_init(struct zipf_state *zs, unsigned long nranges, double h,
 
 unsigned long long pareto_next(struct zipf_state *zs)
 {
-	double rand = (double) __rand(&zs->rand) / (double) FRAND_MAX;
+	double rand = (double) __rand(&zs->rand) / (double) FRAND32_MAX;
 	unsigned long long n = zs->nranges - 1;
 
-	return (__hash_long(n * pow(rand, zs->pareto_pow)) + zs->rand_off) % zs->nranges;
+	return (__hash_u64(n * pow(rand, zs->pareto_pow)) + zs->rand_off) % zs->nranges;
 }