#include <dirent.h>
#include <libgen.h>
#include <math.h>
+#include <assert.h>
#include "fio.h"
#include "smalloc.h"
while (!flist_empty(&du->slaves)) {
struct disk_util *slave;
- slave = flist_entry(du->slaves.next, struct disk_util, slavelist);
+ slave = flist_first_entry(&du->slaves, struct disk_util, slavelist);
flist_del(&slave->slavelist);
slave->users--;
}
dprint(FD_DISKUTIL, "%s: %s", du->path, p);
- ret = sscanf(p, "%u %u %llu %u %u %u %llu %u %u %u %u\n", &dus->ios[0],
- &dus->merges[0], §ors[0],
- &dus->ticks[0], &dus->ios[1],
- &dus->merges[1], §ors[1],
- &dus->ticks[1], &in_flight,
- &dus->io_ticks, &dus->time_in_queue);
+ ret = sscanf(p, "%llu %llu %llu %llu %llu %llu %llu %llu %u %llu %llu\n",
+ (unsigned long long *) &dus->s.ios[0],
+ (unsigned long long *) &dus->s.merges[0],
+ §ors[0],
+ (unsigned long long *) &dus->s.ticks[0],
+ (unsigned long long *) &dus->s.ios[1],
+ (unsigned long long *) &dus->s.merges[1],
+ §ors[1],
+ (unsigned long long *) &dus->s.ticks[1],
+ &in_flight,
+ (unsigned long long *) &dus->s.io_ticks,
+ (unsigned long long *) &dus->s.time_in_queue);
fclose(f);
dprint(FD_DISKUTIL, "%s: stat read ok? %d\n", du->path, ret == 1);
- dus->sectors[0] = sectors[0];
- dus->sectors[1] = sectors[1];
+ dus->s.sectors[0] = sectors[0];
+ dus->s.sectors[1] = sectors[1];
return ret != 11;
}
dus = &du->dus;
ldus = &du->last_dus;
- dus->sectors[0] += (__dus.sectors[0] - ldus->sectors[0]);
- dus->sectors[1] += (__dus.sectors[1] - ldus->sectors[1]);
- dus->ios[0] += (__dus.ios[0] - ldus->ios[0]);
- dus->ios[1] += (__dus.ios[1] - ldus->ios[1]);
- dus->merges[0] += (__dus.merges[0] - ldus->merges[0]);
- dus->merges[1] += (__dus.merges[1] - ldus->merges[1]);
- dus->ticks[0] += (__dus.ticks[0] - ldus->ticks[0]);
- dus->ticks[1] += (__dus.ticks[1] - ldus->ticks[1]);
- dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
- dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
+ dus->s.sectors[0] += (__dus.s.sectors[0] - ldus->s.sectors[0]);
+ dus->s.sectors[1] += (__dus.s.sectors[1] - ldus->s.sectors[1]);
+ dus->s.ios[0] += (__dus.s.ios[0] - ldus->s.ios[0]);
+ dus->s.ios[1] += (__dus.s.ios[1] - ldus->s.ios[1]);
+ dus->s.merges[0] += (__dus.s.merges[0] - ldus->s.merges[0]);
+ dus->s.merges[1] += (__dus.s.merges[1] - ldus->s.merges[1]);
+ dus->s.ticks[0] += (__dus.s.ticks[0] - ldus->s.ticks[0]);
+ dus->s.ticks[1] += (__dus.s.ticks[1] - ldus->s.ticks[1]);
+ dus->s.io_ticks += (__dus.s.io_ticks - ldus->s.io_ticks);
+ dus->s.time_in_queue += (__dus.s.time_in_queue - ldus->s.time_in_queue);
fio_gettime(&t, NULL);
- dus->msec += mtime_since(&du->time, &t);
+ dus->s.msec += mtime_since(&du->time, &t);
memcpy(&du->time, &t, sizeof(t));
- memcpy(ldus, &__dus, sizeof(__dus));
+ memcpy(&ldus->s, &__dus.s, sizeof(__dus.s));
}
int update_io_ticks(void)
fio_mutex_down(disk_util_mutex);
- if (!disk_util_exit) {
+ if (!helper_exit) {
flist_for_each(entry, &disk_list) {
du = flist_entry(entry, struct disk_util, list);
update_io_tick_disk(du);
* are links to the real directories for the slave
* devices?
*/
- linklen = readlink(temppath, slavepath, PATH_MAX - 0);
+ linklen = readlink(temppath, slavepath, PATH_MAX - 1);
if (linklen < 0) {
perror("readlink() for slave device.");
+ closedir(dirhandle);
return;
}
slavepath[linklen] = '\0';
sprintf(temppath, "%s/%s/dev", slavesdir, slavepath);
if (read_block_dev_entry(temppath, &majdev, &mindev)) {
perror("Error getting slave device numbers.");
+ closedir(dirhandle);
return;
}
{
struct disk_util *du, *__du;
struct flist_head *entry;
+ int l;
dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = smalloc(sizeof(*du));
+ if (!du) {
+ log_err("fio: smalloc() pool exhausted\n");
+ return NULL;
+ }
+
memset(du, 0, sizeof(*du));
INIT_FLIST_HEAD(&du->list);
- sprintf(du->path, "%s/stat", path);
- strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ);
+ l = snprintf(du->path, sizeof(du->path), "%s/stat", path);
+ if (l < 0 || l >= sizeof(du->path)) {
+ log_err("constructed path \"%.100s[...]/stat\" larger than buffer (%zu bytes)\n",
+ path, sizeof(du->path) - 1);
+ sfree(du);
+ return NULL;
+ }
+ strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ - 1);
du->sysfs_root = path;
du->major = majdev;
du->minor = mindev;
f->du = __init_disk_util(td, f);
}
-static void show_agg_stats(struct disk_util_agg *agg, int terse)
+static void show_agg_stats(struct disk_util_agg *agg, int terse,
+ struct buf_output *out)
{
if (!agg->slavecount)
return;
if (!terse) {
- log_info(", aggrios=%u/%u, aggrmerge=%u/%u, aggrticks=%u/%u,"
- " aggrin_queue=%u, aggrutil=%3.2f%%",
- agg->ios[0] / agg->slavecount,
- agg->ios[1] / agg->slavecount,
- agg->merges[0] / agg->slavecount,
- agg->merges[1] / agg->slavecount,
- agg->ticks[0] / agg->slavecount,
- agg->ticks[1] / agg->slavecount,
- agg->time_in_queue / agg->slavecount,
- agg->max_util.u.f);
+ log_buf(out, ", aggrios=%llu/%llu, aggrmerge=%llu/%llu, "
+ "aggrticks=%llu/%llu, aggrin_queue=%llu, "
+ "aggrutil=%3.2f%%",
+ (unsigned long long) agg->ios[0] / agg->slavecount,
+ (unsigned long long) agg->ios[1] / agg->slavecount,
+ (unsigned long long) agg->merges[0] / agg->slavecount,
+ (unsigned long long) agg->merges[1] / agg->slavecount,
+ (unsigned long long) agg->ticks[0] / agg->slavecount,
+ (unsigned long long) agg->ticks[1] / agg->slavecount,
+ (unsigned long long) agg->time_in_queue / agg->slavecount,
+ agg->max_util.u.f);
} else {
- log_info(";slaves;%u;%u;%u;%u;%u;%u;%u;%3.2f%%",
- agg->ios[0] / agg->slavecount,
- agg->ios[1] / agg->slavecount,
- agg->merges[0] / agg->slavecount,
- agg->merges[1] / agg->slavecount,
- agg->ticks[0] / agg->slavecount,
- agg->ticks[1] / agg->slavecount,
- agg->time_in_queue / agg->slavecount,
- agg->max_util.u.f);
+ log_buf(out, ";slaves;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
+ (unsigned long long) agg->ios[0] / agg->slavecount,
+ (unsigned long long) agg->ios[1] / agg->slavecount,
+ (unsigned long long) agg->merges[0] / agg->slavecount,
+ (unsigned long long) agg->merges[1] / agg->slavecount,
+ (unsigned long long) agg->ticks[0] / agg->slavecount,
+ (unsigned long long) agg->ticks[1] / agg->slavecount,
+ (unsigned long long) agg->time_in_queue / agg->slavecount,
+ agg->max_util.u.f);
}
}
flist_for_each(entry, &masterdu->slaves) {
slavedu = flist_entry(entry, struct disk_util, slavelist);
dus = &slavedu->dus;
- agg->ios[0] += dus->ios[0];
- agg->ios[1] += dus->ios[1];
- agg->merges[0] += dus->merges[0];
- agg->merges[1] += dus->merges[1];
- agg->sectors[0] += dus->sectors[0];
- agg->sectors[1] += dus->sectors[1];
- agg->ticks[0] += dus->ticks[0];
- agg->ticks[1] += dus->ticks[1];
- agg->time_in_queue += dus->time_in_queue;
+ agg->ios[0] += dus->s.ios[0];
+ agg->ios[1] += dus->s.ios[1];
+ agg->merges[0] += dus->s.merges[0];
+ agg->merges[1] += dus->s.merges[1];
+ agg->sectors[0] += dus->s.sectors[0];
+ agg->sectors[1] += dus->s.sectors[1];
+ agg->ticks[0] += dus->s.ticks[0];
+ agg->ticks[1] += dus->s.ticks[1];
+ agg->time_in_queue += dus->s.time_in_queue;
agg->slavecount++;
- util = (double) (100 * dus->io_ticks / (double) slavedu->dus.msec);
+ util = (double) (100 * dus->s.io_ticks / (double) slavedu->dus.s.msec);
/* System utilization is the utilization of the
* component with the highest utilization.
*/
while (!flist_empty(&disk_list)) {
struct disk_util *du;
- du = flist_entry(disk_list.next, struct disk_util, list);
+ du = flist_first_entry(&disk_list, struct disk_util, list);
flist_del(&du->list);
disk_util_free(du);
}
}
void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg,
- int terse)
+ int terse, struct buf_output *out)
{
double util = 0;
- if (dus->msec)
- util = (double) 100 * dus->io_ticks / (double) dus->msec;
+ if (dus->s.msec)
+ util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
if (util > 100.0)
util = 100.0;
if (!terse) {
if (agg->slavecount)
- log_info(" ");
-
- log_info(" %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, "
- "in_queue=%u, util=%3.2f%%", dus->name,
- dus->ios[0], dus->ios[1],
- dus->merges[0], dus->merges[1],
- dus->ticks[0], dus->ticks[1],
- dus->time_in_queue, util);
+ log_buf(out, " ");
+
+ log_buf(out, " %s: ios=%llu/%llu, merge=%llu/%llu, "
+ "ticks=%llu/%llu, in_queue=%llu, util=%3.2f%%",
+ dus->name,
+ (unsigned long long) dus->s.ios[0],
+ (unsigned long long) dus->s.ios[1],
+ (unsigned long long) dus->s.merges[0],
+ (unsigned long long) dus->s.merges[1],
+ (unsigned long long) dus->s.ticks[0],
+ (unsigned long long) dus->s.ticks[1],
+ (unsigned long long) dus->s.time_in_queue,
+ util);
} else {
- log_info(";%s;%u;%u;%u;%u;%u;%u;%u;%3.2f%%",
- dus->name, dus->ios[0], dus->ios[1],
- dus->merges[0], dus->merges[1],
- dus->ticks[0], dus->ticks[1],
- dus->time_in_queue, util);
+ log_buf(out, ";%s;%llu;%llu;%llu;%llu;%llu;%llu;%llu;%3.2f%%",
+ dus->name,
+ (unsigned long long) dus->s.ios[0],
+ (unsigned long long) dus->s.ios[1],
+ (unsigned long long) dus->s.merges[0],
+ (unsigned long long) dus->s.merges[1],
+ (unsigned long long) dus->s.ticks[0],
+ (unsigned long long) dus->s.ticks[1],
+ (unsigned long long) dus->s.time_in_queue,
+ util);
}
/*
* If the device has slaves, aggregate the stats for
* those slave devices also.
*/
- show_agg_stats(agg, terse);
+ show_agg_stats(agg, terse, out);
if (!terse)
- log_info("\n");
+ log_buf(out, "\n");
}
-static void print_disk_util_json(struct disk_util *du, struct json_array *array)
+void json_array_add_disk_util(struct disk_util_stat *dus,
+ struct disk_util_agg *agg, struct json_array *array)
{
- double util = 0;
- struct disk_util_stat *dus = &du->dus;
- struct disk_util_agg *agg = &du->agg;
struct json_object *obj;
+ double util = 0;
- obj = json_create_object();
- json_array_add_value_object(array, obj);
-
- if (dus->msec)
- util = (double) 100 * dus->io_ticks / (double) dus->msec;
+ if (dus->s.msec)
+ util = (double) 100 * dus->s.io_ticks / (double) dus->s.msec;
if (util > 100.0)
util = 100.0;
+ obj = json_create_object();
+ json_array_add_value_object(array, obj);
json_object_add_value_string(obj, "name", dus->name);
- json_object_add_value_int(obj, "read_ios", dus->ios[0]);
- json_object_add_value_int(obj, "write_ios", dus->ios[1]);
- json_object_add_value_int(obj, "read_merges", dus->merges[0]);
- json_object_add_value_int(obj, "write_merges", dus->merges[1]);
- json_object_add_value_int(obj, "read_ticks", dus->ticks[0]);
- json_object_add_value_int(obj, "write_ticks", dus->ticks[1]);
- json_object_add_value_int(obj, "in_queue", dus->time_in_queue);
+ json_object_add_value_int(obj, "read_ios", dus->s.ios[0]);
+ json_object_add_value_int(obj, "write_ios", dus->s.ios[1]);
+ json_object_add_value_int(obj, "read_merges", dus->s.merges[0]);
+ json_object_add_value_int(obj, "write_merges", dus->s.merges[1]);
+ json_object_add_value_int(obj, "read_ticks", dus->s.ticks[0]);
+ json_object_add_value_int(obj, "write_ticks", dus->s.ticks[1]);
+ json_object_add_value_int(obj, "in_queue", dus->s.time_in_queue);
json_object_add_value_float(obj, "util", util);
/*
json_object_add_value_float(obj, "aggr_util", agg->max_util.u.f);
}
-void show_disk_util(int terse, struct json_object *parent)
+static void json_object_add_disk_utils(struct json_object *obj,
+ struct flist_head *head)
{
+ struct json_array *array = json_create_array();
struct flist_head *entry;
struct disk_util *du;
- struct json_array *array = NULL;
+
+ json_object_add_value_array(obj, "disk_util", array);
+
+ flist_for_each(entry, head) {
+ du = flist_entry(entry, struct disk_util, list);
+
+ aggregate_slaves_stats(du);
+ json_array_add_disk_util(&du->dus, &du->agg, array);
+ }
+}
+
+void show_disk_util(int terse, struct json_object *parent,
+ struct buf_output *out)
+{
+ struct flist_head *entry;
+ struct disk_util *du;
+ bool do_json;
+
+ if (!disk_util_mutex)
+ return;
fio_mutex_down(disk_util_mutex);
return;
}
- if (!terse)
- log_info("\nDisk stats (read/write):\n");
+ if ((output_format & FIO_OUTPUT_JSON) && parent)
+ do_json = true;
+ else
+ do_json = false;
- if (terse && terse_version == 4) {
- array = json_create_array();
- json_object_add_value_array(parent, "disk_util", array);
- }
+ if (!terse && !do_json)
+ log_buf(out, "\nDisk stats (read/write):\n");
- flist_for_each(entry, &disk_list) {
- du = flist_entry(entry, struct disk_util, list);
+ if (do_json)
+ json_object_add_disk_utils(parent, &disk_list);
+ else if (output_format & ~(FIO_OUTPUT_JSON | FIO_OUTPUT_JSON_PLUS)) {
+ flist_for_each(entry, &disk_list) {
+ du = flist_entry(entry, struct disk_util, list);
- aggregate_slaves_stats(du);
- if (terse && terse_version == 4)
- print_disk_util_json(du, array);
- else
- print_disk_util(&du->dus, &du->agg, terse);
+ aggregate_slaves_stats(du);
+ print_disk_util(&du->dus, &du->agg, terse, out);
+ }
}
fio_mutex_up(disk_util_mutex);
projects / fio.git / blobdiff