dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
- gettimeofday(&t, NULL);
+ fio_gettime(&t, NULL);
du->msec += mtime_since(&du->time, &t);
memcpy(&du->time, &t, sizeof(t));
memcpy(ldus, &__dus, sizeof(__dus));
du->name = strdup(basename(path));
du->dev = dev;
- gettimeofday(&du->time, NULL);
+ fio_gettime(&du->time, NULL);
get_io_ticks(du, &du->last_dus);
list_add_tail(&du->list, &disk_list);
{
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;
}
- strcpy(tmp, 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_ddir_status(struct thread_data *td, struct group_run_stats *rs,
int ddir)
{
- char *ddir_str[] = { "read ", "write" };
+ const char *ddir_str[] = { "read ", "write" };
unsigned long min, max;
unsigned long long bw;
double mean, dev;
show_disk_util();
}
+
+ free(runstats);
}
static inline void add_stat_sample(struct io_stat *is, unsigned long val)
add_log_sample(td, td->slat_log, msec, ddir);
}
-void add_bw_sample(struct thread_data *td, int ddir)
+void add_bw_sample(struct thread_data *td, int ddir, struct timeval *t)
{
- unsigned long spent = mtime_since_now(&td->stat_sample_time[ddir]);
+ unsigned long spent = mtime_since(&td->stat_sample_time[ddir], t);
unsigned long rate;
if (spent < td->bw_avg_time)
if (td->bw_log)
add_log_sample(td, td->bw_log, rate, ddir);
- gettimeofday(&td->stat_sample_time[ddir], NULL);
+ fio_gettime(&td->stat_sample_time[ddir], NULL);
td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
}