[PATCH] Add bw/lat log as job options

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 5452716942145f41122c22be01e186a5d9f4bfed..718a8ab2acc1ee65618f132c3efabb9dc6ce7aef 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>

+#include <sys/stat.h>

 #include <dirent.h>
 #include <libgen.h>
 #include <math.h>
 #include <dirent.h>
 #include <libgen.h>
 #include <math.h>


@@ -9,7 +10,7 @@
 #include "fio.h"
 
 static struct itimerval itimer;
 #include "fio.h"
 
 static struct itimerval itimer;

-static LIST_HEAD(disk_list);
+static struct list_head disk_list = LIST_HEAD_INIT(disk_list);

 
 static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
 {
 
 static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
 {


@@ -155,8 +156,6 @@ static int find_block_dir(dev_t dev, char *path)
 
                if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
                        continue;
 
                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);
 
 
                sprintf(full_path, "%s/%s", path, dir->d_name);
 


@@ -167,7 +166,7 @@ static int find_block_dir(dev_t dev, char *path)
                        }
                }
 
                        }
                }
 

-               if (stat(full_path, &st) == -1) {
+               if (lstat(full_path, &st) == -1) {

                        perror("stat");
                        break;
                }
                        perror("stat");
                        break;
                }


@@ -188,6 +187,7 @@ static int find_block_dir(dev_t dev, char *path)
 
 void init_disk_util(struct thread_data *td)
 {
 
 void init_disk_util(struct thread_data *td)
 {

+       struct fio_file *f;

        struct stat st;
        char foo[256], tmp[256];
        dev_t dev;
        struct stat st;
        char foo[256], tmp[256];
        dev_t dev;


@@ -196,7 +196,11 @@ void init_disk_util(struct thread_data *td)
        if (!td->do_disk_util)
                return;
 
        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
                if (S_ISBLK(st.st_mode))
                        dev = st.st_rdev;
                else


@@ -205,7 +209,7 @@ void init_disk_util(struct thread_data *td)
                /*
                 * must be a file, open "." in that path
                 */
                /*
                 * must be a file, open "." in that path
                 */

-               strcpy(foo, td->file_name);
+               strcpy(foo, f->file_name);

                p = dirname(foo);
                if (stat(p, &st)) {
                        perror("disk util stat");
                p = dirname(foo);
                if (stat(p, &st)) {
                        perror("disk util stat");


@@ -232,10 +236,11 @@ void init_disk_util(struct thread_data *td)
                p = dirname(foo);
                sprintf(tmp, "%s/queue", p);
                if (stat(tmp, &st)) {
                p = dirname(foo);
                sprintf(tmp, "%s/queue", p);
                if (stat(tmp, &st)) {

-                       fprintf(stderr, "unknown sysfs layout\n");
+                       log_err("unknown sysfs layout\n");

                        return;
                }
                        return;
                }

-               sprintf(foo, "%s", p);
+               strcpy(tmp, p);
+               sprintf(foo, "%s", tmp);

        }
 
        td->sysfs_root = strdup(foo);
        }
 
        td->sysfs_root = strdup(foo);


@@ -278,20 +283,18 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
        n = (double) is->samples;
        *mean = (double) is->val / n;
        *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
        n = (double) is->samples;
        *mean = (double) is->val / n;
        *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));

-       if (!(*min + *max) && !(*mean + *dev))
-               return 0;

 
        return 1;
 }
 
 static void show_group_stats(struct group_run_stats *rs, int id)
 {
 
        return 1;
 }
 
 static void show_group_stats(struct group_run_stats *rs, int id)
 {

-       printf("\nRun status group %d (all jobs):\n", id);
+       fprintf(f_out, "\nRun status group %d (all jobs):\n", id);

 
        if (rs->max_run[DDIR_READ])
 
        if (rs->max_run[DDIR_READ])

-               printf("   READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[0] >> 10, rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
+               fprintf(f_out, "   READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[0] >> 10, rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);

        if (rs->max_run[DDIR_WRITE])
        if (rs->max_run[DDIR_WRITE])

-               printf("  WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[1] >> 10, rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
+               fprintf(f_out, "  WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[1] >> 10, rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);

 }
 
 static void show_disk_util(void)
 }
 
 static void show_disk_util(void)


@@ -301,7 +304,7 @@ static void show_disk_util(void)
        struct disk_util *du;
        double util;
 
        struct disk_util *du;
        double util;
 

-       printf("\nDisk stats (read/write):\n");
+       fprintf(f_out, "\nDisk stats (read/write):\n");

 
        list_for_each(entry, &disk_list) {
                du = list_entry(entry, struct disk_util, list);
 
        list_for_each(entry, &disk_list) {
                du = list_entry(entry, struct disk_util, list);


@@ -311,7 +314,7 @@ static void show_disk_util(void)
                if (util > 100.0)
                        util = 100.0;
 
                if (util > 100.0)
                        util = 100.0;
 

-               printf("  %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);
+               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);

        }
 }
 
        }
 }
 


@@ -327,19 +330,19 @@ static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
                return;
 
        bw = td->io_bytes[ddir] / td->runtime[ddir];
                return;
 
        bw = td->io_bytes[ddir] / td->runtime[ddir];

-       printf("  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
+       fprintf(f_out, "  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);

 
        if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
 
        if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))

-               printf("    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+               fprintf(f_out, "    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);

 
        if (calc_lat(&td->clat_stat[ddir], &min, &max, &mean, &dev))
 
        if (calc_lat(&td->clat_stat[ddir], &min, &max, &mean, &dev))

-               printf("    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+               fprintf(f_out, "    clat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);

 
        if (calc_lat(&td->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
                p_of_agg = mean * 100 / (double) rs->agg[ddir];
 
        if (calc_lat(&td->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
                p_of_agg = mean * 100 / (double) rs->agg[ddir];

-               printf("    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, dev=%5.02f\n", min, max, p_of_agg, mean, dev);
+               fprintf(f_out, "    bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, dev=%5.02f\n", min, max, p_of_agg, mean, dev);

        }
 }
 
        }
 }
 


@@ -351,7 +354,7 @@ static void show_thread_status(struct thread_data *td,
        if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
                return;
 
        if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
                return;
 

-       printf("Client%d (groupid=%d): err=%2d:\n", td->thread_number, td->groupid, td->error);
+       fprintf(f_out, "%s: (groupid=%d): err=%2d:\n",td->name, td->groupid, td->error);

 
        show_ddir_status(td, rs, td->ddir);
        if (td->io_bytes[td->ddir ^ 1])
 
        show_ddir_status(td, rs, td->ddir);
        if (td->io_bytes[td->ddir ^ 1])


@@ -367,7 +370,64 @@ static void show_thread_status(struct thread_data *td,
                sys_cpu = 0;
        }
 
                sys_cpu = 0;
        }
 

-       printf("  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
+       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)
 }
 
 void show_run_stats(void)


@@ -386,13 +446,11 @@ void show_run_stats(void)
                rs->min_bw[1] = rs->min_run[1] = ~0UL;
        }
 
                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;
 
                unsigned long long rbw, wbw;
 

-               td = &threads[i];
-

                if (td->error) {
                if (td->error) {

-                       printf("Client%d: %s\n", td->thread_number, td->verror);
+                       fprintf(f_out, "%s: %s\n", td->name, td->verror);

                        continue;
                }
 
                        continue;
                }
 


@@ -438,19 +496,24 @@ void show_run_stats(void)
        /*
         * don't overwrite last signal output
         */
        /*
         * 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];
 
                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();
+       }

 }
 
 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 val)