Recent changes (master)
The following changes since commit 447b94e10bddab8078f35c423ca1e3c3f0b1be38:
Fix overflow in percentile calculation for Windows (2017-10-11 16:26:00 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to c13a60ce72aaf5b07b93977ab86e7522d167ec28:
flow: fix bad overflowing math (2017-10-12 10:54:27 -0600)
----------------------------------------------------------------
Andrzej Jakowski (1):
Fix more overflows in percentile calculation for Windows
Jens Axboe (3):
Merge branch 'overflow_fix' of https://github.com/sitsofe/fio
Merge branch 'master' of https://github.com/Venutiwa/fio
flow: fix bad overflowing math
Sitsofe Wheeler (1):
gettime: fix cycles_per_msec overflow when using 32 bit longs
Venu (1):
Adding support for multiple jobs for fio test
examples/fio-rand-RW.job | 18 ++++++++++++++++++ examples/fio-rand-read.job | 16 ++++++++++++++++ examples/fio-rand-write.job | 16 ++++++++++++++++ examples/fio-seq-RW.job | 18 ++++++++++++++++++ examples/fio-seq-read.job | 14 ++++++++++++++ examples/fio-seq-write.job | 16 ++++++++++++++++ flow.c | 10 +++++++--- gclient.c | 2 +- gettime.c | 2 +- stat.c | 4 ++-- stat.h | 2 +- 11 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 examples/fio-rand-RW.job create mode 100644 examples/fio-rand-read.job create mode 100644 examples/fio-rand-write.job create mode 100644 examples/fio-seq-RW.job create mode 100644 examples/fio-seq-read.job create mode 100644 examples/fio-seq-write.job
---
Diff of recent changes:
examples/fio-rand-RW.job new file +18 -0
@@ -0,0 +1,18 @@ +; fio-rand-RW.job for fiotest + +[global] +name=fio-rand-RW +filename=fio-rand-RW +rw=randrw +rwmixread=60 +rwmixwrite=40 +bs=4K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-rand-read.job new file +16 -0
@@ -0,0 +1,16 @@ +; fio-rand-read.job for fiotest + +[global] +name=fio-rand-read +filename=fio-rand-read +rw=randread +bs=4K +direct=0 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-rand-write.job new file +16 -0
@@ -0,0 +1,16 @@ +; fio-rand-write.job for fiotest + +[global] +name=fio-rand-write +filename=fio-rand-write +rw=randwrite +bs=4K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-RW.job new file +18 -0
@@ -0,0 +1,18 @@ +; fio-seq-RW.job for fiotest + +[global] +name=fio-seq-RW +filename=fio-seq-RW +rw=rw +rwmixread=60 +rwmixwrite=40 +bs=256K +direct=0 +numjobs=4 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-read.job new file +14 -0
@@ -0,0 +1,14 @@ +[global] +name=fio-seq-reads +filename=fio-seq-reads +rw=read +bs=256K +direct=0 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
examples/fio-seq-write.job new file +16 -0
@@ -0,0 +1,16 @@ +; fio-seq-write.job for fiotest + +[global] +name=fio-seq-write +filename=fio-seq-write +rw=write +bs=256K +direct=0 +numjobs=1 +time_based=1 +runtime=900 + +[file1] +size=10G +ioengine=libaio +iodepth=16
flow.c +7 -3
@@ -16,13 +16,17 @@ static struct fio_mutex *flow_lock;int flow_threshold_exceeded (struct thread_data *td) {struct fio_flow *flow = td->flow; -int sign; +long long flow_counter;if (!flow)return 0 ; - sign = td->o.flow >0 ?1 :-1 ; -if (sign * flow->flow_counter > td->o.flow_watermark) { +if (td->o.flow >0 ) + flow_counter = flow->flow_counter; +else + flow_counter = -flow->flow_counter; + +if (flow_counter > td->o.flow_watermark) {if (td->o.flow_sleep) {io_u_quiesce (td);usleep (td->o.flow_sleep);
gclient.c +1 -1
@@ -1099,7 +1099,7 @@ static void gfio_show_clat_percentiles(struct gfio_client *gc, int ddir) {unsigned int *io_u_plat = ts->io_u_plat[ddir]; -unsigned long nr = ts->clat_stat[ddir].samples; +unsigned long long nr = ts->clat_stat[ddir].samples;fio_fp64_t *plist = ts->percentile_list;unsigned int len, scale_down;unsigned long long *ovals, minv, maxv;
gettime.c +1 -1
@@ -15,7 +15,7 @@#if defined(ARCH_HAVE_CPU_CLOCK )#ifndef ARCH_CPU_CLOCK_CYCLES_PER_USEC -static unsigned long cycles_per_msec; +static unsigned long long cycles_per_msec;static unsigned long long cycles_start;static unsigned long long clock_mult;static unsigned long long max_cycles_mask;
stat.c +2 -2
@@ -135,7 +135,7 @@ static int double_cmp(const void *a, const void *b)return cmp; } -unsigned int calc_clat_percentiles (unsigned int *io_u_plat,unsigned long nr, +unsigned int calc_clat_percentiles (unsigned int *io_u_plat,unsigned long long nr,fio_fp64_t *plist,unsigned long long **output,unsigned long long *maxv,unsigned long long *minv) {
@@ -198,7 +198,7 @@ unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,/* * Find and display the p-th percentile of clat */ -static void show_clat_percentiles (unsigned int *io_u_plat,unsigned long nr, +static void show_clat_percentiles (unsigned int *io_u_plat,unsigned long long nr,fio_fp64_t *plist,unsigned int precision,bool is_clat,struct buf_output *out) {
stat.h +1 -1
@@ -293,7 +293,7 @@ extern void init_thread_stat(struct thread_stat *ts);extern void init_group_run_stat (struct group_run_stats *gs);extern void eta_to_str (char *str,unsigned long eta_sec);extern bool calc_lat (struct io_stat *is,unsigned long long *min,unsigned long long *max,double *mean,double *dev); -extern unsigned int calc_clat_percentiles (unsigned int *io_u_plat,unsigned long nr,fio_fp64_t *plist,unsigned long long **output,unsigned long long *maxv,unsigned long long *minv); +extern unsigned int calc_clat_percentiles (unsigned int *io_u_plat,unsigned long long nr,fio_fp64_t *plist,unsigned long long **output,unsigned long long *maxv,unsigned long long *minv);extern void stat_calc_lat_n (struct thread_stat *ts,double *io_u_lat);extern void stat_calc_lat_m (struct thread_stat *ts,double *io_u_lat);extern void stat_calc_lat_u (struct thread_stat *ts,double *io_u_lat);