#include <glib.h>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
+#include <string.h>
#include <ltt/ltt.h>
#include <ltt/event.h>
#define RESERVE_SMALL_SIZE_SQUARE RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE
#define RESERVE_SMALL_SIZE_CUBE RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE_SQUARE
+static const LttTime ltt_time_backward = { 1 , 0 };
+
typedef enum _ScrollDirection{
SCROLL_STEP_UP,
SCROLL_STEP_DOWN,
*/
double previous_value;
- 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 current_time_updated;
+ gint start_event_index; // the first event shown in the window
+ gint end_event_index; // the last event shown in the window
+ gint size; // maxi number of events loaded
//scroll window containing Tree View
GtkWidget * scroll_win;
/* Selection handler */
GtkTreeSelection *select_c;
- guint num_visible_events;
- guint first_event, last_event;
+ gint num_visible_events;
+ gint first_event, last_event;
gint number_of_events ;
- guint currently_selected_event;
+ gint currently_selected_event;
gboolean selected_event ;
} EventViewerData ;
LttvTracesetContext * tsc);
//! Event Viewer's constructor hook
-GtkWidget *h_gui_events(Tab *tab, LttvTracesetSelector * s, char* key);
+GtkWidget *h_gui_events(Tab *tab);
//! Event Viewer's constructor
-EventViewerData *gui_events(Tab *tab, LttvTracesetSelector *s, char *key);
+EventViewerData *gui_events(Tab *tab);
//! Event Viewer's destructor
void gui_events_destructor(EventViewerData *event_viewer_data);
void gui_events_free(EventViewerData *event_viewer_data);
-static int event_selected_hook(void *hook_data, void *call_data);
-
static gboolean
header_size_allocate(GtkWidget *widget,
GtkAllocation *allocation,
static void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpointer data);
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_grab_focus(GtkWidget *widget, gpointer data);
static void get_data(double time, guint list_height,
static void get_events(EventViewerData* event_viewer_data, LttTime start,
LttTime end, unsigned max_num_events, unsigned * real_num_events);
-static int after_get_events(void *hook_data, void *call_data);
-
static gboolean parse_event(void *hook_data, void *call_data);
-static LttvModule *main_win_module;
-
/* Enumeration of the columns */
enum
{
* @return The widget created.
*/
GtkWidget *
-h_gui_events(Tab * tab, LttvTracesetSelector * s, char* key)
+h_gui_events(Tab * tab)
{
- EventViewerData* event_viewer_data = gui_events(tab, s, key) ;
-
+ EventViewerData* event_viewer_data = gui_events(tab) ;
if(event_viewer_data)
return event_viewer_data->hbox_v;
else return NULL;
* @return The Event viewer data created.
*/
EventViewerData *
-gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
+gui_events(Tab *tab)
{
LttTime end;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
EventViewerData* event_viewer_data = g_new(EventViewerData,1) ;
- EventFields * data;
event_viewer_data->tab = tab;
G_CALLBACK (tree_v_move_cursor_cb),
event_viewer_data);
- g_signal_connect (G_OBJECT (event_viewer_data->tree_v), "grab-focus",
- G_CALLBACK (tree_v_grab_focus),
- event_viewer_data);
-
// Use on each column!
//gtk_tree_view_column_set_sizing(event_viewer_data->tree_v, GTK_TREE_VIEW_COLUMN_FIXED);
end = ltt_time_sub(time_span.end_time, time_span.start_time);
event_viewer_data->vadjust_c->upper =
- ltt_time_to_double(end) * NANOSECONDS_PER_SECOND;
+ ltt_time_to_double(end);
event_viewer_data->append = TRUE;
/* Set the Selected Event */
// tree_v_set_cursor(event_viewer_data);
- event_viewer_data->current_time_updated = FALSE;
+ // event_viewer_data->current_time_updated = FALSE;
event_viewer_data->size = RESERVE_SMALL_SIZE;
g_object_set_data_full(
if(event_viewer_data->selected_event && event_viewer_data->first_event != -1)
{
- // gtk_adjustment_set_value(event_viewer_data->vadjust_c,
- // event_viewer_data->currently_selected_event);
-
path = gtk_tree_path_new_from_indices(
event_viewer_data->currently_selected_event-
event_viewer_data->first_event,
if(ltt_time.tv_sec != current_time.tv_sec ||
ltt_time.tv_nsec != current_time.tv_nsec){
- event_viewer_data->current_time_updated = TRUE;
- lttvwindow_report_current_time(tab,<t_time);
+ // event_viewer_data->current_time_updated = TRUE;
+ lttvwindow_report_current_time(tab,ltt_time);
}
}else{
g_warning("Can not get iter\n");
// NULL, FALSE);
gtk_tree_path_free(tree_path);
}
-
-
}
-gint get_cell_height(GtkTreeView *TreeView)
+static __inline gint get_cell_height(GtkTreeView *TreeView)
{
- gint height, width;
+ gint height;
GtkTreeViewColumn *column = gtk_tree_view_get_column(TreeView, 0);
- GList *Render_List = gtk_tree_view_column_get_cell_renderers(column);
- GtkCellRenderer *renderer = g_list_first(Render_List)->data;
gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height);
floor(exact_num_visible);
*/
- g_debug("size allocate : last_num_visible_events : %lu,\
- num_visible_events : %lu",
+ g_debug("size allocate : last_num_visible_events : %d,\
+ num_visible_events : %d",
last_num_visible_events,
event_viewer_data->num_visible_events);
if(event_viewer_data->num_visible_events != last_num_visible_events)
}
}
-static void get_data_wrapped(double time_value, guint list_height,
+static void get_data_wrapped(double time_value, gint list_height,
EventViewerData *event_viewer_data, LttEvent *ev);
static void get_data(double time_value, guint list_height,
ltt_event_destroy(ev);
}
-static void get_data_wrapped(double time_value, guint list_height,
+static void get_data_wrapped(double time_value, gint list_height,
EventViewerData *event_viewer_data, LttEvent *ev)
{
- GtkTreeIter iter;
int i;
GtkTreeModel *model = GTK_TREE_MODEL(event_viewer_data->store_m);
- GtkTreePath *tree_path;
EventFields * event_fields;
ScrollDirection direction = SCROLL_NONE;
GList * first;
- int event_number;
+ gint event_number = event_viewer_data->start_event_index;
double value = event_viewer_data->previous_value - time_value;
LttTime start, end, time;
- unsigned backward_num, minNum, maxNum;
+ gint backward_num, minNum, maxNum;
LttTracefile * tf;
- unsigned block_num, event_num;
- unsigned size = 1, count = 0;
+ unsigned block_num;
+ gint size = 1, count = 0;
gboolean need_backward_again, backward;
- GdkWindow * win;
- //GdkCursor * new;
- GtkWidget* widget = gtk_widget_get_parent(event_viewer_data->hbox_v);
LttvTracesetContext * tsc =
lttvwindow_get_traceset_context(event_viewer_data->tab);
TimeInterval time_span = tsc->time_span;
- //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)
{
/* no event can be reused, clear and start from nothing */
- if(value == -1.0) direction = SCROLL_STEP_DOWN;
- else if(value == 1.0 ) direction = SCROLL_STEP_UP;
- else if(value == -2.0) direction = SCROLL_PAGE_DOWN;
- else if(value == 2.0 ) direction = SCROLL_PAGE_UP;
- else if(value == 0.0 ) direction = SCROLL_NONE;
- else direction = SCROLL_JUMP;
+ if(value < 0.0) {
+ if(value >= -1.0) direction = SCROLL_STEP_DOWN;
+ else if(value >= -2.0) direction = SCROLL_PAGE_DOWN;
+ else direction = SCROLL_JUMP;
+ } else if(value > 0.0) {
+ if(value <= 1.0) direction = SCROLL_STEP_UP;
+ else if(value <= 2.0) direction = SCROLL_PAGE_UP;
+ else direction = SCROLL_JUMP;
+ }
+ else direction = SCROLL_NONE; /* 0.0 */
if(g_queue_get_length(event_viewer_data->event_fields_queue)==0)
direction = SCROLL_JUMP;
switch(direction){
case SCROLL_STEP_UP:
- g_debug("direction STEP_UP");
+ if(direction == SCROLL_STEP_UP) g_debug("direction STEP_UP");
case SCROLL_PAGE_UP:
- g_debug("direction PAGE_UP");
+ if(direction == SCROLL_PAGE_UP) g_debug("direction PAGE_UP");
if(direction == SCROLL_PAGE_UP){
backward = list_height>event_viewer_data->start_event_index ? TRUE : FALSE;
}else{
backward = event_viewer_data->start_event_index == 0 ? TRUE : FALSE;
}
if(backward){
+ first = event_viewer_data->event_fields_queue->head;
+ if(!first)break;
+ event_fields = (EventFields*)first->data;
+ LttTime backward_start = event_fields->time;
+
+ maxNum = RESERVE_SMALL_SIZE_CUBE;
event_viewer_data->append = FALSE;
do{
if(direction == SCROLL_PAGE_UP){
}else{
minNum = 1;
}
-
first = event_viewer_data->event_fields_queue->head;
if(!first)break;
event_fields = (EventFields*)first->data;
end = event_fields->time;
- if(end.tv_nsec != 0)
- end.tv_nsec--;
- else {
- g_assert(end.tv_sec != 0);
- end.tv_sec--;
- end.tv_nsec = NANOSECONDS_PER_SECOND-1;
- }
- ltt_event_position_get(event_fields->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(event_fields->ep, block_num, backward_num);
- ltt_tracefile_seek_position(tf, event_fields->ep);
- g_assert(ltt_tracefile_read(tf,ev) != NULL);
- start = ltt_event_time(ev);
- maxNum = RESERVE_SMALL_SIZE_CUBE;
- }else{
- if(block_num > 1){
- ltt_event_position_set(event_fields->ep, block_num-1, 1);
- ltt_tracefile_seek_position(tf, event_fields->ep);
- g_assert(ltt_tracefile_read(tf,ev) != NULL);
- start = ltt_event_time(ev);
- }else{
- start.tv_sec = 0;
- start.tv_nsec = 0;
- }
- maxNum = RESERVE_SMALL_SIZE_CUBE;
- }
- }else{
- if(block_num > count){
- ltt_event_position_set(event_fields->ep, block_num-count, 1);
- ltt_tracefile_seek_position(tf, event_fields->ep);
- g_assert(ltt_tracefile_read(tf, ev) != NULL);
- start = ltt_event_time(ev);
- }else{
- start.tv_sec = 0;
- start.tv_nsec = 0;
- }
- maxNum = RESERVE_SMALL_SIZE_CUBE;
- }
+
+ backward_start = LTT_TIME_MAX(ltt_time_sub(backward_start,
+ ltt_time_backward),
+ tsc->time_span.start_time);
event_viewer_data->current_event_index = event_viewer_data->start_event_index;
- get_events(event_viewer_data, start, end, maxNum, &size);
+ get_events(event_viewer_data, backward_start, end, maxNum, &size);
event_viewer_data->start_event_index = event_viewer_data->current_event_index;
- if(size < minNum && (start.tv_sec !=0 || start.tv_nsec !=0))
+ if(size < minNum
+ && (ltt_time_compare(backward_start, tsc->time_span.start_time)>0))
need_backward_again = TRUE;
else need_backward_again = FALSE;
if(size == 0){
remove_all_items_from_queue(event_viewer_data->event_fields_queue);
end.tv_sec = G_MAXULONG;
end.tv_nsec = G_MAXULONG;
- time = ltt_time_from_double(time_value / NANOSECONDS_PER_SECOND);
+ time = ltt_time_from_double(time_value);
start = ltt_time_add(time_span.start_time, time);
event_viewer_data->previous_value = time_value;
get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE,&size);
end.tv_nsec = NANOSECONDS_PER_SECOND-1;
}
+ gint event_num;
ltt_event_position_get(event_fields->ep, &block_num, &event_num, &tf);
if(event_num > list_height - size){
event_fields = (EventFields*)g_list_nth_data(first,event_number);
if(!event_fields) event_fields = (EventFields*)g_list_nth_data(first,0);
time = ltt_time_sub(event_fields->time, time_span.start_time);
- event_viewer_data->vadjust_c->value = ltt_time_to_double(time) * NANOSECONDS_PER_SECOND;
+ event_viewer_data->vadjust_c->value = ltt_time_to_double(time);
//gtk_adjustment_set_value(event_viewer_data->vadjust_c,
- // ltt_time_to_double(time) * NANOSECONDS_PER_SECOND);
+ // ltt_time_to_double(time));
//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;
//gtk_adjustment_value_changed(event_viewer_data->vadjust_c);
insert_data_into_model(event_viewer_data,event_number, event_number+list_height);
}
-#ifdef DEBUG //do not use this, it's slower and broken
- // } else {
- /* Some events will be reused */
- if(event_number < event_viewer_data->first_event)
- {
- /* scrolling up, prepend events */
- tree_path = gtk_tree_path_new_from_indices
- (event_number+list_height-1 -
- event_viewer_data->first_event + 1,
- -1);
- for(i=0; i<event_viewer_data->last_event-(event_number+list_height-1);
- i++)
- {
- /* Remove the last events from the list */
- if(gtk_tree_model_get_iter(model, &iter, tree_path))
- gtk_list_store_remove(event_viewer_data->store_m, &iter);
- }
-
- for(i=event_viewer_data->first_event-1; i>=event_number; i--)
- {
- if(i>=event_viewer_data->number_of_events) break;
- /* Prepend new events */
- gtk_list_store_prepend (event_viewer_data->store_m, &iter);
- gtk_list_store_set (event_viewer_data->store_m, &iter,
- CPUID_COLUMN, 0,
- EVENT_COLUMN, "event irq",
- TIME_COLUMN, i,
- PID_COLUMN, 100,
- ENTRY_LEN_COLUMN, 17,
- EVENT_DESCR_COLUMN, "Detailed information",
- -1);
- }
- } else {
- /* Scrolling down, append events */
- for(i=event_viewer_data->first_event; i<event_number; i++)
- {
- /* Remove these events from the list */
- gtk_tree_model_get_iter_first(model, &iter);
- gtk_list_store_remove(event_viewer_data->store_m, &iter);
- }
- for(i=event_viewer_data->last_event+1; i<event_number+list_height; i++)
- {
- if(i>=event_viewer_data->number_of_events) break;
- /* Append new events */
- gtk_list_store_append (event_viewer_data->store_m, &iter);
- gtk_list_store_set (event_viewer_data->store_m, &iter,
- CPUID_COLUMN, 0,
- EVENT_COLUMN, "event irq",
- TIME_COLUMN, i,
- PID_COLUMN, 100,
- ENTRY_LEN_COLUMN, 17,
- EVENT_DESCR_COLUMN, "Detailed information",
- -1);
- }
-
- }
- //}
-#endif //DEBUG
+
event_viewer_data->first_event = event_viewer_data->start_event_index ;
event_viewer_data->last_event = event_viewer_data->end_event_index ;
LAST:
return;
- // if(widget)
- // gdk_window_set_cursor(win, NULL);
}
void
gui_events_destructor(EventViewerData *event_viewer_data)
{
- guint index;
/* May already been done by GTK window closing */
if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
- gui_events_free(event_viewer_data);
gtk_widget_destroy(event_viewer_data->hbox_v);
- event_viewer_data = NULL;
}
-
- /* Destroy the Tree View */
- //gtk_widget_destroy(event_viewer_data->tree_v);
-
- /* Clear raw event list */
- //gtk_list_store_clear(event_viewer_data->store_m);
- //gtk_widget_destroy(GTK_WIDGET(event_viewer_data->store_m));
-
- //gui_events_free(event_viewer_data);
}
-//FIXME : call hGuiEvents_Destructor for corresponding data upon widget destroy
static void
tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
}
-int event_selected_hook(void *hook_data, void *call_data)
-{
- EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
- guint *event_number = (guint*) call_data;
-
- event_viewer_data->currently_selected_event = *event_number;
- event_viewer_data->selected_event = TRUE ;
-
- tree_v_set_cursor(event_viewer_data);
-
-}
-
#if 0
/* If every module uses the filter, maybe these two
* (add/remove_context_hooks functions) should be put in common place
{
EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
const LttTime * current_time = (LttTime*)call_data;
- guint64 nsec = current_time->tv_sec * NANOSECONDS_PER_SECOND
- + current_time->tv_nsec;
+ guint64 nsec = (guint64)current_time->tv_sec * NANOSECONDS_PER_SECOND
+ + (guint64)current_time->tv_nsec;
GtkTreeIter iter;
guint64 time;
- int count = -1;
GtkTreeModel* model = (GtkTreeModel*)event_viewer_data->store_m;
GList * list;
EventFields * data, *data1;
GtkTreePath* path;
char str_path[64];
- int i, j;
+ guint i;
+ gint j;
LttTime t;
LttvTracesetContext * tsc =
lttvwindow_get_traceset_context(event_viewer_data->tab);
TimeInterval time_span = tsc->time_span;
if(!event_viewer_data->event_fields_queue->head) return FALSE;
-
+#if 0
if(event_viewer_data->current_time_updated ){
event_viewer_data->current_time_updated = FALSE;
return FALSE;
}
-
+#endif //0
//check if the event is shown in the current viewer
+ gint count = 0;
+ gboolean event_shown = FALSE;
if(gtk_tree_model_get_iter_first(model, &iter)){
- while(1){
- gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
- if(time < nsec){
- if(!gtk_tree_model_iter_next(model, &iter)){
- count = -1;
- break;
- }
- count++;
- }else{
- break;
+ gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
+ if(time > nsec){
+ /* Event is before the list */
+ } else {
+ /* Event can be in the list */
+ if(time >= nsec){
+ /* found */
+ event_shown = TRUE;
+ } else {
+ while(gtk_tree_model_iter_next(model, &iter)) {
+ gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
+ count++;
+ if(time >= nsec){
+ /* found */
+ event_shown = TRUE;
+ break;
+ }
+ }
}
}
- // event_selected_hook(event_viewer_data, &count);
}
- //the event is not shown in the current viewer
- if(count == -1){
+ if(!event_shown)
+ {
+ //the event is not shown in the current viewer
count = 0;
//check if the event is in the buffer
list = event_viewer_data->event_fields_queue->head;
}
break;
}
- if(event_viewer_data->event_fields_queue->length-count < event_viewer_data->num_visible_events){
+ if((gint)event_viewer_data->event_fields_queue->length-count
+ < event_viewer_data->num_visible_events){
j = event_viewer_data->event_fields_queue->length - event_viewer_data->num_visible_events;
count -= j;
data = (EventFields*)g_list_nth_data(list,j);
count = 0;
}
t = ltt_time_sub(data->time, time_span.start_time);
- event_viewer_data->vadjust_c->value = ltt_time_to_double(t) * NANOSECONDS_PER_SECOND;
+ event_viewer_data->vadjust_c->value = ltt_time_to_double(t);
//gtk_adjustment_set_value(event_viewer_data->vadjust_c,
- // ltt_time_to_double(t) * NANOSECONDS_PER_SECOND);
+ // ltt_time_to_double(t));
//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;
insert_data_into_model(event_viewer_data,j, j+event_viewer_data->num_visible_events);
}else{//the event is not in the buffer
LttTime start = ltt_time_sub(*current_time, time_span.start_time);
- double position = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
+ double position = ltt_time_to_double(start);
gtk_adjustment_set_value(event_viewer_data->vadjust_c, position);
}
}
- sprintf(str_path,"%d\0",count);
+ sprintf(str_path,"%d",count);
path = gtk_tree_path_new_from_string (str_path);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
//g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->tree_v), "cursor-changed");
event_viewer_data->append = TRUE;
end = ltt_time_sub(time_span.end_time, time_span.start_time);
- event_viewer_data->vadjust_c->upper = ltt_time_to_double(end) * NANOSECONDS_PER_SECOND;
+ event_viewer_data->vadjust_c->upper = ltt_time_to_double(end);
+ g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed");
// event_viewer_data->vadjust_c->value = 0;
return FALSE;
}
-void tree_v_grab_focus(GtkWidget *widget, gpointer data){
- EventViewerData *event_viewer_data = (EventViewerData *)data;
- Tab * tab = event_viewer_data->tab;
- lttvwindow_report_focus(tab, event_viewer_data->hbox_v);
-}
-
void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
{
EventFields * data;
list = event_viewer_data->event_fields_queue->head;
tmpList = event_viewer_data->event_fields_queue_tmp->head;
if(event_viewer_data->append){
- for(i= event_viewer_data->event_fields_queue->length-1;i>=0;i--){
+ for(i=(gint)event_viewer_data->event_fields_queue->length-1;i>=0;i--){
data = (EventFields*)g_list_nth_data(list,i);
len = data->pid==0 ? -2 : data->pid;
if(data->cpu_id+1 > pid_array->len){
}
}
- for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+ for(i=0;i<(gint)event_viewer_data->event_fields_queue_tmp->length;i++){
data = (EventFields*)g_list_nth_data(tmpList,i);
len = data->pid==0 ? -2 : data->pid;
if(data->cpu_id+1 > tmp_pid_array->len){
}
}
}else{
- for(i=0;i<event_viewer_data->event_fields_queue->length;i++){
+ for(i=0;i<(gint)event_viewer_data->event_fields_queue->length;i++){
data = (EventFields*)g_list_nth_data(list,i);
len = data->pid==0 ? -2 : data->pid;
if(data->cpu_id+1 > pid_array->len){
}
}
- for(i=event_viewer_data->event_fields_queue_tmp->length-1;i>=0;i--){
+ for(i=(gint)event_viewer_data->event_fields_queue_tmp->length-1;i>=0;i--){
data = (EventFields*)g_list_nth_data(tmpList,i);
len = data->pid==0 ? -2 : data->pid;
if(data->cpu_id+1 > tmp_pid_array->len){
}
}
- len = pid_array->len > tmp_pid_array->len ? tmp_pid_array->len : pid_array->len;
+ len = (pid_array->len > tmp_pid_array->len) ?
+ tmp_pid_array->len : pid_array->len;
for(j=0;j<len;j++){
pid = g_array_index(pid_array,int, j);
tmpPid = g_array_index(tmp_pid_array,int,j);
if(tmpPid == -2) tmpPid = 0;
if(pid == -1 && tmpPid != -1){
- for(i=0;i<event_viewer_data->event_fields_queue->length;i++){
+ for(i=0;i<(gint)event_viewer_data->event_fields_queue->length;i++){
data = (EventFields*)g_list_nth_data(list,i);
- if(data->pid == -1 && data->cpu_id == j) data->pid = tmpPid;
+ if(data->pid == -1 && (gint)data->cpu_id == j) data->pid = tmpPid;
}
}else if(pid != -1 && tmpPid == -1){
- for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+ for(i=0;i<(gint)event_viewer_data->event_fields_queue_tmp->length;i++){
data = (EventFields*)g_list_nth_data(tmpList,i);
- if(data->pid == -1 && data->cpu_id == j) data->pid = pid;
+ if(data->pid == -1 && (gint)data->cpu_id == j) data->pid = pid;
}
}
}
g_array_free(tmp_pid_array, TRUE);
//add data from tmp queue into the queue
- event_viewer_data->number_of_events = event_viewer_data->event_fields_queue->length
- + event_viewer_data->event_fields_queue_tmp->length;
+ event_viewer_data->number_of_events =
+ event_viewer_data->event_fields_queue->length
+ + event_viewer_data->event_fields_queue_tmp->length;
if(event_viewer_data->append){
if(event_viewer_data->event_fields_queue->length > 0)
event_viewer_data->current_event_index = event_viewer_data->event_fields_queue->length - 1;
NULL,
event_viewer_data->event_hooks,
NULL);
+ if(event_viewer_data->append == TRUE) {
+ /* append data */
+ lttv_process_traceset_middle(tsc, end, max_num_events, NULL);
+ } else{
+ guint count;
+ LttvTracefileContext *tfc;
+ /* prepend data */
+ do {
+ /* clear the temp list */
+ while(g_queue_pop_head(event_viewer_data->event_fields_queue_tmp));
+ /* read max_num events max */
+ count = lttv_process_traceset_middle(tsc, end, max_num_events, NULL);
+ /* loop if reached the max number of events to read, but not
+ * if end of trace or end time reached.*/
+ tfc = lttv_traceset_context_get_current_tfc(tsc);
+ } while(max_num_events == count
+ && (tfc != NULL && ltt_time_compare(tfc->timestamp, end) < 0));
- lttv_process_traceset_middle(tsc, end, max_num_events, NULL);
-
+ }
+
//remove_context_hooks(event_viewer_data,tsc);
lttv_process_traceset_end(tsc,
NULL,
events_request->end_time = ltt_time_infinite;
events_request->num_events = max_num_events;
events_request->end_position = NULL;
+ events_request->trace = -1; /* FIXME */
+ events_request->hooks = NULL; /* FIXME */
events_request->before_chunk_traceset = NULL;
events_request->before_chunk_trace = NULL;
events_request->before_chunk_tracefile = NULL;
}
g_string_append_printf(s, " }");
break;
+
+ case LTT_UNION:
+ g_string_append_printf(s, " {");
+ nb = ltt_type_member_number(type);
+ for(i = 0 ; i < nb ; i++) {
+ element = ltt_field_member(f,i);
+ ltt_type_member_type(type, i, &name);
+ g_string_append_printf(s, " %s = ", name);
+ get_event_detail(e, element, s);
+ }
+ g_string_append_printf(s, " }");
+ break;
+
}
}
tmp_event_fields->pid = in;
if(prev_event_fields && prev_event_fields->pid == -1){
list = event_viewer_data->event_fields_queue_tmp->head;
- for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+ for(i=0;i<(gint)event_viewer_data->event_fields_queue_tmp->length;i++){
data = (EventFields *)g_list_nth_data(list,i);
if(data->cpu_id == tmp_event_fields->cpu_id){
data->pid = out;
*/
static void init() {
- lttvwindow_register_constructor("/",
+ lttvwindow_register_constructor("guievents",
+ "/",
"Insert Event Viewer",
hGuiEventsInsert_xpm,
"Insert Event Viewer",
* everything that has been registered in the gtkTraceSet API.
*/
static void destroy() {
- int i;
-
- EventViewerData *event_viewer_data;
g_slist_foreach(g_event_viewer_data_list, event_destroy_walk, NULL );
g_slist_free(g_event_viewer_data_list);
projects / lttv.git / blobdiff