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;
}
- 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);
}
void update_rusage_stat(struct thread_data *td)
{
- if (!(td->runtime[0] + td->runtime[1]))
- return;
-
getrusage(RUSAGE_SELF, &td->ru_end);
td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
double *mean, double *dev)
{
- double n;
+ double n, o;
if (is->samples == 0)
return 0;
n = (double) is->samples;
*mean = (double) is->val / n;
- *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
+ *dev = 0.01;
+
+ if (n <= 1.0)
+ return 1;
+
+ o = (double) is->val_sq - ((*mean * *mean) / n);
+ if (o < 0.0)
+ *dev = -1.0;
+ else
+ *dev = sqrt(o / (n - 1.0));
return 1;
}
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,
int ddir)
{
- char *ddir_str[] = { "read ", "write" };
+ const char *ddir_str[] = { "read ", "write" };
unsigned long min, max;
unsigned long long bw;
double mean, dev;
struct group_run_stats *rs)
{
double usr_cpu, sys_cpu;
+ unsigned long runtime;
if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
return;
if (td->io_bytes[td->ddir ^ 1])
show_ddir_status(td, rs, td->ddir ^ 1);
- if (td->runtime[0] + td->runtime[1]) {
- double runt = td->runtime[0] + td->runtime[1];
+ runtime = mtime_since(&td->epoch, &td->end_time);
+ if (runtime) {
+ double runt = (double) runtime;
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
show_ddir_status_terse(td, rs, 1);
if (td->runtime[0] + td->runtime[1]) {
- double runt = td->runtime[0] + td->runtime[1];
+ double runt = (double) (td->runtime[0] + td->runtime[1]);
usr_cpu = (double) td->usr_time * 100 / runt;
sys_cpu = (double) td->sys_time * 100 / runt;
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)
}
static void add_log_sample(struct thread_data *td, struct io_log *iolog,
- unsigned long val, int ddir)
+ unsigned long val, enum fio_ddir ddir)
{
if (iolog->nr_samples == iolog->max_samples) {
int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
iolog->nr_samples++;
}
-void add_clat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->clat_stat[ddir], msec);
add_log_sample(td, td->clat_log, msec, ddir);
}
-void add_slat_sample(struct thread_data *td, int ddir, unsigned long msec)
+void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
+ unsigned long msec)
{
add_stat_sample(&td->slat_stat[ddir], msec);
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, enum fio_ddir 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];
}