X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiEvents.c;h=3cba5411512a2361aacdf3643acd0cd0e08b3a04;hb=9f797243e1537f470b67cd27ff2030bfd2d89bcb;hp=051147e75fb12933aa5ae9c1b74784231cef6dfa;hpb=a8c0f09de06b94e9420d286e1541c39092fff434;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c index 051147e7..3cba5411 100644 --- a/ltt/branches/poly/lttv/modules/guiEvents.c +++ b/ltt/branches/poly/lttv/modules/guiEvents.c @@ -41,6 +41,7 @@ #include #include #include +#include #include //#include "mw_api.h" @@ -64,8 +65,10 @@ typedef struct _RawTraceData{ LttEventPosition *ep; } RawTraceData; -#define RESERVE_BIG_SIZE 1000 -#define RESERVE_SMALL_SIZE 100 +#define RESERVE_BIG_SIZE 1000 +#define RESERVE_SMALL_SIZE 100 +#define RESERVE_SMALL_SIZE_SQUARE RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE +#define RESERVE_SMALL_SIZE_CUBE RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE_SQUARE typedef enum _ScrollDirection{ SCROLL_STEP_UP, @@ -875,7 +878,7 @@ void get_test_data(double time_value, guint list_height, ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); - maxNum = G_MAXULONG; + maxNum = RESERVE_SMALL_SIZE_CUBE; }else{ if(block_num > 1){ ltt_event_position_set(raw_data->ep, block_num-1, 1); @@ -886,7 +889,7 @@ void get_test_data(double time_value, guint list_height, start.tv_sec = 0; start.tv_nsec = 0; } - maxNum = G_MAXULONG; + maxNum = RESERVE_SMALL_SIZE_CUBE; } }else{ if(block_num > count){ @@ -898,7 +901,7 @@ void get_test_data(double time_value, guint list_height, start.tv_sec = 0; start.tv_nsec = 0; } - maxNum = G_MAXULONG; + maxNum = RESERVE_SMALL_SIZE_CUBE; } event_viewer_data->current_event_index = event_viewer_data->start_event_index; @@ -931,12 +934,18 @@ void get_test_data(double time_value, guint list_height, end.tv_sec = G_MAXULONG; end.tv_nsec = G_MAXULONG; get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE, &size); + if(size == 0){ + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size); + if(size == 0) + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_CUBE,&size); + } }else size = 1; if(size > 0) event_number = event_viewer_data->start_event_index + 1; else event_number = event_viewer_data->start_event_index; break; case SCROLL_PAGE_DOWN: - if(event_viewer_data->end_event_index >= event_viewer_data->number_of_events - 1 - list_height){ + i = event_viewer_data->number_of_events - 1 - list_height; + if((gint)(event_viewer_data->end_event_index) >= i){ event_viewer_data->append = TRUE; first = event_viewer_data->raw_trace_data_queue->head; if(!first)break; @@ -946,6 +955,11 @@ void get_test_data(double time_value, guint list_height, end.tv_sec = G_MAXULONG; end.tv_nsec = G_MAXULONG; get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE,&size); + if(size == 0){ + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size); + if(size == 0) + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_CUBE,&size); + } } if(list_height <= event_viewer_data->number_of_events - 1 - event_viewer_data->end_event_index) event_number = event_viewer_data->start_event_index + list_height - 1; @@ -961,7 +975,7 @@ void get_test_data(double time_value, guint list_height, start = ltt_time_add(event_viewer_data->time_span.startTime, time); event_viewer_data->previous_value = time_value; get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE,&size); - if(size < list_height){ + if(size < list_height && size > 0){ event_viewer_data->append = FALSE; first = event_viewer_data->raw_trace_data_queue->head; if(!first)break; @@ -977,12 +991,17 @@ void get_test_data(double time_value, guint list_height, ltt_tracefile_seek_position(tf, raw_data->ep); ev = ltt_tracefile_read(tf); start = ltt_event_time(ev); - maxNum = G_MAXULONG; + maxNum = RESERVE_SMALL_SIZE_CUBE; event_viewer_data->current_event_index = 0; get_events(event_viewer_data, start, end, maxNum, &size); event_viewer_data->start_event_index = event_viewer_data->current_event_index; } event_number = event_viewer_data->raw_trace_data_queue->length - list_height; + }else if(size == 0){ + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size); + if(size == 0) + get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_CUBE,&size); + event_number = 0; }else{ event_number = 0; } @@ -1001,6 +1020,7 @@ void get_test_data(double time_value, guint list_height, first = event_viewer_data->raw_trace_data_queue->head; if(first){ raw_data = (RawTraceData*)g_list_nth_data(first,event_number); + if(!raw_data) raw_data = (RawTraceData*)g_list_nth_data(first,0); 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"); @@ -1011,6 +1031,9 @@ void get_test_data(double time_value, guint list_height, event_viewer_data->start_event_index = event_number; event_viewer_data->end_event_index = event_number + list_height - 1; + if(event_viewer_data->end_event_index > event_viewer_data->number_of_events - 1){ + event_viewer_data->end_event_index = event_viewer_data->number_of_events - 1; + } first = event_viewer_data->raw_trace_data_queue->head; gtk_list_store_clear(event_viewer_data->store_m); @@ -1218,11 +1241,14 @@ int event_selected_hook(void *hook_data, void *call_data) } - +/* If every module uses the filter, maybe these two + * (add/remove_context_hooks functions) should be put in common place + */ void add_context_hooks(EventViewerData * event_viewer_data, LttvTracesetContext * tsc) { - gint i, j, nbi, nb_tracefile, nb_control, nb_per_cpu; + gint i, j, k, m,n, nbi, id; + gint nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event; LttTrace *trace; LttvTraceContext *tc; LttvTracefileContext *tfc; @@ -1230,6 +1256,9 @@ void add_context_hooks(EventViewerData * event_viewer_data, LttvTraceSelector * t_s; LttvTracefileSelector * tf_s; gboolean selected; + LttFacility * fac; + LttEventType * et; + LttvEventtypeSelector * eventtype; ts_s = (LttvTracesetSelector*)g_object_get_data(G_OBJECT(event_viewer_data->hbox_v), event_viewer_data->filter_key); @@ -1238,7 +1267,7 @@ void add_context_hooks(EventViewerData * event_viewer_data, nbi = lttv_traceset_number(tsc->ts); for(i = 0 ; i < nbi ; i++) { - t_s = lttv_traceset_selector_get(ts_s,i); + t_s = lttv_traceset_selector_trace_get(ts_s,i); selected = lttv_trace_selector_get_selected(t_s); if(!selected) continue; tc = tsc->traces[i]; @@ -1250,7 +1279,7 @@ void add_context_hooks(EventViewerData * event_viewer_data, nb_tracefile = nb_control + nb_per_cpu; for(j = 0 ; j < nb_tracefile ; j++) { - tf_s = lttv_trace_selector_get(t_s,j); + tf_s = lttv_trace_selector_tracefile_get(t_s,j); selected = lttv_tracefile_selector_get_selected(tf_s); if(!selected) continue; @@ -1260,8 +1289,28 @@ void add_context_hooks(EventViewerData * event_viewer_data, 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); + // lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL, + // event_viewer_data->before_event_hooks,NULL); + + nb_facility = ltt_trace_facility_number(trace); + n = 0; + for(k=0;kbefore_event_hooks, + NULL); + } + n++; + } + } + } } @@ -1274,7 +1323,8 @@ void add_context_hooks(EventViewerData * event_viewer_data, void remove_context_hooks(EventViewerData * event_viewer_data, LttvTracesetContext * tsc) { - gint i, j, nbi, nb_tracefile, nb_control, nb_per_cpu; + gint i, j, k, m, nbi, n, id; + gint nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event; LttTrace *trace; LttvTraceContext *tc; LttvTracefileContext *tfc; @@ -1282,6 +1332,9 @@ void remove_context_hooks(EventViewerData * event_viewer_data, LttvTraceSelector * t_s; LttvTracefileSelector * tf_s; gboolean selected; + LttFacility * fac; + LttEventType * et; + LttvEventtypeSelector * eventtype; ts_s = (LttvTracesetSelector*)g_object_get_data(G_OBJECT(event_viewer_data->hbox_v), event_viewer_data->filter_key); @@ -1290,7 +1343,7 @@ void remove_context_hooks(EventViewerData * event_viewer_data, nbi = lttv_traceset_number(tsc->ts); for(i = 0 ; i < nbi ; i++) { - t_s = lttv_traceset_selector_get(ts_s,i); + t_s = lttv_traceset_selector_trace_get(ts_s,i); selected = lttv_trace_selector_get_selected(t_s); if(!selected) continue; tc = tsc->traces[i]; @@ -1302,7 +1355,7 @@ void remove_context_hooks(EventViewerData * event_viewer_data, nb_tracefile = nb_control + nb_per_cpu; for(j = 0 ; j < nb_tracefile ; j++) { - tf_s = lttv_trace_selector_get(t_s,j); + tf_s = lttv_trace_selector_tracefile_get(t_s,j); selected = lttv_tracefile_selector_get_selected(tf_s); if(!selected) continue; @@ -1312,8 +1365,25 @@ void remove_context_hooks(EventViewerData * event_viewer_data, 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); + // lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL, + // event_viewer_data->before_event_hooks,NULL); + + nb_facility = ltt_trace_facility_number(trace); + n = 0; + for(k=0;k