X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.c;h=6c6380bbc774e7b4dca76f6882dac9008008538b;hp=dd8fc6a20b3aec09875823f416369743a897af3e;hb=dacac3b936092aa73e29257fefcb7bf5658ec7cb;hpb=4f37732a580d7983467ea1ba11f963da4e8cf06e diff --git a/diskutil.c b/diskutil.c index dd8fc6a2..6c6380bb 100644 --- a/diskutil.c +++ b/diskutil.c @@ -1,13 +1,10 @@ #include #include -#include #include #include #include #include #include -#include -#include #ifdef CONFIG_VALGRIND_DEV #include #else @@ -184,8 +181,7 @@ static int get_device_numbers(char *file_name, int *maj, int *min) /* * must be a file, open "." in that path */ - tempname[PATH_MAX - 1] = '\0'; - strncpy(tempname, file_name, PATH_MAX - 1); + snprintf(tempname, ARRAY_SIZE(tempname), "%s", file_name); p = dirname(tempname); if (stat(p, &st)) { perror("disk util stat"); @@ -245,7 +241,8 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, !strcmp(dirent->d_name, "..")) continue; - sprintf(temppath, "%s/%s", slavesdir, dirent->d_name); + nowarn_snprintf(temppath, sizeof(temppath), "%s/%s", slavesdir, + dirent->d_name); /* Can we always assume that the slaves device entries * are links to the real directories for the slave * devices? @@ -258,9 +255,12 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, } slavepath[linklen] = '\0'; - sprintf(temppath, "%s/%s/dev", slavesdir, slavepath); + nowarn_snprintf(temppath, sizeof(temppath), "%s/%s/dev", + slavesdir, slavepath); if (access(temppath, F_OK) != 0) - sprintf(temppath, "%s/%s/device/dev", slavesdir, slavepath); + nowarn_snprintf(temppath, sizeof(temppath), + "%s/%s/device/dev", slavesdir, + slavepath); if (read_block_dev_entry(temppath, &majdev, &mindev)) { perror("Error getting slave device numbers"); closedir(dirhandle); @@ -274,7 +274,8 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, if (slavedu) continue; - sprintf(temppath, "%s/%s", slavesdir, slavepath); + nowarn_snprintf(temppath, sizeof(temppath), "%s/%s", slavesdir, + slavepath); __init_per_file_disk_util(td, majdev, mindev, temppath); slavedu = disk_util_exists(majdev, mindev); @@ -312,7 +313,8 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev, sfree(du); return NULL; } - strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ - 1); + snprintf((char *) du->dus.name, ARRAY_SIZE(du->dus.name), "%s", + basename(path)); du->sysfs_root = strdup(path); du->major = majdev; du->minor = mindev; @@ -433,8 +435,7 @@ static struct disk_util *__init_per_file_disk_util(struct thread_data *td, log_err("unknown sysfs layout\n"); return NULL; } - tmp[PATH_MAX - 1] = '\0'; - strncpy(tmp, p, PATH_MAX - 1); + snprintf(tmp, ARRAY_SIZE(tmp), "%s", p); sprintf(path, "%s", tmp); } @@ -497,72 +498,6 @@ void init_disk_util(struct thread_data *td) f->du = __init_disk_util(td, f); } -static void show_agg_stats(struct disk_util_agg *agg, int terse, - struct buf_output *out) -{ - if (!agg->slavecount) - return; - - if (!terse) { - 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_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); - } -} - -static void aggregate_slaves_stats(struct disk_util *masterdu) -{ - struct disk_util_agg *agg = &masterdu->agg; - struct disk_util_stat *dus; - struct flist_head *entry; - struct disk_util *slavedu; - double util; - - flist_for_each(entry, &masterdu->slaves) { - slavedu = flist_entry(entry, struct disk_util, slavelist); - dus = &slavedu->dus; - 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->s.io_ticks / (double) slavedu->dus.s.msec); - /* System utilization is the utilization of the - * component with the highest utilization. - */ - if (util > agg->max_util.u.f) - agg->max_util.u.f = util; - - } - - if (agg->max_util.u.f > 100.0) - agg->max_util.u.f = 100.0; -} - void disk_util_prune_entries(void) { fio_sem_down(disk_util_sem); @@ -580,157 +515,6 @@ void disk_util_prune_entries(void) fio_sem_remove(disk_util_sem); } -void print_disk_util(struct disk_util_stat *dus, struct disk_util_agg *agg, - int terse, struct buf_output *out) -{ - double util = 0; - - 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_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_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, out); - - if (!terse) - log_buf(out, "\n"); -} - -void json_array_add_disk_util(struct disk_util_stat *dus, - struct disk_util_agg *agg, struct json_array *array) -{ - struct json_object *obj; - double util = 0; - - 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->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); - - /* - * If the device has slaves, aggregate the stats for - * those slave devices also. - */ - if (!agg->slavecount) - return; - json_object_add_value_int(obj, "aggr_read_ios", - agg->ios[0] / agg->slavecount); - json_object_add_value_int(obj, "aggr_write_ios", - agg->ios[1] / agg->slavecount); - json_object_add_value_int(obj, "aggr_read_merges", - agg->merges[0] / agg->slavecount); - json_object_add_value_int(obj, "aggr_write_merge", - agg->merges[1] / agg->slavecount); - json_object_add_value_int(obj, "aggr_read_ticks", - agg->ticks[0] / agg->slavecount); - json_object_add_value_int(obj, "aggr_write_ticks", - agg->ticks[1] / agg->slavecount); - json_object_add_value_int(obj, "aggr_in_queue", - agg->time_in_queue / agg->slavecount); - json_object_add_value_float(obj, "aggr_util", agg->max_util.u.f); -} - -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; - - 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_sem) - return; - - fio_sem_down(disk_util_sem); - - if (flist_empty(&disk_list)) { - fio_sem_up(disk_util_sem); - return; - } - - if ((output_format & FIO_OUTPUT_JSON) && parent) - do_json = true; - else - do_json = false; - - if (!terse && !do_json) - log_buf(out, "\nDisk stats (read/write):\n"); - - 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); - print_disk_util(&du->dus, &du->agg, terse, out); - } - } - - fio_sem_up(disk_util_sem); -} - void setup_disk_util(void) { disk_util_sem = fio_sem_init(FIO_SEM_UNLOCKED);