X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=985044ebc8e6000bd133daa1321ea6b1b54e4a46;hb=9d7e0c255f8df252a67f60bbb3ddd8c6b4dde0d9;hp=5a674589ecce0c30cad0439a17f4af9f0044c411;hpb=a998b781c5e28cb4a364ce09cd99dc1d3dbf6a06;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 5a674589..985044eb 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -1,5 +1,6 @@ /* This file is part of the Linux Trace Toolkit viewer * Copyright (C) 2003-2004 Mathieu Desnoyers and XangXiu Yang + * 2005 Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -35,6 +36,8 @@ * * Authors : Mathieu Desnoyers and XangXiu Yang, June to December 2003 * Inspired from original LTT, made by Karim Yaghmour + * + * Mostly rewritten by Mathieu Desnoyers, August 2005. */ #ifdef HAVE_CONFIG_H @@ -60,6 +63,7 @@ #include #include #include +#include #include "hGuiEventsInsert.xpm" @@ -70,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 ; @@ -121,12 +125,22 @@ 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 */ + 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 ... */ @@ -136,6 +150,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 @@ -163,7 +179,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 void 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); @@ -237,6 +257,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); @@ -251,7 +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 ( @@ -288,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); @@ -418,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), @@ -476,12 +514,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. + */ + 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, + 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, @@ -537,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, @@ -550,23 +678,246 @@ 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 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), + 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); - } - indices = gtk_tree_path_get_indices(path); - - value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); + gtk_tree_path_free(path); + return; + + } +#endif //0 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; + 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) { + /* 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; + 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 */ + g_printf("a\n"); + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + g_printf("b\n"); + event_viewer_data->update_cursor = FALSE; + g_printf("c\n"); + gtk_adjustment_set_value(event_viewer_data->vadjust_c, + gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1); + g_printf("d\n"); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + g_printf("e\n"); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + g_printf("f\n"); + gtk_tree_path_free(path); + g_printf("g\n"); + } + } + } + } + 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; + 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) { + 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; + 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 */ + printf("A\n"); + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection( + GTK_TREE_VIEW(event_viewer_data->tree_v))); + printf("B\n"); + 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); + printf("C\n"); + event_viewer_data->update_cursor = TRUE; + if(event_viewer_data->pos->len > 0) { + path = gtk_tree_path_new_from_indices( + 0, -1); + printf("D\n"); + if(path) { + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); + printf("E\n"); + gtk_tree_path_free(path); + printf("F\n"); + } + } + } + } + break; + default: + break; + } + + //gtk_tree_path_free(path); #if 0 if(arg1 == GTK_MOVEMENT_DISPLAY_LINES) @@ -685,7 +1036,25 @@ void tree_v_move_cursor_cb (GtkWidget *widget, } } #endif //0 - gtk_tree_path_free(path); +} + + +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) @@ -699,21 +1068,26 @@ 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); - - 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"); - } -#endif //0 + 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); + } + } + } } @@ -753,7 +1127,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 @@ -781,7 +1161,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); @@ -809,6 +1194,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; } @@ -904,13 +1297,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; @@ -959,13 +1352,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, @@ -1010,6 +1417,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); @@ -1042,12 +1452,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); @@ -1073,6 +1481,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; } @@ -1093,7 +1504,6 @@ 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); @@ -1109,10 +1519,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, @@ -1132,7 +1541,20 @@ int event_hook(void *hook_data, void *call_data) g_string_free(desc, TRUE); - if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events) + 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); + 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 ) return TRUE; else return FALSE; @@ -1140,13 +1562,53 @@ int event_hook(void *hook_data, void *call_data) +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 = + (LttvTracesetContextPosition*)g_ptr_array_index(positions, i); + 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); + 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 = lttvwindow_get_traceset_context(event_viewer_data->tab); + GtkTreePath *path; /* If the currently selected event time != current time, set the first event * with this time as currently selected. */ @@ -1154,9 +1616,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); } @@ -1164,6 +1652,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, @@ -1171,14 +1660,20 @@ gboolean update_current_time(void * hook_data, void * call_data) || lttv_traceset_context_pos_pos_compare( event_viewer_data->currently_selected_position, - event_viewer_data->last_event) > 0) + 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); + } + 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; @@ -1190,7 +1685,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, @@ -1203,6 +1697,9 @@ gboolean update_current_position(void * hook_data, void * call_data) time = ltt_time_sub(time, tsc->time_span.start_time); double new_value = ltt_time_to_double(time); 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); } } @@ -1226,9 +1723,27 @@ gboolean traceset_changed(void * hook_data, void * call_data) end = ltt_time_sub(time_span.end_time, time_span.start_time); event_viewer_data->vadjust_c->upper = ltt_time_to_double(end); - g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed"); + + /* Reset the positions */ + lttv_traceset_context_position_destroy( + event_viewer_data->currently_selected_position); + lttv_traceset_context_position_destroy( + event_viewer_data->first_event); + lttv_traceset_context_position_destroy( + event_viewer_data->last_event); + + event_viewer_data->currently_selected_position = + lttv_traceset_context_position_new(tsc); + event_viewer_data->first_event = + lttv_traceset_context_position_new(tsc); + event_viewer_data->last_event = + lttv_traceset_context_position_new(tsc); + + 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; } @@ -1240,14 +1755,18 @@ gboolean filter_changed(void * hook_data, void * call_data) event_viewer_data->main_win_filter = (LttvFilter*)call_data; - g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed"); + get_events(event_viewer_data->vadjust_c->value, event_viewer_data); return FALSE; } +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) { @@ -1282,6 +1801,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);