[PATCH] Improve time accounting for a job

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 718a8ab2acc1ee65618f132c3efabb9dc6ce7aef..731b3036544de363e9db4a82084cce1316203d1e 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -60,7 +60,7 @@ static void update_io_tick_disk(struct disk_util *du)
        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));
@@ -102,7 +102,7 @@ static void disk_util_add(dev_t dev, char *path)
        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);
@@ -189,7 +189,7 @@ 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;
 
@@ -209,7 +209,7 @@ void init_disk_util(struct thread_data *td)
                /*
                 * 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");
@@ -239,11 +239,13 @@ void init_disk_util(struct thread_data *td)
                        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);
 }
 
@@ -256,9 +258,6 @@ void disk_util_timer_arm(void)
 
 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);
@@ -300,7 +299,7 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 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;
 
@@ -316,12 +315,22 @@ static void show_disk_util(void)
 
                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;
@@ -350,6 +359,7 @@ static void show_thread_status(struct thread_data *td,
                               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;
@@ -360,8 +370,9 @@ static void show_thread_status(struct thread_data *td,
        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 = runtime;
 
                usr_cpu = (double) td->usr_time * 100 / runt;
                sys_cpu = (double) td->sys_time * 100 / runt;
@@ -514,6 +525,8 @@ void show_run_stats(void)
 
                show_disk_util();
        }
+
+       free(runstats);
 }
 
 static inline void add_stat_sample(struct io_stat *is, unsigned long val)
@@ -560,9 +573,9 @@ void add_slat_sample(struct thread_data *td, int ddir, unsigned long 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, 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)
@@ -574,7 +587,7 @@ void add_bw_sample(struct thread_data *td, int ddir)
        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];
 }