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=8b4656b9cf3bce166eb2bb6b48a9952e51455773;hpb=7cf3c9f35381eb30e1142c2f1b22773303c308f9;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 8b4656b9..985044eb 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 ; @@ -133,10 +133,14 @@ typedef struct _EventViewerData { 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 ... */ @@ -175,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 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); @@ -272,6 +279,8 @@ gui_events(Tab *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 ( N_COLUMNS, /* Total number of columns */ @@ -307,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); @@ -549,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, @@ -635,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, @@ -662,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), @@ -677,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); @@ -696,17 +730,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* 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); - } - } + 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) { @@ -720,17 +775,45 @@ 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 */ + 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: @@ -746,21 +829,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget, /* 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) { @@ -773,20 +873,44 @@ 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 */ + 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: @@ -914,6 +1038,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; @@ -927,22 +1070,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 */ - - if(event_viewer_data->report_position) { - 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); - - 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); - } + 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); + } + } + } } @@ -982,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 @@ -1010,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); @@ -1038,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; } @@ -1188,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, @@ -1303,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; } @@ -1323,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); @@ -1339,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, @@ -1367,9 +1546,11 @@ 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); + } } } @@ -1393,13 +1574,32 @@ 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) { @@ -1420,19 +1620,31 @@ gboolean update_current_time(void * hook_data, void * call_data) *current_time); lttv_process_traceset_middle(tsc, *current_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 + /* 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_save(tsc, - event_viewer_data->currently_selected_position); + 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); } @@ -1530,6 +1742,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; }