X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=10ee82f8bcb351828e5cc0913beacb2fa37830cf;hb=78b82ded59fb3f65ed0829cd1cad36475ae4d0fb;hp=a61268790835e79dd9b5393a486037ca89b5c245;hpb=1193dd6805ea06edbd8336d6dfc01056802816ac;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 a6126879..10ee82f8 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -63,6 +63,7 @@ #include #include #include +#include #include "hGuiEventsInsert.xpm" @@ -124,12 +125,18 @@ typedef struct _EventViewerData { 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 ... */ @@ -139,6 +146,8 @@ gboolean update_current_position(void * hook_data, void * call_data); gboolean traceset_changed(void * hook_data, void * call_data); 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); //! Event Viewer's constructor @@ -167,6 +176,7 @@ 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 get_events(double time, EventViewerData *event_viewer_data); @@ -240,6 +250,9 @@ gui_events(Tab *tab) traceset_changed,event_viewer_data); lttvwindow_register_filter_notify(tab, filter_changed, event_viewer_data); + lttvwindow_register_redraw_notify(tab, + redraw_notify, event_viewer_data); + event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (event_viewer_data->scroll_win); @@ -254,7 +267,10 @@ gui_events(Tab *tab) event_viewer_data->last_event = lttv_traceset_context_position_new(tsc); - event_viewer_data->main_win_filter = NULL; + event_viewer_data->main_win_filter = lttvwindow_get_filter(tab); + + event_viewer_data->update_cursor = TRUE; + event_viewer_data->report_position = TRUE; /* Create a model for storing the data list */ event_viewer_data->store_m = gtk_list_store_new ( @@ -421,6 +437,8 @@ gui_events(Tab *tab) gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), event_viewer_data->scroll_win, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(event_viewer_data->hbox_v), 1); + /* Create vertical scrollbar and pack it */ event_viewer_data->vscroll_vc = gtk_vscrollbar_new(NULL); gtk_range_set_update_policy (GTK_RANGE(event_viewer_data->vscroll_vc), @@ -479,12 +497,89 @@ gui_events(Tab *tab) event_viewer_data, (GDestroyNotify)gui_events_free); + event_viewer_data->background_info_waiting = 0; + + request_background_data(event_viewer_data); + return event_viewer_data; } +static gint background_ready(void *hook_data, void *call_data) +{ + EventViewerData *event_viewer_data = (EventViewerData *)hook_data; + LttvTrace *trace = (LttvTrace*)call_data; + + event_viewer_data->background_info_waiting--; + + if(event_viewer_data->background_info_waiting == 0) { + g_message("event viewer : background computation data ready."); + + redraw_notify(event_viewer_data, NULL); + } + + return 0; +} + + +static void request_background_data(EventViewerData *event_viewer_data) +{ + LttvTracesetContext * tsc = + lttvwindow_get_traceset_context(event_viewer_data->tab); + gint num_traces = lttv_traceset_number(tsc->ts); + gint i; + LttvTrace *trace; + + LttvHooks *background_ready_hook = + lttv_hooks_new(); + lttv_hooks_add(background_ready_hook, background_ready, event_viewer_data, + LTTV_PRIO_DEFAULT); + event_viewer_data->background_info_waiting = 0; + + for(i=0;its, i); + + if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) { + + if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"), + trace) == FALSE) { + /* We first remove requests that could have been done for the same + * information. Happens when two viewers ask for it before servicing + * starts. + */ + lttvwindowtraces_background_request_remove(trace, "state"); + lttvwindowtraces_background_request_queue(trace, + "state"); + lttvwindowtraces_background_notify_queue(event_viewer_data, + trace, + ltt_time_infinite, + NULL, + background_ready_hook); + event_viewer_data->background_info_waiting++; + } else { /* in progress */ + + lttvwindowtraces_background_notify_current(event_viewer_data, + trace, + ltt_time_infinite, + NULL, + background_ready_hook); + 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 + * request is always linked with a redraw. + */ + } + + } + + lttv_hooks_destroy(background_ready_hook); + +} + static gboolean header_size_allocate(GtkWidget *widget, GtkAllocation *allocation, @@ -553,23 +648,152 @@ void tree_v_move_cursor_cb (GtkWidget *widget, EventViewerData *event_viewer_data = (EventViewerData*)data; g_debug("move cursor cb"); - gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), - &path, NULL); - if(path == NULL) - { + //gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + // &path, NULL); + //if(path == NULL) + //{ /* No prior cursor, put it at beginning of page * and let the execution do */ + // 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); + //} + + //indices = gtk_tree_path_get_indices(path); + + //value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); + + /* If no prior position... */ + if(ltt_time_compare( + lttv_traceset_context_position_get_time( + event_viewer_data->currently_selected_position), + ltt_time_infinite) == 0) { + 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); + return; + } - indices = gtk_tree_path_get_indices(path); - - value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); g_debug("tree view move cursor : arg1 is %u and arg2 is %d", (guint)arg1, arg2); + + switch(arg1) { + case GTK_MOVEMENT_DISPLAY_LINES: + if(arg2 == 1) { + /* Move one line down */ + if(event_viewer_data->pos->len > 0) { + LttvTracesetContextPosition *end_pos = + (LttvTracesetContextPosition*)g_ptr_array_index( + event_viewer_data->pos, + event_viewer_data->pos->len-1); + if(lttv_traceset_context_pos_pos_compare(end_pos, + event_viewer_data->currently_selected_position) == 0) { + /* 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); + } + } + + } else { + if(event_viewer_data->pos->len > 0) { + /* Move one line up */ + LttvTracesetContextPosition *begin_pos = + (LttvTracesetContextPosition*)g_ptr_array_index( + event_viewer_data->pos, + 0); + if(lttv_traceset_context_pos_pos_compare(begin_pos, + event_viewer_data->currently_selected_position) == 0) { + /* 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); + } + } + } + break; + case GTK_MOVEMENT_PAGES: + if(arg2 == 1) { + /* Move one page down */ + if(event_viewer_data->pos->len > 0) { + LttvTracesetContextPosition *end_pos = + (LttvTracesetContextPosition*)g_ptr_array_index( + event_viewer_data->pos, + event_viewer_data->pos->len-1); + if(lttv_traceset_context_pos_pos_compare(end_pos, + event_viewer_data->currently_selected_position) == 0) { + /* 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); + + } + } + + } else { + /* Move one page up */ + if(event_viewer_data->pos->len > 0) { + LttvTracesetContextPosition *begin_pos = + (LttvTracesetContextPosition*)g_ptr_array_index( + event_viewer_data->pos, + 0); + if(lttv_traceset_context_pos_pos_compare(begin_pos, + event_viewer_data->currently_selected_position) == 0) { + /* 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); + } + } + + } + break; + default: + break; + } + + //gtk_tree_path_free(path); #if 0 if(arg1 == GTK_MOVEMENT_DISPLAY_LINES) @@ -688,7 +912,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, } } #endif //0 - gtk_tree_path_free(path); } void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) @@ -702,7 +925,6 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) g_debug("cursor changed cb"); -#if 0 /* On cursor change, modify the currently selected event by calling * the right API function */ tree_v_get_cursor(event_viewer_data); @@ -711,12 +933,12 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) &path, NULL); if(gtk_tree_model_get_iter(model,&iter,path)){ gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1); - - lttvwindow_report_current_position(tab, pos); + + if(event_viewer_data->report_position) + lttvwindow_report_current_position(tab, pos); }else{ g_warning("Can not get iter\n"); } -#endif //0 } @@ -907,13 +1129,13 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) ScrollDirection direction; gint relative_position; - if(value < 0.0) { + if(value < -0.8) { if(value >= -1.0) direction = SCROLL_STEP_UP; else { if(value >= -2.0) direction = SCROLL_PAGE_UP; else direction = SCROLL_JUMP; } - } else if(value > 0.0) { + } else if(value > 0.8) { if(value <= 1.0) direction = SCROLL_STEP_DOWN; else { if(value <= 2.0) direction = SCROLL_PAGE_DOWN; @@ -1045,12 +1267,10 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) /* Mathieu : - * I make the choice not to use the mainwindow lttvwindow API here : it will - * be faster to read the events ourself from lttv_process_traceset_middle, as - * we are already at the right read position. It would be costier to use the - * seek time closest for nothing, as we only have few events to read. + * 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. */ - /* FIXME : use seek time closest and middle to have a good state. */ lttv_process_traceset_begin(tsc, NULL, NULL, NULL, event_viewer_data->event_hooks, NULL); @@ -1135,16 +1355,18 @@ int event_hook(void *hook_data, void *call_data) g_string_free(desc, TRUE); - if(lttv_traceset_context_pos_pos_compare(pos, - 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(event_viewer_data->update_cursor) { + if(lttv_traceset_context_pos_pos_compare(pos, + 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(event_viewer_data->pos->len >= event_viewer_data->num_visible_events) + + if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events ) return TRUE; else return FALSE; @@ -1156,6 +1378,7 @@ static void event_update_selection(EventViewerData *event_viewer_data) { guint i; GPtrArray *positions = event_viewer_data->pos; + g_info("event_update_selection"); for(i=0;ilen;i++) { LttvTracesetContextPosition *cur_pos = @@ -1173,6 +1396,7 @@ static void event_update_selection(EventViewerData *event_viewer_data) gboolean update_current_time(void * hook_data, void * call_data) { + g_info("update_current_time"); EventViewerData *event_viewer_data = (EventViewerData*) hook_data; const LttTime * current_time = (LttTime*)call_data; LttvTracesetContext * tsc = @@ -1185,7 +1409,21 @@ gboolean update_current_time(void * hook_data, void * call_data) event_viewer_data->currently_selected_position); if(ltt_time_compare(pos_time, *current_time) != 0) { + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, + pos_time); + lttv_process_traceset_middle(tsc, pos_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 */ + 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 + lttv_traceset_context_position_save(tsc, event_viewer_data->currently_selected_position); pos_time = lttv_traceset_context_position_get_time( @@ -1195,6 +1433,7 @@ gboolean update_current_time(void * hook_data, void * call_data) LttTime time = ltt_time_sub(pos_time, tsc->time_span.start_time); double new_value = ltt_time_to_double(time); + event_viewer_data->report_position = FALSE; /* Change the viewed area if does not match */ if(lttv_traceset_context_pos_pos_compare( event_viewer_data->currently_selected_position, @@ -1205,15 +1444,17 @@ gboolean update_current_time(void * hook_data, void * call_data) event_viewer_data->last_event) > 0) { gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value); } else { - /* Simply update the current time : it is in the list */ - event_update_selection(event_viewer_data); + /* Simply update the current time : it is in the list */ + event_update_selection(event_viewer_data); } + event_viewer_data->report_position = TRUE; return FALSE; } gboolean update_current_position(void * hook_data, void * call_data) { + g_info("update_current_position"); EventViewerData *event_viewer_data = (EventViewerData*) hook_data; const LttvTracesetContextPosition *current_pos = (LttvTracesetContextPosition*)call_data; @@ -1225,7 +1466,6 @@ gboolean update_current_position(void * hook_data, void * call_data) lttv_traceset_context_position_copy( event_viewer_data->currently_selected_position, current_pos); - /* Change the viewed area if does not match */ if(lttv_traceset_context_pos_pos_compare( event_viewer_data->currently_selected_position, @@ -1300,8 +1540,12 @@ gboolean filter_changed(void * hook_data, void * call_data) } +gint 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); +} void gui_events_free(EventViewerData *event_viewer_data) { @@ -1336,6 +1580,10 @@ void gui_events_free(EventViewerData *event_viewer_data) traceset_changed, 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); g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data);