X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=dcd2cf998460c1cedefbfef453782ba9d3e8b302;hb=727706d9b00c6bcdb8dfd6eb00ae714323e57045;hp=17502e89563cd130507c6e50c2df63952a5ad923;hpb=93ac601b7487eba4b0733f44117f45fa9dd0baee;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 17502e89..dcd2cf99 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -64,6 +65,7 @@ #include #include #include +#include #include "hGuiEventsInsert.xpm" @@ -74,7 +76,8 @@ #endif #define abs(a) (((a)<0)?(-a):(a)) - +#define max(a,b) ((a)>(b)?(a):(b)) +#define min(a,b) ((a)<(b)?(a):(b)) /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; @@ -91,6 +94,7 @@ typedef enum _ScrollDirection{ typedef struct _EventViewerData { Tab * tab; + LttvPluginTab *ptab; LttvHooks * event_hooks; /* previous value is used to determine if it is a page up/down or @@ -133,10 +137,16 @@ 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 */ + + guint num_events; /* Number of events processed */ + } EventViewerData ; /** hook functions for update time interval, current time ... */ @@ -149,9 +159,9 @@ 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); +GtkWidget *h_gui_events(LttvPlugin *plugin); //! Event Viewer's constructor -EventViewerData *gui_events(Tab *tab); +EventViewerData *gui_events(LttvPluginTab *ptab); //! Event Viewer's destructor void gui_events_destructor(EventViewerData *event_viewer_data); void gui_events_free(EventViewerData *event_viewer_data); @@ -175,6 +185,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); @@ -207,9 +220,10 @@ enum * @return The widget created. */ GtkWidget * -h_gui_events(Tab * tab) +h_gui_events(LttvPlugin *plugin) { - EventViewerData* event_viewer_data = gui_events(tab) ; + LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin); + EventViewerData* event_viewer_data = gui_events(ptab) ; if(event_viewer_data) return event_viewer_data->top_widget; else return NULL; @@ -223,14 +237,15 @@ h_gui_events(Tab * tab) * @return The Event viewer data created. */ EventViewerData * -gui_events(Tab *tab) +gui_events(LttvPluginTab *ptab) { LttTime end; GtkTreeViewColumn *column; GtkCellRenderer *renderer; EventViewerData* event_viewer_data = g_new(EventViewerData,1) ; - + Tab *tab = ptab->tab; event_viewer_data->tab = tab; + event_viewer_data->ptab = ptab; LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab); @@ -272,6 +287,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 +324,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); @@ -531,6 +556,7 @@ static void request_background_data(EventViewerData *event_viewer_data) gint num_traces = lttv_traceset_number(tsc->ts); gint i; LttvTrace *trace; + LttvTraceState *tstate; LttvHooks *background_ready_hook = lttv_hooks_new(); @@ -540,8 +566,10 @@ static void request_background_data(EventViewerData *event_viewer_data) for(i=0;its, i); + tstate = LTTV_TRACE_STATE(tsc->traces[i]); - if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) { + if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE + && !tstate->has_precomputed_states) { if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"), trace) == FALSE) { @@ -550,7 +578,8 @@ static void request_background_data(EventViewerData *event_viewer_data) * starts. */ if(!lttvwindowtraces_background_request_find(trace, "state")) - lttvwindowtraces_background_request_queue(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, @@ -567,7 +596,7 @@ static void request_background_data(EventViewerData *event_viewer_data) event_viewer_data->background_info_waiting++; } } else { - /* Data ready. Be its nature, this viewer doesn't need to have + /* Data ready. By 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. */ @@ -634,7 +663,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, @@ -661,8 +703,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), @@ -676,7 +722,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); @@ -695,17 +741,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) { @@ -719,17 +786,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: @@ -745,21 +833,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) { @@ -772,20 +877,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: @@ -913,6 +1036,27 @@ 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; + default: + g_error("Only scroll up and down expected"); + } + return TRUE; +} + void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) { EventViewerData *event_viewer_data = (EventViewerData*) data; @@ -926,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); + } + } + } } @@ -981,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 @@ -1009,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); @@ -1037,6 +1194,13 @@ 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; } @@ -1111,11 +1275,16 @@ gboolean show_event_detail(void * hook_data, void * call_data) } #endif //0 - - - - - +static gboolean events_check_handler(guint count, gboolean *stop_flag) +{ + if(count % CHECK_GDK_INTERVAL == 0) { + gtk_main_iteration_do(FALSE); + if(*stop_flag) + return TRUE; + else + return FALSE; + } else return FALSE; +} static void get_events(double new_value, EventViewerData *event_viewer_data) { @@ -1126,8 +1295,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) guint i; gboolean seek_by_time; + if(lttvwindow_preempt_count > 0) return; + double value = new_value - event_viewer_data->previous_value; + /* Set stop button status for foreground processing */ + event_viewer_data->tab->stop_foreground = FALSE; + lttvwindow_events_request_disable(); + /* See where we have to scroll... */ ScrollDirection direction; gint relative_position; @@ -1226,8 +1401,9 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) */ if(relative_position > 0) { guint count; - count = lttv_process_traceset_seek_n_forward(tsc, relative_position, - event_viewer_data->main_win_filter); + count += lttv_process_traceset_seek_n_forward(tsc, relative_position, + event_viewer_data->main_win_filter, events_check_handler, + &event_viewer_data->tab->stop_foreground); } else if(relative_position < 0) { guint count; @@ -1239,10 +1415,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) LttTime time_diff = ltt_time_sub(last_event_time, first_event_time); if(ltt_time_compare(time_diff, ltt_time_zero) == 0) time_diff = seek_back_default_offset; - count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position), + + count = lttv_process_traceset_seek_n_backward(tsc, + abs(relative_position), time_diff, (seek_time_fct)lttv_state_traceset_seek_time_closest, - event_viewer_data->main_win_filter); + event_viewer_data->main_win_filter, + events_check_handler, + &event_viewer_data->tab->stop_foreground); } /* else 0 : do nothing : we are already at the beginning position */ lttv_traceset_context_position_destroy(pos); @@ -1289,11 +1469,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data) /* Mathieu : * 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. + * scrolling. However, we call the gdk loop to get events periodically so the + * processing can be stopped. */ lttv_process_traceset_begin(tsc, NULL, NULL, NULL, event_viewer_data->event_hooks, NULL); + + event_viewer_data->num_events = 0; lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL); @@ -1316,6 +1499,11 @@ 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)); + + lttvwindow_events_request_enable(); return; } @@ -1326,8 +1514,16 @@ 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); + if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) { + gtk_main_iteration_do(FALSE); + if(event_viewer_data->tab->stop_foreground) + return TRUE; + } + event_viewer_data->num_events++; + LttvFilter *filter = event_viewer_data->main_win_filter; if(filter != NULL && filter->head != NULL) if(!lttv_filter_tree_parse(filter->head,e,tfc->tf, @@ -1336,10 +1532,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]; @@ -1352,10 +1547,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, @@ -1380,9 +1574,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); + } } } @@ -1406,13 +1602,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) { @@ -1433,20 +1648,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 */ - // We don't care : this will be taken care of by the _middle. - //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); } @@ -1544,6 +1770,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; } @@ -1566,6 +1794,7 @@ 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); + return 0; } void gui_events_free(EventViewerData *event_viewer_data)