#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"
-#define ZIPF_MAX_GEN 10000000
+#define ZIPF_MAX_GEN 10000000UL
static void zipf_update(struct zipf_state *zs)
{
* 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);
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);
}
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)
else
val = 1 + (unsigned long long)(n * pow(eta*rand_uni - eta + 1.0, alpha));
- return (__hash_u64(val - 1) + zs->rand_off) % zs->nranges;
+ val--;
+
+ if (!zs->disable_hash)
+ val = __hash_u64(val);
+
+ return (val + zs->rand_off) % zs->nranges;
}
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;
- unsigned long long n = zs->nranges - 1;
+ double rand = (double) __rand(&zs->rand) / (double) FRAND32_MAX;
+ unsigned long long n;
+
+ n = (zs->nranges - 1) * pow(rand, zs->pareto_pow);
+
+ if (!zs->disable_hash)
+ n = __hash_u64(n);
- return (__hash_u64(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)
+{
+ zs->disable_hash = true;
}