kernelshark: Create and use trace_view_store_get_visible_row()

The gtk_tree_selection_get_selected_rows returns the row of the
entire list, no the visible row. The current trace_view_store_get_row()
returns the record of the row passed in compared to the visible row.
But the row that is passed in is the absolute row, and this causes
us to index incorrectly.

This patch creates trace_view_store_get_visible_row() for use when
the row passed in is the visible row, and changes
trace_view_store_get_row() to return record based off of the
absolute row.

Reported-by: Darren Hart <dvhltc@us.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

3 files changed, 27 insertions, 9 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 9820ac3..1caedf2 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -315,7 +315,7 @@ static void row_double_clicked(GtkTreeView        *treeview,
         row = atoi(spath);
         g_free(spath);
 
-        rec = trace_view_store_get_row(TRACE_VIEW_STORE(model), row);
+        rec = trace_view_store_get_visible_row(TRACE_VIEW_STORE(model), row);
         time = rec->timestamp;
         trace_graph_select_by_time(info->ginfo, time);
 }
diff --git a/trace-view-store.c b/trace-view-store.c
index 13da4ea..9e36493 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -336,7 +336,7 @@ trace_view_store_get_iter (GtkTreeModel *tree_model,
 
         n = indices[0]; /* the n-th top level row */
 
-        record = trace_view_store_get_row(trace_view_store, n);
+        record = trace_view_store_get_visible_row(trace_view_store, n);
         if (!record)
                 return FALSE;
 
@@ -1222,10 +1222,31 @@ gint trace_view_store_get_timestamp_page(TraceViewStore *store, guint64 ts)
         return rec->pos / store->rows_per_page + 1;
 }
 
+static TraceViewRecord *get_row(TraceViewStore *store, gint row)
+{
+        TraceViewRecord *record;
+
+        g_return_val_if_fail(row >= store->start_row && row < store->visible_rows, NULL);
+
+        record = store->rows[row];
+        g_assert(record != NULL);
+        g_assert(record->pos == row);
+        return record;
+}
+
+
 TraceViewRecord *
 trace_view_store_get_row(TraceViewStore *store, gint row)
 {
-        TraceViewRecord *record;
+        g_return_val_if_fail(TRACE_VIEW_IS_LIST(store), NULL);
+
+        return get_row(store, row);
+}
+
+
+TraceViewRecord *
+trace_view_store_get_visible_row(TraceViewStore *store, gint row)
+{
         g_return_val_if_fail(TRACE_VIEW_IS_LIST(store), NULL);
 
         /* If we don't have any visible rows, return NULL */
@@ -1234,12 +1255,7 @@ trace_view_store_get_row(TraceViewStore *store, gint row)
 
         row += store->start_row;
 
-        g_return_val_if_fail(row >= store->start_row && row < store->visible_rows, NULL);
-
-        record = store->rows[row];
-        g_assert(record != NULL);
-        g_assert(record->pos == row);
-        return record;
+        return get_row(store, row);
 }
 
 gint get_next_pid(TraceViewStore *store, struct pevent *pevent, struct record *record)
diff --git a/trace-view-store.h b/trace-view-store.h
index 5a9a7a7..8f660ff 100644
--- a/trace-view-store.h
+++ b/trace-view-store.h
@@ -135,6 +135,8 @@ void trace_view_store_assign_filters(TraceViewStore *store,
 
 TraceViewRecord *trace_view_store_get_row(TraceViewStore *store, gint row);
 
+TraceViewRecord *trace_view_store_get_visible_row(TraceViewStore *store, gint row);
+
 gboolean trace_view_store_system_enabled(TraceViewStore *store, const gchar *system);
 
 gboolean trace_view_store_event_enabled(TraceViewStore *store, gint event_id);