X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=0121d931dfdc71ffc292797f1a786e3c86a6401a;hb=0ad10e7f28bf28543b8c131eb5a812ebbeb44216;hp=2e123ad6ea4b0388bad64df41fa46a268e59bc64;hpb=b139ad2a3bd7c28ad16f0c3faed4c62c5cb2c22b;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 2e123ad6..0121d931 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -189,6 +189,7 @@ gui_events(LttvPluginTab *ptab) GtkCellRenderer *renderer; 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; @@ -237,6 +238,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 */ @@ -424,6 +427,8 @@ gui_events(LttvPluginTab *ptab) "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); @@ -460,6 +465,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; @@ -505,9 +513,9 @@ gui_events(LttvPluginTab *ptab) event_viewer_data->background_info_waiting = 0; + request_background_data(event_viewer_data); - return event_viewer_data; } @@ -578,7 +586,7 @@ static void request_background_data(EventViewerData *event_viewer_data) } } else { /* Data ready. By its nature, this viewer doesn't need to have - * its data ready hook called htere, because a background + * its data ready hook called there, because a background * request is always linked with a redraw. */ } @@ -1101,6 +1109,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); @@ -1229,14 +1238,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); - } + } } @@ -1280,10 +1290,24 @@ gboolean show_event_detail(void * hook_data, void * call_data) } #endif //0 -static gboolean events_check_handler(guint count, gboolean *stop_flag) +static gboolean events_check_handler(guint count, gboolean *stop_flag, + gpointer data) { + EventViewerData *evd = (EventViewerData*)data; if(count % CHECK_GDK_INTERVAL == 0) { - gtk_main_iteration_do(FALSE); + 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 @@ -1410,7 +1434,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) events_check_handler, &event_viewer_data->tab->stop_foreground, event_viewer_data->main_win_filter, - event_viewer_data->filter, NULL); + event_viewer_data->filter, NULL, event_viewer_data); } else if(relative_position < 0) { guint count; @@ -1430,7 +1454,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) events_check_handler, &event_viewer_data->tab->stop_foreground, event_viewer_data->main_win_filter, - event_viewer_data->filter, NULL); + 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); @@ -1525,7 +1549,20 @@ int event_hook(void *hook_data, void *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); + 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; } @@ -1534,13 +1571,13 @@ int 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)) + tfc->t_context->t,tfc,NULL,NULL)) return FALSE; @@ -1634,13 +1671,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)) + tfc->t_context->t,tfc,NULL,NULL)) return FALSE; lttv_traceset_context_position_save(tfc->t_context->ts_context,