X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=63a1bbf88e381a043f08f71b2b540c3056136649;hb=ae3d0f50f89e7b965795a9b9ad7e1f533f760598;hp=c71d04b1fc758b85ef0005b5c51e15e1c900767c;hpb=d2cdf874d5b0dd3dfdd9b5d896c2807dbef7e307;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 c71d04b1..63a1bbf8 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -74,7 +74,7 @@ #endif #define abs(a) (((a)<0)?(-a):(a)) - +#define max(a,b) ((a)>(b)?(a):(b)) /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; @@ -127,14 +127,20 @@ typedef struct _EventViewerData { 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 */ + } EventViewerData ; /** hook functions for update time interval, current time ... */ @@ -173,6 +179,9 @@ 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 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); @@ -265,9 +274,12 @@ 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; + + 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 ( @@ -304,6 +316,14 @@ 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 +454,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), @@ -544,9 +566,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, @@ -630,7 +652,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, @@ -657,8 +692,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), @@ -672,7 +711,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); @@ -685,29 +724,44 @@ void tree_v_move_cursor_cb (GtkWidget *widget, LttvTracesetContextPosition *end_pos = (LttvTracesetContextPosition*)g_ptr_array_index( event_viewer_data->pos, - event_viewer_data->pos->len - 1); + 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); - } -#if 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); -#endif //0 - } + 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) { @@ -721,17 +775,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: @@ -741,27 +816,44 @@ void tree_v_move_cursor_cb (GtkWidget *widget, LttvTracesetContextPosition *end_pos = (LttvTracesetContextPosition*)g_ptr_array_index( event_viewer_data->pos, - event_viewer_data->pos->len - 1); + 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); - - } - } - + 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) { @@ -774,20 +866,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: @@ -915,6 +1025,25 @@ void tree_v_move_cursor_cb (GtkWidget *widget, #endif //0 } + +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; + } + return TRUE; +} + void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) { EventViewerData *event_viewer_data = (EventViewerData*) data; @@ -928,17 +1057,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 */ - tree_v_get_cursor(event_viewer_data); - - 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); - - lttvwindow_report_current_position(tab, pos); - }else{ - g_warning("Can not get iter\n"); - } + if(event_viewer_data->report_position) { + 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); + } + } + } } @@ -978,7 +1114,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 @@ -1006,7 +1148,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); @@ -1034,6 +1181,14 @@ 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; } @@ -1184,13 +1339,27 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) LttvTracesetContextPosition *pos = lttv_traceset_context_position_new(tsc); - /* Remember the beginning position */ + /* Remember the beginning position */ if(event_viewer_data->pos->len > 0) { LttvTracesetContextPosition *first_pos = - (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos, - 0); + (LttvTracesetContextPosition*)g_ptr_array_index( + event_viewer_data->pos, + 0); lttv_traceset_context_position_copy(pos, first_pos); - g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); + + if(relative_position >= 0) { + LttTime first_event_time = + lttv_traceset_context_position_get_time( + pos); + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, + first_event_time); + lttv_process_traceset_middle(tsc, ltt_time_infinite, + G_MAXUINT, + pos); + + } else if(relative_position < 0) { + g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); + } } else { /* There is nothing in the list : simply seek to the time value. */ lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, @@ -1235,6 +1404,9 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) time = lttv_traceset_context_position_get_time( event_viewer_data->first_event); + //if(ltt_time_compare(time, tsc->time_span.end_time) > 0) + // time = tsc->time_span.end_time; + LttTime time_val = ltt_time_sub(time, tsc->time_span.start_time); event_viewer_data->previous_value = ltt_time_to_double(time_val); @@ -1296,6 +1468,9 @@ 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)); return; } @@ -1306,6 +1481,7 @@ 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); LttvFilter *filter = event_viewer_data->main_win_filter; @@ -1316,10 +1492,9 @@ int event_hook(void *hook_data, void *call_data) 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]; @@ -1332,10 +1507,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, @@ -1360,13 +1534,15 @@ 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); + } } } - if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events -1 ) + if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events ) return TRUE; else return FALSE; @@ -1378,6 +1554,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 = @@ -1385,16 +1562,36 @@ 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; + + 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) { + g_info("update_current_time"); EventViewerData *event_viewer_data = (EventViewerData*) hook_data; const LttTime * current_time = (LttTime*)call_data; LttvTracesetContext * tsc = @@ -1407,9 +1604,35 @@ 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_process_traceset_seek_time(tsc, *current_time); - lttv_traceset_context_position_save(tsc, - event_viewer_data->currently_selected_position); + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, + *current_time); + lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT, + NULL); + + /* 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_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); } @@ -1417,6 +1640,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, @@ -1427,15 +1651,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; @@ -1447,7 +1673,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, @@ -1505,6 +1730,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; } @@ -1565,6 +1792,8 @@ void gui_events_free(EventViewerData *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); g_free(event_viewer_data);