projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/zbd: avoid test case 31 failure with small devices
[fio.git]
/
lib
/
zipf.c
diff --git
a/lib/zipf.c
b/lib/zipf.c
index 8b581fafff6e9e0dd8b1423d7e7d0b9e5e2d94de..14d7928f664a0dfadf8d005e5c87414407cc91fa 100644
(file)
--- a/
lib/zipf.c
+++ b/
lib/zipf.c
@@
-1,12
+1,5
@@
#include <math.h>
#include <string.h>
#include <math.h>
#include <string.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include "ieee754.h"
-#include "../log.h"
#include "zipf.h"
#include "../minmax.h"
#include "../hash.h"
#include "zipf.h"
#include "../minmax.h"
#include "../hash.h"
@@
-15,7
+8,7
@@
static void zipf_update(struct zipf_state *zs)
{
static void zipf_update(struct zipf_state *zs)
{
- u
nsigned long
to_gen;
+ u
int64_t
to_gen;
unsigned int i;
/*
unsigned int i;
/*
@@
-29,20
+22,22
@@
static void zipf_update(struct zipf_state *zs)
zs->zetan += pow(1.0 / (double) (i + 1), zs->theta);
}
zs->zetan += pow(1.0 / (double) (i + 1), zs->theta);
}
-static void shared_rand_init(struct zipf_state *zs, u
nsigned long
nranges,
- unsigned int seed)
+static void shared_rand_init(struct zipf_state *zs, u
int64_t
nranges,
+
double center,
unsigned int seed)
{
memset(zs, 0, sizeof(*zs));
zs->nranges = nranges;
init_rand_seed(&zs->rand, seed, 0);
zs->rand_off = __rand(&zs->rand);
{
memset(zs, 0, sizeof(*zs));
zs->nranges = nranges;
init_rand_seed(&zs->rand, seed, 0);
zs->rand_off = __rand(&zs->rand);
+ if (center != -1)
+ zs->rand_off = nranges * center;
}
}
-void zipf_init(struct zipf_state *zs, u
nsigned long
nranges, double theta,
- unsigned int seed)
+void zipf_init(struct zipf_state *zs, u
int64_t
nranges, double theta,
+
double center,
unsigned int seed)
{
{
- shared_rand_init(zs, nranges, seed);
+ shared_rand_init(zs, nranges,
center,
seed);
zs->theta = theta;
zs->zeta2 = pow(1.0, zs->theta) + pow(0.5, zs->theta);
zs->theta = theta;
zs->zeta2 = pow(1.0, zs->theta) + pow(0.5, zs->theta);
@@
-50,7
+45,7
@@
void zipf_init(struct zipf_state *zs, unsigned long nranges, double theta,
zipf_update(zs);
}
zipf_update(zs);
}
-u
nsigned long long
zipf_next(struct zipf_state *zs)
+u
int64_t
zipf_next(struct zipf_state *zs)
{
double alpha, eta, rand_uni, rand_z;
unsigned long long n = zs->nranges;
{
double alpha, eta, rand_uni, rand_z;
unsigned long long n = zs->nranges;
@@
-69,28
+64,32
@@
unsigned long long zipf_next(struct zipf_state *zs)
else
val = 1 + (unsigned long long)(n * pow(eta*rand_uni - eta + 1.0, alpha));
else
val = 1 + (unsigned long long)(n * pow(eta*rand_uni - eta + 1.0, alpha));
+ val--;
+
if (!zs->disable_hash)
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, u
nsigned long
nranges, double h,
- unsigned int seed)
+void pareto_init(struct zipf_state *zs, u
int64_t
nranges, double h,
+
double center,
unsigned int seed)
{
{
- shared_rand_init(zs, nranges, seed);
+ shared_rand_init(zs, nranges,
center,
seed);
zs->pareto_pow = log(h) / log(1.0 - h);
}
zs->pareto_pow = log(h) / log(1.0 - h);
}
-u
nsigned long long
pareto_next(struct zipf_state *zs)
+u
int64_t
pareto_next(struct zipf_state *zs)
{
double rand = (double) __rand(&zs->rand) / (double) FRAND32_MAX;
{
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)
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)
}
void zipf_disable_hash(struct zipf_state *zs)