Merge branch 'for-rostedt/trace-view' of git://git.kernel.org/pub/scm/linux/kernel/git/dvhart/trace-cmd into dvhart-temp

5 files changed, 27 insertions, 44 deletions

diff --git a/Makefile b/Makefile
index 3d17256..4826dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -129,21 +129,24 @@ plugin_mac80211.so: plugin_mac80211.o
         $(CC) -shared -nostartfiles -o $@ $<
 
 
-.PHONY: python
-python: $(TCMD_LIB_OBJS)
+PYTHON_INCLUDES = `python-config --includes`
+PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
+
+ctracecmd.so: $(TCMD_LIB_OBJS)
         swig -Wall -python -noproxy ctracecmd.i
-        #swig -Wall -python ctracecmd.i
-        gcc -fpic -c  `python-config --includes` ctracecmd_wrap.c
+        gcc -fpic -c $(PYTHON_INCLUDES)  ctracecmd_wrap.c
         $(CC) --shared $^ ctracecmd_wrap.o -o ctracecmd.so
-        #$(CC) --shared $^ ctracecmd_wrap.o -o _ctracecmd.so
 
-.PHONY: python-gui
-python-gui: $(TRACE_VIEW_OBJS)
+ctracecmdgui.so: $(TRACE_VIEW_OBJS) $(LIB_FILE)
         swig -Wall -python -noproxy ctracecmdgui.i
-        # FIXME: where do we get the pygtk include from?
-        gcc -fpic -c  `python-config --includes` $(CFLAGS) $(INCLUDES) -I/usr/include/pygtk-2.0/ ctracecmdgui_wrap.c
+        gcc -fpic -c  $(CFLAGS) $(INCLUDES) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) ctracecmdgui_wrap.c
         $(CC) --shared $^ $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so
 
+.PHONY: python
+python: ctracecmd.so
+
+.PHONY: python-gui
+python-gui: ctracecmd.so ctracecmdgui.so 
 
 .PHONY: force
 force:
diff --git a/kernel-shark.c b/kernel-shark.c
index fbc5a5f..a55fc8a 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -137,6 +137,7 @@ static void row_double_clicked(GtkTreeView        *treeview,
                                gpointer            data)
 {
         struct shark_info *info = data;
+        TraceViewRecord *rec;
         GtkTreeModel *model;
         gchar *spath;
         guint64 time;
@@ -151,7 +152,8 @@ static void row_double_clicked(GtkTreeView        *treeview,
         row = atoi(spath);
         g_free(spath);
 
-        time = trace_view_store_get_time_from_row(TRACE_VIEW_STORE(model), row);
+        rec = trace_view_store_get_row(TRACE_VIEW_STORE(model), row);
+        time = rec->timestamp;
         trace_graph_select_by_time(info->ginfo, time);
 }
 
@@ -220,7 +222,7 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
         static GtkWidget *menu_filter_add_task;
         static GtkWidget *menu_filter_clear_tasks;
         struct record *record;
-        TraceViewStore *store;
+        TraceViewRecord *vrec;
         GtkTreeSelection *selection;
         GtkTreeModel *model;
         GtkTreePath *path;
@@ -281,8 +283,8 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
                 g_free(spath);
 
                 model = gtk_tree_view_get_model(GTK_TREE_VIEW(info->treeview));
-                store = TRACE_VIEW_STORE(model);
-                offset = trace_view_store_get_offset_from_row(store, row);
+                vrec = trace_view_store_get_row(TRACE_VIEW_STORE(model), row);
+                offset = vrec->offset;
 
                 record = tracecmd_read_at(info->handle, offset, &cpu);
 
diff --git a/trace-view-store.c b/trace-view-store.c
index 5ae3a00..9ad2073 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -1219,37 +1219,16 @@ gint trace_view_store_get_timestamp_page(TraceViewStore *store, guint64 ts)
         return rec->pos / store->rows_per_page + 1;
 }
 
-guint64 trace_view_store_get_time_from_row(TraceViewStore *store, gint row)
-{
-        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), 0);
-
-        row += store->start_row;
-
-        g_return_val_if_fail (row >= 0 && row < store->visible_rows, 0);
-
-        return store->rows[row]->timestamp;
-}
-
-guint64 trace_view_store_get_offset_from_row(TraceViewStore *store, gint row)
-{
-        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), 0);
-
-        row += store->start_row;
-
-        g_return_val_if_fail (row >= 0 && row < store->visible_rows, 0);
-
-        return store->rows[row]->offset;
-}
-
 TraceViewRecord *
 trace_view_store_get_row(TraceViewStore *store, gint row)
 {
         TraceViewRecord *record;
+        g_return_val_if_fail(TRACE_VIEW_IS_LIST(store), NULL);
 
-        if (row >= store->num_rows || row < 0)
-                return NULL;
+        row += store->start_row;
+        g_return_val_if_fail(row >= store->start_row && row < store->visible_rows, NULL);
 
-        record = store->rows[store->start_row + row];
+        record = store->rows[row];
         g_assert(record != NULL);
         g_assert((record->pos - store->start_row) == row);
         return record;
diff --git a/trace-view-store.h b/trace-view-store.h
index f6825bc..60f90a5 100644
--- a/trace-view-store.h
+++ b/trace-view-store.h
@@ -120,10 +120,6 @@ gint trace_view_store_get_timestamp_page(TraceViewStore *store, guint64 ts);
 
 gint trace_view_store_get_timestamp_visible_row(TraceViewStore *store, guint64 ts);
 
-guint64 trace_view_store_get_time_from_row(TraceViewStore *store, gint row);
-
-guint64 trace_view_store_get_offset_from_row(TraceViewStore *store, gint row);
-
 void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *filter);
 
 TraceViewRecord *trace_view_store_get_row(TraceViewStore *store, gint row);
diff --git a/trace-view.c b/trace-view.c
index 3c023e5..899b3b3 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -271,6 +271,7 @@ void trace_view_make_selection_visible(GtkWidget *treeview)
 void trace_view_update_task_filter(GtkWidget *treeview, struct filter_task *filter)
 {
         GtkTreeView *tree = GTK_TREE_VIEW(treeview);
+        TraceViewRecord *vrec;
         GtkTreeModel *model;
         guint64 time;
         gint row;
@@ -281,8 +282,10 @@ void trace_view_update_task_filter(GtkWidget *treeview, struct filter_task *filt
 
         /* Keep track of the currently selected row */
         row = trace_view_get_selected_row(treeview);
-        if (row >= 0)
-                time = trace_view_store_get_time_from_row(TRACE_VIEW_STORE(model), row);
+        if (row >= 0) {
+                vrec = trace_view_store_get_row(TRACE_VIEW_STORE(model), row);
+                time = vrec->timestamp;
+        }
 
         g_object_ref(model);
         gtk_tree_view_set_model(tree, NULL);