trace-view: Fix trace_view_store_get_timestamp_visible_row()

The search used the size of the actual_rows array, and not the
size of what was visible.  The visible_rows use the array, but anything
outside the visible rows are just left overs.

Using the bsearch on the entire array causes errors in the search.
It should only use the subset that is visible.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 15 insertions, 17 deletions

diff --git a/trace-view-store.c b/trace-view-store.c
index df16561..31c702b 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -1008,24 +1008,29 @@ static TraceViewRecord *
 search_for_record_by_timestamp(TraceViewStore *store, guint64 ts)
 {
         TraceViewRecord key;
-        TraceViewRecord **rec;
+        TraceViewRecord *rec, **prec;
 
-        if (!store->actual_rows)
+        if (!store->visible_rows)
                 return NULL;
 
         if (ts < store->rows[0]->timestamp)
                 return NULL;
 
-        if (ts >= store->rows[store->actual_rows-1]->timestamp)
-                return store->rows[store->actual_rows-1];
+        if (ts >= store->rows[store->visible_rows-1]->timestamp)
+                return store->rows[store->visible_rows-1];
 
         key.timestamp = ts;
-        rec = bsearch(&key, store->rows, store->actual_rows - 1,
-                      sizeof(store->rows[0]), rows_ts_cmp);
+        prec = bsearch(&key, store->rows, store->visible_rows - 2,
+                       sizeof(store->rows[0]), rows_ts_cmp);
 
-        g_assert(rec != NULL);
+        g_assert(prec != NULL);
 
-        return *rec;
+        rec = *prec;
+
+        if (rec)
+                printf("found row rec for %ld at %ld\n",
+                       ts, rec->timestamp);
+        return rec;
 }
 
 gint trace_view_store_get_timestamp_visible_row(TraceViewStore *store, guint64 ts)
@@ -1038,13 +1043,6 @@ gint trace_view_store_get_timestamp_visible_row(TraceViewStore *store, guint64 t
         if (!rec)
                 return 0;
 
-        /* Make sure the record is visible */
-        while (rec && !rec->visible)
-                rec++;
-
-        if (!rec)
-                return 0;
-
         return rec->pos - (store->page - 1) * store->rows_per_page;
 }
 
@@ -1067,7 +1065,7 @@ guint64 trace_view_store_get_time_from_row(TraceViewStore *store, gint row)
 
         row += store->start_row;
 
-        g_return_val_if_fail (row >= 0 && row < store->actual_rows, 0);
+        g_return_val_if_fail (row >= 0 && row < store->visible_rows, 0);
 
         return store->rows[row]->timestamp;
 }
@@ -1078,7 +1076,7 @@ guint64 trace_view_store_get_offset_from_row(TraceViewStore *store, gint row)
 
         row += store->start_row;
 
-        g_return_val_if_fail (row >= 0 && row < store->actual_rows, 0);
+        g_return_val_if_fail (row >= 0 && row < store->visible_rows, 0);
 
         return store->rows[row]->offset;
 }