X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiEvents.c;h=ee9fa0f58ab16e9266b49761f928b8ecf8284600;hb=80ff382d91a521680da68573badb338cb2a50550;hp=078314dd013bdf2d598c92005b2b2f600ba16721;hpb=ed3b99b601fb95fea1f2c4e8718a0a94233929f2;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c index 078314dd..ee9fa0f5 100644 --- a/ltt/branches/poly/lttv/modules/guiEvents.c +++ b/ltt/branches/poly/lttv/modules/guiEvents.c @@ -65,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, @@ -876,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); @@ -887,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){ @@ -899,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; @@ -933,7 +935,9 @@ void get_test_data(double time_value, guint list_height, 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, G_MAXULONG, &size); + 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; @@ -952,7 +956,9 @@ void get_test_data(double time_value, guint list_height, 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, G_MAXULONG,&size); + 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) @@ -985,14 +991,16 @@ 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*RESERVE_SMALL_SIZE,&size); + 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; @@ -1457,8 +1465,12 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size) { RawTraceData * data; if(size > 0){ - int pid, tmpPid, i; + int pid, tmpPid, i,j,len; GList * list, *tmpList; + GArray * pid_array, * tmp_pid_array; + + pid_array = g_array_sized_new(FALSE, TRUE, sizeof(int), 10); + tmp_pid_array = g_array_sized_new(FALSE, TRUE, sizeof(int), 10); //if the queue is full, remove some data, keep the size of the queue constant while(event_viewer_data->raw_trace_data_queue->length + size > RESERVE_BIG_SIZE){ @@ -1471,30 +1483,95 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size) list = event_viewer_data->raw_trace_data_queue->head; tmpList = event_viewer_data->raw_trace_data_queue_tmp->head; if(event_viewer_data->append){ - data = (RawTraceData*)g_list_nth_data(list, event_viewer_data->raw_trace_data_queue->length-1); - pid = data->pid; - data = (RawTraceData*)g_list_nth_data(tmpList, 0); - tmpPid = data->pid; + for(i= event_viewer_data->raw_trace_data_queue->length-1;i>=0;i--){ + data = (RawTraceData*)g_list_nth_data(list,i); + len = data->pid==0 ? -2 : data->pid; + if(data->cpu_id+1 > pid_array->len){ + pid_array = g_array_set_size(pid_array,data->cpu_id+1); + pid_array = g_array_insert_val(pid_array,data->cpu_id,len); + pid_array = g_array_remove_index(pid_array,data->cpu_id+1); + }else if(data->cpu_id+1 < pid_array->len){ + pid = g_array_index(pid_array,int,data->cpu_id); + if(pid == 0){ + pid_array = g_array_insert_val(pid_array,data->cpu_id,len); + pid_array = g_array_remove_index(pid_array,data->cpu_id+1); + } + } + } + + for(i=0;iraw_trace_data_queue_tmp->length-1;i++){ + data = (RawTraceData*)g_list_nth_data(tmpList,i); + len = data->pid==0 ? -2 : data->pid; + if(data->cpu_id+1 > tmp_pid_array->len){ + tmp_pid_array = g_array_set_size(tmp_pid_array,data->cpu_id+1); + tmp_pid_array = g_array_insert_val(tmp_pid_array,data->cpu_id,len); + tmp_pid_array = g_array_remove_index(tmp_pid_array,data->cpu_id+1); + }else if(data->cpu_id+1 < tmp_pid_array->len){ + pid = g_array_index(tmp_pid_array,int,data->cpu_id); + if(pid == 0){ + tmp_pid_array = g_array_insert_val(tmp_pid_array,data->cpu_id,len); + tmp_pid_array = g_array_remove_index(tmp_pid_array,data->cpu_id+1); + } + } + } }else{ - data = (RawTraceData*)g_list_nth_data(list, 0); - pid = data->pid; - data = (RawTraceData*)g_list_nth_data(tmpList, event_viewer_data->raw_trace_data_queue_tmp->length-1); - tmpPid = data->pid; - } - - if(pid == -1 && tmpPid != -1){ - for(i=0;iraw_trace_data_queue->length;i++){ + for(i=0;iraw_trace_data_queue->length-1;i++){ data = (RawTraceData*)g_list_nth_data(list,i); - if(data->pid == -1) data->pid = tmpPid; + len = data->pid==0 ? -2 : data->pid; + if(data->cpu_id+1 > pid_array->len){ + pid_array = g_array_set_size(pid_array,data->cpu_id+1); + pid_array = g_array_insert_val(pid_array,data->cpu_id,len); + pid_array = g_array_remove_index(pid_array,data->cpu_id+1); + }else if(data->cpu_id+1 < pid_array->len){ + pid = g_array_index(pid_array,int,data->cpu_id); + if(pid == 0){ + pid_array = g_array_insert_val(pid_array,data->cpu_id,len); + pid_array = g_array_remove_index(pid_array,data->cpu_id+1); + } + } } - }else if(pid != -1 && tmpPid == -1){ - for(i=0;iraw_trace_data_queue_tmp->length;i++){ + + for(i=event_viewer_data->raw_trace_data_queue_tmp->length-1;i>=0;i--){ data = (RawTraceData*)g_list_nth_data(tmpList,i); - if(data->pid == -1) data->pid = pid; + len = data->pid==0 ? -2 : data->pid; + if(data->cpu_id+1 > tmp_pid_array->len){ + tmp_pid_array = g_array_set_size(tmp_pid_array,data->cpu_id+1); + tmp_pid_array = g_array_insert_val(tmp_pid_array,data->cpu_id,len); + tmp_pid_array = g_array_remove_index(tmp_pid_array,data->cpu_id+1); + }else if(data->cpu_id+1 < tmp_pid_array->len){ + pid = g_array_index(tmp_pid_array,int,data->cpu_id); + if(pid == 0){ + tmp_pid_array = g_array_insert_val(tmp_pid_array,data->cpu_id,len); + tmp_pid_array = g_array_remove_index(tmp_pid_array,data->cpu_id+1); + } + } + } + } + + len = pid_array->len > tmp_pid_array->len ? tmp_pid_array->len : pid_array->len; + for(j=0;jraw_trace_data_queue->length;i++){ + data = (RawTraceData*)g_list_nth_data(list,i); + if(data->pid == -1 && data->cpu_id == j) data->pid = tmpPid; + } + }else if(pid != -1 && tmpPid == -1){ + for(i=0;iraw_trace_data_queue_tmp->length;i++){ + data = (RawTraceData*)g_list_nth_data(tmpList,i); + if(data->pid == -1 && data->cpu_id == j) data->pid = pid; + } } } } + g_array_free(pid_array,TRUE); + g_array_free(tmp_pid_array, TRUE); + //add data from tmp queue into the queue event_viewer_data->number_of_events = event_viewer_data->raw_trace_data_queue->length + event_viewer_data->raw_trace_data_queue_tmp->length; @@ -1632,17 +1709,23 @@ gboolean parse_event(void *hook_data, void *call_data) field = ltt_event_field(e); time = ltt_event_time(e); - if(event_viewer_data->raw_trace_data_queue_tmp->length){ - list = g_list_last(event_viewer_data->raw_trace_data_queue_tmp->head); - prev_raw_trace_data = (RawTraceData *)(list->data); - } - tmp_raw_trace_data = g_new(RawTraceData,1); 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(event_viewer_data->raw_trace_data_queue_tmp->length){ + list = event_viewer_data->raw_trace_data_queue_tmp->head; + for(i=event_viewer_data->raw_trace_data_queue_tmp->length-1;i>=0;i--){ + data = (RawTraceData *)g_list_nth_data(list,i); + if(data->cpu_id == tmp_raw_trace_data->cpu_id){ + prev_raw_trace_data = data; + break; + } + } + } + if(prev_raw_trace_data) tmp_raw_trace_data->pid = prev_raw_trace_data->pid; else tmp_raw_trace_data->pid = -1; @@ -1661,7 +1744,9 @@ gboolean parse_event(void *hook_data, void *call_data) list = event_viewer_data->raw_trace_data_queue_tmp->head; for(i=0;iraw_trace_data_queue_tmp->length;i++){ data = (RawTraceData *)g_list_nth_data(list,i); - data->pid = out; + if(data->cpu_id == tmp_raw_trace_data->cpu_id){ + data->pid = out; + } } } }