projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'android-26-shm' of https://github.com/omor1/fio
[fio.git]
/
stat.c
diff --git
a/stat.c
b/stat.c
index 8770ae28920e5a484cc04ec12579e8b54a777ec5..5b4841322285b1b28cce80bd190049f3c5f14030 100644
(file)
--- a/
stat.c
+++ b/
stat.c
@@
-2171,6
+2171,9
@@
void reset_io_stats(struct thread_data *td)
ts->io_bytes[i] = 0;
ts->runtime[i] = 0;
ts->io_bytes[i] = 0;
ts->runtime[i] = 0;
+ ts->total_io_u[i] = 0;
+ ts->short_io_u[i] = 0;
+ ts->drop_io_u[i] = 0;
for (j = 0; j < FIO_IO_U_PLAT_NR; j++)
ts->io_u_plat[i][j] = 0;
for (j = 0; j < FIO_IO_U_PLAT_NR; j++)
ts->io_u_plat[i][j] = 0;
@@
-2180,17
+2183,15
@@
void reset_io_stats(struct thread_data *td)
ts->io_u_map[i] = 0;
ts->io_u_submit[i] = 0;
ts->io_u_complete[i] = 0;
ts->io_u_map[i] = 0;
ts->io_u_submit[i] = 0;
ts->io_u_complete[i] = 0;
+ }
+
+ for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
ts->io_u_lat_u[i] = 0;
ts->io_u_lat_u[i] = 0;
+ for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
ts->io_u_lat_m[i] = 0;
ts->io_u_lat_m[i] = 0;
- ts->total_submit = 0;
- ts->total_complete = 0;
- }
- for (i = 0; i < 3; i++) {
- ts->total_io_u[i] = 0;
- ts->short_io_u[i] = 0;
- ts->drop_io_u[i] = 0;
- }
+ ts->total_submit = 0;
+ ts->total_complete = 0;
}
static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir,
}
static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir,
@@
-2464,7
+2465,7
@@
static int __add_samples(struct thread_data *td, struct timeval *parent_tv,
add_stat_sample(&stat[ddir], rate);
add_stat_sample(&stat[ddir], rate);
- if (
td->bw_
log) {
+ if (log) {
unsigned int bs = 0;
if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
unsigned int bs = 0;
if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
@@
-2540,12
+2541,14
@@
int calc_log_samples(void)
next = min(td->o.iops_avg_time, td->o.bw_avg_time);
continue;
}
next = min(td->o.iops_avg_time, td->o.bw_avg_time);
continue;
}
- if (td->bw_log && !per_unit_log(td->bw_log)) {
+ if (!td->bw_log ||
+ (td->bw_log && !per_unit_log(td->bw_log))) {
tmp = add_bw_samples(td, &now);
if (tmp < next)
next = tmp;
}
tmp = add_bw_samples(td, &now);
if (tmp < next)
next = tmp;
}
- if (td->iops_log && !per_unit_log(td->iops_log)) {
+ if (!td->iops_log ||
+ (td->iops_log && !per_unit_log(td->iops_log))) {
tmp = add_iops_samples(td, &now);
if (tmp < next)
next = tmp;
tmp = add_iops_samples(td, &now);
if (tmp < next)
next = tmp;