projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/io_uring: add test support for pre mapping DMA buffers
[fio.git]
/
stat.c
diff --git
a/stat.c
b/stat.c
index a8a96c85a4120b0d70dee939c9102fe340565aae..30f9b5c1e995d49174aebc2fd48ebe6e51d34acf 100644
(file)
--- a/
stat.c
+++ b/
stat.c
@@
-17,7
+17,11
@@
#include "zbd.h"
#include "oslib/asprintf.h"
#include "zbd.h"
#include "oslib/asprintf.h"
+#ifdef WIN32
+#define LOG_MSEC_SLACK 2
+#else
#define LOG_MSEC_SLACK 1
#define LOG_MSEC_SLACK 1
+#endif
struct fio_sem *stat_sem;
struct fio_sem *stat_sem;
@@
-211,7
+215,7
@@
static void show_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr,
len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
if (!len || !ovals)
len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
if (!len || !ovals)
-
goto out
;
+
return
;
/*
* We default to nsecs, but if the value range is such that we
/*
* We default to nsecs, but if the value range is such that we
@@
-258,7
+262,6
@@
static void show_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr,
log_buf(out, "\n");
}
log_buf(out, "\n");
}
-out:
free(ovals);
}
free(ovals);
}
@@
-2860,7
+2863,8
@@
static struct io_logs *get_cur_log(struct io_log *iolog)
static void __add_log_sample(struct io_log *iolog, union io_sample_data data,
enum fio_ddir ddir, unsigned long long bs,
static void __add_log_sample(struct io_log *iolog, union io_sample_data data,
enum fio_ddir ddir, unsigned long long bs,
- unsigned long t, uint64_t offset, uint8_t priority_bit)
+ unsigned long t, uint64_t offset,
+ unsigned int priority)
{
struct io_logs *cur_log;
{
struct io_logs *cur_log;
@@
-2879,7
+2883,7
@@
static void __add_log_sample(struct io_log *iolog, union io_sample_data data,
s->time = t + (iolog->td ? iolog->td->unix_epoch : 0);
io_sample_set_ddir(iolog, s, ddir);
s->bs = bs;
s->time = t + (iolog->td ? iolog->td->unix_epoch : 0);
io_sample_set_ddir(iolog, s, ddir);
s->bs = bs;
- s->priority
_bit = priority_bit
;
+ s->priority
= priority
;
if (iolog->log_offset) {
struct io_sample_offset *so = (void *) s;
if (iolog->log_offset) {
struct io_sample_offset *so = (void *) s;
@@
-2956,7
+2960,7
@@
void reset_io_stats(struct thread_data *td)
}
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,
- unsigned long elapsed, bool log_max
, uint8_t priority_bit
)
+ unsigned long elapsed, bool log_max)
{
/*
* Note an entry in the log. Use the mean from the logged samples,
{
/*
* Note an entry in the log. Use the mean from the logged samples,
@@
-2971,26
+2975,26
@@
static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir,
else
data.val = iolog->avg_window[ddir].mean.u.f + 0.50;
else
data.val = iolog->avg_window[ddir].mean.u.f + 0.50;
- __add_log_sample(iolog, data, ddir, 0, elapsed, 0,
priority_bit
);
+ __add_log_sample(iolog, data, ddir, 0, elapsed, 0,
0
);
}
reset_io_stat(&iolog->avg_window[ddir]);
}
static void _add_stat_to_log(struct io_log *iolog, unsigned long elapsed,
}
reset_io_stat(&iolog->avg_window[ddir]);
}
static void _add_stat_to_log(struct io_log *iolog, unsigned long elapsed,
- bool log_max
, uint8_t priority_bit
)
+ bool log_max)
{
int ddir;
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)
{
int ddir;
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++)
- __add_stat_to_log(iolog, ddir, elapsed, log_max
, priority_bit
);
+ __add_stat_to_log(iolog, ddir, elapsed, log_max);
}
static unsigned long add_log_sample(struct thread_data *td,
struct io_log *iolog,
union io_sample_data data,
enum fio_ddir ddir, unsigned long long bs,
}
static unsigned long add_log_sample(struct thread_data *td,
struct io_log *iolog,
union io_sample_data data,
enum fio_ddir ddir, unsigned long long bs,
- uint64_t offset, u
int8_t priority_bit
)
+ uint64_t offset, u
nsigned int ioprio
)
{
unsigned long elapsed, this_window;
{
unsigned long elapsed, this_window;
@@
-3003,7
+3007,8
@@
static unsigned long add_log_sample(struct thread_data *td,
* If no time averaging, just add the log sample.
*/
if (!iolog->avg_msec) {
* If no time averaging, just add the log sample.
*/
if (!iolog->avg_msec) {
- __add_log_sample(iolog, data, ddir, bs, elapsed, offset, priority_bit);
+ __add_log_sample(iolog, data, ddir, bs, elapsed, offset,
+ ioprio);
return 0;
}
return 0;
}
@@
-3027,7
+3032,7
@@
static unsigned long add_log_sample(struct thread_data *td,
return diff;
}
return diff;
}
- __add_stat_to_log(iolog, ddir, elapsed, td->o.log_max != 0
, priority_bit
);
+ __add_stat_to_log(iolog, ddir, elapsed, td->o.log_max != 0);
iolog->avg_last[ddir] = elapsed - (elapsed % iolog->avg_msec);
iolog->avg_last[ddir] = elapsed - (elapsed % iolog->avg_msec);
@@
-3041,19
+3046,19
@@
void finalize_logs(struct thread_data *td, bool unit_logs)
elapsed = mtime_since_now(&td->epoch);
if (td->clat_log && unit_logs)
elapsed = mtime_since_now(&td->epoch);
if (td->clat_log && unit_logs)
- _add_stat_to_log(td->clat_log, elapsed, td->o.log_max != 0
, 0
);
+ _add_stat_to_log(td->clat_log, elapsed, td->o.log_max != 0);
if (td->slat_log && unit_logs)
if (td->slat_log && unit_logs)
- _add_stat_to_log(td->slat_log, elapsed, td->o.log_max != 0
, 0
);
+ _add_stat_to_log(td->slat_log, elapsed, td->o.log_max != 0);
if (td->lat_log && unit_logs)
if (td->lat_log && unit_logs)
- _add_stat_to_log(td->lat_log, elapsed, td->o.log_max != 0
, 0
);
+ _add_stat_to_log(td->lat_log, elapsed, td->o.log_max != 0);
if (td->bw_log && (unit_logs == per_unit_log(td->bw_log)))
if (td->bw_log && (unit_logs == per_unit_log(td->bw_log)))
- _add_stat_to_log(td->bw_log, elapsed, td->o.log_max != 0
, 0
);
+ _add_stat_to_log(td->bw_log, elapsed, td->o.log_max != 0);
if (td->iops_log && (unit_logs == per_unit_log(td->iops_log)))
if (td->iops_log && (unit_logs == per_unit_log(td->iops_log)))
- _add_stat_to_log(td->iops_log, elapsed, td->o.log_max != 0
, 0
);
+ _add_stat_to_log(td->iops_log, elapsed, td->o.log_max != 0);
}
}
-void add_agg_sample(union io_sample_data data, enum fio_ddir ddir,
unsigned long long bs,
-
uint8_t priority_bit
)
+void add_agg_sample(union io_sample_data data, enum fio_ddir ddir,
+
unsigned long long bs
)
{
struct io_log *iolog;
{
struct io_log *iolog;
@@
-3061,7
+3066,7
@@
void add_agg_sample(union io_sample_data data, enum fio_ddir ddir, unsigned long
return;
iolog = agg_io_log[ddir];
return;
iolog = agg_io_log[ddir];
- __add_log_sample(iolog, data, ddir, bs, mtime_since_genesis(), 0,
priority_bit
);
+ __add_log_sample(iolog, data, ddir, bs, mtime_since_genesis(), 0,
0
);
}
void add_sync_clat_sample(struct thread_stat *ts, unsigned long long nsec)
}
void add_sync_clat_sample(struct thread_stat *ts, unsigned long long nsec)
@@
-3083,14
+3088,14
@@
static void add_lat_percentile_sample_noprio(struct thread_stat *ts,
}
static void add_lat_percentile_sample(struct thread_stat *ts,
}
static void add_lat_percentile_sample(struct thread_stat *ts,
- unsigned long long nsec, enum fio_ddir ddir,
uint8_t priority_bit,
- enum fio_lat lat)
+ unsigned long long nsec, enum fio_ddir ddir,
+
bool high_prio,
enum fio_lat lat)
{
unsigned int idx = plat_val_to_idx(nsec);
add_lat_percentile_sample_noprio(ts, nsec, ddir, lat);
{
unsigned int idx = plat_val_to_idx(nsec);
add_lat_percentile_sample_noprio(ts, nsec, ddir, lat);
- if (!
priority_bit
)
+ if (!
high_prio
)
ts->io_u_plat_low_prio[ddir][idx]++;
else
ts->io_u_plat_high_prio[ddir][idx]++;
ts->io_u_plat_low_prio[ddir][idx]++;
else
ts->io_u_plat_high_prio[ddir][idx]++;
@@
-3098,7
+3103,7
@@
static void add_lat_percentile_sample(struct thread_stat *ts,
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
unsigned long long nsec, unsigned long long bs,
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
unsigned long long nsec, unsigned long long bs,
- uint64_t offset, u
int8_t priority_bit
)
+ uint64_t offset, u
nsigned int ioprio, bool high_prio
)
{
const bool needs_lock = td_async_processing(td);
unsigned long elapsed, this_window;
{
const bool needs_lock = td_async_processing(td);
unsigned long elapsed, this_window;
@@
-3111,7
+3116,7
@@
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
add_stat_sample(&ts->clat_stat[ddir], nsec);
if (!ts->lat_percentiles) {
add_stat_sample(&ts->clat_stat[ddir], nsec);
if (!ts->lat_percentiles) {
- if (
priority_bit
)
+ if (
high_prio
)
add_stat_sample(&ts->clat_high_prio_stat[ddir], nsec);
else
add_stat_sample(&ts->clat_low_prio_stat[ddir], nsec);
add_stat_sample(&ts->clat_high_prio_stat[ddir], nsec);
else
add_stat_sample(&ts->clat_low_prio_stat[ddir], nsec);
@@
-3119,13
+3124,13
@@
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
if (td->clat_log)
add_log_sample(td, td->clat_log, sample_val(nsec), ddir, bs,
if (td->clat_log)
add_log_sample(td, td->clat_log, sample_val(nsec), ddir, bs,
- offset,
priority_bit
);
+ offset,
ioprio
);
if (ts->clat_percentiles) {
if (ts->lat_percentiles)
add_lat_percentile_sample_noprio(ts, nsec, ddir, FIO_CLAT);
else
if (ts->clat_percentiles) {
if (ts->lat_percentiles)
add_lat_percentile_sample_noprio(ts, nsec, ddir, FIO_CLAT);
else
- add_lat_percentile_sample(ts, nsec, ddir,
priority_bit
, FIO_CLAT);
+ add_lat_percentile_sample(ts, nsec, ddir,
high_prio
, FIO_CLAT);
}
if (iolog && iolog->hist_msec) {
}
if (iolog && iolog->hist_msec) {
@@
-3154,7
+3159,7
@@
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
FIO_IO_U_PLAT_NR * sizeof(uint64_t));
flist_add(&dst->list, &hw->list);
__add_log_sample(iolog, sample_plat(dst), ddir, bs,
FIO_IO_U_PLAT_NR * sizeof(uint64_t));
flist_add(&dst->list, &hw->list);
__add_log_sample(iolog, sample_plat(dst), ddir, bs,
-
elapsed, offset, priority_bit
);
+
elapsed, offset, ioprio
);
/*
* Update the last time we recorded as being now, minus
/*
* Update the last time we recorded as being now, minus
@@
-3171,8
+3176,8
@@
void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
}
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
}
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
-
unsigned long long nsec, unsigned long long bs, uint64_t offset
,
-
uint8_t priority_bit
)
+
unsigned long long nsec, unsigned long long bs
,
+
uint64_t offset, unsigned int ioprio
)
{
const bool needs_lock = td_async_processing(td);
struct thread_stat *ts = &td->ts;
{
const bool needs_lock = td_async_processing(td);
struct thread_stat *ts = &td->ts;
@@
-3186,8
+3191,8
@@
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
add_stat_sample(&ts->slat_stat[ddir], nsec);
if (td->slat_log)
add_stat_sample(&ts->slat_stat[ddir], nsec);
if (td->slat_log)
- add_log_sample(td, td->slat_log, sample_val(nsec), ddir, bs,
offset,
-
priority_bit
);
+ add_log_sample(td, td->slat_log, sample_val(nsec), ddir, bs,
+
offset, ioprio
);
if (ts->slat_percentiles)
add_lat_percentile_sample_noprio(ts, nsec, ddir, FIO_SLAT);
if (ts->slat_percentiles)
add_lat_percentile_sample_noprio(ts, nsec, ddir, FIO_SLAT);
@@
-3198,7
+3203,7
@@
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
unsigned long long nsec, unsigned long long bs,
void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
unsigned long long nsec, unsigned long long bs,
- uint64_t offset, u
int8_t priority_bit
)
+ uint64_t offset, u
nsigned int ioprio, bool high_prio
)
{
const bool needs_lock = td_async_processing(td);
struct thread_stat *ts = &td->ts;
{
const bool needs_lock = td_async_processing(td);
struct thread_stat *ts = &td->ts;
@@
-3213,11
+3218,11
@@
void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
if (td->lat_log)
add_log_sample(td, td->lat_log, sample_val(nsec), ddir, bs,
if (td->lat_log)
add_log_sample(td, td->lat_log, sample_val(nsec), ddir, bs,
- offset,
priority_bit
);
+ offset,
ioprio
);
if (ts->lat_percentiles) {
if (ts->lat_percentiles) {
- add_lat_percentile_sample(ts, nsec, ddir,
priority_bit
, FIO_LAT);
- if (
priority_bit
)
+ add_lat_percentile_sample(ts, nsec, ddir,
high_prio
, FIO_LAT);
+ if (
high_prio
)
add_stat_sample(&ts->clat_high_prio_stat[ddir], nsec);
else
add_stat_sample(&ts->clat_low_prio_stat[ddir], nsec);
add_stat_sample(&ts->clat_high_prio_stat[ddir], nsec);
else
add_stat_sample(&ts->clat_low_prio_stat[ddir], nsec);
@@
-3246,7
+3251,7
@@
void add_bw_sample(struct thread_data *td, struct io_u *io_u,
if (td->bw_log)
add_log_sample(td, td->bw_log, sample_val(rate), io_u->ddir,
if (td->bw_log)
add_log_sample(td, td->bw_log, sample_val(rate), io_u->ddir,
- bytes, io_u->offset, io_u
_is_prio(io_u)
);
+ bytes, io_u->offset, io_u
->ioprio
);
td->stat_io_bytes[io_u->ddir] = td->this_io_bytes[io_u->ddir];
td->stat_io_bytes[io_u->ddir] = td->this_io_bytes[io_u->ddir];
@@
-3300,7
+3305,8
@@
static int __add_samples(struct thread_data *td, struct timespec *parent_tv,
if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
bs = td->o.min_bs[ddir];
if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
bs = td->o.min_bs[ddir];
- next = add_log_sample(td, log, sample_val(rate), ddir, bs, 0, 0);
+ next = add_log_sample(td, log, sample_val(rate), ddir,
+ bs, 0, 0);
next_log = min(next_log, next);
}
next_log = min(next_log, next);
}
@@
-3340,7
+3346,7
@@
void add_iops_sample(struct thread_data *td, struct io_u *io_u,
if (td->iops_log)
add_log_sample(td, td->iops_log, sample_val(1), io_u->ddir,
if (td->iops_log)
add_log_sample(td, td->iops_log, sample_val(1), io_u->ddir,
- bytes, io_u->offset, io_u
_is_prio(io_u)
);
+ bytes, io_u->offset, io_u
->ioprio
);
td->stat_io_blocks[io_u->ddir] = td->this_io_blocks[io_u->ddir];
td->stat_io_blocks[io_u->ddir] = td->this_io_blocks[io_u->ddir];