[PATCH] Change timeout to runtime and rearrange option entries

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 731b3036544de363e9db4a82084cce1316203d1e..e7eb8ad68aeb369dafe30abb937ad2e5fa1b90bb 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -94,14 +94,26 @@ static int disk_util_exists(dev_t dev)
 
 static void disk_util_add(dev_t dev, char *path)
 {
-       struct disk_util *du = malloc(sizeof(*du));
+       struct disk_util *du, *__du;
+       struct list_head *entry;
 
+       du = malloc(sizeof(*du));
        memset(du, 0, sizeof(*du));
        INIT_LIST_HEAD(&du->list);
        sprintf(du->path, "%s/stat", path);
        du->name = strdup(basename(path));
        du->dev = dev;
 
+       list_for_each(entry, &disk_list) {
+               __du = list_entry(entry, struct disk_util, list);
+
+               if (!strcmp(du->name, __du->name)) {
+                       free(du->name);
+                       free(du);
+                       return;
+               }
+       }
+
        fio_gettime(&du->time, NULL);
        get_io_ticks(du, &du->last_dus);
 
@@ -263,7 +275,6 @@ void update_rusage_stat(struct thread_data *td)
        td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
        td->sys_time += mtime_since(&td->ru_start.ru_stime, &td->ru_end.ru_stime);
        td->ctx += td->ru_end.ru_nvcsw + td->ru_end.ru_nivcsw - (td->ru_start.ru_nvcsw + td->ru_start.ru_nivcsw);
-
        
        memcpy(&td->ru_start, &td->ru_end, sizeof(td->ru_end));
 }
@@ -271,7 +282,7 @@ void update_rusage_stat(struct thread_data *td)
 static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
                    double *mean, double *dev)
 {
-       double n;
+       double n = is->samples;
 
        if (is->samples == 0)
                return 0;
@@ -280,8 +291,12 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
        *max = is->max_val;
 
        n = (double) is->samples;
-       *mean = (double) is->val / n;
-       *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
+       *mean = is->mean;
+
+       if (n > 1.0)
+               *dev = sqrt(is->S / (n - 1.0));
+       else
+               *dev = -1.0;
 
        return 1;
 }
@@ -372,7 +387,7 @@ static void show_thread_status(struct thread_data *td,
 
        runtime = mtime_since(&td->epoch, &td->end_time);
        if (runtime) {
-               double runt = runtime;
+               double runt = (double) runtime;
 
                usr_cpu = (double) td->usr_time * 100 / runt;
                sys_cpu = (double) td->sys_time * 100 / runt;
@@ -429,7 +444,7 @@ static void show_thread_status_terse(struct thread_data *td,
        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;
@@ -529,20 +544,26 @@ void show_run_stats(void)
        free(runstats);
 }
 
-static inline void add_stat_sample(struct io_stat *is, unsigned long val)
+static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 {
-       if (val > is->max_val)
-               is->max_val = val;
-       if (val < is->min_val)
-               is->min_val = val;
+       double val = data;
+       double delta, n;
+
+       if (data > is->max_val)
+               is->max_val = data;
+       if (data < is->min_val)
+               is->min_val = data;
+
+       delta = val - is->mean;
+       n = is->samples + 1.0;
+       is->mean += delta / n;
+       is->S += delta * (val - is->mean);
 
-       is->val += val;
-       is->val_sq += val * val;
        is->samples++;
 }
 
 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;
@@ -557,7 +578,8 @@ static void add_log_sample(struct thread_data *td, struct io_log *iolog,
        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);
 
@@ -565,7 +587,8 @@ void add_clat_sample(struct thread_data *td, int ddir, unsigned long 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);
 
@@ -573,7 +596,8 @@ 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, struct timeval *t)
+void add_bw_sample(struct thread_data *td, enum fio_ddir ddir,
+                  struct timeval *t)
 {
        unsigned long spent = mtime_since(&td->stat_sample_time[ddir], t);
        unsigned long rate;