[PATCH] Add seperate read/write block size options
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/init.c b/init.c
index 3532c49..616c51f 100644
--- a/init.c
+++ b/init.c
@@ -139,7 +139,17 @@
{
.name = "bs",
.type = FIO_OPT_STR_VAL,
- .off1 = td_var_offset(bs),
+ .off1 = td_var_offset(bs[DDIR_READ]),
+ },
+ {
+ .name = "read_bs",
+ .type = FIO_OPT_STR_VAL,
+ .off1 = td_var_offset(bs[DDIR_READ]),
+ },
+ {
+ .name = "write_bs",
+ .type = FIO_OPT_STR_VAL,
+ .off1 = td_var_offset(bs[DDIR_WRITE]),
},
{
.name = "offset",
@@ -164,8 +174,20 @@
{
.name = "bsrange",
.type = FIO_OPT_RANGE,
- .off1 = td_var_offset(min_bs),
- .off2 = td_var_offset(max_bs),
+ .off1 = td_var_offset(min_bs[DDIR_READ]),
+ .off2 = td_var_offset(max_bs[DDIR_READ]),
+ },
+ {
+ .name = "read_bsrange",
+ .type = FIO_OPT_RANGE,
+ .off1 = td_var_offset(min_bs[DDIR_READ]),
+ .off2 = td_var_offset(max_bs[DDIR_READ]),
+ },
+ {
+ .name = "write_bsrange",
+ .type = FIO_OPT_RANGE,
+ .off1 = td_var_offset(min_bs[DDIR_WRITE]),
+ .off2 = td_var_offset(max_bs[DDIR_WRITE]),
},
{
.name = "nrfiles",
@@ -484,10 +506,19 @@
if (td_read(td) || td_rw(td))
td->overwrite = 1;
- if (!td->min_bs)
- td->min_bs = td->bs;
- if (!td->max_bs)
- td->max_bs = td->bs;
+ if (td->bs[DDIR_READ] != DEF_BS)
+ td->bs[DDIR_WRITE] = td->bs[DDIR_READ];
+ if (!td->min_bs[DDIR_READ])
+ td->min_bs[DDIR_READ]= td->bs[DDIR_READ];
+ if (!td->max_bs[DDIR_READ])
+ td->max_bs[DDIR_READ] = td->bs[DDIR_READ];
+ if (!td->min_bs[DDIR_WRITE])
+ td->min_bs[DDIR_WRITE]= td->bs[DDIR_READ];
+ if (!td->max_bs[DDIR_WRITE])
+ td->max_bs[DDIR_WRITE] = td->bs[DDIR_READ];
+
+ td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
+
if (td_read(td) && !td_rw(td))
td->verify = 0;
@@ -626,7 +657,7 @@
if (td->io_ops->flags & FIO_CPUIO)
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else
- fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_ops->name, td->iodepth);
+ fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d/%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs[DDIR_READ], td->max_bs[DDIR_READ], td->min_bs[DDIR_WRITE], td->max_bs[DDIR_WRITE], td->rate, td->io_ops->name, td->iodepth);
} else if (job_add_num == 1)
fprintf(f_out, "...\n");
}
@@ -694,7 +725,7 @@
if (!td->norandommap) {
for_each_file(td, f, i) {
- blocks = (f->file_size + td->min_bs - 1) / td->min_bs;
+ blocks = (f->file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
f->num_maps = num_maps;
@@ -958,9 +989,10 @@
*/
def_thread.ddir = DDIR_READ;
def_thread.iomix = 0;
- def_thread.bs = DEF_BS;
- def_thread.min_bs = 0;
- def_thread.max_bs = 0;
+ def_thread.bs[DDIR_READ] = DEF_BS;
+ def_thread.bs[DDIR_WRITE] = DEF_BS;
+ def_thread.min_bs[DDIR_READ] = def_thread.min_bs[DDIR_WRITE] = 0;
+ def_thread.max_bs[DDIR_READ] = def_thread.max_bs[DDIR_WRITE] = 0;
def_thread.odirect = DEF_ODIRECT;
def_thread.ratecycle = DEF_RATE_CYCLE;
def_thread.sequential = DEF_SEQUENTIAL;