From 5290ec02dda002f243ef98cd018f31ee44e07843 Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 31 Aug 2005 23:55:31 +0000 Subject: [PATCH] detailed event list partially works git-svn-id: http://ltt.polymtl.ca/svn@1102 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/lttv/lttv/print.c | 3 +- .../lttv/modules/gui/detailedevents/events.c | 1469 ++++------------- .../gui/lttvwindow/lttvwindow/callbacks.c | 16 + .../gui/lttvwindow/lttvwindow/lttvwindow.c | 89 +- .../gui/lttvwindow/lttvwindow/lttvwindow.h | 46 +- 5 files changed, 485 insertions(+), 1138 deletions(-) diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c index 10034244..89dad9a4 100644 --- a/ltt/branches/poly/lttv/lttv/print.c +++ b/ltt/branches/poly/lttv/lttv/print.c @@ -20,7 +20,8 @@ /* print.c * - * Event printing routines. */ + * Event printing routines. + */ #ifdef HAVE_CONFIG_H #include diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index 129a3e53..df1db075 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -58,34 +58,23 @@ #include #include #include +#include #include #include "hGuiEventsInsert.xpm" #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) + +#ifndef g_debug #define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) +#endif + +#define abs(a) (((a)<0)?(-a):(a)) /** Array containing instanced objects. Used when module is unloaded */ static GSList *g_event_viewer_data_list = NULL ; -typedef struct _EventFields{ - unsigned cpu_id; - char * event_name; - LttTime time; - int pid; - unsigned entry_length; - char * event_description; - LttEventPosition *ep; -} EventFields; - -#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 - -static const LttTime ltt_time_backward = { 1 , 0 }; - typedef enum _ScrollDirection{ SCROLL_STEP_UP, SCROLL_STEP_DOWN, @@ -100,26 +89,19 @@ typedef struct _EventViewerData { Tab * tab; LttvHooks * event_hooks; - gboolean append; // prepend or append item - GQueue * event_fields_queue; // buf to contain event fields - GQueue * event_fields_queue_tmp; // tmp buf to contain event fields - unsigned current_event_index; - /* previous value is used to determine if it is a page up/down or * step up/down, in which case we move of a certain amount of events (one or * the number of events shown on the screen) instead of changing begin time. */ double previous_value; - - 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; /* Model containing list data */ GtkListStore *store_m; + + GPtrArray *pos; /* Array of LttvTracesetContextPosition * */ GtkWidget *hbox_v; /* Widget to display the data in a columned list */ @@ -136,11 +118,8 @@ typedef struct _EventViewerData { GtkTreeSelection *select_c; gint num_visible_events; - gint first_event, last_event; - gint number_of_events ; gint currently_selected_event; - gboolean selected_event ; } EventViewerData ; @@ -148,12 +127,6 @@ typedef struct _EventViewerData { 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(Tab *tab); @@ -172,37 +145,38 @@ void tree_v_set_cursor(EventViewerData *event_viewer_data); void tree_v_get_cursor(EventViewerData *event_viewer_data); /* Prototype for selection handler callback */ -static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data); +static void tree_selection_changed_cb (GtkTreeSelection *selection, + gpointer data); static void v_scroll_cb (GtkAdjustment *adjustment, gpointer data); -static void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer data); -static void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpointer data); +static void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, + gpointer data); +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 get_data(double time, guint list_height, - EventViewerData *event_viewer_data); +static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, + gint arg2, gpointer 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 void get_events(double time, EventViewerData *event_viewer_data); -static gboolean parse_event(void *hook_data, void *call_data); +int event_hook(void *hook_data, void *call_data); /* Enumeration of the columns */ enum { + TRACE_NAME_COLUMN, + TRACEFILE_NAME_COLUMN, CPUID_COLUMN, EVENT_COLUMN, - TIME_COLUMN, + FACILITY_COLUMN, + TIME_S_COLUMN, + TIME_NS_COLUMN, PID_COLUMN, - ENTRY_LEN_COLUMN, EVENT_DESCR_COLUMN, + POSITION_COLUMN, N_COLUMNS }; - /** * Event Viewer's constructor hook * @@ -238,15 +212,13 @@ gui_events(Tab *tab) event_viewer_data->tab = tab; event_viewer_data->event_hooks = lttv_hooks_new(); - lttv_hooks_add(event_viewer_data->event_hooks, parse_event, event_viewer_data, LTTV_PRIO_DEFAULT); - - event_viewer_data->event_fields_queue = g_queue_new(); - event_viewer_data->event_fields_queue_tmp = g_queue_new(); + lttv_hooks_add(event_viewer_data->event_hooks, + event_hook, + event_viewer_data, + LTTV_PRIO_DEFAULT); lttvwindow_register_current_time_notify(tab, update_current_time,event_viewer_data); - //lttvwindow_register_show_notify(tab, - // show_event_detail,event_viewer_data); lttvwindow_register_traceset_notify(tab, traceset_changed,event_viewer_data); @@ -256,19 +228,23 @@ gui_events(Tab *tab) GTK_SCROLLED_WINDOW(event_viewer_data->scroll_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); - /* TEST DATA, TO BE READ FROM THE TRACE */ - event_viewer_data->currently_selected_event = 0; - event_viewer_data->selected_event = FALSE; + event_viewer_data->currently_selected_event = -1; /* Create a model for storing the data list */ event_viewer_data->store_m = gtk_list_store_new ( N_COLUMNS, /* Total number of columns */ - G_TYPE_INT, /* CPUID */ + G_TYPE_STRING, /* Trace name */ + G_TYPE_STRING, /* Tracefile name */ + G_TYPE_UINT, /* CPUID */ G_TYPE_STRING, /* Event */ - G_TYPE_UINT64, /* Time */ + G_TYPE_STRING, /* Facility */ + G_TYPE_UINT, /* Time s */ + G_TYPE_UINT, /* Time ns */ G_TYPE_INT, /* PID */ - G_TYPE_INT, /* Entry length */ - G_TYPE_STRING); /* Event's description */ + G_TYPE_STRING, /* Event's description */ + G_TYPE_POINTER);/* Position (not shown) */ + + event_viewer_data->pos = g_ptr_array_sized_new(10); /* Create the viewer widget for the columned list */ event_viewer_data->tree_v = @@ -290,7 +266,8 @@ gui_events(Tab *tab) event_viewer_data); // Use on each column! - //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v, GTK_TREE_VIEW_COLUMN_FIXED); + //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v, + //GTK_TREE_VIEW_COLUMN_FIXED); /* The view now holds a reference. We can get rid of our own * reference */ @@ -301,13 +278,14 @@ gui_events(Tab *tab) * cell_renderer to the first column of the model */ /* Columns alignment : 0.0 : Left 0.5 : Center 1.0 : Right */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("CPUID", + column = gtk_tree_view_column_new_with_attributes ("Trace", renderer, - "text", CPUID_COLUMN, + "text", TRACE_NAME_COLUMN, NULL); gtk_tree_view_column_set_alignment (column, 0.0); - gtk_tree_view_column_set_fixed_width (column, 45); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); + gtk_tree_view_column_set_fixed_width (column, 120); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); event_viewer_data->button = column->button; @@ -316,6 +294,29 @@ gui_events(Tab *tab) G_CALLBACK(header_size_allocate), (gpointer)event_viewer_data); + + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Tracefile", + renderer, + "text", TRACEFILE_NAME_COLUMN, + NULL); + gtk_tree_view_column_set_alignment (column, 0.0); + gtk_tree_view_column_set_fixed_width (column, 120); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); + + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("CPUID", + renderer, + "text", CPUID_COLUMN, + NULL); + gtk_tree_view_column_set_alignment (column, 0.0); + gtk_tree_view_column_set_fixed_width (column, 45); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); + renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Event", renderer, @@ -323,34 +324,49 @@ gui_events(Tab *tab) NULL); gtk_tree_view_column_set_alignment (column, 0.0); gtk_tree_view_column_set_fixed_width (column, 120); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); - + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); + renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Time", + column = gtk_tree_view_column_new_with_attributes ("Facility", renderer, - "text", TIME_COLUMN, + "text", FACILITY_COLUMN, NULL); - gtk_tree_view_column_set_alignment (column, 1.0); + gtk_tree_view_column_set_alignment (column, 0.0); gtk_tree_view_column_set_fixed_width (column, 120); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("PID", + column = gtk_tree_view_column_new_with_attributes ("Time (s)", renderer, - "text", PID_COLUMN, + "text", TIME_S_COLUMN, NULL); gtk_tree_view_column_set_alignment (column, 1.0); - gtk_tree_view_column_set_fixed_width (column, 45); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); + gtk_tree_view_column_set_fixed_width (column, 120); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Entry Length", + column = gtk_tree_view_column_new_with_attributes ("Time (ns)", renderer, - "text", ENTRY_LEN_COLUMN, + "text", TIME_NS_COLUMN, NULL); gtk_tree_view_column_set_alignment (column, 1.0); - gtk_tree_view_column_set_fixed_width (column, 60); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); + gtk_tree_view_column_set_fixed_width (column, 120); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); + + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("PID", + renderer, + "text", PID_COLUMN, + NULL); + gtk_tree_view_column_set_alignment (column, 1.0); + gtk_tree_view_column_set_fixed_width (column, 45); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Event Description", @@ -358,20 +374,25 @@ gui_events(Tab *tab) "text", EVENT_DESCR_COLUMN, NULL); gtk_tree_view_column_set_alignment (column, 0.0); - gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column); + gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), + column); /* Setup the selection handler */ - event_viewer_data->select_c = gtk_tree_view_get_selection (GTK_TREE_VIEW (event_viewer_data->tree_v)); - gtk_tree_selection_set_mode (event_viewer_data->select_c, GTK_SELECTION_SINGLE); + event_viewer_data->select_c = + gtk_tree_view_get_selection (GTK_TREE_VIEW (event_viewer_data->tree_v)); + gtk_tree_selection_set_mode (event_viewer_data->select_c, + GTK_SELECTION_SINGLE); g_signal_connect (G_OBJECT (event_viewer_data->select_c), "changed", G_CALLBACK (tree_selection_changed_cb), event_viewer_data); - gtk_container_add (GTK_CONTAINER (event_viewer_data->scroll_win), event_viewer_data->tree_v); + gtk_container_add (GTK_CONTAINER (event_viewer_data->scroll_win), + event_viewer_data->tree_v); event_viewer_data->hbox_v = gtk_hbox_new(0, 0); - gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), event_viewer_data->scroll_win, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), + event_viewer_data->scroll_win, TRUE, TRUE, 0); /* Create vertical scrollbar and pack it */ event_viewer_data->vscroll_vc = gtk_vscrollbar_new(NULL); @@ -379,10 +400,12 @@ gui_events(Tab *tab) GTK_UPDATE_CONTINUOUS); // Changed by MD : more user friendly :) //GTK_UPDATE_DISCONTINUOUS); - gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), event_viewer_data->vscroll_vc, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v), + event_viewer_data->vscroll_vc, FALSE, TRUE, 0); /* Get the vertical scrollbar's adjustment */ - event_viewer_data->vadjust_c = gtk_range_get_adjustment(GTK_RANGE(event_viewer_data->vscroll_vc)); + event_viewer_data->vadjust_c = + gtk_range_get_adjustment(GTK_RANGE(event_viewer_data->vscroll_vc)); event_viewer_data->vtree_adjust_c = gtk_tree_view_get_vadjustment( GTK_TREE_VIEW (event_viewer_data->tree_v)); @@ -405,11 +428,9 @@ gui_events(Tab *tab) gtk_widget_show(event_viewer_data->vscroll_vc); /* Add the object's information to the module's array */ - g_event_viewer_data_list = g_slist_append(g_event_viewer_data_list, event_viewer_data); + g_event_viewer_data_list = g_slist_append(g_event_viewer_data_list, + event_viewer_data); - event_viewer_data->first_event = -1 ; - event_viewer_data->last_event = 0 ; - event_viewer_data->num_visible_events = 1; //get the life span of the traceset and set the upper of the scroll bar @@ -422,17 +443,11 @@ gui_events(Tab *tab) event_viewer_data->vadjust_c->upper = ltt_time_to_double(end); - event_viewer_data->append = TRUE; - - event_viewer_data->start_event_index = 0; - event_viewer_data->end_event_index = event_viewer_data->num_visible_events - 1; - /* Set the Selected Event */ // tree_v_set_cursor(event_viewer_data); // event_viewer_data->current_time_updated = FALSE; - event_viewer_data->size = RESERVE_SMALL_SIZE; - + // g_object_set_data_full( G_OBJECT(event_viewer_data->hbox_v), "event_viewer_data", @@ -462,14 +477,14 @@ void tree_v_set_cursor(EventViewerData *event_viewer_data) { GtkTreePath *path; - if(event_viewer_data->selected_event && event_viewer_data->first_event != -1) + if(event_viewer_data->currently_selected_event != -1) { path = gtk_tree_path_new_from_indices( - event_viewer_data->currently_selected_event- - event_viewer_data->first_event, + event_viewer_data->currently_selected_event, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + path, NULL, FALSE); gtk_tree_path_free(path); } } @@ -479,19 +494,14 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data) GtkTreePath *path; gint *indices; - gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), &path, NULL); + gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), + &path, NULL); indices = gtk_tree_path_get_indices(path); if(indices != NULL) - { - event_viewer_data->selected_event = TRUE; - event_viewer_data->currently_selected_event = - event_viewer_data->first_event + indices[0]; - - } else { - event_viewer_data->selected_event = FALSE; - event_viewer_data->currently_selected_event = 0; - } + event_viewer_data->currently_selected_event = indices[0]; + else + event_viewer_data->currently_selected_event = -1; gtk_tree_path_free(path); @@ -524,13 +534,17 @@ void tree_v_move_cursor_cb (GtkWidget *widget, value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); + g_debug("tree view move cursor : arg1 is %u and arg2 is %d", + (guint)arg1, arg2); + +#if 0 if(arg1 == GTK_MOVEMENT_DISPLAY_LINES) { /* Move one line */ if(arg2 == 1) { /* move one line down */ - if(indices[0] == event_viewer_data->num_visible_events - 1) + if(indices[0]) // Do we need an empty field here (before first)? { if(value + event_viewer_data->num_visible_events <= event_viewer_data->number_of_events -1) @@ -639,7 +653,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget, g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor"); } } - +#endif //0 gtk_tree_path_free(path); } @@ -647,28 +661,22 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) { EventViewerData *event_viewer_data = (EventViewerData*) data; Tab *tab = event_viewer_data->tab; - LttTime current_time = lttvwindow_get_current_time(tab); - LttTime ltt_time; - guint64 time; GtkTreeIter iter; GtkTreeModel* model = GTK_TREE_MODEL(event_viewer_data->store_m); GtkTreePath *path; + LttvTracesetContextPosition *pos; + /* On cursor change, modify the currently selected event by calling * the right API function */ tree_v_get_cursor(event_viewer_data); - gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), &path, NULL); + 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, TIME_COLUMN, &time, -1); - ltt_time.tv_sec = time / NANOSECONDS_PER_SECOND; - ltt_time.tv_nsec = time % NANOSECONDS_PER_SECOND; + gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1); - 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,ltt_time); - } + lttvwindow_report_current_position(tab, pos); }else{ g_warning("Can not get iter\n"); } @@ -681,28 +689,18 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data) EventViewerData *event_viewer_data = (EventViewerData*)data; GtkTreePath *tree_path; - get_data(adjustment->value, event_viewer_data->num_visible_events, - event_viewer_data); + get_events(adjustment->value, event_viewer_data); - - if(event_viewer_data->currently_selected_event - >= event_viewer_data->first_event - && - event_viewer_data->currently_selected_event - <= event_viewer_data->last_event - && - event_viewer_data->selected_event) - { + if(event_viewer_data->currently_selected_event != -1) { tree_path = gtk_tree_path_new_from_indices( - event_viewer_data->currently_selected_event- - event_viewer_data->first_event, + event_viewer_data->currently_selected_event, -1); // gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), tree_path, // NULL, FALSE); gtk_tree_path_free(tree_path); - } + } } static __inline gint get_cell_height(GtkTreeView *TreeView) @@ -741,9 +739,7 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer event_viewer_data->num_visible_events); if(event_viewer_data->num_visible_events != last_num_visible_events) { - get_data(event_viewer_data->vadjust_c->value, - event_viewer_data->num_visible_events, - event_viewer_data); + get_events(event_viewer_data->vadjust_c->value, event_viewer_data); } @@ -789,598 +785,216 @@ gboolean show_event_detail(void * hook_data, void * call_data) #endif //0 -void insert_data_into_model(EventViewerData *event_viewer_data, int start, int end) -{ - int i; - guint64 real_data; - EventFields * raw_data; - GList * first; - GtkTreeIter iter; - - first = event_viewer_data->event_fields_queue->head; - for(i=start; i=event_viewer_data->number_of_events) break; - raw_data = (EventFields*)g_list_nth_data(first, i); - - // Add a new row to the model - real_data = raw_data->time.tv_sec; - real_data *= NANOSECONDS_PER_SECOND; - real_data += raw_data->time.tv_nsec; - gtk_list_store_append (event_viewer_data->store_m, &iter); - gtk_list_store_set (event_viewer_data->store_m, &iter, - CPUID_COLUMN, raw_data->cpu_id, - EVENT_COLUMN, raw_data->event_name, - TIME_COLUMN, real_data, - PID_COLUMN, raw_data->pid, - ENTRY_LEN_COLUMN, raw_data->entry_length, - EVENT_DESCR_COLUMN, raw_data->event_description, - -1); - } -} -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, - EventViewerData *event_viewer_data) -{ - LttEvent * ev = ltt_event_new(); - get_data_wrapped(time_value, list_height, - event_viewer_data, ev); - ltt_event_destroy(ev); -} -static void get_data_wrapped(double time_value, gint list_height, - EventViewerData *event_viewer_data, LttEvent *ev) +static void get_events(double new_value, EventViewerData *event_viewer_data) { - int i; - GtkTreeModel *model = GTK_TREE_MODEL(event_viewer_data->store_m); - EventFields * event_fields; - ScrollDirection direction = SCROLL_NONE; - GList * first; - gint event_number = event_viewer_data->start_event_index; - double value = event_viewer_data->previous_value - time_value; - LttTime start, end, time; - gint backward_num, minNum, maxNum; - LttTracefile * tf; - unsigned block_num; - gint size = 1, count = 0; - gboolean need_backward_again, backward; - LttvTracesetContext * tsc = - lttvwindow_get_traceset_context(event_viewer_data->tab); - TimeInterval time_span = tsc->time_span; + LttvTracesetStats *tss = + lttvwindow_get_traceset_stats(event_viewer_data->tab); + LttvTracesetContext *tsc = (LttvTracesetContext*)tss; + guint i; + + double value = new_value - event_viewer_data->previous_value; + event_viewer_data->previous_value = new_value; - // 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 < 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; + /* See where we have to scroll... */ + ScrollDirection direction; + gint relative_position; + + 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: - if(direction == SCROLL_STEP_UP) g_debug("direction STEP_UP"); - case SCROLL_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){ - minNum = list_height - event_viewer_data->start_event_index ; - }else{ - minNum = 1; - } - first = event_viewer_data->event_fields_queue->head; - if(!first)break; - event_fields = (EventFields*)first->data; - end = event_fields->time; - - 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, backward_start, end, maxNum, &size); - event_viewer_data->start_event_index = event_viewer_data->current_event_index; - - 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){ - count++; - }else{ - count = 0; - } - }while(need_backward_again); - } - if(direction == SCROLL_STEP_UP) - event_number = event_viewer_data->start_event_index - 1; - else - event_number = event_viewer_data->start_event_index - list_height; - break; - case SCROLL_STEP_DOWN: - g_debug("direction STEP_DOWN"); - if(event_viewer_data->end_event_index == event_viewer_data->number_of_events - 1){ - event_viewer_data->append = TRUE; - first = event_viewer_data->event_fields_queue->head; - if(!first)break; - event_fields = (EventFields*)g_list_nth_data(first,event_viewer_data->number_of_events - 1); - start = event_fields->time; - start.tv_nsec++; - end = ltt_time_infinite; - 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(size==0) event_number = event_viewer_data->start_event_index; - else event_number = event_viewer_data->number_of_events - size - list_height + 1; - }else event_number = event_viewer_data->start_event_index + 1; - break; - case SCROLL_PAGE_DOWN: - g_debug("direction PAGE_DOWN"); - i = event_viewer_data->number_of_events - 1 - list_height; - if((gint)(event_viewer_data->end_event_index) >= i){ - int remain_events = event_viewer_data->number_of_events - 1 - - event_viewer_data->end_event_index; - event_viewer_data->append = TRUE; - first = event_viewer_data->event_fields_queue->head; - if(!first)break; - event_fields = (EventFields*)g_list_nth_data(first,event_viewer_data->number_of_events - 1); - start = event_fields->time; - start.tv_nsec++; - end = ltt_time_infinite; - 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); } - remain_events += size; - if(list_height <= remain_events) - event_number = event_viewer_data->number_of_events - remain_events - 1; - else - event_number = event_viewer_data->number_of_events - 1 - list_height; - }else event_number = event_viewer_data->start_event_index + list_height - 1; - break; - case SCROLL_JUMP: - g_debug("direction SCROLL_JUMP"); - event_viewer_data->append = TRUE; - remove_all_items_from_queue(event_viewer_data->event_fields_queue); - end = ltt_time_infinite; - 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); - if(size < list_height && size > 0){ - event_viewer_data->append = FALSE; - 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 if(value > 0.0) { + if(value <= 1.0) direction = SCROLL_STEP_DOWN; else { - g_assert(end.tv_sec != 0); - end.tv_sec--; - 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){ - 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; - 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; + if(value <= 2.0) direction = SCROLL_PAGE_DOWN; + else direction = SCROLL_JUMP; } - event_number = event_viewer_data->event_fields_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; - } - break; - case SCROLL_NONE: - g_debug("direction SCROLL_NONE"); - event_number = event_viewer_data->current_event_index; - break; - default: + } else direction = SCROLL_NONE; /* 0.0 */ + + + switch(direction) { + case SCROLL_STEP_UP: + g_debug("get_events : SCROLL_STEP_UP"); + relative_position = -1; break; - } + case SCROLL_STEP_DOWN: + g_debug("get_events : SCROLL_STEP_DOWN"); + relative_position = 1; + break; + case SCROLL_PAGE_UP: + g_debug("get_events : SCROLL_PAGE_UP"); + relative_position = -(event_viewer_data->num_visible_events); + break; + case SCROLL_PAGE_DOWN: + g_debug("get_events : SCROLL_PAGE_DOWN"); + relative_position = event_viewer_data->num_visible_events; + break; + case SCROLL_JUMP: + g_debug("get_events : SCROLL_JUMP"); + relative_position = 0; + break; + case SCROLL_NONE: + g_debug("get_events : SCROLL_NONE"); + goto end; + break; + } - if(event_number < 0) event_number = 0; - - //update the value of the scroll bar - if(direction != SCROLL_NONE && direction != SCROLL_JUMP){ - g_debug("updating scrollbar value because near."); - first = event_viewer_data->event_fields_queue->head; - if(first){ - 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); - //gtk_adjustment_set_value(event_viewer_data->vadjust_c, - // 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); - } - } - + LttTime time = ltt_time_from_double(new_value); + time = ltt_time_add(tsc->time_span.start_time, time); - 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; + if(relative_position) { + + LttvTracesetContextPosition *pos = + lttv_traceset_context_position_new(tsc); + + /* Remember the beginning position */ + if(event_viewer_data->pos->len > 0) { + LttvTracesetContextPosition *first_pos = + (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos, + 0); + lttv_traceset_context_position_copy(pos, first_pos); + g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); + } else { + /* There is nothing in the list : simply seek to the time value. */ + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, + time); } - - first = event_viewer_data->event_fields_queue->head; + + /* Clear the model (don't forget to free the TCS positions!) */ 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); - - insert_data_into_model(event_viewer_data,event_number, event_number+list_height); - } + for(i=0;ipos->len;i++) { + LttvTracesetContextPosition *cur_pos = + (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos, + i); + lttv_traceset_context_position_destroy(cur_pos); + } + g_ptr_array_set_size(event_viewer_data->pos, 0); - event_viewer_data->first_event = event_viewer_data->start_event_index ; - event_viewer_data->last_event = event_viewer_data->end_event_index ; + /* Note that, as we mess with the tsc position, this function CANNOT be called + * from a hook inside the lttv_process_traceset_middle. */ + /* As the lttvwindow API keeps a sync_position inside the tsc to go back at + * the right spot after being interrupted, it's ok to change the tsc position, + * as long as we do not touch the sync_position. */ - LAST: - return; + /* Get the beginning position of the read (with seek backward or seek forward) + */ + if(relative_position > 0) { + guint count; + count = lttv_process_traceset_seek_n_forward(tsc, relative_position, + lttvwindow_get_filter(event_viewer_data->tab)); + } else { /* < 0 */ + guint count; + count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position), + seek_back_default_offset, lttv_process_traceset_seek_time, + lttvwindow_get_filter(event_viewer_data->tab)); + } -} + lttv_traceset_context_position_destroy(pos); + } else { + /* Seek by time */ + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, + time); + } + + /* Mathieu : + * I make the choice not to use the mainwindow lttvwindow API here : it will + * be faster to read the events ourself from lttv_process_traceset_middle, as + * we are already at the right read position. It would be costier to use the + * seek time closest for nothing, as we only have few events to read. + */ -void add_test_data(EventViewerData *event_viewer_data) -{ - GtkTreeIter iter; - int i; + lttv_process_traceset_begin(tsc, + NULL, NULL, NULL, event_viewer_data->event_hooks, NULL); - for(i=0; i<10; i++) - { - /* Add a new row to the model */ - 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); - } + lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL); + + lttv_process_traceset_end(tsc, + NULL, NULL, NULL, event_viewer_data->event_hooks, NULL); +end: + return; } -void -gui_events_free(EventViewerData *event_viewer_data) -{ - Tab *tab = event_viewer_data->tab; - - if(event_viewer_data){ - lttv_hooks_remove(event_viewer_data->event_hooks,parse_event); - lttv_hooks_destroy(event_viewer_data->event_hooks); - - remove_all_items_from_queue (event_viewer_data->event_fields_queue); - g_queue_free(event_viewer_data->event_fields_queue); - g_queue_free(event_viewer_data->event_fields_queue_tmp); - lttvwindow_unregister_current_time_notify(tab, - update_current_time, event_viewer_data); - //lttvwindow_unregister_show_notify(tab, - // show_event_detail, event_viewer_data); - lttvwindow_unregister_traceset_notify(tab, - traceset_changed, event_viewer_data); - g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data); - g_free(event_viewer_data); - } -} - -void -gui_events_destructor(EventViewerData *event_viewer_data) +int 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); + 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); + LttvTraceState *ts = (LttvTraceState*)tfc->t_context; + LttvProcessState *process = ts->running_process[cpu]; + + GtkTreeIter iter; - /* 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); - } -} - + GString *desc = g_string_new(""); -static void -tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) -{ - EventViewerData *event_viewer_data = (EventViewerData*)data; - GtkTreeIter iter; - GtkTreeModel *model = GTK_TREE_MODEL(event_viewer_data->store_m); - gchar *event; - - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gtk_tree_model_get (model, &iter, EVENT_COLUMN, &event, -1); - - g_free (event); - } -} + LttvTracesetContextPosition *pos = + lttv_traceset_context_position_new(tfc->t_context->ts_context); + if(field) + lttv_print_field(e, field, desc, TRUE); -#if 0 -/* 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, k, m,n, nbi, id; - gint nb_tracefile, nb_facility, nb_event; - LttTrace *trace; - LttvTraceContext *tc; - LttvTracefileContext *tfc; - gboolean selected; - LttFacility * fac; - LttEventType * et; - - //if there are hooks for traceset, add them here + g_info("field : %s", desc->str); - nbi = lttv_traceset_number(tsc->ts); - for(i = 0 ; i < nbi ; 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]; - trace = tc->t; - //if there are hooks for trace, add them here - - nb_tracefile = ltt_trace_control_tracefile_number(trace) + - ltt_trace_per_cpu_tracefile_number(trace); - - for(j = 0 ; j < nb_tracefile ; j++) { - tf_s = lttv_trace_selector_tracefile_get(t_s,j); - selected = lttv_tracefile_selector_get_selected(tf_s); - if(!selected) continue; - tfc = tc->tracefiles[j]; - - //if there are hooks for tracefile, add them here - // lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL, - // event_viewer_data->event_hooks,NULL); - - nb_facility = ltt_trace_facility_number(trace); - n = 0; - for(k=0;kevent_hooks); - } - n++; - } - } + gtk_list_store_append (event_viewer_data->store_m, &iter); + gtk_list_store_set (event_viewer_data->store_m, &iter, + TRACE_NAME_COLUMN, g_quark_to_string(ltt_trace_name(tfc->t_context->t)), + TRACEFILE_NAME_COLUMN, g_quark_to_string(ltt_tracefile_name(tfc->tf)), + CPUID_COLUMN, cpu, + FACILITY_COLUMN, g_quark_to_string(ltt_facility_name(facility)), + EVENT_COLUMN, g_quark_to_string(ltt_eventtype_name(event_type)), + TIME_S_COLUMN, time.tv_sec, + TIME_NS_COLUMN, time.tv_nsec, + PID_COLUMN, process->pid, + EVENT_DESCR_COLUMN, desc->str, + POSITION_COLUMN, pos, + -1); - } - } + g_ptr_array_add(event_viewer_data->pos, pos); - //add hooks for process_traceset - // lttv_traceset_context_add_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL, - // NULL, NULL, NULL,event_viewer_data->event_hooks,NULL); + g_string_free(desc, TRUE); + + if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events) + return TRUE; + else + return FALSE; } -void remove_context_hooks(EventViewerData * event_viewer_data, - LttvTracesetContext * tsc) -{ - gint i, j, k, m, nbi, n, id; - gint nb_tracefile, nb_facility, nb_event; - LttTrace *trace; - LttvTraceContext *tc; - LttvTracefileContext *tfc; - LttvTracesetSelector * ts_s; - 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); - - //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_trace_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_tracefile = ltt_trace_control_tracefile_number(trace) + - ltt_trace_per_cpu_tracefile_number(trace); - - for(j = 0 ; j < nb_tracefile ; j++) { - tf_s = lttv_trace_selector_tracefile_get(t_s,j); - selected = lttv_tracefile_selector_get_selected(tf_s); - if(!selected) continue; - tfc = tc->tracefiles[j]; - - //if there are hooks for tracefile, remove them here - // lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL, - // event_viewer_data->event_hooks,NULL); - - nb_facility = ltt_trace_facility_number(trace); - n = 0; - for(k=0;kevent_hooks,NULL); -} -#endif //0 + gboolean update_current_time(void * hook_data, void * call_data) { EventViewerData *event_viewer_data = (EventViewerData*) hook_data; const LttTime * current_time = (LttTime*)call_data; - guint64 nsec = (guint64)current_time->tv_sec * NANOSECONDS_PER_SECOND - + (guint64)current_time->tv_nsec; - GtkTreeIter iter; - guint64 time; - GtkTreeModel* model = (GtkTreeModel*)event_viewer_data->store_m; - GList * list; - EventFields * data, *data1; - GtkTreePath* path; - char str_path[64]; - 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)){ - 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; - } - } - } - } - } + + LttTime time = ltt_time_sub(*current_time, tsc->time_span.start_time); + double new_value = ltt_time_to_double(time); + GtkTreePath *path; - 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; - data = (EventFields*)g_list_nth_data(list,0); - data1 = (EventFields*)g_list_nth_data(list,event_viewer_data->event_fields_queue->length-1); -#if 0 - //the event is in the buffer - if(ltt_time_compare(data->time, *current_time)<=0 && - ltt_time_compare(data1->time, *current_time)>=0){ - for(i=0;ievent_fields_queue->length;i++){ - data = (EventFields*)g_list_nth_data(list,i); - if(ltt_time_compare(data->time, *current_time) < 0){ - count++; - continue; - } - break; - } - 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); - }else{ - j = count; - count = 0; - } - t = ltt_time_sub(data->time, time_span.start_time); - 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)); - //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); - //gtk_adjustment_value_changed(event_viewer_data->vadjust_c); - - }else{//the event is not in the buffer -#endif //0 - LttTime start = ltt_time_sub(*current_time, time_span.start_time); - double position = ltt_time_to_double(start); - gtk_adjustment_set_value(event_viewer_data->vadjust_c, position); - //} - } + gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value); + + event_viewer_data->currently_selected_event = 0; - sprintf(str_path,"%d",count); - path = gtk_tree_path_new_from_string (str_path); + path = gtk_tree_path_new_from_indices( + event_viewer_data->currently_selected_event, + -1); 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"); gtk_tree_path_free(path); @@ -1396,9 +1010,8 @@ gboolean traceset_changed(void * hook_data, void * call_data) TimeInterval time_span = tsc->time_span; LttTime end; - remove_all_items_from_queue(event_viewer_data->event_fields_queue); gtk_list_store_clear(event_viewer_data->store_m); - event_viewer_data->append = TRUE; + g_ptr_array_set_size(event_viewer_data->pos, 0); end = ltt_time_sub(time_span.end_time, time_span.start_time); event_viewer_data->vadjust_c->upper = ltt_time_to_double(end); @@ -1409,459 +1022,49 @@ gboolean traceset_changed(void * hook_data, void * call_data) } -void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size) -{ - EventFields * data; - if(size > 0){ - 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->event_fields_queue->length + size > RESERVE_BIG_SIZE){ - remove_item_from_queue(event_viewer_data->event_fields_queue, - event_viewer_data->append); - } - - //update pid if it is not known - if(event_viewer_data->event_fields_queue->length > 0){ - list = event_viewer_data->event_fields_queue->head; - tmpList = event_viewer_data->event_fields_queue_tmp->head; - if(event_viewer_data->append){ - 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){ - 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;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){ - 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{ - 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){ - 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=(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){ - 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;jevent_fields_queue->length;i++){ - data = (EventFields*)g_list_nth_data(list,i); - if(data->pid == -1 && (gint)data->cpu_id == j) data->pid = tmpPid; - } - }else if(pid != -1 && tmpPid == -1){ - 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 && (gint)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->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; - else event_viewer_data->current_event_index = 0; - while((data = g_queue_pop_head(event_viewer_data->event_fields_queue_tmp)) != NULL){ - g_queue_push_tail(event_viewer_data->event_fields_queue, data); - } - }else{ - event_viewer_data->current_event_index += event_viewer_data->event_fields_queue_tmp->length; - while((data = g_queue_pop_tail(event_viewer_data->event_fields_queue_tmp)) != NULL){ - g_queue_push_head(event_viewer_data->event_fields_queue, data); - } - } - } -} -void get_events(EventViewerData* event_viewer_data, LttTime start, - LttTime end,unsigned max_num_events, unsigned * real_num_events) +void gui_events_free(EventViewerData *event_viewer_data) { - LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab); Tab *tab = event_viewer_data->tab; + guint i; + + if(event_viewer_data){ + lttv_hooks_remove(event_viewer_data->event_hooks,event_hook); + lttv_hooks_destroy(event_viewer_data->event_hooks); + + for(i=0;ipos->len;i++) { + LttvTracesetContextPosition *cur_pos = + (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos, + i); + lttv_traceset_context_position_destroy(cur_pos); + } + g_ptr_array_free(event_viewer_data->pos, TRUE); + + lttvwindow_unregister_current_time_notify(tab, + update_current_time, event_viewer_data); + //lttvwindow_unregister_show_notify(tab, + // show_event_detail, event_viewer_data); + lttvwindow_unregister_traceset_notify(tab, + traceset_changed, event_viewer_data); - //add_context_hooks(event_viewer_data,tsc); - //seek state because we use the main window's traceset context. - lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), start); - lttv_process_traceset_middle(tsc, start, G_MAXUINT, NULL); - lttv_process_traceset_begin(tsc, - NULL, - NULL, - 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)); - - } - - //remove_context_hooks(event_viewer_data,tsc); - lttv_process_traceset_end(tsc, - NULL, - NULL, - NULL, - event_viewer_data->event_hooks, - NULL); - int size; - - size = event_viewer_data->event_fields_queue_tmp->length; - *real_num_events = size; - - update_raw_data_array(event_viewer_data,size); - -#if 0 - EventsRequest *events_request = g_new(EventsRequest, 1); - // Create the hooks - LttvHooks *event = lttv_hooks_new(); - LttvHooks *after_request = lttv_hooks_new(); - - lttv_hooks_add(after_request, - after_get_events, - events_request, - LTTV_PRIO_DEFAULT); - lttv_hooks_add(event, - parse_event, - event_viewer_data, - LTTV_PRIO_DEFAULT); - - // Fill the events request - events_request->owner = event_viewer_data; - events_request->viewer_data = event_viewer_data; - events_request->servicing = FALSE; - events_request->start_time = start; - events_request->start_position = NULL; - events_request->stop_flag = FALSE; - 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; - events_request->event = event; - events_request->event_by_id = NULL; - events_request->after_chunk_tracefile = NULL; - events_request->after_chunk_trace = NULL; - events_request->after_chunk_traceset = NULL; - events_request->before_request = NULL; - events_request->after_request = after_request; - - g_debug("req : start : %u, %u", start.tv_sec, - start.tv_nsec); - - lttvwindow_events_request_remove_all(tab, - event_viewer_data); - lttvwindow_events_request(tab, events_request); -#endif //0 -} -#if 0 -static int after_get_events(void *hook_data, void *call_data) -{ - EventViewerData *event_viewer_data = (EventViewerData *)hook_data; - int size; - - size = event_viewer_data->event_fields_queue_tmp->length; - *real_num_events = size; - - update_raw_data_array(event_viewer_data,size); -} -#endif //0 - -static void get_event_detail(LttEvent *e, LttField *f, GString * s) -{ - LttType *type; - LttField *element; - char *name; - int nb, i; - - type = ltt_field_type(f); - switch(ltt_type_class(type)) { - case LTT_INT: - g_string_append_printf(s, " %ld", ltt_event_get_long_int(e,f)); - break; - - case LTT_UINT: - g_string_append_printf(s, " %lu", ltt_event_get_long_unsigned(e,f)); - break; - - case LTT_FLOAT: - g_string_append_printf(s, " %g", ltt_event_get_double(e,f)); - break; - - case LTT_STRING: - g_string_append_printf(s, " \"%s\"", ltt_event_get_string(e,f)); - break; - - case LTT_ENUM: - g_string_append_printf(s, " %s", ltt_enum_string_get(type, - ltt_event_get_unsigned(e,f)-1)); - break; - - case LTT_ARRAY: - case LTT_SEQUENCE: - g_string_append_printf(s, " {"); - nb = ltt_event_field_element_number(e,f); - element = ltt_field_element(f); - for(i = 0 ; i < nb ; i++) { - ltt_event_field_element_select(e,f,i); - get_event_detail(e, element, s); - } - g_string_append_printf(s, " }"); - break; - - case LTT_STRUCT: - 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; - - 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; - - } - -} - -static void get_pid(unsigned * in, unsigned * out, char * s) -{ - char * str; - str = strstr(s, "out ="); - if (str){ - str = str + 5; - sscanf(str,"%d", out); - }else{ - g_warning("Can not find out pid\n"); - } - - str = strstr(s,"in ="); - if (str){ - str = str + 4; - sscanf(str,"%d", in); - }else{ - g_warning("Can not find in pid\n"); + g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, + event_viewer_data); + g_free(event_viewer_data); } } -gboolean parse_event(void *hook_data, void *call_data) -{ - EventViewerData *event_viewer_data = (EventViewerData *)hook_data; - LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - LttvTracefileState *tfs = (LttvTracefileState *)call_data; - - EventFields * tmp_event_fields,*prev_event_fields = NULL, *data=NULL; - LttEvent *e; - LttTime time; - LttField * field; - unsigned in=0, out=0; - int i; - GString * detail_event = g_string_new(""); - GList * list; - - e = tfc->e; - field = ltt_event_field(e); - time = ltt_event_time(e); - - tmp_event_fields = g_new(EventFields,1); - tmp_event_fields->cpu_id = ltt_event_cpu_id(e); - tmp_event_fields->event_name = g_strdup(ltt_eventtype_name(ltt_event_eventtype(e))); - tmp_event_fields->time = time; - tmp_event_fields->ep = ltt_event_position_new(); - - if(event_viewer_data->event_fields_queue_tmp->length){ - list = event_viewer_data->event_fields_queue_tmp->head; - for(i=event_viewer_data->event_fields_queue_tmp->length-1;i>=0;i--){ - data = (EventFields *)g_list_nth_data(list,i); - if(data->cpu_id == tmp_event_fields->cpu_id){ - prev_event_fields = data; - break; - } - } - } - - if(prev_event_fields) tmp_event_fields->pid = prev_event_fields->pid; - else tmp_event_fields->pid = -1; - - tmp_event_fields->entry_length = field == NULL ? 0 : ltt_field_size(field); - if(field) get_event_detail(e, field, detail_event); - tmp_event_fields->event_description = g_strdup(detail_event->str); - - if(strcmp(tmp_event_fields->event_name, "schedchange") == 0){ - get_pid(&in, &out, detail_event->str); - } - - - if(in != 0 || out != 0){ - 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<(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; - } - } - } - } - - ltt_event_position(e, tmp_event_fields->ep); - - if(event_viewer_data->event_fields_queue_tmp->length >= RESERVE_SMALL_SIZE){ - if(event_viewer_data->append){ - list = g_list_last(event_viewer_data->event_fields_queue_tmp->head); - data = (EventFields *)(list->data); - if(data->time.tv_sec == time.tv_sec && - data->time.tv_nsec == time.tv_nsec){ - g_queue_push_tail(event_viewer_data->event_fields_queue_tmp,tmp_event_fields); - }else{ - g_free(tmp_event_fields); - } - }else{ - remove_item_from_queue(event_viewer_data->event_fields_queue_tmp,TRUE); - g_queue_push_tail(event_viewer_data->event_fields_queue_tmp,tmp_event_fields); - } - }else{ - g_queue_push_tail (event_viewer_data->event_fields_queue_tmp,tmp_event_fields); - } - - g_string_free(detail_event, TRUE); - return FALSE; -} -void remove_item_from_queue(GQueue * q, gboolean fromHead) +void gui_events_destructor(EventViewerData *event_viewer_data) { - EventFields *data1, *data2 = NULL; - GList * list; - - if(fromHead){ - data1 = (EventFields *)g_queue_pop_head(q); - list = g_list_first(q->head); - if(list) - data2 = (EventFields *)(list->data); - }else{ - data1 = (EventFields *)g_queue_pop_tail(q); - list = g_list_last(q->head); - if(list) - data2 = (EventFields *)(list->data); - } - - if(data2){ - if(data1->time.tv_sec == data2->time.tv_sec && - data1->time.tv_nsec == data2->time.tv_nsec){ - remove_item_from_queue(q, fromHead); - } + /* 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(data1); - - return; } -void remove_all_items_from_queue(GQueue *q) -{ - EventFields *data; - while((data = (EventFields *)g_queue_pop_head(q)) != NULL){ - g_free(data); - } -} /** @@ -1901,6 +1104,8 @@ static void destroy() { } + + LTTV_MODULE("guievents", "Detailed events view", \ "Graphical module to display a detailed event list", \ - init, destroy, "lttvwindow") + init, destroy, "lttvwindow", "print") diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index 9d5a5da6..060fcbc7 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -3588,6 +3588,22 @@ void current_time_change_manager (Tab *tab, tab->current_time_manager_lock = FALSE; } +void current_position_change_manager(Tab *tab, + LttvTracesetContextPosition *pos) +{ + LttvTracesetContext *tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + + g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); + LttTime new_time = lttv_traceset_context_position_get_time(pos); + + current_time_change_manager(tab, new_time); + + set_current_position(tab, pos); +} + + void on_MEntry5_value_changed (GtkSpinButton *spinbutton, gpointer user_data) diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c index cec78e03..96a3a48b 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c @@ -101,6 +101,27 @@ void set_current_time(Tab *tab, const LttTime *current_time) if(tmp != NULL) lttv_hooks_call(tmp, &tab->current_time); } +/* set_current_position + * + * It updates the current time of the tab, then calls the updatetimewindow + * hooks of each viewer. + * + * This is called whenever the current time value changes. + */ + +void set_current_position(Tab *tab, const LttvTracesetContextPosition *pos) +{ + LttvAttributeValue value; + LttvHooks * tmp; + + tab->current_time = lttv_traceset_context_position_get_time(pos); + + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatecurrentposition", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp != NULL) lttv_hooks_call(tmp, &pos); +} + void add_toolbar_constructor(MainWindow *mw, LttvToolbarClosure *toolbar_c) { LttvIAttribute *attributes = mw->attributes; @@ -600,7 +621,7 @@ void lttvwindow_unregister_filter_notify(Tab *tab, } /** - * Function to register a hook function for a viewer to set/update its + * function to register a hook function for a viewer to set/update its * current time. * @param tab viewer's tab * @param hook hook function of the viewer. @@ -624,7 +645,7 @@ void lttvwindow_register_current_time_notify(Tab *tab, /** - * Function to unregister a viewer's hook function which is used to + * function to unregister a viewer's hook function which is used to * set/update the current time of the viewer. * @param tab viewer's tab * @param hook hook function of the viewer. @@ -643,6 +664,50 @@ void lttvwindow_unregister_current_time_notify(Tab *tab, lttv_hooks_remove_data(tmp, hook, hook_data); } +/** + * function to register a hook function for a viewer to set/update its + * current position. + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_register_current_position_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatecurrentposition", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL){ + tmp = lttv_hooks_new(); + *(value.v_pointer) = tmp; + } + lttv_hooks_add(tmp, hook, hook_data, LTTV_PRIO_DEFAULT); +} + + +/** + * function to unregister a viewer's hook function which is used to + * set/update the current position of the viewer. + * @param tab viewer's tab + * @param hook hook function of the viewer. + * @param hook_data hook data associated with the hook function. + */ + +void lttvwindow_unregister_current_position_notify(Tab *tab, + LttvHook hook, gpointer hook_data) +{ + LttvAttributeValue value; + LttvHooks * tmp; + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatecurrentposition", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) return; + lttv_hooks_remove_data(tmp, hook, hook_data); +} + /** * Function to register a hook function for a viewer to show @@ -794,7 +859,7 @@ void lttvwindow_report_time_window(Tab *tab, /** - * Function to set the current time/event of the current tab. + * Function to set the current time of the current tab. * It will be called by a viewer's signal handle associated with * the button-release-event signal * @param tab viewer's tab @@ -810,6 +875,24 @@ void lttvwindow_report_current_time(Tab *tab, current_time_change_manager(tab, time); } +/** + * Function to set the current event of the current tab. + * It will be called by a viewer's signal handle associated with + * the button-release-event signal + * @param tab viewer's tab + * @param time a pointer where time is stored. + */ + +void lttvwindow_report_current_position(Tab *tab, + LttvTracesetContextPosition *pos) +{ + LttvAttributeValue value; + LttvHooks * tmp; + + current_position_change_manager(tab, pos); +} + + /** * Function to set the position of the hpane's dividor (viewer). * It will be called by a viewer's signal handle associated with diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h index 1533ae24..c555f7ae 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h @@ -516,6 +516,37 @@ void lttvwindow_unregister_current_time_notify(Tab *tab, LttvHook hook, gpointer hook_data); +/** + * Function to register a hook function for a viewer to set/update its + * current position. + * + * @param tab the tab the viewer belongs to. + * @param hook hook function of the viewer that updates the current time. The + * call_data is a LttTime* representing the new current time. + * @param hook_data hook data associated with the hook function. It will + * be typically a pointer to the viewer's data structure. + */ + +void lttvwindow_register_current_position_notify(Tab *tab, + LttvHook hook, + gpointer hook_data); + + +/** + * Function to unregister a viewer's hook function which is used to + * set/update the current position of the viewer. + * @param tab the tab the viewer belongs to. + * @param hook hook function of the viewer that updates the current time. The + * call_data is a LttTime* representing the new current time. + * @param hook_data hook data associated with the hook function. It will + * be typically a pointer to the viewer's data structure. + */ + +void lttvwindow_unregister_current_position_notify(Tab *tab, + LttvHook hook, + gpointer hook_data); + + /** * Function to register a hook function for a viewer to set/update the @@ -566,17 +597,28 @@ void lttvwindow_report_time_window(Tab *tab, TimeWindow time_window); /** - * Function to set the current time/event of the current tab. + * Function to set the current time of the current tab. * It will be called by a viewer's signal handle associated with * the button-release-event signal * @param tab the tab the viewer belongs to. - * @param new current time. + * @param time current time. */ void lttvwindow_report_current_time(Tab *tab, LttTime time); +/** + * Function to set the current event of the current tab. + * It will be called by a viewer's signal handle associated with + * the button-release-event signal + * @param tab the tab the viewer belongs to. + * @param pos the current position. + */ + +void lttvwindow_report_current_position(Tab *tab, + LttvTracesetContextPosition *pos); + /** * Function to set the position of the hpane's dividor (viewer). * It will typically be called by a viewer's signal handle associated -- 2.34.1