From ddf24e42b5f801e6a66f8976c97edcb88080ecdf Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 9 Aug 2013 12:53:44 -0600 Subject: [PATCH] Add number_ios= option Signed-off-by: Jens Axboe --- HOWTO | 7 +++++++ cconv.c | 2 ++ fio.1 | 7 +++++++ io_u.c | 3 +++ options.c | 10 ++++++++++ server.h | 2 +- thread_options.h | 2 ++ 7 files changed, 32 insertions(+), 1 deletion(-) diff --git a/HOWTO b/HOWTO index 2335a07f..005dac25 100644 --- a/HOWTO +++ b/HOWTO @@ -709,6 +709,13 @@ offset_increment=int If this is provided, then the real offset becomes which are intended to operate on a file in parallel in disjoint segments, with even spacing between the starting points. +number_ios=int Fio will normally perform IOs until it has exhausted the size + of the region set by size=, or if it exhaust the allocated + time (or hits an error condition). With this setting, the + range/size can be set independently of the number of IOs to + perform. When fio reaches this number, it will exit normally + and report status. + fsync=int If writing to a file, issue a sync of the dirty data for every number of blocks given. For example, if you give 32 as a parameter, fio will sync the file for every 32 diff --git a/cconv.c b/cconv.c index 8e7c69e9..21e3a51b 100644 --- a/cconv.c +++ b/cconv.c @@ -146,6 +146,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->zone_skip = le64_to_cpu(top->zone_skip); o->lockmem = le64_to_cpu(top->lockmem); o->offset_increment = le64_to_cpu(top->offset_increment); + o->number_ios = le64_to_cpu(top->number_ios); o->overwrite = le32_to_cpu(top->overwrite); o->bw_avg_time = le32_to_cpu(top->bw_avg_time); @@ -394,6 +395,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->start_offset = __cpu_to_le64(o->start_offset); top->trim_backlog = __cpu_to_le64(o->trim_backlog); top->offset_increment = __cpu_to_le64(o->offset_increment); + top->number_ios = __cpu_to_le64(o->number_ios); for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) top->percentile_list[i].u.i = __cpu_to_le64(fio_double_to_uint64(o->percentile_list[i].u.f)); diff --git a/fio.1 b/fio.1 index b54eeadb..e35bd938 100644 --- a/fio.1 +++ b/fio.1 @@ -576,6 +576,13 @@ that starts at 0 and is incremented for each job. This option is useful if there are several jobs which are intended to operate on a file in parallel in disjoint segments, with even spacing between the starting points. .TP +.BI number_ios \fR=\fPint +Fio will normally perform IOs until it has exhausted the size of the region +set by \fBsize\fR, or if it exhaust the allocated time (or hits an error +condition). With this setting, the range/size can be set independently of +the number of IOs to perform. When fio reaches this number, it will exit +normally and report status. +.TP .BI fsync \fR=\fPint How many I/Os to perform before issuing an \fBfsync\fR\|(2) of dirty data. If 0, don't sync. Default: 0. diff --git a/io_u.c b/io_u.c index a35aafd2..c50a17df 100644 --- a/io_u.c +++ b/io_u.c @@ -1413,6 +1413,9 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u, add_bw_sample(td, idx, bytes, &icd->time); add_iops_sample(td, idx, bytes, &icd->time); + + if (td->o.number_ios && !--td->o.number_ios) + td->done = 1; } static long long usec_for_io(struct thread_data *td, enum fio_ddir ddir) diff --git a/options.c b/options.c index 1816d0be..caf89d3c 100644 --- a/options.c +++ b/options.c @@ -1482,6 +1482,16 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .category = FIO_OPT_C_IO, .group = FIO_OPT_G_INVALID, }, + { + .name = "number_ios", + .lname = "Number of IOs to perform", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(number_ios), + .help = "Force job completion of this number of IOs", + .def = "0", + .category = FIO_OPT_C_IO, + .group = FIO_OPT_G_INVALID, + }, { .name = "bs", .lname = "Block size", diff --git a/server.h b/server.h index 2f41be09..aefd4183 100644 --- a/server.h +++ b/server.h @@ -38,7 +38,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 24, + FIO_SERVER_VER = 25, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, diff --git a/thread_options.h b/thread_options.h index eaafaee2..3f345c56 100644 --- a/thread_options.h +++ b/thread_options.h @@ -236,6 +236,7 @@ struct thread_options { unsigned int flow_sleep; unsigned long long offset_increment; + unsigned long long number_ios; unsigned int sync_file_range; }; @@ -440,6 +441,7 @@ struct thread_options_pack { uint32_t flow_sleep; uint64_t offset_increment; + uint64_t number_ios; uint32_t sync_file_range; } __attribute__((packed)); -- 2.25.1