X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=2e123ad6ea4b0388bad64df41fa46a268e59bc64;hb=b139ad2a3bd7c28ad16f0c3faed4c62c5cb2c22b;hp=074a07aa110181abf8099d5df4ed921c2399b19d;hpb=aaecaa999a51da6f31979c3a98825545ce8e35c8;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index 074a07aa..2e123ad6 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -64,7 +65,11 @@ #include #include #include +#include +#include +#include "lttv_plugin_evd.h" +#include "events.h" #include "hGuiEventsInsert.xpm" #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) @@ -74,7 +79,8 @@ #endif #define abs(a) (((a)<0)?(-a):(a)) - +#define max(a,b) ((a)>(b)?(a):(b)) +#define min(a,b) ((a)<(b)?(a):(b)) /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; @@ -88,57 +94,6 @@ typedef enum _ScrollDirection{ SCROLL_NONE } ScrollDirection; -typedef struct _EventViewerData { - - Tab * tab; - LttvHooks * event_hooks; - - /* previous value is used to determine if it is a page up/down or - * step up/down, in which case we move of a certain amount of events (one or - * the number of events shown on the screen) instead of changing begin time. - */ - double previous_value; - - //scroll window containing Tree View - GtkWidget * scroll_win; - - /* Model containing list data */ - GtkListStore *store_m; - - GPtrArray *pos; /* Array of LttvTracesetContextPosition * */ - - GtkWidget *top_widget; - GtkWidget *hbox_v; - /* Widget to display the data in a columned list */ - GtkWidget *tree_v; - GtkAdjustment *vtree_adjust_c ; - GtkWidget *button; /* a button of the header, used to get the header_height */ - gint header_height; - - /* Vertical scrollbar and its adjustment */ - GtkWidget *vscroll_vc; - GtkAdjustment *vadjust_c; - - /* Selection handler */ - GtkTreeSelection *select_c; - - gint num_visible_events; - - LttvTracesetContextPosition *currently_selected_position; - gboolean update_cursor; /* Speed optimisation : do not update cursor when - unnecessary */ - gboolean report_position; /* do not report position when in current_time - update */ - - LttvTracesetContextPosition *first_event; /* Time of the first event shown */ - LttvTracesetContextPosition *last_event; /* Time of the first event shown */ - - LttvFilter *main_win_filter; - - gint background_info_waiting; - -} EventViewerData ; - /** hook functions for update time interval, current time ... */ gboolean update_current_time(void * hook_data, void * call_data); gboolean update_current_position(void * hook_data, void * call_data); @@ -149,12 +104,12 @@ gboolean filter_changed(void * hook_data, void * call_data); static void request_background_data(EventViewerData *event_viewer_data); //! Event Viewer's constructor hook -GtkWidget *h_gui_events(Tab *tab); +GtkWidget *h_gui_events(LttvPlugin *plugin); //! Event Viewer's constructor -EventViewerData *gui_events(Tab *tab); +EventViewerData *gui_events(LttvPluginTab *ptab); //! Event Viewer's destructor -void gui_events_destructor(EventViewerData *event_viewer_data); -void gui_events_free(EventViewerData *event_viewer_data); +void gui_events_destructor(gpointer data); +void gui_events_free(gpointer data); static gboolean header_size_allocate(GtkWidget *widget, @@ -175,8 +130,11 @@ static void tree_v_size_request_cb (GtkWidget *widget, static void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data); static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, gpointer data); - -static gint redraw_notify(void *hook_data, void *call_data); +static void filter_button (GtkToolButton *toolbutton, + gpointer user_data); +static gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data); +static gboolean key_handler(GtkWidget *widget, GdkEventKey *event, + gpointer user_data); static void get_events(double time, EventViewerData *event_viewer_data); @@ -207,9 +165,10 @@ enum * @return The widget created. */ GtkWidget * -h_gui_events(Tab * tab) +h_gui_events(LttvPlugin *plugin) { - EventViewerData* event_viewer_data = gui_events(tab) ; + LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin); + EventViewerData* event_viewer_data = gui_events(ptab) ; if(event_viewer_data) return event_viewer_data->top_widget; else return NULL; @@ -223,14 +182,18 @@ h_gui_events(Tab * tab) * @return The Event viewer data created. */ EventViewerData * -gui_events(Tab *tab) +gui_events(LttvPluginTab *ptab) { LttTime end; GtkTreeViewColumn *column; GtkCellRenderer *renderer; - EventViewerData* event_viewer_data = g_new(EventViewerData,1) ; - + EventViewerData* event_viewer_data = g_new(EventViewerData,1); + LttvPluginEVD *plugin_evd = g_object_new(LTTV_TYPE_PLUGIN_EVD, NULL); + plugin_evd->evd = event_viewer_data; + Tab *tab = ptab->tab; event_viewer_data->tab = tab; + event_viewer_data->ptab = ptab; + GtkWidget *tmp_toolbar_icon; LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab); @@ -251,7 +214,7 @@ gui_events(Tab *tab) lttvwindow_register_filter_notify(tab, filter_changed, event_viewer_data); lttvwindow_register_redraw_notify(tab, - redraw_notify, event_viewer_data); + evd_redraw_notify, event_viewer_data); event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL); @@ -272,6 +235,8 @@ gui_events(Tab *tab) event_viewer_data->update_cursor = TRUE; event_viewer_data->report_position = TRUE; + event_viewer_data->last_tree_update_time = 0; + /* Create a model for storing the data list */ event_viewer_data->store_m = gtk_list_store_new ( N_COLUMNS, /* Total number of columns */ @@ -307,6 +272,16 @@ gui_events(Tab *tab) G_CALLBACK (tree_v_move_cursor_cb), event_viewer_data); + g_signal_connect (G_OBJECT(event_viewer_data->tree_v), "key-press-event", + G_CALLBACK(key_handler), + event_viewer_data); + + g_signal_connect (G_OBJECT(event_viewer_data->tree_v), "scroll-event", + G_CALLBACK(tree_v_scroll_handler), + event_viewer_data); + + + // Use on each column! //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v, //GTK_TREE_VIEW_COLUMN_FIXED); @@ -434,6 +409,30 @@ gui_events(Tab *tab) event_viewer_data->hbox_v = gtk_hbox_new(0, 0); event_viewer_data->top_widget = event_viewer_data->hbox_v; + plugin_evd->parent.top_widget = event_viewer_data->hbox_v; + + event_viewer_data->toolbar = gtk_toolbar_new(); + gtk_toolbar_set_orientation(GTK_TOOLBAR(event_viewer_data->toolbar), + GTK_ORIENTATION_VERTICAL); + + tmp_toolbar_icon = create_pixmap (main_window_get_widget(tab), + "guifilter16x16.png"); + gtk_widget_show(tmp_toolbar_icon); + event_viewer_data->button_filter = gtk_tool_button_new(tmp_toolbar_icon, + "Filter"); + g_signal_connect (G_OBJECT(event_viewer_data->button_filter), + "clicked", + G_CALLBACK (filter_button), + (gpointer)plugin_evd); + gtk_toolbar_insert(GTK_TOOLBAR(event_viewer_data->toolbar), + event_viewer_data->button_filter, + 0); + gtk_toolbar_set_style(GTK_TOOLBAR(event_viewer_data->toolbar), + GTK_TOOLBAR_ICONS); + gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), + event_viewer_data->toolbar, FALSE, FALSE, 0); + event_viewer_data->filter = NULL; + gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), event_viewer_data->scroll_win, TRUE, TRUE, 0); @@ -468,13 +467,15 @@ gui_events(Tab *tab) event_viewer_data->vadjust_c->page_size = 2.0; // event_viewer_data->vtree_adjust_c->upper; /* Raw event trace */ + gtk_widget_show(GTK_WIDGET(event_viewer_data->button_filter)); + gtk_widget_show(event_viewer_data->toolbar); gtk_widget_show(event_viewer_data->hbox_v); gtk_widget_show(event_viewer_data->tree_v); gtk_widget_show(event_viewer_data->vscroll_vc); /* Add the object's information to the module's array */ g_event_viewer_data_list = g_slist_append(g_event_viewer_data_list, - event_viewer_data); + plugin_evd); event_viewer_data->num_visible_events = 1; @@ -493,9 +494,14 @@ gui_events(Tab *tab) // g_object_set_data_full( G_OBJECT(event_viewer_data->hbox_v), - "event_viewer_data", - event_viewer_data, + "plugin_data", + plugin_evd, (GDestroyNotify)gui_events_free); + + g_object_set_data( + G_OBJECT(event_viewer_data->hbox_v), + "event_viewer_data", + event_viewer_data); event_viewer_data->background_info_waiting = 0; @@ -517,7 +523,7 @@ static gint background_ready(void *hook_data, void *call_data) if(event_viewer_data->background_info_waiting == 0) { g_message("event viewer : background computation data ready."); - redraw_notify(event_viewer_data, NULL); + evd_redraw_notify(event_viewer_data, NULL); } return 0; @@ -531,6 +537,7 @@ static void request_background_data(EventViewerData *event_viewer_data) gint num_traces = lttv_traceset_number(tsc->ts); gint i; LttvTrace *trace; + LttvTraceState *tstate; LttvHooks *background_ready_hook = lttv_hooks_new(); @@ -540,8 +547,10 @@ static void request_background_data(EventViewerData *event_viewer_data) for(i=0;its, i); + tstate = LTTV_TRACE_STATE(tsc->traces[i]); - if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) { + if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE + && !tstate->has_precomputed_states) { if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"), trace) == FALSE) { @@ -549,9 +558,9 @@ static void request_background_data(EventViewerData *event_viewer_data) * information. Happens when two viewers ask for it before servicing * starts. */ - lttvwindowtraces_background_request_remove(trace, "state"); - lttvwindowtraces_background_request_queue(trace, - "state"); + if(!lttvwindowtraces_background_request_find(trace, "state")) + lttvwindowtraces_background_request_queue( + main_window_get_widget(event_viewer_data->tab), trace, "state"); lttvwindowtraces_background_notify_queue(event_viewer_data, trace, ltt_time_infinite, @@ -568,7 +577,7 @@ static void request_background_data(EventViewerData *event_viewer_data) event_viewer_data->background_info_waiting++; } } else { - /* Data ready. Be its nature, this viewer doesn't need to have + /* Data ready. By its nature, this viewer doesn't need to have * its data ready hook called htere, because a background * request is always linked with a redraw. */ @@ -635,7 +644,20 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data) #endif //0 } - +/* Filter out the key repeats that come too fast */ +static gboolean key_handler(GtkWidget *widget, GdkEventKey *event, + gpointer user_data) +{ + EventViewerData *evd = (EventViewerData *)user_data; + + g_debug("event time : %u , last time : %u", event->time, + evd->last_tree_update_time); + + if(guint32_before(event->time, evd->last_tree_update_time)) + return TRUE; + else + return FALSE; +} void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, @@ -662,8 +684,12 @@ void tree_v_move_cursor_cb (GtkWidget *widget, //indices = gtk_tree_path_get_indices(path); //value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); + + /* If events request pending, do nothing*/ + if(lttvwindow_events_request_pending(event_viewer_data->tab)) return; /* If no prior position... */ +#if 0 if(ltt_time_compare( lttv_traceset_context_position_get_time( event_viewer_data->currently_selected_position), @@ -677,7 +703,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget, return; } - +#endif //0 g_debug("tree view move cursor : arg1 is %u and arg2 is %d", (guint)arg1, arg2); @@ -696,17 +722,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* Must get down one event and select the last one */ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( GTK_TREE_VIEW(event_viewer_data->tree_v))); - event_viewer_data->update_cursor = FALSE; - gtk_adjustment_set_value(event_viewer_data->vadjust_c, - gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1); - event_viewer_data->update_cursor = TRUE; - path = gtk_tree_path_new_from_indices( - event_viewer_data->pos->len - 1, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); - } - } + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + max(0, event_viewer_data->pos->len - 1), -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } + } else { + /* Must get down one event and select the last one */ + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + max(0, event_viewer_data->pos->len - 1), -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } } else { if(event_viewer_data->pos->len > 0) { @@ -720,17 +767,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* Must get up one event and select the first one */ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( GTK_TREE_VIEW(event_viewer_data->tree_v))); - event_viewer_data->update_cursor = FALSE; - gtk_adjustment_set_value(event_viewer_data->vadjust_c, - gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1); - event_viewer_data->update_cursor = TRUE; - path = gtk_tree_path_new_from_indices( - 0, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); - } - } + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } + } else { + /* Must get up one event and select the first one */ + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } } break; case GTK_MOVEMENT_PAGES: @@ -746,21 +814,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* Must get down one page and select the last one */ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( GTK_TREE_VIEW(event_viewer_data->tree_v))); - - event_viewer_data->update_cursor = FALSE; - gtk_adjustment_set_value(event_viewer_data->vadjust_c, - gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2); - event_viewer_data->update_cursor = TRUE; - - path = gtk_tree_path_new_from_indices( - event_viewer_data->pos->len - 1, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); - - } - } - + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + event_viewer_data->pos->len - 1, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } + } else { + /* Must get down one page and select the last one */ + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + event_viewer_data->pos->len - 1, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } } else { /* Move one page up */ if(event_viewer_data->pos->len > 0) { @@ -773,20 +858,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* Must get up one page and select the first one */ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( GTK_TREE_VIEW(event_viewer_data->tree_v))); - - event_viewer_data->update_cursor = FALSE; - gtk_adjustment_set_value(event_viewer_data->vadjust_c, - gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2); - event_viewer_data->update_cursor = TRUE; - - path = gtk_tree_path_new_from_indices( - 0, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); - } - } - + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } + } else { + /* Must get up one page and select the first one */ + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + event_viewer_data->update_cursor = FALSE; + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } + } + } } break; default: @@ -914,6 +1017,51 @@ void tree_v_move_cursor_cb (GtkWidget *widget, #endif //0 } +static void filter_button (GtkToolButton *toolbutton, + gpointer user_data) +{ + LttvPluginEVD *plugin_evd = (LttvPluginEVD*)user_data; + LttvAttribute *attribute; + LttvAttributeValue value; + gboolean ret; + g_printf("Filter button clicked\n"); + + attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( + LTTV_IATTRIBUTE(lttv_global_attributes()), + LTTV_VIEWER_CONSTRUCTORS)); + g_assert(attribute); + + ret = lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute), + "guifilter", LTTV_POINTER, &value); + g_assert(ret); + lttvwindow_viewer_constructor constructor = + (lttvwindow_viewer_constructor)*(value.v_pointer); + if(constructor) constructor(&plugin_evd->parent); + else g_warning("Filter module not loaded."); + + //FIXME : viewer returned. +} + +gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data) +{ + EventViewerData *event_viewer_data = (EventViewerData*) data; + Tab *tab = event_viewer_data->tab; + + switch(event->direction) { + case GDK_SCROLL_UP: + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1); + break; + case GDK_SCROLL_DOWN: + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1); + break; + default: + g_error("Only scroll up and down expected"); + } + return TRUE; +} + void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) { EventViewerData *event_viewer_data = (EventViewerData*) data; @@ -927,22 +1075,24 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) /* On cursor change, modify the currently selected event by calling * the right API function */ - - if(event_viewer_data->report_position) { - gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - &path, NULL); - if(gtk_tree_model_get_iter(model,&iter,path)){ - gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1); - - if(lttv_traceset_context_pos_pos_compare(pos, - event_viewer_data->currently_selected_position) != 0) - lttvwindow_report_current_position(tab, pos); - }else{ - g_warning("Can not get iter\n"); - } - gtk_tree_path_free(path); - } + if(event_viewer_data->pos->len > 0) { + gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + &path, NULL); + if(path) { + if(gtk_tree_model_get_iter(model,&iter,path)){ + gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1); + + if(lttv_traceset_context_pos_pos_compare(pos, + event_viewer_data->currently_selected_position) != 0) + lttvwindow_report_current_position(tab, pos); + }else{ + g_warning("Can not get iter\n"); + } + gtk_tree_path_free(path); + } + } + } } @@ -982,7 +1132,13 @@ static void tree_selection_changed_cb (GtkTreeSelection *selection, #endif //0 } - +#if 0 +static gint key_snooper(GtkWidget *grab_widget, GdkEventKey *event, + gpointer func_data) +{ + return TRUE; +} +#endif //0 /* This callback may be recalled after a step up/down, but we don't want to lose * the exact position : what we do is that we only set the value if it has @@ -1010,7 +1166,12 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data) //LttTime old_time = event_viewer_data->first_event; + + //gint snoop = gtk_key_snooper_install(key_snooper, NULL); + get_events(adjustment->value, event_viewer_data); + + //gtk_key_snooper_remove(snoop); #if 0 LttTime time = ltt_time_sub(event_viewer_data->first_event, tsc->time_span.start_time); @@ -1038,6 +1199,13 @@ static __inline gint get_cell_height(GtkTreeView *TreeView) gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height); + gint vertical_separator; + gtk_widget_style_get (GTK_WIDGET (TreeView), + "vertical-separator", &vertical_separator, + NULL); + + height += vertical_separator; + return height; } @@ -1112,11 +1280,16 @@ gboolean show_event_detail(void * hook_data, void * call_data) } #endif //0 - - - - - +static gboolean events_check_handler(guint count, gboolean *stop_flag) +{ + if(count % CHECK_GDK_INTERVAL == 0) { + gtk_main_iteration_do(FALSE); + if(*stop_flag) + return TRUE; + else + return FALSE; + } else return FALSE; +} static void get_events(double new_value, EventViewerData *event_viewer_data) { @@ -1127,8 +1300,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) guint i; gboolean seek_by_time; + if(lttvwindow_preempt_count > 0) return; + double value = new_value - event_viewer_data->previous_value; + /* Set stop button status for foreground processing */ + event_viewer_data->tab->stop_foreground = FALSE; + lttvwindow_events_request_disable(); + /* See where we have to scroll... */ ScrollDirection direction; gint relative_position; @@ -1196,7 +1375,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) 0); lttv_traceset_context_position_copy(pos, first_pos); - if(relative_position > 0) { + if(relative_position >= 0) { LttTime first_event_time = lttv_traceset_context_position_get_time( pos); @@ -1206,7 +1385,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) G_MAXUINT, pos); - } else if(relative_position <= 0) { + } else if(relative_position < 0) { g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); } } else { @@ -1227,8 +1406,11 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) */ if(relative_position > 0) { guint count; - count = lttv_process_traceset_seek_n_forward(tsc, relative_position, - event_viewer_data->main_win_filter); + count += lttv_process_traceset_seek_n_forward(tsc, relative_position, + events_check_handler, + &event_viewer_data->tab->stop_foreground, + event_viewer_data->main_win_filter, + event_viewer_data->filter, NULL); } else if(relative_position < 0) { guint count; @@ -1240,10 +1422,15 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) LttTime time_diff = ltt_time_sub(last_event_time, first_event_time); if(ltt_time_compare(time_diff, ltt_time_zero) == 0) time_diff = seek_back_default_offset; - count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position), + + count = lttv_process_traceset_seek_n_backward(tsc, + abs(relative_position), time_diff, (seek_time_fct)lttv_state_traceset_seek_time_closest, - event_viewer_data->main_win_filter); + events_check_handler, + &event_viewer_data->tab->stop_foreground, + event_viewer_data->main_win_filter, + event_viewer_data->filter, NULL); } /* else 0 : do nothing : we are already at the beginning position */ lttv_traceset_context_position_destroy(pos); @@ -1290,11 +1477,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) /* Mathieu : * I make the choice not to use the mainwindow lttvwindow API here : the idle * loop might have a too low priority, and we want good update while - * scrolling. + * scrolling. However, we call the gdk loop to get events periodically so the + * processing can be stopped. */ lttv_process_traceset_begin(tsc, NULL, NULL, NULL, event_viewer_data->event_hooks, NULL); + + event_viewer_data->num_events = 0; lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL); @@ -1317,30 +1507,48 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) //g_signal_emit_by_name(G_OBJECT (event_viewer_data->select_c), // "changed"); + event_viewer_data->last_tree_update_time = + gdk_x11_get_server_time( + gtk_widget_get_parent_window(event_viewer_data->tree_v)); + + lttvwindow_events_request_enable(); return; } - int event_hook(void *hook_data, void *call_data) { EventViewerData *event_viewer_data = (EventViewerData*)hook_data; LttvTracefileContext *tfc = (LttvTracefileContext*)call_data; + LttvTracefileState *tfs = (LttvTracefileState*)call_data; LttEvent *e = ltt_tracefile_get_event(tfc->tf); + if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) { + gtk_main_iteration_do(FALSE); + if(event_viewer_data->tab->stop_foreground) + return TRUE; + } + event_viewer_data->num_events++; + LttvFilter *filter = event_viewer_data->main_win_filter; if(filter != NULL && filter->head != NULL) if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, tfc->t_context->t,tfc)) return FALSE; + filter = event_viewer_data->filter; + if(filter != NULL && filter->head != NULL) + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,tfc)) + return FALSE; + + LttFacility *facility = ltt_event_facility(e); LttEventType *event_type = ltt_event_eventtype(e); - LttField *field = ltt_event_field(e); LttTime time = ltt_event_time(e); - guint cpu = ltt_tracefile_num(tfc->tf); + guint cpu = tfs->cpu; LttvTraceState *ts = (LttvTraceState*)tfc->t_context; LttvProcessState *process = ts->running_process[cpu]; @@ -1353,10 +1561,9 @@ int event_hook(void *hook_data, void *call_data) lttv_traceset_context_position_save(tfc->t_context->ts_context, pos); - if(field) - lttv_print_field(e, field, desc, TRUE); + lttv_event_to_string(e, desc, TRUE, TRUE, (LttvTracefileState*)tfc); - g_info("field : %s", desc->str); + g_info("detail : %s", desc->str); gtk_list_store_append (event_viewer_data->store_m, &iter); gtk_list_store_set (event_viewer_data->store_m, &iter, @@ -1381,9 +1588,11 @@ int event_hook(void *hook_data, void *call_data) event_viewer_data->currently_selected_position) == 0) { GtkTreePath *path = gtk_tree_path_new_from_indices( event_viewer_data->pos->len - 1, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } } } @@ -1407,13 +1616,38 @@ static void event_update_selection(EventViewerData *event_viewer_data) if(lttv_traceset_context_pos_pos_compare(cur_pos, event_viewer_data->currently_selected_position) == 0) { GtkTreePath *path = gtk_tree_path_new_from_indices(i, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - path, NULL, FALSE); - gtk_tree_path_free(path); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + gtk_tree_path_free(path); + } } } } +static int current_time_get_first_event_hook(void *hook_data, void *call_data) +{ + EventViewerData *event_viewer_data = (EventViewerData*)hook_data; + LttvTracefileContext *tfc = (LttvTracefileContext*)call_data; + LttEvent *e = ltt_tracefile_get_event(tfc->tf); + + LttvFilter *filter = event_viewer_data->main_win_filter; + if(filter != NULL && filter->head != NULL) + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,tfc)) + return FALSE; + + filter = event_viewer_data->filter; + if(filter != NULL && filter->head != NULL) + if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,tfc)) + return FALSE; + + lttv_traceset_context_position_save(tfc->t_context->ts_context, + event_viewer_data->current_time_get_first); + return TRUE; +} + gboolean update_current_time(void * hook_data, void * call_data) { @@ -1434,20 +1668,31 @@ gboolean update_current_time(void * hook_data, void * call_data) *current_time); lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT, NULL); - /* Little trick : seek 0 events forward to get the first event - * that passes the filter. The trick is to have a match function that - * returns 2 : it makes the read stop and keep the last position */ - // We don't care : this will be taken care of by the _middle. - //guint count; - //count = lttv_process_traceset_seek_n_forward(tsc, 0, - // event_viewer_data->main_win_filter); -#if 0 - lttv_process_traceset_seek_time(tsc, *current_time); -#endif //0 + /* Get the first event that passes in the filter */ + event_viewer_data->current_time_get_first = + lttv_traceset_context_position_new(tsc); + LttvHooks *hooks = lttv_hooks_new(); + lttv_hooks_add(hooks, + current_time_get_first_event_hook, + event_viewer_data, + LTTV_PRIO_DEFAULT); + + lttv_process_traceset_begin(tsc, + NULL, NULL, NULL, hooks, NULL); + + lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL); + + lttv_process_traceset_end(tsc, + NULL, NULL, NULL, hooks, NULL); + + lttv_hooks_destroy(hooks); - lttv_traceset_context_position_save(tsc, - event_viewer_data->currently_selected_position); + lttv_traceset_context_position_copy( + event_viewer_data->currently_selected_position, + event_viewer_data->current_time_get_first); + lttv_traceset_context_position_destroy( + event_viewer_data->current_time_get_first); pos_time = lttv_traceset_context_position_get_time( event_viewer_data->currently_selected_position); } @@ -1545,6 +1790,8 @@ gboolean traceset_changed(void * hook_data, void * call_data) get_events(event_viewer_data->vadjust_c->value, event_viewer_data); // event_viewer_data->vadjust_c->value = 0; + request_background_data(event_viewer_data); + return FALSE; } @@ -1562,19 +1809,24 @@ gboolean filter_changed(void * hook_data, void * call_data) } -gint redraw_notify(void *hook_data, void *call_data) +gint evd_redraw_notify(void *hook_data, void *call_data) { EventViewerData *event_viewer_data = (EventViewerData*) hook_data; get_events(event_viewer_data->vadjust_c->value, event_viewer_data); + return 0; } -void gui_events_free(EventViewerData *event_viewer_data) +void gui_events_free(gpointer data) { - Tab *tab = event_viewer_data->tab; + LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data; + Tab *tab = plugin_evd->evd->tab; + EventViewerData *event_viewer_data = plugin_evd->evd; guint i; - if(event_viewer_data){ + lttv_filter_destroy(plugin_evd->evd->filter); + + if(tab != NULL){ lttv_hooks_remove(event_viewer_data->event_hooks,event_hook); lttv_hooks_destroy(event_viewer_data->event_hooks); @@ -1603,23 +1855,25 @@ void gui_events_free(EventViewerData *event_viewer_data) lttvwindow_unregister_filter_notify(tab, filter_changed, event_viewer_data); lttvwindow_unregister_redraw_notify(tab, - redraw_notify, event_viewer_data); + evd_redraw_notify, event_viewer_data); - lttvwindowtraces_background_notify_remove(event_viewer_data); - - g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, - event_viewer_data); - g_free(event_viewer_data); } + lttvwindowtraces_background_notify_remove(event_viewer_data); + + g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, + event_viewer_data); + //g_free(event_viewer_data); + g_object_unref(plugin_evd); } -void gui_events_destructor(EventViewerData *event_viewer_data) +void gui_events_destructor(gpointer data) { + LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data; /* May already been done by GTK window closing */ - if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){ - gtk_widget_destroy(event_viewer_data->hbox_v); + if(GTK_IS_WIDGET(plugin_evd->parent.top_widget)){ + gtk_widget_destroy(plugin_evd->parent.top_widget); } } @@ -1643,7 +1897,7 @@ static void init() { void event_destroy_walk(gpointer data, gpointer user_data) { - gui_events_destructor((EventViewerData*)data); + gui_events_destructor((LttvPluginEVD*)data); } /**