X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fgauss.c;h=1d24e187ab733793fa4ece4dc50c8c15a5efa332;hb=1612c4a5eea3bc09f6f94115b028320bbc32ce4b;hp=5c3203c05754b8ae52b57aee6393b441a16050bc;hpb=3cdb8cf38198d5cea73074d427ae310320e1d65f;p=fio.git

diff --git a/lib/gauss.c b/lib/gauss.c
index 5c3203c0..1d24e187 100644
--- a/lib/gauss.c
+++ b/lib/gauss.c
@@ -1,6 +1,5 @@
 #include <math.h>
 #include <string.h>
-#include <stdio.h>
 #include "../hash.h"
 #include "gauss.h"
 
@@ -15,7 +14,7 @@ static int gauss_dev(struct gauss_state *gs)
 		return 0;
 
 	r = __rand(&gs->r);
-	vr = gs->stddev * (r / (FRAND_MAX + 1.0));
+	vr = gs->stddev * (r / (FRAND32_MAX + 1.0));
 
 	return vr - gs->stddev / 2;
 }
@@ -38,18 +37,27 @@ unsigned long long gauss_next(struct gauss_state *gs)
 		sum += dev;
 	}
 
-	return __hash_u64(sum) % gs->nranges;
+	if (!gs->disable_hash)
+		sum = __hash_u64(sum);
+
+	return sum % gs->nranges;
 }
 
-void gauss_init(struct gauss_state *gs, unsigned long nranges, unsigned int d,
+void gauss_init(struct gauss_state *gs, unsigned long nranges, double dev,
 		unsigned int seed)
 {
 	memset(gs, 0, sizeof(*gs));
-	init_rand_seed(&gs->r, seed);
+	init_rand_seed(&gs->r, seed, 0);
 	gs->nranges = nranges;
-	if (d) {
-		gs->stddev = (nranges * 100) / d;
+
+	if (dev != 0.0) {
+		gs->stddev = ceil((double) (nranges * 100.0) / dev);
 		if (gs->stddev > nranges / 2)
 			gs->stddev = nranges / 2;
 	}
 }
+
+void gauss_disable_hash(struct gauss_state *gs)
+{
+	gs->disable_hash = true;
+}