projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filesetup: create_work_dirs() can return bool
[fio.git]
/
stat.c
diff --git
a/stat.c
b/stat.c
index 91c74abef420f8fb0e8453e5a9be1fecff1e6f56..c8a45dbd4ce05e962659245be13e67e0251adcc6 100644
(file)
--- a/
stat.c
+++ b/
stat.c
@@
-135,15
+135,15
@@
static int double_cmp(const void *a, const void *b)
return cmp;
}
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)
{
fio_fp64_t *plist, unsigned long long **output,
unsigned long long *maxv, unsigned long long *minv)
{
- unsigned long sum = 0;
+ unsigned long
long
sum = 0;
unsigned int len, i, j = 0;
unsigned int oval_len = 0;
unsigned long long *ovals = NULL;
unsigned int len, i, j = 0;
unsigned int oval_len = 0;
unsigned long long *ovals = NULL;
-
int
is_last;
+
bool
is_last;
*minv = -1ULL;
*maxv = 0;
*minv = -1ULL;
*maxv = 0;
@@
-166,7
+166,7
@@
unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
/*
* Calculate bucket values, note down max and min values
*/
/*
* Calculate bucket values, note down max and min values
*/
- is_last =
0
;
+ is_last =
false
;
for (i = 0; i < FIO_IO_U_PLAT_NR && !is_last; i++) {
sum += io_u_plat[i];
while (sum >= (plist[j].u.f / 100.0 * nr)) {
for (i = 0; i < FIO_IO_U_PLAT_NR && !is_last; i++) {
sum += io_u_plat[i];
while (sum >= (plist[j].u.f / 100.0 * nr)) {
@@
-183,7
+183,7
@@
unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
if (ovals[j] > *maxv)
*maxv = ovals[j];
if (ovals[j] > *maxv)
*maxv = ovals[j];
- is_last = (j == len - 1);
+ is_last = (j == len - 1)
!= 0
;
if (is_last)
break;
if (is_last)
break;
@@
-198,14
+198,16
@@
unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
/*
* Find and display the p-th percentile of clat
*/
/*
* 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,
fio_fp64_t *plist, unsigned int precision,
- struct buf_output *out)
+
bool is_clat,
struct buf_output *out)
{
unsigned int divisor, len, i, j = 0;
unsigned long long minv, maxv;
unsigned long long *ovals;
{
unsigned int divisor, len, i, j = 0;
unsigned long long minv, maxv;
unsigned long long *ovals;
- int is_last, per_line, scale_down, time_width;
+ int per_line, scale_down, time_width;
+ const char *pre = is_clat ? "clat" : " lat";
+ bool is_last;
char fmt[32];
len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
char fmt[32];
len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
@@
-219,15
+221,15
@@
static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
if (minv > 2000000 && maxv > 99999999ULL) {
scale_down = 2;
divisor = 1000000;
if (minv > 2000000 && maxv > 99999999ULL) {
scale_down = 2;
divisor = 1000000;
- log_buf(out, "
clat percentiles (msec):\n |"
);
+ log_buf(out, "
%s percentiles (msec):\n |", pre
);
} else if (minv > 2000 && maxv > 99999) {
scale_down = 1;
divisor = 1000;
} else if (minv > 2000 && maxv > 99999) {
scale_down = 1;
divisor = 1000;
- log_buf(out, "
clat percentiles (usec):\n |"
);
+ log_buf(out, "
%s percentiles (usec):\n |", pre
);
} else {
scale_down = 0;
divisor = 1;
} else {
scale_down = 0;
divisor = 1;
- log_buf(out, "
clat percentiles (nsec):\n |"
);
+ log_buf(out, "
%s percentiles (nsec):\n |", pre
);
}
}
@@
-243,7
+245,7
@@
static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
log_buf(out, " |");
/* end of the list */
log_buf(out, " |");
/* end of the list */
- is_last = (j == len - 1);
+ is_last = (j == len - 1)
!= 0
;
for (i = 0; i < scale_down; i++)
ovals[j] = (ovals[j] + 999) / 1000;
for (i = 0; i < scale_down; i++)
ovals[j] = (ovals[j] + 999) / 1000;
@@
-457,11
+459,12
@@
static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
display_lat(" lat", min, max, mean, dev, out);
if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
display_lat(" lat", min, max, mean, dev, out);
- if (ts->clat_percentiles) {
+ if (ts->clat_percentiles
|| ts->lat_percentiles
) {
show_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list,
show_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list,
- ts->percentile_precision, out);
+ ts->percentile_precision,
+ ts->clat_percentiles, out);
}
if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
double p_of_agg = 100.0, fkb_base = (double)rs->kb_base;
}
if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
double p_of_agg = 100.0, fkb_base = (double)rs->kb_base;
@@
-509,20
+512,21
@@
static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
}
}
}
}
-static
int
show_lat(double *io_u_lat, int nr, const char **ranges,
- const char *msg, struct buf_output *out)
+static
bool
show_lat(double *io_u_lat, int nr, const char **ranges,
+
const char *msg, struct buf_output *out)
{
{
- int new_line = 1, i, line = 0, shown = 0;
+ bool new_line = true, shown = false;
+ int i, line = 0;
for (i = 0; i < nr; i++) {
if (io_u_lat[i] <= 0.0)
continue;
for (i = 0; i < nr; i++) {
if (io_u_lat[i] <= 0.0)
continue;
- shown =
1
;
+ shown =
true
;
if (new_line) {
if (line)
log_buf(out, "\n");
log_buf(out, " lat (%s) : ", msg);
if (new_line) {
if (line)
log_buf(out, "\n");
log_buf(out, " lat (%s) : ", msg);
- new_line =
0
;
+ new_line =
false
;
line = 0;
}
if (line)
line = 0;
}
if (line)
@@
-530,13
+534,13
@@
static int show_lat(double *io_u_lat, int nr, const char **ranges,
log_buf(out, "%s%3.2f%%", ranges[i], io_u_lat[i]);
line++;
if (line == 5)
log_buf(out, "%s%3.2f%%", ranges[i], io_u_lat[i]);
line++;
if (line == 5)
- new_line =
1
;
+ new_line =
true
;
}
if (shown)
log_buf(out, "\n");
}
if (shown)
log_buf(out, "\n");
- return
shown
;
+ return
true
;
}
static void show_lat_n(double *io_u_lat_n, struct buf_output *out)
}
static void show_lat_n(double *io_u_lat_n, struct buf_output *out)
@@
-896,7
+900,7
@@
static void show_ddir_status_terse(struct thread_stat *ts,
else
log_buf(out, ";%llu;%llu;%f;%f", 0ULL, 0ULL, 0.0, 0.0);
else
log_buf(out, ";%llu;%llu;%f;%f", 0ULL, 0ULL, 0.0, 0.0);
- if (ts->clat_percentiles) {
+ if (ts->clat_percentiles
|| ts->lat_percentiles
) {
len = calc_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list, &ovals, &maxv,
len = calc_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list, &ovals, &maxv,
@@
-958,7
+962,7
@@
static void add_ddir_status_json(struct thread_stat *ts,
unsigned int len;
int i;
const char *ddirname[] = {"read", "write", "trim"};
unsigned int len;
int i;
const char *ddirname[] = {"read", "write", "trim"};
- struct json_object *dir_object, *tmp_object, *percentile_object, *clat_bins_object;
+ struct json_object *dir_object, *tmp_object, *percentile_object, *clat_bins_object
= NULL
;
char buf[120];
double p_of_agg = 100.0;
char buf[120];
double p_of_agg = 100.0;
@@
-1011,7
+1015,7
@@
static void add_ddir_status_json(struct thread_stat *ts,
json_object_add_value_float(tmp_object, "mean", mean);
json_object_add_value_float(tmp_object, "stddev", dev);
json_object_add_value_float(tmp_object, "mean", mean);
json_object_add_value_float(tmp_object, "stddev", dev);
- if (ts->clat_percentiles) {
+ if (ts->clat_percentiles
|| ts->lat_percentiles
) {
len = calc_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list, &ovals, &maxv,
len = calc_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list, &ovals, &maxv,
@@
-1032,7
+1036,9
@@
static void add_ddir_status_json(struct thread_stat *ts,
if (output_format & FIO_OUTPUT_JSON_PLUS) {
clat_bins_object = json_create_object();
if (output_format & FIO_OUTPUT_JSON_PLUS) {
clat_bins_object = json_create_object();
- json_object_add_value_object(tmp_object, "bins", clat_bins_object);
+ if (ts->clat_percentiles)
+ json_object_add_value_object(tmp_object, "bins", clat_bins_object);
+
for(i = 0; i < FIO_IO_U_PLAT_NR; i++) {
if (ts->io_u_plat[ddir][i]) {
snprintf(buf, sizeof(buf), "%llu", plat_idx_to_val(i));
for(i = 0; i < FIO_IO_U_PLAT_NR; i++) {
if (ts->io_u_plat[ddir][i]) {
snprintf(buf, sizeof(buf), "%llu", plat_idx_to_val(i));
@@
-1051,6
+1057,9
@@
static void add_ddir_status_json(struct thread_stat *ts,
json_object_add_value_int(tmp_object, "max", max);
json_object_add_value_float(tmp_object, "mean", mean);
json_object_add_value_float(tmp_object, "stddev", dev);
json_object_add_value_int(tmp_object, "max", max);
json_object_add_value_float(tmp_object, "mean", mean);
json_object_add_value_float(tmp_object, "stddev", dev);
+ if (output_format & FIO_OUTPUT_JSON_PLUS && ts->lat_percentiles)
+ json_object_add_value_object(tmp_object, "bins", clat_bins_object);
+
if (ovals)
free(ovals);
if (ovals)
free(ovals);
@@
-1588,8
+1597,8
@@
void __show_run_stats(void)
struct thread_data *td;
struct thread_stat *threadstats, *ts;
int i, j, k, nr_ts, last_ts, idx;
struct thread_data *td;
struct thread_stat *threadstats, *ts;
int i, j, k, nr_ts, last_ts, idx;
-
int kb_base_warned = 0
;
-
int unit_base_warned = 0
;
+
bool kb_base_warned = false
;
+
bool unit_base_warned = false
;
struct json_object *root = NULL;
struct json_array *array = NULL;
struct buf_output output[FIO_OUTPUT_NR];
struct json_object *root = NULL;
struct json_array *array = NULL;
struct buf_output output[FIO_OUTPUT_NR];
@@
-1645,6
+1654,7
@@
void __show_run_stats(void)
ts = &threadstats[j];
ts->clat_percentiles = td->o.clat_percentiles;
ts = &threadstats[j];
ts->clat_percentiles = td->o.clat_percentiles;
+ ts->lat_percentiles = td->o.lat_percentiles;
ts->percentile_precision = td->o.percentile_precision;
memcpy(ts->percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list));
opt_lists[j] = &td->opt_list;
ts->percentile_precision = td->o.percentile_precision;
memcpy(ts->percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list));
opt_lists[j] = &td->opt_list;
@@
-1681,11
+1691,11
@@
void __show_run_stats(void)
} else if (ts->kb_base != td->o.kb_base && !kb_base_warned) {
log_info("fio: kb_base differs for jobs in group, using"
" %u as the base\n", ts->kb_base);
} else if (ts->kb_base != td->o.kb_base && !kb_base_warned) {
log_info("fio: kb_base differs for jobs in group, using"
" %u as the base\n", ts->kb_base);
- kb_base_warned =
1
;
+ kb_base_warned =
true
;
} else if (ts->unit_base != td->o.unit_base && !unit_base_warned) {
log_info("fio: unit_base differs for jobs in group, using"
" %u as the base\n", ts->unit_base);
} else if (ts->unit_base != td->o.unit_base && !unit_base_warned) {
log_info("fio: unit_base differs for jobs in group, using"
" %u as the base\n", ts->unit_base);
- unit_base_warned =
1
;
+ unit_base_warned =
true
;
}
ts->continue_on_error = td->o.continue_on_error;
}
ts->continue_on_error = td->o.continue_on_error;
@@
-1929,9
+1939,9
@@
void __show_running_run_stats(void)
fio_mutex_up(stat_mutex);
}
fio_mutex_up(stat_mutex);
}
-static
int
status_interval_init;
+static
bool
status_interval_init;
static struct timespec status_time;
static struct timespec status_time;
-static
int
status_file_disabled;
+static
bool
status_file_disabled;
#define FIO_STATUS_FILE "fio-dump-status"
#define FIO_STATUS_FILE "fio-dump-status"
@@
-1962,7
+1972,7
@@
static int check_status_file(void)
log_err("fio: failed to unlink %s: %s\n", fio_status_file_path,
strerror(errno));
log_err("fio: disabling status file updates\n");
log_err("fio: failed to unlink %s: %s\n", fio_status_file_path,
strerror(errno));
log_err("fio: disabling status file updates\n");
- status_file_disabled =
1
;
+ status_file_disabled =
true
;
}
return 1;
}
return 1;
@@
-1973,7
+1983,7
@@
void check_for_running_stats(void)
if (status_interval) {
if (!status_interval_init) {
fio_gettime(&status_time, NULL);
if (status_interval) {
if (!status_interval_init) {
fio_gettime(&status_time, NULL);
- status_interval_init =
1
;
+ status_interval_init =
true
;
} else if (mtime_since_now(&status_time) >= status_interval) {
show_running_run_stats();
fio_gettime(&status_time, NULL);
} else if (mtime_since_now(&status_time) >= status_interval) {
show_running_run_stats();
fio_gettime(&status_time, NULL);
@@
-2159,7
+2169,7
@@
static void __add_log_sample(struct io_log *iolog, union io_sample_data data,
if (iolog->disabled)
return;
if (flist_empty(&iolog->io_logs))
if (iolog->disabled)
return;
if (flist_empty(&iolog->io_logs))
- iolog->avg_last = t;
+ iolog->avg_last
[ddir]
= t;
cur_log = get_cur_log(iolog);
if (cur_log) {
cur_log = get_cur_log(iolog);
if (cur_log) {
@@
-2290,9
+2300,9
@@
static long add_log_sample(struct thread_data *td, struct io_log *iolog,
* If period hasn't passed, adding the above sample is all we
* need to do.
*/
* If period hasn't passed, adding the above sample is all we
* need to do.
*/
- this_window = elapsed - iolog->avg_last;
- if (elapsed < iolog->avg_last)
- return iolog->avg_last - elapsed;
+ this_window = elapsed - iolog->avg_last
[ddir]
;
+ if (elapsed < iolog->avg_last
[ddir]
)
+ return iolog->avg_last
[ddir]
- elapsed;
else if (this_window < iolog->avg_msec) {
int diff = iolog->avg_msec - this_window;
else if (this_window < iolog->avg_msec) {
int diff = iolog->avg_msec - this_window;
@@
-2300,9
+2310,9
@@
static long add_log_sample(struct thread_data *td, struct io_log *iolog,
return diff;
}
return diff;
}
- _
add_stat_to_log(iolog
, elapsed, td->o.log_max != 0);
+ _
_add_stat_to_log(iolog, ddir
, elapsed, td->o.log_max != 0);
- iolog->avg_last = elapsed - (this_window - iolog->avg_msec);
+ iolog->avg_last
[ddir]
= elapsed - (this_window - iolog->avg_msec);
return iolog->avg_msec;
}
return iolog->avg_msec;
}
@@
-2437,6
+2447,9
@@
void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
add_log_sample(td, td->lat_log, sample_val(nsec), ddir, bs,
offset);
add_log_sample(td, td->lat_log, sample_val(nsec), ddir, bs,
offset);
+ if (ts->lat_percentiles)
+ add_clat_percentile_sample(ts, nsec, ddir);
+
td_io_u_unlock(td);
}
td_io_u_unlock(td);
}