{
struct fio_file *f;
struct stat st;
- char foo[256], tmp[256];
+ char foo[PATH_MAX], tmp[PATH_MAX];
dev_t dev;
char *p;
/*
* must be a file, open "." in that path
*/
- strcpy(foo, f->file_name);
+ strncpy(foo, f->file_name, PATH_MAX - 1);
p = dirname(foo);
if (stat(p, &st)) {
perror("disk util stat");
log_err("unknown sysfs layout\n");
return;
}
- sprintf(foo, "%s", p);
+ strncpy(tmp, p, PATH_MAX - 1);
+ sprintf(foo, "%s", tmp);
}
- td->sysfs_root = strdup(foo);
+ if (td->ioscheduler)
+ td->sysfs_root = strdup(foo);
+
disk_util_add(dev, foo);
}
static void show_disk_util(void)
{
struct disk_util_stat *dus;
- struct list_head *entry;
+ struct list_head *entry, *next;
struct disk_util *du;
double util;
fprintf(f_out, " %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, in_queue=%u, util=%3.2f%%\n", du->name, dus->ios[0], dus->ios[1], dus->merges[0], dus->merges[1], dus->ticks[0], dus->ticks[1], dus->time_in_queue, util);
}
+
+ /*
+ * now free the list
+ */
+ list_for_each_safe(entry, next, &disk_list) {
+ list_del(entry);
+ du = list_entry(entry, struct disk_util, list);
+ free(du->name);
+ free(du);
+ }
}
static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
rs->min_bw[1] = rs->min_run[1] = ~0UL;
}
- for (i = 0; i < thread_number; i++) {
+ for_each_td(td, i) {
unsigned long long rbw, wbw;
- td = &threads[i];
-
if (td->error) {
fprintf(f_out, "%s: %s\n", td->name, td->verror);
continue;
if (!terse_output)
printf("\n");
- for (i = 0; i < thread_number; i++) {
- td = &threads[i];
+ for_each_td(td, i) {
rs = &runstats[td->groupid];
if (terse_output)
show_disk_util();
}
+
+ free(runstats);
}
static inline void add_stat_sample(struct io_stat *is, unsigned long val)