X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=5c8456f9eb8d6e6828935975b9236276e861a5ff;hb=dd455fb8aa68172162fa7a44c534a405bccf1aa4;hp=84af45a060e2b0ee98d7da31b7faf2abd73f1680;hpb=5698740e7329b8a34faf0c178ff44a5e21654cdc;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 84af45a0..5c8456f9 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -54,9 +54,7 @@ #include #include -#include #include -#include #include #include #include @@ -66,7 +64,10 @@ #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) @@ -77,10 +78,8 @@ #define abs(a) (((a)<0)?(-a):(a)) #define max(a,b) ((a)>(b)?(a):(b)) +#define min(a,b) ((a)<(b)?(a):(b)) -/* Number of events between checks for GDK events (stop button) */ -#define CHECK_GDK_INTERVAL 50000 - /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; @@ -93,64 +92,6 @@ typedef enum _ScrollDirection{ SCROLL_NONE } ScrollDirection; -typedef struct _EventViewerData { - - Tab * tab; - LttvPluginTab *ptab; - 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 */ - - LttvTracesetContextPosition *current_time_get_first; - - LttvFilter *main_win_filter; - - gint background_info_waiting; - - guint32 last_tree_update_time; /* To filter out repeat keys */ - - guint num_events; /* Number of events processed */ - -} 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); @@ -165,8 +106,8 @@ GtkWidget *h_gui_events(LttvPlugin *plugin); //! Event Viewer's constructor 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, @@ -187,12 +128,12 @@ 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 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 gint redraw_notify(void *hook_data, void *call_data); - static void get_events(double time, EventViewerData *event_viewer_data); int event_hook(void *hook_data, void *call_data); @@ -204,7 +145,6 @@ enum TRACEFILE_NAME_COLUMN, CPUID_COLUMN, EVENT_COLUMN, - FACILITY_COLUMN, TIME_S_COLUMN, TIME_NS_COLUMN, PID_COLUMN, @@ -244,10 +184,14 @@ 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); + GtkTooltips *tooltips = gtk_tooltips_new(); + 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); @@ -268,7 +212,7 @@ gui_events(LttvPluginTab *ptab) 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); @@ -291,6 +235,8 @@ gui_events(LttvPluginTab *ptab) event_viewer_data->last_tree_update_time = 0; + event_viewer_data->init_done = 0; + /* Create a model for storing the data list */ event_viewer_data->store_m = gtk_list_store_new ( N_COLUMNS, /* Total number of columns */ @@ -334,6 +280,8 @@ gui_events(LttvPluginTab *ptab) 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); @@ -396,16 +344,6 @@ gui_events(LttvPluginTab *ptab) gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Facility", - renderer, - "text", FACILITY_COLUMN, - NULL); - gtk_tree_view_column_set_alignment (column, 0.0); - gtk_tree_view_column_set_fixed_width (column, 120); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), - column); - renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Time (s)", renderer, @@ -461,6 +399,32 @@ gui_events(LttvPluginTab *ptab) 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_tool_item_set_tooltip(GTK_TOOL_ITEM(event_viewer_data->button_filter), + tooltips, "Open the filter window", NULL); + 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); @@ -488,6 +452,9 @@ gui_events(LttvPluginTab *ptab) event_viewer_data->previous_value = 0; event_viewer_data->vadjust_c->lower = 0.0; //event_viewer_data->vadjust_c->upper = event_viewer_data->number_of_events; + LttTime time = lttvwindow_get_current_time(tab); + time = ltt_time_sub(time, tsc->time_span.start_time); + event_viewer_data->vadjust_c->value = ltt_time_to_double(time); event_viewer_data->vadjust_c->value = 0.0; event_viewer_data->vadjust_c->step_increment = 1.0; event_viewer_data->vadjust_c->page_increment = 2.0; @@ -495,13 +462,15 @@ gui_events(LttvPluginTab *ptab) 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; @@ -520,15 +489,20 @@ gui_events(LttvPluginTab *ptab) // 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; + request_background_data(event_viewer_data); - return event_viewer_data; } @@ -544,7 +518,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; @@ -558,6 +532,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(); @@ -567,8 +542,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) { @@ -595,8 +572,8 @@ 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 - * its data ready hook called htere, because a background + /* Data ready. By its nature, this viewer doesn't need to have + * its data ready hook called there, because a background * request is always linked with a redraw. */ } @@ -1035,6 +1012,30 @@ 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) { @@ -1095,6 +1096,7 @@ static void tree_selection_changed_cb (GtkTreeSelection *selection, { g_debug("tree sel changed cb"); EventViewerData *event_viewer_data = (EventViewerData*) data; + #if 0 /* Set the cursor to currently selected event */ GtkTreeModel* model = GTK_TREE_MODEL(event_viewer_data->store_m); @@ -1223,14 +1225,15 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer floor(exact_num_visible); */ - g_debug("size allocate : last_num_visible_events : %d,\ - num_visible_events : %d", - last_num_visible_events, - event_viewer_data->num_visible_events); - if(event_viewer_data->num_visible_events != last_num_visible_events) - { + g_debug("size allocate %p : last_num_visible_events : %d", + event_viewer_data, last_num_visible_events); + g_debug("num_visible_events : %d, value %lu", + event_viewer_data->num_visible_events, + event_viewer_data->vadjust_c->value); + + if(event_viewer_data->num_visible_events != last_num_visible_events) { get_events(event_viewer_data->vadjust_c->value, event_viewer_data); - } + } } @@ -1274,11 +1277,30 @@ gboolean show_event_detail(void * hook_data, void * call_data) } #endif //0 - - - - - +static gboolean events_check_handler(guint count, gboolean *stop_flag, + gpointer data) +{ + EventViewerData *evd = (EventViewerData*)data; + if(count % CHECK_GDK_INTERVAL == 0) { + GdkEvent *event; + GtkWidget *widget; + while((event = gdk_event_get()) != NULL) { + widget = gtk_get_event_widget(event); + if(widget == + lookup_widget(main_window_get_widget(evd->tab), + "StopProcessingButton") + || widget == evd->vscroll_vc) { + gtk_main_do_event(event); + gdk_window_process_all_updates(); + } + gdk_event_free(event); + } + if(*stop_flag) + return TRUE; + else + return FALSE; + } else return FALSE; +} static void get_events(double new_value, EventViewerData *event_viewer_data) { @@ -1289,10 +1311,13 @@ 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; @@ -1392,8 +1417,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, event_viewer_data); } else if(relative_position < 0) { guint count; @@ -1405,10 +1433,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, event_viewer_data); } /* else 0 : do nothing : we are already at the beginning position */ lttv_traceset_context_position_destroy(pos); @@ -1489,11 +1522,12 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) 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; @@ -1501,22 +1535,41 @@ int event_hook(void *hook_data, void *call_data) LttvTracefileState *tfs = (LttvTracefileState*)call_data; LttEvent *e = ltt_tracefile_get_event(tfc->tf); - event_viewer_data->num_events++; if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) { - while(gtk_events_pending ()) - gtk_main_iteration(); + GdkEvent *event; + GtkWidget *widget; + while((event = gdk_event_get()) != NULL) { + widget = gtk_get_event_widget(event); + if(widget == + lookup_widget(main_window_get_widget(event_viewer_data->tab), + "StopProcessingButton") + || widget == event_viewer_data->vscroll_vc) { + gtk_main_do_event(event); + gdk_window_process_all_updates(); + } + gdk_event_free(event); + } + //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)) + tfc->t_context->t,tfc,NULL,NULL)) return FALSE; - LttFacility *facility = ltt_event_facility(e); - LttEventType *event_type = ltt_event_eventtype(e); + 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,NULL,NULL)) + return FALSE; + + +// LttFacility *facility = ltt_event_facility(e); +// LttEventType *event_type = ltt_event_eventtype(e); LttTime time = ltt_event_time(e); guint cpu = tfs->cpu; @@ -1541,8 +1594,7 @@ int event_hook(void *hook_data, void *call_data) TRACE_NAME_COLUMN, g_quark_to_string(ltt_trace_name(tfc->t_context->t)), TRACEFILE_NAME_COLUMN, g_quark_to_string(ltt_tracefile_name(tfc->tf)), CPUID_COLUMN, cpu, - FACILITY_COLUMN, g_quark_to_string(ltt_facility_name(facility)), - EVENT_COLUMN, g_quark_to_string(ltt_eventtype_name(event_type)), + EVENT_COLUMN, g_quark_to_string(marker_get_info_from_id(tfc->tf->trace, e->event_id)->name), TIME_S_COLUMN, time.tv_sec, TIME_NS_COLUMN, time.tv_nsec, PID_COLUMN, process->pid, @@ -1605,7 +1657,13 @@ static int current_time_get_first_event_hook(void *hook_data, void *call_data) 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)) + tfc->t_context->t,tfc,NULL,NULL)) + 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,NULL,NULL)) return FALSE; lttv_traceset_context_position_save(tfc->t_context->ts_context, @@ -1774,7 +1832,7 @@ 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; @@ -1782,12 +1840,16 @@ gint redraw_notify(void *hook_data, void *call_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); @@ -1816,23 +1878,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); - - lttvwindowtraces_background_notify_remove(event_viewer_data); + evd_redraw_notify, 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); } } @@ -1856,7 +1920,7 @@ static void init() { void event_destroy_walk(gpointer data, gpointer user_data) { - gui_events_destructor((EventViewerData*)data); + gui_events_destructor((LttvPluginEVD*)data); } /**