Added in running stats for btt

[blktrace.git] / btt / bt_timeline.c

diff --git a/btt/bt_timeline.c b/btt/bt_timeline.c
index 1c3216db66101e50f3dc37bc968f5153a5280c0e..9b0850b8729c511493e6c3e3563fbefae7dfe6d7 100644 (file)
--- a/btt/bt_timeline.c
+++ b/btt/bt_timeline.c
@@ -21,81 +21,110 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-
+#include <sys/time.h>
+#include <time.h>
 #include "globals.h"
 
-char bt_timeline_version[] = "0.99";
+char bt_timeline_version[] = "2.08";
 
-char *devices = NULL;
-char *exes = NULL;
-char *input_name = NULL;
-char *output_name = NULL;
-char *seek_name = NULL;
-double range_delta = 0.1;
-FILE *ranges_ofp, *avgs_ofp;
-int is_lvm = -1;
-int verbose = 0;
-int ifd;
-unsigned long n_traces, n_io_allocs, n_io_frees;
+char *devices, *exes, *input_name, *output_name, *seek_name, *bno_dump_name;
+char *d2c_name, *q2c_name, *per_io_name, *unplug_hist_name;
+char *sps_name, *aqd_name, *q2d_name, *per_io_trees;
+FILE *rngs_ofp, *avgs_ofp, *xavgs_ofp, *per_io_ofp, *msgs_ofp;
+int verbose, done, time_bounded, output_all_data, seek_absolute;
+int easy_parse_avgs, ignore_remaps;
+double t_astart, t_aend, last_t_seen;
+unsigned long n_traces;
 struct avgs_info all_avgs;
-__u64 last_q = (__u64)-1;
-unsigned int pending_xs;
-
 unsigned int n_devs;
+time_t genesis, last_vtrace;
 LIST_HEAD(all_devs);
-LIST_HEAD(all_ios);
 LIST_HEAD(all_procs);
-struct my_mem *free_ios = NULL;
-struct my_mem *free_bits = NULL;
+LIST_HEAD(all_ios);
+LIST_HEAD(free_ios);
+LIST_HEAD(free_bilinks);
+__u64 q_histo[N_HIST_BKTS], d_histo[N_HIST_BKTS];
+
+double plat_freq = 0.0;
+double range_delta = 0.1;
+__u64 last_q = (__u64)-1;
 
 struct region_info all_regions = {
        .qranges = LIST_HEAD_INIT(all_regions.qranges),
        .cranges = LIST_HEAD_INIT(all_regions.cranges),
-       .qr_cur = NULL,
-       .cr_cur = NULL
 };
 
-char iop_map[] = { 'Q', 'X', 'A', 'M', 'I', 'D', 'C', 'Y' };
-
-struct blk_io_trace *convert_to_cpu(struct blk_io_trace *t);
 int process(void);
 
 int main(int argc, char *argv[])
 {
        handle_args(argc, argv);
 
-       cy_init();
-       if (process() || output_avgs(avgs_ofp) || output_ranges(ranges_ofp))
+       init_dev_heads();
+       iostat_init();
+       if (!rstat_init())
+               return 1;
+
+       if (process() || output_avgs(avgs_ofp) || output_ranges(rngs_ofp))
                return 1;
 
+       if (iostat_ofp) {
+               fprintf(iostat_ofp, "\n");
+               iostat_dump_stats(iostat_last_stamp, 1);
+       }
+
+       if (msgs_ofp != stdout)
+               fclose(msgs_ofp);
+       if (rngs_ofp != stdout)
+               fclose(rngs_ofp);
+       if (avgs_ofp != stdout)
+               fclose(avgs_ofp);
+       if (xavgs_ofp)
+               fclose(xavgs_ofp);
+
+       dip_cleanup();
+       dev_map_exit();
+       dip_exit();
+       rstat_exit();
+       pip_exit();
+       io_free_all();
+       region_exit(&all_regions);
+       clean_allocs();
+
        return 0;
 }
 
+static inline double tv2dbl(struct timeval *tv)
+{
+       return (double)tv->tv_sec + (((double)tv->tv_usec) / (1000.0 * 1000.0));
+}
+
 int process(void)
 {
        int ret = 0;
-       struct blk_io_trace *t;
-       struct io *iop = IO_ZALLOC();
-
-       while (!do_read(ifd, &iop->t, sizeof(iop->t))) {
-               t = convert_to_cpu(&iop->t);
-               if (t->pdu_len > 0) {
-                       iop->pdu = malloc(t->pdu_len);
-                       if (do_read(ifd, iop->pdu, t->pdu_len)) {
-                               free(iop->pdu);
-                               ret = 1;
-                               break;
-                       }
-               }
+       struct io *iop = io_alloc();
+       struct timeval tvs, tve;
+
+       genesis = last_vtrace = time(NULL);
+       gettimeofday(&tvs, NULL);
+       while (!done && next_trace(&iop->t, &iop->pdu)) {
                add_trace(iop);
-               iop = IO_ZALLOC();
+               iop = io_alloc();
        }
-       IO_FREE(iop);
 
-       if (verbose)
-               printf("\n%10lu traces, %10lu mallocs %1lu frees\n",
-                                      n_traces, n_io_allocs, n_io_frees);
+       io_release(iop);
+       gettimeofday(&tve, NULL);
+
+       if (verbose) {
+               double tps, dt_input = tv2dbl(&tve) - tv2dbl(&tvs);
+
+               tps = (double)n_traces / dt_input;
+               printf("\r                                        "
+                      "                                        \r");
+               printf("%10lu traces @ %.1lf Ktps in %.6lf seconds\n",
+                       n_traces, tps/1000.0,
+                       dt_input);
+       }
 
-       cy_shutdown();
        return ret;
 }