Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message May 9, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 81f3d8e9b0c7e178fc308e6416fade2756898fed:

Fio 2.2.8 (2015-05-07 18:19:25 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 94d8288ef299b544d518da69f21a6df9a04eb086:

Merge branch 'master' of ssh://git.kernel.dk/data/git/fio (2015-05-08 09:21:17 -0600)

----------------------------------------------------------------
Jens Axboe (2):
random: document default seed value
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

 HOWTO     |  1 +
 init.c    | 10 +++-------
 options.c |  1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

---

Diff of recent changes:

HOWTO +1 -0
index 0808cc3..d62d408 100644
@@ -435,6 +435,7 @@ unified_rw_reporting=bool	Fio normally reports statistics on a per
 
 randrepeat=bool	For random IO workloads, seed the generator in a predictable
 		way so that results are repeatable across repetitions.
+		Defaults to true.
 
 randseed=int	Seed the random number generators based on this seed value, to
 		be able to control what sequence of output is being generated.
init.c +3 -7
index fa50d3c..ba5bf2f 100644
@@ -749,7 +749,7 @@ static int fixup_options(struct thread_data *td)
 	/*
 	 * If randseed is set, that overrides randrepeat
 	 */
-	if (td->o.rand_seed)
+	if (fio_option_is_set(&td->o, rand_seed))
 		td->o.rand_repeatable = 0;
 
 	if ((td->io_ops->flags & FIO_NOEXTEND) && td->o.file_append) {
@@ -966,14 +966,10 @@ static int setup_random_seeds(struct thread_data *td)
 	unsigned long seed;
 	unsigned int i;
 
-	if (!td->o.rand_repeatable && !td->o.rand_seed)
+	if (!td->o.rand_repeatable && !fio_option_is_set(&td->o, rand_seed))
 		return init_random_state(td, td->rand_seeds, sizeof(td->rand_seeds));
 
-	if (!td->o.rand_seed)
-		seed = 0x89;
-	else
-		seed = td->o.rand_seed;
-
+	seed = td->o.rand_seed;
 	for (i = 0; i < 4; i++)
 		seed *= 0x9e370001UL;
 
options.c +1 -0
index f21ed26..e306b28 100644
@@ -1845,6 +1845,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(rand_seed),
 		.help	= "Set the random generator seed value",
+		.def	= "0x89",
 		.parent = "rw",
 		.category = FIO_OPT_C_IO,
 		.group	= FIO_OPT_G_RANDOM,