X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=lib%2Fzipf.c;h=681df70069ac27419b4545dcbac0ee2de81fdbee;hp=8b581fafff6e9e0dd8b1423d7e7d0b9e5e2d94de;hb=8c5e96a4ee7004b2982b5d5247ecea1cb96bccb7;hpb=76527b19c2464f50d6b124d40ba190db381b65d3

diff --git a/lib/zipf.c b/lib/zipf.c
index 8b581faf..681df700 100644
--- a/lib/zipf.c
+++ b/lib/zipf.c
@@ -69,10 +69,12 @@ unsigned long long zipf_next(struct zipf_state *zs)
 	else
 		val = 1 + (unsigned long long)(n * pow(eta*rand_uni - eta + 1.0, alpha));
 
+	val--;
+
 	if (!zs->disable_hash)
-		return (__hash_u64(val - 1) + zs->rand_off) % zs->nranges;
+		val = __hash_u64(val);
 
-	return (val - 1 + zs->rand_off) % zs->nranges;
+	return (val + zs->rand_off) % zs->nranges;
 }
 
 void pareto_init(struct zipf_state *zs, unsigned long nranges, double h,
@@ -85,12 +87,14 @@ 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) FRAND32_MAX;
-	unsigned long long n = zs->nranges - 1;
+	unsigned long long n;
+
+	n = (zs->nranges - 1) * pow(rand, zs->pareto_pow);
 
 	if (!zs->disable_hash)
-		return (__hash_u64(n * pow(rand, zs->pareto_pow)) + zs->rand_off) % zs->nranges;
+		n = __hash_u64(n);
 
-	return (unsigned long long) (n * pow(rand, zs->pareto_pow) + zs->rand_off) % zs->nranges;
+	return (n + zs->rand_off)  % zs->nranges;
 }
 
 void zipf_disable_hash(struct zipf_state *zs)