#include "parse.h"
#include "smalloc.h"
#include "filehash.h"
+#include "verify.h"
-static char fio_version_string[] = "fio 1.23";
+static char fio_version_string[] = "fio 1.27";
#define FIO_RANDSEED (0xb1899bedUL)
return 0;
}
+static int fixed_block_size(struct thread_options *o)
+{
+ return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] &&
+ o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] &&
+ o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE];
+}
+
/*
* Lazy way of fixing up options that depend on each other. We could also
* define option callback handlers, but this is easier.
o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
+ /*
+ * For random IO, allow blockalign offset other than min_bs.
+ */
+ if (!o->ba[DDIR_READ] || !td_random(td))
+ o->ba[DDIR_READ] = o->min_bs[DDIR_READ];
+ if (!o->ba[DDIR_WRITE] || !td_random(td))
+ o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE];
+
+ if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] ||
+ o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) &&
+ !td->o.norandommap) {
+ log_err("fio: Any use of blockalign= turns off randommap\n");
+ td->o.norandommap = 1;
+ }
+
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
- if (o->norandommap && o->verify != VERIFY_NONE) {
- log_err("fio: norandommap given, verify disabled\n");
+ if (o->norandommap && o->verify != VERIFY_NONE
+ && !fixed_block_size(o)) {
+ log_err("fio: norandommap given for variable block sizes, "
+ "verify disabled\n");
o->verify = VERIFY_NONE;
}
if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO))
if (td->o.verify != VERIFY_NONE)
td->o.refill_buffers = 1;
+ if (td->o.pre_read)
+ td->o.invalidate_cache = 0;
+
return 0;
}
return 1;
}
+void td_fill_rand_seeds(struct thread_data *td)
+{
+ os_random_seed(td->rand_seeds[0], &td->bsrange_state);
+ os_random_seed(td->rand_seeds[1], &td->verify_state);
+ os_random_seed(td->rand_seeds[2], &td->rwmix_state);
+
+ if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
+ os_random_seed(td->rand_seeds[3], &td->next_file_state);
+
+ os_random_seed(td->rand_seeds[5], &td->file_size_state);
+
+ if (!td_random(td))
+ return;
+
+ if (td->o.rand_repeatable)
+ td->rand_seeds[4] = FIO_RANDSEED * td->thread_number;
+
+ os_random_seed(td->rand_seeds[4], &td->random_state);
+}
+
/*
* Initialize the various random states we need (random io, block size ranges,
* read/write mix, etc).
*/
static int init_random_state(struct thread_data *td)
{
- unsigned long seeds[6];
int fd;
fd = open("/dev/urandom", O_RDONLY);
return 1;
}
- if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
+ if (read(fd, td->rand_seeds, sizeof(td->rand_seeds)) <
+ (int) sizeof(td->rand_seeds)) {
td_verror(td, EIO, "read");
close(fd);
return 1;
}
close(fd);
-
- os_random_seed(seeds[0], &td->bsrange_state);
- os_random_seed(seeds[1], &td->verify_state);
- os_random_seed(seeds[2], &td->rwmix_state);
-
- if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
- os_random_seed(seeds[3], &td->next_file_state);
-
- os_random_seed(seeds[5], &td->file_size_state);
-
- if (!td_random(td))
- return 0;
-
- if (td->o.rand_repeatable)
- seeds[4] = FIO_RANDSEED * td->thread_number;
-
- os_random_seed(seeds[4], &td->random_state);
+ td_fill_rand_seeds(td);
return 0;
}
if (file_alloced) {
td_new->o.filename = NULL;
td_new->files_index = 0;
+ td_new->files_size = 0;
td_new->files = NULL;
}
if (!strncmp(name, "global", 6))
return 0;
- return strncmp(job_section, name, strlen(job_section));
+ return strcmp(job_section, name);
}
static int is_empty_or_comment(char *line)