X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiEvents.c;h=051147e75fb12933aa5ae9c1b74784231cef6dfa;hb=a8c0f09de06b94e9420d286e1541c39092fff434;hp=bd5668c31b064fe4d9abf5dd03a4eefda6caf431;hpb=607177bea1468beac4c8470f95e7548d8d1cf11d;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c index bd5668c3..051147e7 100644 --- a/ltt/branches/poly/lttv/modules/guiEvents.c +++ b/ltt/branches/poly/lttv/modules/guiEvents.c @@ -54,12 +54,6 @@ static LttvHooks *before_event; /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; -/** hook functions for update time interval, current time ... */ -gboolean update_time_window(void * hook_data, void * call_data); -gboolean update_current_time(void * hook_data, void * call_data); -void remove_item_from_queue(GQueue * q, gboolean fromHead); -void remove_all_items_from_queue(GQueue * q); - typedef struct _RawTraceData{ unsigned cpu_id; char * event_name; @@ -67,7 +61,7 @@ typedef struct _RawTraceData{ int pid; unsigned entry_length; char * event_description; - LttEventPosition ep; + LttEventPosition *ep; } RawTraceData; #define RESERVE_BIG_SIZE 1000 @@ -95,10 +89,11 @@ typedef struct _EventViewerData { unsigned current_event_index; double previous_value; //value of the slide TimeInterval time_span; - // LttTime trace_start; - // LttTime trace_end; unsigned start_event_index; //the first event shown in the window unsigned end_event_index; //the last event shown in the window + unsigned size; //maxi number of events loaded when instance the viewer + gboolean shown; //indicate if event detail is shown or not + char * filter_key; //scroll window containing Tree View GtkWidget * scroll_win; @@ -128,10 +123,22 @@ typedef struct _EventViewerData { } EventViewerData ; +/** hook functions for update time interval, current time ... */ +gboolean update_time_window(void * hook_data, void * call_data); +gboolean update_current_time(void * hook_data, void * call_data); +gboolean show_event_detail(void * hook_data, void * call_data); +gboolean traceset_changed(void * hook_data, void * call_data); +void remove_item_from_queue(GQueue * q, gboolean fromHead); +void remove_all_items_from_queue(GQueue * q); +void add_context_hooks(EventViewerData * event_viewer_data, + LttvTracesetContext * tsc); +void remove_context_hooks(EventViewerData * event_viewer_data, + LttvTracesetContext * tsc); + //! Event Viewer's constructor hook -GtkWidget *h_gui_events(MainWindow *parent_window); +GtkWidget *h_gui_events(MainWindow *parent_window, LttvTracesetSelector * s, char* key); //! Event Viewer's constructor -EventViewerData *gui_events(MainWindow *parent_window); +EventViewerData *gui_events(MainWindow *parent_window, LttvTracesetSelector *s, char *key); //! Event Viewer's destructor void gui_events_destructor(EventViewerData *event_viewer_data); void gui_events_free(EventViewerData *event_viewer_data); @@ -156,6 +163,8 @@ static void get_test_data(double time, guint list_height, void add_test_data(EventViewerData *event_viewer_data); +static void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size); + static void get_events(EventViewerData* event_viewer_data, LttTime start, LttTime end, unsigned max_num_events, unsigned * real_num_events); static gboolean parse_event(void *hook_data, void *call_data); @@ -235,9 +244,9 @@ enum * @return The widget created. */ GtkWidget * -h_gui_events(MainWindow * parent_window) +h_gui_events(MainWindow * parent_window, LttvTracesetSelector * s, char* key) { - EventViewerData* event_viewer_data = gui_events(parent_window) ; + EventViewerData* event_viewer_data = gui_events(parent_window, s, key) ; if(event_viewer_data) return event_viewer_data->hbox_v; @@ -252,14 +261,13 @@ h_gui_events(MainWindow * parent_window) * @return The Event viewer data created. */ EventViewerData * -gui_events(MainWindow *parent_window) +gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key ) { LttTime start, end; GtkTreeViewColumn *column; GtkCellRenderer *renderer; EventViewerData* event_viewer_data = g_new(EventViewerData,1) ; RawTraceData * data; - unsigned size; event_viewer_data->mw = parent_window; get_time_window(event_viewer_data->mw, &event_viewer_data->time_window); @@ -273,6 +281,8 @@ gui_events(MainWindow *parent_window) reg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw); reg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw); + reg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw); + reg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw); event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show ( event_viewer_data->scroll_win); @@ -437,25 +447,30 @@ gui_events(MainWindow *parent_window) event_viewer_data->append = TRUE; - start.tv_sec = 0; - start.tv_nsec = 0; - end.tv_sec = G_MAXULONG; - end.tv_nsec = G_MAXULONG; - - get_events(event_viewer_data, start,end, RESERVE_SMALL_SIZE, &size); - event_viewer_data->start_event_index = 0; event_viewer_data->end_event_index = event_viewer_data->num_visible_events - 1; - // Test data - get_test_data(event_viewer_data->vadjust_c->value, - event_viewer_data->num_visible_events, - event_viewer_data); - /* Set the Selected Event */ // tree_v_set_cursor(event_viewer_data); - + event_viewer_data->shown = FALSE; + event_viewer_data->size = RESERVE_SMALL_SIZE; + g_object_set_data( + G_OBJECT(event_viewer_data->hbox_v), + MAX_NUMBER_EVENT, + &event_viewer_data->size); + + g_object_set_data( + G_OBJECT(event_viewer_data->hbox_v), + TRACESET_TIME_SPAN, + &event_viewer_data->time_span); + + event_viewer_data->filter_key = g_strdup(key); + g_object_set_data( + G_OBJECT(event_viewer_data->hbox_v), + event_viewer_data->filter_key, + s); + g_object_set_data_full( G_OBJECT(event_viewer_data->hbox_v), "event_viewer_data", @@ -764,6 +779,26 @@ void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpo } +gboolean show_event_detail(void * hook_data, void * call_data) +{ + EventViewerData *event_viewer_data = (EventViewerData*) hook_data; + LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw); + + if(event_viewer_data->shown == FALSE){ + event_viewer_data->shown = TRUE; + update_raw_data_array(event_viewer_data, + event_viewer_data->raw_trace_data_queue_tmp->length); + + get_test_data(event_viewer_data->vadjust_c->value, + event_viewer_data->num_visible_events, + event_viewer_data); + + remove_context_hooks(event_viewer_data,tsc); + } + + return FALSE; +} + void get_test_data(double time_value, guint list_height, EventViewerData *event_viewer_data) { @@ -783,8 +818,20 @@ void get_test_data(double time_value, guint list_height, unsigned block_num, event_num; unsigned size = 1, count = 0; gboolean need_backward_again, backward; - + GdkWindow * win; + GdkCursor * new; + GtkWidget* widget = gtk_widget_get_parent(event_viewer_data->hbox_v); + if(widget){ + new = gdk_cursor_new(GDK_X_CURSOR); + win = gtk_widget_get_parent_window(widget); + gdk_window_set_cursor(win, new); + gdk_cursor_unref(new); + gdk_window_stick(win); + gdk_window_unstick(win); + } + + // if(event_number > event_viewer_data->last_event || // event_number + list_height-1 < event_viewer_data->first_event || // event_viewer_data->first_event == -1) @@ -815,23 +862,24 @@ void get_test_data(double time_value, guint list_height, } first = event_viewer_data->raw_trace_data_queue->head; + if(!first)break; raw_data = (RawTraceData*)g_list_nth_data(first,0); end = raw_data->time; end.tv_nsec--; - ltt_event_position_get(&raw_data->ep, &block_num, &event_num, &tf); + ltt_event_position_get(raw_data->ep, &block_num, &event_num, &tf); if(size !=0){ if(event_num > minNum){ backward_num = event_num > RESERVE_SMALL_SIZE ? event_num - RESERVE_SMALL_SIZE : 1; - ltt_event_position_set(&raw_data->ep, block_num, backward_num); - ltt_tracefile_seek_position(tf, &raw_data->ep); + ltt_event_position_set(raw_data->ep, block_num, backward_num); + ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); maxNum = G_MAXULONG; }else{ if(block_num > 1){ - ltt_event_position_set(&raw_data->ep, block_num-1, 1); - ltt_tracefile_seek_position(tf, &raw_data->ep); + ltt_event_position_set(raw_data->ep, block_num-1, 1); + ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); }else{ @@ -842,8 +890,8 @@ void get_test_data(double time_value, guint list_height, } }else{ if(block_num > count){ - ltt_event_position_set(&raw_data->ep, block_num-count, 1); - ltt_tracefile_seek_position(tf, &raw_data->ep); + ltt_event_position_set(raw_data->ep, block_num-count, 1); + ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); }else{ @@ -876,6 +924,7 @@ void get_test_data(double time_value, guint list_height, if(event_viewer_data->end_event_index == event_viewer_data->number_of_events - 1){ event_viewer_data->append = TRUE; first = event_viewer_data->raw_trace_data_queue->head; + if(!first)break; raw_data = (RawTraceData*)g_list_nth_data(first,event_viewer_data->number_of_events - 1); start = raw_data->time; start.tv_nsec++; @@ -890,6 +939,7 @@ void get_test_data(double time_value, guint list_height, if(event_viewer_data->end_event_index >= event_viewer_data->number_of_events - 1 - list_height){ event_viewer_data->append = TRUE; first = event_viewer_data->raw_trace_data_queue->head; + if(!first)break; raw_data = (RawTraceData*)g_list_nth_data(first,event_viewer_data->number_of_events - 1); start = raw_data->time; start.tv_nsec++; @@ -914,16 +964,17 @@ void get_test_data(double time_value, guint list_height, if(size < list_height){ event_viewer_data->append = FALSE; first = event_viewer_data->raw_trace_data_queue->head; + if(!first)break; raw_data = (RawTraceData*)g_list_nth_data(first,0); end = raw_data->time; end.tv_nsec--; - ltt_event_position_get(&raw_data->ep, &block_num, &event_num, &tf); + ltt_event_position_get(raw_data->ep, &block_num, &event_num, &tf); if(event_num > list_height - size){ backward_num = event_num > RESERVE_SMALL_SIZE ? event_num - RESERVE_SMALL_SIZE : 1; - ltt_event_position_set(&raw_data->ep, block_num, backward_num); - ltt_tracefile_seek_position(tf, &raw_data->ep); + ltt_event_position_set(raw_data->ep, block_num, backward_num); + ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); maxNum = G_MAXULONG; @@ -943,14 +994,18 @@ void get_test_data(double time_value, guint list_height, break; } + if(event_number < 0) event_number = 0; + //update the value of the scroll bar if(direction != SCROLL_NONE && direction != SCROLL_JUMP){ first = event_viewer_data->raw_trace_data_queue->head; - raw_data = (RawTraceData*)g_list_nth_data(first,event_number); - time = ltt_time_sub(raw_data->time, event_viewer_data->time_span.startTime); - event_viewer_data->vadjust_c->value = ltt_time_to_double(time) * NANOSECONDS_PER_SECOND; - g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed"); - event_viewer_data->previous_value = event_viewer_data->vadjust_c->value; + if(first){ + raw_data = (RawTraceData*)g_list_nth_data(first,event_number); + time = ltt_time_sub(raw_data->time, event_viewer_data->time_span.startTime); + event_viewer_data->vadjust_c->value = ltt_time_to_double(time) * NANOSECONDS_PER_SECOND; + g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed"); + event_viewer_data->previous_value = event_viewer_data->vadjust_c->value; + } } @@ -959,6 +1014,13 @@ void get_test_data(double time_value, guint list_height, first = event_viewer_data->raw_trace_data_queue->head; gtk_list_store_clear(event_viewer_data->store_m); + if(!first){ + // event_viewer_data->previous_value = 0; + // event_viewer_data->vadjust_c->value = 0.0; + // gtk_widget_hide(event_viewer_data->vscroll_vc); + goto LAST; + }else gtk_widget_show(event_viewer_data->vscroll_vc); + for(i=event_number; ifirst_event = event_viewer_data->start_event_index ; event_viewer_data->last_event = event_viewer_data->end_event_index ; - + LAST: + if(widget) + gdk_window_set_cursor(win, NULL); } @@ -1093,6 +1157,8 @@ gui_events_free(EventViewerData *event_viewer_data) unreg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw); unreg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw); + unreg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw); + unreg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw); g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data); g_free(event_viewer_data); @@ -1107,6 +1173,7 @@ gui_events_destructor(EventViewerData *event_viewer_data) /* May already been done by GTK window closing */ if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){ gtk_widget_destroy(event_viewer_data->hbox_v); + g_free(event_viewer_data->filter_key); event_viewer_data = NULL; } @@ -1152,10 +1219,119 @@ int event_selected_hook(void *hook_data, void *call_data) } +void add_context_hooks(EventViewerData * event_viewer_data, + LttvTracesetContext * tsc) +{ + gint i, j, nbi, nb_tracefile, nb_control, nb_per_cpu; + LttTrace *trace; + LttvTraceContext *tc; + LttvTracefileContext *tfc; + LttvTracesetSelector * ts_s; + LttvTraceSelector * t_s; + LttvTracefileSelector * tf_s; + gboolean selected; + + ts_s = (LttvTracesetSelector*)g_object_get_data(G_OBJECT(event_viewer_data->hbox_v), + event_viewer_data->filter_key); + + //if there are hooks for traceset, add them here + + nbi = lttv_traceset_number(tsc->ts); + for(i = 0 ; i < nbi ; i++) { + t_s = lttv_traceset_selector_get(ts_s,i); + selected = lttv_trace_selector_get_selected(t_s); + if(!selected) continue; + tc = tsc->traces[i]; + trace = tc->t; + //if there are hooks for trace, add them here + + nb_control = ltt_trace_control_tracefile_number(trace); + nb_per_cpu = ltt_trace_per_cpu_tracefile_number(trace); + nb_tracefile = nb_control + nb_per_cpu; + + for(j = 0 ; j < nb_tracefile ; j++) { + tf_s = lttv_trace_selector_get(t_s,j); + selected = lttv_tracefile_selector_get_selected(tf_s); + if(!selected) continue; + + if(j < nb_control) + tfc = tc->control_tracefiles[j]; + else + tfc = tc->per_cpu_tracefiles[j - nb_control]; + + //if there are hooks for tracefile, add them here + lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL, + event_viewer_data->before_event_hooks,NULL); + } + } + + //add hooks for process_traceset + // context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); +} + + +void remove_context_hooks(EventViewerData * event_viewer_data, + LttvTracesetContext * tsc) +{ + gint i, j, nbi, nb_tracefile, nb_control, nb_per_cpu; + LttTrace *trace; + LttvTraceContext *tc; + LttvTracefileContext *tfc; + LttvTracesetSelector * ts_s; + LttvTraceSelector * t_s; + LttvTracefileSelector * tf_s; + gboolean selected; + + ts_s = (LttvTracesetSelector*)g_object_get_data(G_OBJECT(event_viewer_data->hbox_v), + event_viewer_data->filter_key); + + //if there are hooks for traceset, remove them here + + nbi = lttv_traceset_number(tsc->ts); + for(i = 0 ; i < nbi ; i++) { + t_s = lttv_traceset_selector_get(ts_s,i); + selected = lttv_trace_selector_get_selected(t_s); + if(!selected) continue; + tc = tsc->traces[i]; + trace = tc->t; + //if there are hooks for trace, remove them here + + nb_control = ltt_trace_control_tracefile_number(trace); + nb_per_cpu = ltt_trace_per_cpu_tracefile_number(trace); + nb_tracefile = nb_control + nb_per_cpu; + + for(j = 0 ; j < nb_tracefile ; j++) { + tf_s = lttv_trace_selector_get(t_s,j); + selected = lttv_tracefile_selector_get_selected(tf_s); + if(!selected) continue; + + if(j < nb_control) + tfc = tc->control_tracefiles[j]; + else + tfc = tc->per_cpu_tracefiles[j - nb_control]; + + //if there are hooks for tracefile, remove them here + lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL, + event_viewer_data->before_event_hooks,NULL); + } + } + //remove hooks from context + // context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); +} + + gboolean update_time_window(void * hook_data, void * call_data) { EventViewerData *event_viewer_data = (EventViewerData*) hook_data; - event_viewer_data->time_window = *(TimeWindow*)call_data; + LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw); + + if(event_viewer_data->shown == FALSE){ + event_viewer_data->time_window = *(TimeWindow*)call_data; + + add_context_hooks(event_viewer_data, tsc); + } return FALSE; } @@ -1164,10 +1340,10 @@ gboolean update_current_time(void * hook_data, void * call_data) { EventViewerData *event_viewer_data = (EventViewerData*) hook_data; event_viewer_data->current_time = *(LttTime*)call_data; - uint64_t nsec = event_viewer_data->current_time.tv_sec * NANOSECONDS_PER_SECOND + guint64 nsec = event_viewer_data->current_time.tv_sec * NANOSECONDS_PER_SECOND + event_viewer_data->current_time.tv_nsec; GtkTreeIter iter; - uint64_t time; + guint64 time; int count = 0; GtkTreeModel* model = (GtkTreeModel*)event_viewer_data->store_m; @@ -1190,25 +1366,34 @@ gboolean update_current_time(void * hook_data, void * call_data) return FALSE; } +gboolean traceset_changed(void * hook_data, void * call_data) +{ + EventViewerData *event_viewer_data = (EventViewerData*) hook_data; + LttTime start; + + remove_all_items_from_queue(event_viewer_data->raw_trace_data_queue); + gtk_list_store_clear(event_viewer_data->store_m); + event_viewer_data->shown = FALSE; + event_viewer_data->append = TRUE; + + get_traceset_time_span(event_viewer_data->mw, &event_viewer_data->time_span); + start = ltt_time_sub(event_viewer_data->time_span.endTime, event_viewer_data->time_span.startTime); + event_viewer_data->vadjust_c->upper = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND; + // event_viewer_data->vadjust_c->value = 0; + + return FALSE; +} + + void tree_v_grab_focus(GtkWidget *widget, gpointer data){ EventViewerData *event_viewer_data = (EventViewerData *)data; MainWindow * mw = event_viewer_data->mw; set_focused_pane(mw, gtk_widget_get_parent(event_viewer_data->hbox_v)); } -void get_events(EventViewerData* event_viewer_data, LttTime start, - LttTime end,unsigned max_num_events, unsigned * real_num_events) +void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size) { - int size; RawTraceData * data; - context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); - process_traceset_api(event_viewer_data->mw, start, end, max_num_events); - context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); - - size = event_viewer_data->raw_trace_data_queue_tmp->length; - *real_num_events = size; if(size > 0){ int pid, tmpPid, i; GList * list, *tmpList; @@ -1267,6 +1452,28 @@ void get_events(EventViewerData* event_viewer_data, LttTime start, } } +void get_events(EventViewerData* event_viewer_data, LttTime start, + LttTime end,unsigned max_num_events, unsigned * real_num_events) +{ + int size; + LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw); + + // context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); + add_context_hooks(event_viewer_data,tsc); + + process_traceset_api(event_viewer_data->mw, start, end, max_num_events); + + remove_context_hooks(event_viewer_data,tsc); + // context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); + + size = event_viewer_data->raw_trace_data_queue_tmp->length; + *real_num_events = size; + + update_raw_data_array(event_viewer_data,size); +} + static void get_event_detail(LttEvent *e, LttField *f, GString * s) { LttType *type; @@ -1372,11 +1579,12 @@ gboolean parse_event(void *hook_data, void *call_data) tmp_raw_trace_data->cpu_id = ltt_event_cpu_id(e); tmp_raw_trace_data->event_name = g_strdup(ltt_eventtype_name(ltt_event_eventtype(e))); tmp_raw_trace_data->time = time; + tmp_raw_trace_data->ep = ltt_event_position_new(); if(prev_raw_trace_data) tmp_raw_trace_data->pid = prev_raw_trace_data->pid; else tmp_raw_trace_data->pid = -1; - tmp_raw_trace_data->entry_length = field == NULL ? 0 : field->field_size; + tmp_raw_trace_data->entry_length = field == NULL ? 0 : ltt_field_size(field); if(field) get_event_detail(e, field, detail_event); tmp_raw_trace_data->event_description = g_strdup(detail_event->str); @@ -1396,7 +1604,7 @@ gboolean parse_event(void *hook_data, void *call_data) } } - ltt_event_position(e, &tmp_raw_trace_data->ep); + ltt_event_position(e, tmp_raw_trace_data->ep); if(event_viewer_data->raw_trace_data_queue_tmp->length >= RESERVE_SMALL_SIZE){ if(event_viewer_data->append){