cleanup

5 files changed, 72 insertions, 78 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 5961e30..069a9c0 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -66,6 +66,8 @@ void usage(char *prog)
         printf("  -v    Display version and exit\n");
         printf("  -i    input_file, default is %s\n", default_input_file);
         printf("  -c    Ignore records before system release\n");
+        printf("  -s    (float) Seconds after first record to begin displaying\n");
+        printf("  -d    (float) Seconds of data to display\n");
 }
 
 static gboolean display_warnings;
@@ -1831,6 +1833,9 @@ void kernel_shark(int argc, char **argv)
         int ret;
         int c;
         int clean;
+        double start = 0.0;
+        double duration = 0.0;
+        
 
         g_thread_init(NULL);
         gdk_threads_init();
@@ -1838,7 +1843,7 @@ void kernel_shark(int argc, char **argv)
         gtk_init(&argc, &argv);
 
         clean = 0;
-        while ((c = getopt(argc, argv, "hcvi:")) != -1) {
+        while ((c = getopt(argc, argv, "hcvs:d:i:")) != -1) {
                 switch(c) {
                 case 'h':
                         usage(basename(argv[0]));
@@ -1854,6 +1859,12 @@ void kernel_shark(int argc, char **argv)
                 case 'c':
                         clean = 1;
                         break;
+                case 's':
+                        start = atof(optarg);
+                        break;
+                case 'd':
+                        duration = atof(optarg);
+                        break;
                 default:
                         /* assume the other options are for gtk */
                         break;
@@ -2408,6 +2419,9 @@ void kernel_shark(int argc, char **argv)
 
         info->ginfo = trace_graph_create_with_callbacks(handle, &info->graph_cbs);
         info->ginfo->rtg_info.clean_records = clean;
+        info->ginfo->rtg_info.start_offset = start;
+        info->ginfo->rtg_info.duration = duration;
+        
         widget = trace_graph_get_window(info->ginfo);
         gtk_paned_add1(GTK_PANED(vpaned), widget);
         gtk_widget_show(widget);
diff --git a/rt-graph.h b/rt-graph.h
index 2b77c6e..b1453fd 100644
--- a/rt-graph.h
+++ b/rt-graph.h
@@ -24,6 +24,9 @@ struct rt_graph_info {
         /* For ignoring records before system release */
         gboolean                clean_records;
         long long               start_time;
+        long long               end_time;
+        gdouble                 start_offset;
+        gdouble                 duration;
 
         /* List of all real-time tasks */
         struct task_list        *tasks[TASK_HASH_SIZE];
diff --git a/rt-plot-task.c b/rt-plot-task.c
index ec13313..2acf18f 100644
--- a/rt-plot-task.c
+++ b/rt-plot-task.c
@@ -512,12 +512,12 @@ rt_task_plot_write_header(struct rt_plot_common *rt,
         }
         trace_seq_putc(s, '\n');
 
-        if (in_res(ginfo, deadline, time)) {
+        if (is_high_res(ginfo) && in_res(ginfo, deadline, time)) {
                 trace_seq_printf(s, "\nlitmus_deadline\n"
                                  "deadline(job(%d,%d)): %llu\n",
                                  pid, job, deadline);
         }
-        if (in_res(ginfo, release, time)) {
+        if (is_high_res(ginfo) && in_res(ginfo, release, time)) {
                 trace_seq_printf(s, "\nlitmus_release\n"
                                  "release(job(%d,%d)): %llu\n",
                                  pid, job, release);
@@ -563,8 +563,7 @@ void rt_plot_task_update_callback(gboolean accept,
                 select_size = i;
         }
 
-        /*
-         * Remove and add task plots.
+        /* Remove and add task plots.
          * Go backwards, since removing a plot shifts the
          * array from current position back.
          */
@@ -582,8 +581,7 @@ void rt_plot_task_update_callback(gboolean accept,
                 ptr = bsearch(&rtt_info->pid, selected, select_size,
                               sizeof(gint), id_cmp);
                 if (ptr) {
-                        /*
-                         * This plot plot already exists, remove it
+                        /* This plot plot already exists, remove it
                          * from the selected array.
                          */
                         memmove(ptr, ptr + 1,
@@ -683,6 +681,7 @@ void rt_plot_add_all_tasks(struct graph_info *ginfo)
         int i, j, len, tmp;
         tasks = task_list_pids(ginfo->rtg_info.tasks);
 
+        /* Awful sort */
         for (i = 0; tasks[i] != -1; ++i) {
                 for (j = i; tasks[j] != -1; ++j) {
                         if (tasks[i] > tasks[j]) {
diff --git a/rt-plot.c b/rt-plot.c
index dd7535e..4065424 100644
--- a/rt-plot.c
+++ b/rt-plot.c
@@ -19,7 +19,6 @@ void insert_record(struct graph_info *ginfo, struct record_list *list,
         if (node->next)
                 die("Node is in use!");
         if (!record) {
-                printf("No record\n");
                 return;
         }
 
@@ -134,7 +133,6 @@ prev_display_iterator(struct graph_info *ginfo, struct record *record, void *dat
         if (!ignored && args->common->record_matches(args->common, ginfo, record)) {
                 args->result = record;
                 ++record->ref_count;
-                printf("success!\n");
                 return 0;
         } else {
                 return 1;
@@ -250,22 +248,14 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
         long long pdiff, rdiff;
         int eid;
 
-        /* printf("\nBegin display\n"); */
-
         /* Write plot-specific data */
         data_record = rt_info->write_header(rt_info, ginfo, s, time);
-        /* printf("Data record: "); print_record(data_record); */
 
         /* Select closest relevant record */
         range = 2 / ginfo->resolution;
 
-
         record = __find_rt_record(ginfo, rt_info, time, 1, range);
         prev_record = find_prev_display_record(ginfo, rt_info, time, range);
-        //prev_record = NULL;
-
-        /* printf("Next: "); print_record(record); */
-        /* printf("Prev: "); print_record(prev_record); */
 
         if (!record) {
                 record = prev_record;
@@ -284,21 +274,20 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
 
         /* Write event info */
         if (record) {
-                /* rts = get_rts(ginfo, record); */
-                /* eid = pevent_data_type(ginfo->pevent, record); */
-
-                /* if (in_res(ginfo, rts, time)) { */
-                /*      event = pevent_data_event_from_type(ginfo->pevent, eid); */
-                /*      if (event) { */
-                /*              trace_seq_putc(s, '\n'); */
-                /*              trace_seq_puts(s, event->name); */
-                /*              trace_seq_putc(s, '\n'); */
-                /*              pevent_event_info(s, event, record); */
-                /*      } else */
-                /*              trace_seq_printf(s, "\nUNKNOWN EVENT %d\n", eid); */
-                /* } */
+                rts = get_rts(ginfo, record);
+                eid = pevent_data_type(ginfo->pevent, record);
+
+                if (in_res(ginfo, rts, time)) {
+                        event = pevent_data_event_from_type(ginfo->pevent, eid);
+                        if (event) {
+                                trace_seq_putc(s, '\n');
+                                trace_seq_puts(s, event->name);
+                                trace_seq_putc(s, '\n');
+                                pevent_event_info(s, event, record);
+                        } else
+                                trace_seq_printf(s, "\nUNKNOWN EVENT %d\n", eid);
+                }
                 free_record(record);
-                /* printf("Freed record: "); print_record(record); */
         }
 
         /* Metadata */
@@ -309,7 +298,6 @@ rt_plot_display_info(struct graph_info *ginfo, struct graph_plot *plot,
         if (data_record) {
                 trace_seq_printf(s, " CPU: %03d", data_record->cpu);
                 free_record(data_record);
-                /* printf("Freed data: "); print_record(data_record); */
         }
 
         return 1;
diff --git a/trace-graph.c b/trace-graph.c
index 66c2722..0b2b7cf 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1149,8 +1149,9 @@ static void draw_plot_info(struct graph_info *ginfo, struct graph_plot *plot,
 
         trace_seq_init(&s);
 
-        dprintf(3, "start=%llu end=%llu time=%llu\n",
-                (u64)ginfo->start_time, (u64)ginfo->end_time, (u64)time);
+        dprintf(3, "start=%llu end=%llu time=%llu, vstart: %llu, vend: %llu\n",
+                (u64)ginfo->start_time, (u64)ginfo->end_time, (u64)time,
+                (u64)ginfo->view_start_time, (u64)ginfo->view_end_time);
 
         if (!trace_graph_plot_display_info(ginfo, plot, &s, time)) {
                 /* Just display the current time */
@@ -1381,7 +1382,6 @@ static void zoom_in_window(struct graph_info *ginfo, gint start, gint end)
         dprintf(1, "*** ended with with ");
         print_time(convert_x_to_time(ginfo, ginfo->hadj_value));
         dprintf(1, "\n");
-
 }
 
 static gboolean
@@ -1859,32 +1859,43 @@ static void draw_plot(struct graph_info *ginfo, struct graph_plot *plot,
                                  plot->p1, plot->p2, ginfo->draw_width, width_16, font);
 }
 
-int tries = 0;
-
+/*
+ * TODO: this method needs refactoring
+ */
 static void draw_hashed_plots(struct graph_info *ginfo)
 {
-        gint cpu, pid;
+        gint cpu, pid, clean;
         struct record *record;
         struct plot_hash *hash;
         struct plot_list *list;
-        unsigned long long old_start;
+        unsigned long long old_start, max_time, min_time;
+        gdouble duration, start;
+
+        start = ginfo->rtg_info.start_offset;
+        duration = ginfo->rtg_info.duration;
+        clean = ginfo->rtg_info.clean_records;
 
         set_cpus_to_rts(ginfo, ginfo->view_start_time);
+        
+        max_time = ginfo->view_end_time;
+        min_time = ginfo->view_start_time;
 
         while ((record = tracecmd_read_next_data(ginfo->handle, &cpu))) {
                 int first = ginfo->rtg_info.start_time == 0;
-                if (get_rts(ginfo, record) < ginfo->view_start_time) {
+
+                if (get_rts(ginfo, record) < min_time) {
                         free_record(record);
                         continue;
                 }
-                if (get_rts(ginfo, record) > ginfo->view_end_time) {
+
+                if (get_rts(ginfo, record) > max_time) {
                         free_record(record);
                         break;
                 }
 
                 // TODO: hack to clean up until first release, make unhacky
                 if (ginfo->rtg_info.clean_records &&
-                    (ginfo->rtg_info.start_time == 0 || ginfo->view_start_time < ginfo->rtg_info.start_time)) {
+                    (ginfo->rtg_info.start_time == 0 || get_rts(ginfo, record) < ginfo->rtg_info.start_time)) {
                         unsigned long long dull, rel = 0;
                         char *dchar;
                         int dint;
@@ -1900,12 +1911,20 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                         rt_graph_check_server_param(ARG, &dint, &dull, &dull);
 #undef ARG
                         if (rt_graph_check_sys_release(ginfo, record, &rel)) {
-                                dull = rel - .1 * (ginfo->view_end_time - rel);
-                                ginfo->rtg_info.start_time = get_rts(ginfo, record);
-                                //ginfo->view_end_time -= get_rts(ginfo, record) - ginfo->view_start_time;
-                                ginfo->view_start_time = get_rts(ginfo, record);
-                                if (first)
+                                min_time = rel + ginfo->rtg_info.start_offset * NSECS_PER_SEC;
+                                ginfo->rtg_info.start_time = min_time;
+                                ginfo->view_start_time = min_time;
+                                ginfo->start_time = min_time;
+
+                                if (ginfo->rtg_info.duration) {
+                                        max_time = MIN(max_time, min_time + ginfo->rtg_info.duration * NSECS_PER_SEC);
+                                        ginfo->view_end_time = max_time;
+                                        ginfo->end_time = max_time;
+                                }
+                                if (first) {
+                                        free_record(record);
                                         return;
+                                }
                         }
 
                         free_record(record);
@@ -1913,6 +1932,7 @@ static void draw_hashed_plots(struct graph_info *ginfo)
                         continue;
                 }
 
+
                 hash = trace_graph_plot_find_cpu(ginfo, cpu);
                 if (hash) {
                         for (list = hash->plots; list; list = list->next) {
@@ -1970,38 +1990,10 @@ static void draw_plots(struct graph_info *ginfo, gint new_width)
                 set_color(ginfo->draw, plot->gc, plot->last_color);
         }
 
-        printf("we here1\n");
-
         trace_set_cursor(GDK_WATCH);
-        /* /\* Shortcut if we don't have any task plots *\/ */
-        /* if (!ginfo->nr_task_hash && !ginfo->all_recs) { */
-        /*      tracecmd_set_all_cpus_to_timestamp(ginfo->handle, */
-        /*                                         ginfo->view_start_time); */
-        /*      for (cpu = 0; cpu < ginfo->cpus; cpu++) { */
-        /*              hash = trace_graph_plot_find_cpu(ginfo, cpu); */
-        /*              if (!hash) */
-        /*                      continue; */
-
-        /*              while ((record = tracecmd_read_data(ginfo->handle, cpu))) { */
-        /*                      if (record->ts < ginfo->view_start_time) { */
-        /*                              free_record(record); */
-        /*                              continue; */
-        /*                      } */
-        /*                      if (record->ts > ginfo->view_end_time) { */
-        /*                              free_record(record); */
-        /*                              break; */
-        /*                      } */
-        /*                      for (list = hash->plots; list; list = list->next) */
-        /*                              draw_plot(ginfo, list->plot, record); */
-        /*                      free_record(record); */
-        /*              } */
-        /*      } */
-        /*      goto out; */
-        /* } */
 
         draw_hashed_plots(ginfo);
 
-out:
         for (i = 0; i < ginfo->plots; i++) {
                 plot = ginfo->plot_array[i];
                 draw_plot(ginfo, plot, NULL);
@@ -2010,6 +2002,7 @@ out:
                         gdk_gc_unref(plot->gc);
                 plot->gc = NULL;
         }
+
         trace_put_cursor();
 }
 
@@ -2105,10 +2098,8 @@ static void draw_timeline(struct graph_info *ginfo, gint width)
 static void draw_info(struct graph_info *ginfo,
                       gint new_width)
 {
-        printf("we going?\n");
         if (!ginfo->handle)
                 return;
-        printf("we gone\n");
 
         ginfo->resolution = (gdouble)new_width / (gdouble)(ginfo->view_end_time -
                                                            ginfo->view_start_time);
@@ -2117,7 +2108,6 @@ static void draw_info(struct graph_info *ginfo,
 
         draw_timeline(ginfo, new_width);
 
-        printf("drawing plots\n");
         draw_plots(ginfo, new_width);
 
         ginfo->read_comms = FALSE;