Add option to select how to service multiple files
Right now we just round robin the open files, but sometimes you
just want to randomly go through the files. Add a 'file_service'
option for that, default to round robin still.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/init.c b/init.c
index c8f27ad..01e615f 100644
--- a/init.c
+++ b/init.c
@@ -33,6 +33,7 @@
#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
+static int str_file_service_cb(void *, const char *);
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
@@ -153,6 +154,14 @@
.def = "1",
},
{
+ .name = "file_service_type",
+ .type = FIO_OPT_STR,
+ .cb = str_file_service_cb,
+ .help = "How to select which file to service next",
+ .def = "roundrobin",
+ .posval = { "random", "roundrobin" },
+ },
+ {
.name = "fsync",
.type = FIO_OPT_INT,
.off1 = td_var_offset(fsync_blocks),
@@ -841,7 +850,7 @@
*/
int init_random_state(struct thread_data *td)
{
- unsigned long seeds[4];
+ unsigned long seeds[5];
int fd, num_maps, blocks, i;
struct fio_file *f;
@@ -865,12 +874,13 @@
os_random_seed(seeds[0], &td->bsrange_state);
os_random_seed(seeds[1], &td->verify_state);
os_random_seed(seeds[2], &td->rwmix_state);
+ os_random_seed(seeds[3], &td->next_file_state);
if (td->sequential)
return 0;
if (td->rand_repeatable)
- seeds[3] = FIO_RANDSEED * td->thread_number;
+ seeds[4] = FIO_RANDSEED * td->thread_number;
if (!td->norandommap) {
for_each_file(td, f, i) {
@@ -882,7 +892,7 @@
}
}
- os_random_seed(seeds[3], &td->random_state);
+ os_random_seed(seeds[4], &td->random_state);
return 0;
}
@@ -1087,6 +1097,22 @@
return 0;
}
+static int str_file_service_cb(void *data, const char *str)
+{
+ struct thread_data *td = data;
+
+ if (!strncmp(str, "random", 6)) {
+ td->file_service_type = FIO_FSERVICE_RANDOM;
+ return 0;
+ } else if (!strncmp(str, "roundrobin", 10)) {
+ td->file_service_type = FIO_FSERVICE_RR;
+ return 0;
+ }
+
+ log_err("fio: file_service= random, roundrobin\n");
+ return 1;
+}
+
/*
* This is our [ini] type file parser.
*/