if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- if (!strcmp(dir->d_name, "device"))
- continue;
sprintf(full_path, "%s/%s", path, dir->d_name);
}
}
- if (stat(full_path, &st) == -1) {
+ if (lstat(full_path, &st) == -1) {
perror("stat");
break;
}
void init_disk_util(struct thread_data *td)
{
+ struct fio_file *f;
struct stat st;
- char foo[256], tmp[256];
+ char foo[PATH_MAX], tmp[PATH_MAX];
dev_t dev;
char *p;
if (!td->do_disk_util)
return;
- if (!stat(td->file_name, &st)) {
+ /*
+ * Just use the same file, they are on the same device.
+ */
+ f = &td->files[0];
+ if (!stat(f->file_name, &st)) {
if (S_ISBLK(st.st_mode))
dev = st.st_rdev;
else
/*
* must be a file, open "." in that path
*/
- strcpy(foo, td->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,
fprintf(f_out, " cpu : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
}
+static void show_ddir_status_terse(struct thread_data *td,
+ struct group_run_stats *rs, int ddir)
+{
+ unsigned long min, max;
+ unsigned long long bw;
+ double mean, dev;
+
+ bw = 0;
+ if (td->runtime[ddir])
+ bw = td->io_bytes[ddir] / td->runtime[ddir];
+
+ fprintf(f_out, ",%llu,%llu,%lu", td->io_bytes[ddir] >> 10, bw, td->runtime[ddir]);
+
+ if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
+ fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+ else
+ fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+
+ if (calc_lat(&td->clat_stat[ddir], &min, &max, &mean, &dev))
+ fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+ else
+ fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+
+ if (calc_lat(&td->bw_stat[ddir], &min, &max, &mean, &dev)) {
+ double p_of_agg;
+
+ p_of_agg = mean * 100 / (double) rs->agg[ddir];
+ fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", min, max, p_of_agg, mean, dev);
+ } else
+ fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", 0UL, 0UL, 0.0, 0.0, 0.0);
+
+}
+
+
+static void show_thread_status_terse(struct thread_data *td,
+ struct group_run_stats *rs)
+{
+ double usr_cpu, sys_cpu;
+
+ fprintf(f_out, "%s,%d,%d",td->name, td->groupid, td->error);
+
+ show_ddir_status_terse(td, rs, 0);
+ show_ddir_status_terse(td, rs, 1);
+
+ if (td->runtime[0] + td->runtime[1]) {
+ double runt = td->runtime[0] + td->runtime[1];
+
+ usr_cpu = (double) td->usr_time * 100 / runt;
+ sys_cpu = (double) td->sys_time * 100 / runt;
+ } else {
+ usr_cpu = 0;
+ sys_cpu = 0;
+ }
+
+ fprintf(f_out, ",%f%%,%f%%,%lu\n", usr_cpu, sys_cpu, td->ctx);
+}
+
void show_run_stats(void)
{
struct group_run_stats *runstats, *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;
/*
* don't overwrite last signal output
*/
- printf("\n");
+ if (!terse_output)
+ printf("\n");
- for (i = 0; i < thread_number; i++) {
- td = &threads[i];
+ for_each_td(td, i) {
rs = &runstats[td->groupid];
- show_thread_status(td, rs);
+ if (terse_output)
+ show_thread_status_terse(td, rs);
+ else
+ show_thread_status(td, rs);
}
- for (i = 0; i < groupid + 1; i++)
- show_group_stats(&runstats[i], i);
+ if (!terse_output) {
+ for (i = 0; i < groupid + 1; i++)
+ show_group_stats(&runstats[i], i);
+
+ show_disk_util();
+ }
- show_disk_util();
+ free(runstats);
}
static inline void add_stat_sample(struct io_stat *is, unsigned long val)