Vadim Tkachenko has proposed merging
lp:~vadim-tk/sysbench/sysbench-pareto-merge into lp:sysbench.
Requested reviews:
sysbench-developers (sysbench-developers)
For more details, see:
https://code.launchpad.net/~vadim-tk/sysbench/sysbench-pareto-merge/+merge/125811
Added pareto distribution
--
https://code.launchpad.net/~vadim-tk/sysbench/sysbench-pareto-merge/+merge/125811
Your team sysbench-developers is requested to review the proposed merge of
lp:~vadim-tk/sysbench/sysbench-pareto-merge into lp:sysbench.
=== modified file 'sysbench/sysbench.c'
--- sysbench/sysbench.c 2012-08-30 08:37:09 +0000
+++ sysbench/sysbench.c 2012-09-21 20:50:31 +0000
@@ -81,7 +81,8 @@
{
DIST_TYPE_UNIFORM,
DIST_TYPE_GAUSSIAN,
- DIST_TYPE_SPECIAL
+ DIST_TYPE_SPECIAL,
+ DIST_TYPE_PARETO
} rand_dist_t;
/* Event queue data type for the tx-rate mode */
@@ -99,6 +100,10 @@
static unsigned int rand_res;
static int rand_seed; /* optional seed set on the command line */
+/* parameters for Pareto distribution */
+static double pareto_h; /* parameter h */
+static double pareto_power; /* parameter pre-calculated by h */
+
/* Random seed used to generate unique random numbers */
static unsigned long long rnd_seed;
/* Mutex to protect random seed */
@@ -131,7 +136,7 @@
{"help", "print help and exit", SB_ARG_TYPE_FLAG, NULL},
{"version", "print version and exit", SB_ARG_TYPE_FLAG, "off"},
{"rand-init", "initialize random number generator", SB_ARG_TYPE_FLAG, "off"},
- {"rand-type", "random numbers distribution {uniform,gaussian,special}", SB_ARG_TYPE_STRING,
+ {"rand-type", "random numbers distribution {uniform,gaussian,special,pareto}", SB_ARG_TYPE_STRING,
"special"},
{"rand-spec-iter", "number of iterations used for numbers generation", SB_ARG_TYPE_INT, "12"},
{"rand-spec-pct", "percentage of values to be treated as 'special' (for special distribution)",
@@ -139,6 +144,7 @@
{"rand-spec-res", "percentage of 'special' values to use (for special distribution)",
SB_ARG_TYPE_INT, "75"},
{"rand-seed", "seed for random number generator, ignored when 0", SB_ARG_TYPE_INT, "0"},
+ {"rand-pareto-h", "parameter h for pareto distibution", SB_ARG_TYPE_FLOAT, "0.2"},
{NULL, NULL, SB_ARG_TYPE_NULL, NULL}
};
@@ -1020,6 +1026,11 @@
rand_type = DIST_TYPE_SPECIAL;
rand_func = &sb_rand_special;
}
+ else if (!strcmp(s, "pareto"))
+ {
+ rand_type = DIST_TYPE_PARETO;
+ rand_func = &sb_rand_pareto;
+ }
else
{
log_text(LOG_FATAL, "Invalid random numbers distribution: %s.", s);
@@ -1030,6 +1041,9 @@
rand_pct = sb_get_value_int("rand-spec-pct");
rand_res = sb_get_value_int("rand-spec-res");
+ pareto_h = sb_get_value_float("rand-pareto-h");
+ pareto_power = log(pareto_h)/log(1.0-pareto_h);
+
sb_globals.tx_rate = sb_get_value_int("tx-rate");
sb_globals.report_interval = sb_get_value_int("report-interval");
@@ -1271,6 +1285,15 @@
return a + res;
}
+/* Pareto distribution */
+
+int sb_rand_pareto(int a, int b)
+{
+ double randf;
+ randf = (double) sb_rnd() / (double) SB_MAX_RND;
+
+ return a + (int)(b - a + 1) * pow(randf, pareto_power);
+}
/* Generate unique random id */
=== modified file 'sysbench/sysbench.h'
--- sysbench/sysbench.h 2012-03-18 22:35:16 +0000
+++ sysbench/sysbench.h 2012-09-21 20:50:31 +0000
@@ -227,6 +227,7 @@
int sb_rand_uniform(int, int);
int sb_rand_gaussian(int, int);
int sb_rand_special(int, int);
+int sb_rand_pareto(int, int);
int sb_rand_uniq(int a, int b);
void sb_rand_str(const char *, char *);
_______________________________________________
Mailing list: https://launchpad.net/~sysbench-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~sysbench-developers
More help : https://help.launchpad.net/ListHelp
