X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiEvents.c;h=94fc4a2d35c5b7d79488852616bdf234f460f241;hb=49bf71b500f112cc90b790eb3975cceac351d021;hp=3cb93299005bc74549ba8358792c5e1f37e40b9d;hpb=cc41a00ff0dc5ccf53359a6180da93126a900249;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c index 3cb93299..94fc4a2d 100644 --- a/ltt/branches/poly/lttv/modules/guiEvents.c +++ b/ltt/branches/poly/lttv/modules/guiEvents.c @@ -84,7 +84,7 @@ typedef enum _ScrollDirection{ typedef struct _EventViewerData { - mainWindow * mw; + MainWindow * mw; TimeWindow time_window; LttTime current_time; LttvHooks * before_event_hooks; @@ -129,9 +129,9 @@ typedef struct _EventViewerData { } EventViewerData ; //! Event Viewer's constructor hook -GtkWidget *h_gui_events(mainWindow *parent_window); +GtkWidget *h_gui_events(MainWindow *parent_window, LttvTracesetSelector * s, char* key); //! Event Viewer's constructor -EventViewerData *gui_events(mainWindow *parent_window); +EventViewerData *gui_events(MainWindow *parent_window, LttvTracesetSelector *s, char *key); //! Event Viewer's destructor void gui_events_destructor(EventViewerData *event_viewer_data); void gui_events_free(EventViewerData *event_viewer_data); @@ -177,14 +177,11 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { return; } - - g_critical("GUI Event Viewer init()"); - /* Register the toolbar insert button */ - ToolbarItemReg(hGuiEventsInsert_xpm, "Insert Event Viewer", h_gui_events); + toolbar_item_reg(hGuiEventsInsert_xpm, "Insert Event Viewer", h_gui_events); /* Register the menu item insert entry */ - MenuItemReg("/", "Insert Event Viewer", h_gui_events); + menu_item_reg("/", "Insert Event Viewer", h_gui_events); } @@ -204,18 +201,16 @@ G_MODULE_EXPORT void destroy() { EventViewerData *event_viewer_data; - g_critical("GUI Event Viewer destroy()"); - if(g_event_viewer_data_list){ g_slist_foreach(g_event_viewer_data_list, event_destroy_walk, NULL ); g_slist_free(g_event_viewer_data_list); } /* Unregister the toolbar insert button */ - ToolbarItemUnreg(h_gui_events); + toolbar_item_unreg(h_gui_events); /* Unregister the menu item insert entry */ - MenuItemUnreg(h_gui_events); + menu_item_unreg(h_gui_events); } /* Enumeration of the columns */ @@ -240,9 +235,9 @@ enum * @return The widget created. */ GtkWidget * -h_gui_events(mainWindow * parent_window) +h_gui_events(MainWindow * parent_window, LttvTracesetSelector * s, char* key) { - EventViewerData* event_viewer_data = gui_events(parent_window) ; + EventViewerData* event_viewer_data = gui_events(parent_window, s, key) ; if(event_viewer_data) return event_viewer_data->hbox_v; @@ -257,7 +252,7 @@ h_gui_events(mainWindow * parent_window) * @return The Event viewer data created. */ EventViewerData * -gui_events(mainWindow *parent_window) +gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key ) { LttTime start, end; GtkTreeViewColumn *column; @@ -267,8 +262,8 @@ gui_events(mainWindow *parent_window) unsigned size; event_viewer_data->mw = parent_window; - GetTimeWindow(event_viewer_data->mw, &event_viewer_data->time_window); - GetCurrentTime(event_viewer_data->mw, &event_viewer_data->current_time); + get_time_window(event_viewer_data->mw, &event_viewer_data->time_window); + get_current_time(event_viewer_data->mw, &event_viewer_data->current_time); event_viewer_data->before_event_hooks = lttv_hooks_new(); lttv_hooks_add(event_viewer_data->before_event_hooks, parse_event, event_viewer_data); @@ -276,8 +271,8 @@ gui_events(mainWindow *parent_window) event_viewer_data->raw_trace_data_queue = g_queue_new(); event_viewer_data->raw_trace_data_queue_tmp = g_queue_new(); - RegUpdateTimeWindow(update_time_window,event_viewer_data, event_viewer_data->mw); - RegUpdateCurrentTime(update_current_time,event_viewer_data, event_viewer_data->mw); + reg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw); + reg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw); event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show ( event_viewer_data->scroll_win); @@ -399,6 +394,8 @@ gui_events(mainWindow *parent_window) /* Create vertical scrollbar and pack it */ event_viewer_data->vscroll_vc = gtk_vscrollbar_new(NULL); + gtk_range_set_update_policy (GTK_RANGE(event_viewer_data->vscroll_vc), + GTK_UPDATE_DISCONTINUOUS); 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 */ @@ -419,7 +416,6 @@ gui_events(mainWindow *parent_window) // event_viewer_data->vtree_adjust_c->upper; event_viewer_data->vadjust_c->page_size = 2.0; // event_viewer_data->vtree_adjust_c->upper; - g_critical("value : %u",event_viewer_data->vtree_adjust_c->upper); /* Raw event trace */ gtk_widget_show(event_viewer_data->hbox_v); gtk_widget_show(event_viewer_data->tree_v); @@ -434,7 +430,7 @@ gui_events(mainWindow *parent_window) event_viewer_data->num_visible_events = 1; //get the life span of the traceset and set the upper of the scroll bar - getTracesetTimeSpan(event_viewer_data->mw, &event_viewer_data->time_span); + get_traceset_time_span(event_viewer_data->mw, &event_viewer_data->time_span); start = ltt_time_sub(event_viewer_data->time_span.endTime, event_viewer_data->time_span.startTime); event_viewer_data->vadjust_c->upper = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND; @@ -460,6 +456,11 @@ gui_events(mainWindow *parent_window) // tree_v_set_cursor(event_viewer_data); + g_object_set_data( + G_OBJECT(event_viewer_data->hbox_v), + key, + s); + g_object_set_data_full( G_OBJECT(event_viewer_data->hbox_v), "event_viewer_data", @@ -506,7 +507,6 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data) event_viewer_data->selected_event = FALSE; event_viewer_data->currently_selected_event = 0; } - g_critical("DEBUG : Event Selected : %i , num: %u", event_viewer_data->selected_event, event_viewer_data->currently_selected_event) ; gtk_tree_path_free(path); @@ -531,8 +531,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, indices = gtk_tree_path_get_indices(path); - g_critical("DEBUG : move cursor step : %u , int : %i , indice : %i", (guint)arg1, arg2, indices[0]) ; - value = gtk_adjustment_get_value(event_viewer_data->vadjust_c); if(arg1 == GTK_MOVEMENT_DISPLAY_LINES) @@ -546,7 +544,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, if(value + event_viewer_data->num_visible_events <= event_viewer_data->number_of_events -1) { - g_critical("need 1 event down") ; event_viewer_data->currently_selected_event += 1; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, value+1); //gtk_tree_path_free(path); @@ -561,7 +558,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, { if(value - 1 >= 0 ) { - g_critical("need 1 event up") ; event_viewer_data->currently_selected_event -= 1; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, value-1); //gtk_tree_path_free(path); @@ -586,8 +582,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, if(value + event_viewer_data->num_visible_events-1 <= event_viewer_data->number_of_events ) { - g_critical("need 1 page down") ; - event_viewer_data->currently_selected_event += event_viewer_data->num_visible_events-1; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, // value+(event_viewer_data->num_visible_events-1)); @@ -605,8 +599,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, { if(value - (event_viewer_data->num_visible_events-1) >= 0) { - g_critical("need 1 page up") ; - event_viewer_data->currently_selected_event -= event_viewer_data->num_visible_events-1; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, @@ -618,8 +610,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, } else { /* Go to first Event */ - g_critical("need 1 page up") ; - event_viewer_data->currently_selected_event == 0 ; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, // 0); @@ -641,7 +631,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, if(arg2 == 1) { /* move end of buffer */ - g_critical("End of buffer") ; event_viewer_data->currently_selected_event = event_viewer_data->number_of_events-1 ; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, // event_viewer_data->number_of_events - @@ -652,7 +641,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor"); } else { /* Move beginning of buffer */ - g_critical("Beginning of buffer") ; event_viewer_data->currently_selected_event = 0 ; // gtk_adjustment_set_value(event_viewer_data->vadjust_c, 0); //gtk_tree_path_free(path); @@ -676,7 +664,6 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) GtkTreeModel* model = GTK_TREE_MODEL(event_viewer_data->store_m); GtkTreePath *path; - g_critical("DEBUG : cursor change"); /* On cursor change, modify the currently selected event by calling * the right API function */ tree_v_get_cursor(event_viewer_data); @@ -689,7 +676,7 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data) if(ltt_time.tv_sec != event_viewer_data->current_time.tv_sec || ltt_time.tv_nsec != event_viewer_data->current_time.tv_nsec) - SetCurrentTime(event_viewer_data->mw,<t_time); + set_current_time(event_viewer_data->mw,<t_time); }else{ g_warning("Can not get iter\n"); } @@ -702,8 +689,6 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data) EventViewerData *event_viewer_data = (EventViewerData*)data; GtkTreePath *tree_path; - g_critical("DEBUG : scroll signal, value : %f", adjustment->value); - get_test_data(adjustment->value, event_viewer_data->num_visible_events, event_viewer_data); @@ -722,8 +707,8 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data) event_viewer_data->first_event, -1); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), tree_path, - NULL, FALSE); + // gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), tree_path, + // NULL, FALSE); gtk_tree_path_free(tree_path); } @@ -735,10 +720,9 @@ gint get_cell_height(GtkTreeView *TreeView) gint height, width; 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; + GtkCellRenderer *renderer = g_list_first(Render_List)->data; gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height); - g_critical("cell 0 height : %u",height); return height; } @@ -750,17 +734,12 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer gint last_num_visible_events = event_viewer_data->num_visible_events; gdouble exact_num_visible; - g_critical("size-allocate"); - exact_num_visible = ( alloc->height - TREE_VIEW_HEADER_HEIGHT (GTK_TREE_VIEW(event_viewer_data->tree_v)) ) / (double)cell_height ; event_viewer_data->num_visible_events = ceil(exact_num_visible) ; - g_critical("number of events shown : %u",event_viewer_data->num_visible_events); - g_critical("ex number of events shown : %f",exact_num_visible); - /* event_viewer_data->vadjust_c->page_increment = floor(exact_num_visible); @@ -784,8 +763,6 @@ void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpo EventViewerData *event_viewer_data = (EventViewerData*)data; gint cell_height = get_cell_height(GTK_TREE_VIEW(event_viewer_data->tree_v)); - g_critical("size-request"); - h = cell_height + TREE_VIEW_HEADER_HEIGHT (GTK_TREE_VIEW(event_viewer_data->tree_v)); requisition->height = h; @@ -811,9 +788,20 @@ void get_test_data(double time_value, guint list_height, unsigned block_num, event_num; unsigned size = 1, count = 0; gboolean need_backward_again, backward; - - g_warning("DEBUG : get_test_data, time value %f\n", time_value); + GdkWindow * win; + GdkCursor * new; + GtkWidget* widget = gtk_widget_get_parent(event_viewer_data->hbox_v); + if(widget){ + new = gdk_cursor_new(GDK_X_CURSOR); + win = gtk_widget_get_parent_window(widget); + gdk_window_set_cursor(win, new); + gdk_cursor_unref(new); + gdk_window_stick(win); + gdk_window_unstick(win); + } + + // if(event_number > event_viewer_data->last_event || // event_number + list_height-1 < event_viewer_data->first_event || // event_viewer_data->first_event == -1) @@ -979,7 +967,7 @@ void get_test_data(double time_value, guint list_height, time = ltt_time_sub(raw_data->time, event_viewer_data->time_span.startTime); event_viewer_data->vadjust_c->value = ltt_time_to_double(time) * NANOSECONDS_PER_SECOND; g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed"); - event_viewer_data->previous_value = value; + event_viewer_data->previous_value = event_viewer_data->vadjust_c->value; } @@ -1083,7 +1071,8 @@ void get_test_data(double time_value, guint list_height, event_viewer_data->first_event = event_viewer_data->start_event_index ; event_viewer_data->last_event = event_viewer_data->end_event_index ; - + if(widget) + gdk_window_set_cursor(win, NULL); } @@ -1120,11 +1109,10 @@ gui_events_free(EventViewerData *event_viewer_data) g_queue_free(event_viewer_data->raw_trace_data_queue); g_queue_free(event_viewer_data->raw_trace_data_queue_tmp); - UnregUpdateTimeWindow(update_time_window,event_viewer_data, event_viewer_data->mw); - UnregUpdateCurrentTime(update_current_time,event_viewer_data, event_viewer_data->mw); + unreg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw); + unreg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw); g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data); - g_warning("Delete Event data\n"); g_free(event_viewer_data); } } @@ -1147,7 +1135,6 @@ gui_events_destructor(EventViewerData *event_viewer_data) //gtk_list_store_clear(event_viewer_data->store_m); //gtk_widget_destroy(GTK_WIDGET(event_viewer_data->store_m)); - g_warning("Delete Event data from destroy\n"); //gui_events_free(event_viewer_data); } @@ -1165,8 +1152,6 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) { gtk_tree_model_get (model, &iter, EVENT_COLUMN, &event, -1); - g_print ("Event selected : %s\n", event); - g_free (event); } } @@ -1177,8 +1162,6 @@ int event_selected_hook(void *hook_data, void *call_data) EventViewerData *event_viewer_data = (EventViewerData*) hook_data; guint *event_number = (guint*) call_data; - g_critical("DEBUG : event selected by main window : %u", *event_number); - event_viewer_data->currently_selected_event = *event_number; event_viewer_data->selected_event = TRUE ; @@ -1199,10 +1182,10 @@ gboolean update_current_time(void * hook_data, void * call_data) { EventViewerData *event_viewer_data = (EventViewerData*) hook_data; event_viewer_data->current_time = *(LttTime*)call_data; - uint64_t nsec = event_viewer_data->current_time.tv_sec * NANOSECONDS_PER_SECOND + guint64 nsec = event_viewer_data->current_time.tv_sec * NANOSECONDS_PER_SECOND + event_viewer_data->current_time.tv_nsec; GtkTreeIter iter; - uint64_t time; + guint64 time; int count = 0; GtkTreeModel* model = (GtkTreeModel*)event_viewer_data->store_m; @@ -1227,8 +1210,8 @@ gboolean update_current_time(void * hook_data, void * call_data) void tree_v_grab_focus(GtkWidget *widget, gpointer data){ EventViewerData *event_viewer_data = (EventViewerData *)data; - mainWindow * mw = event_viewer_data->mw; - SetFocusedPane(mw, gtk_widget_get_parent(event_viewer_data->hbox_v)); + MainWindow * mw = event_viewer_data->mw; + set_focused_pane(mw, gtk_widget_get_parent(event_viewer_data->hbox_v)); } void get_events(EventViewerData* event_viewer_data, LttTime start, @@ -1236,11 +1219,11 @@ void get_events(EventViewerData* event_viewer_data, LttTime start, { int size; RawTraceData * data; - contextAddHooks(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); - processTraceset(event_viewer_data->mw, start, end, max_num_events); - contextRemoveHooks(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); + context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); + process_traceset_api(event_viewer_data->mw, start, end, max_num_events); + context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); size = event_viewer_data->raw_trace_data_queue_tmp->length; *real_num_events = size; @@ -1278,7 +1261,7 @@ void get_events(EventViewerData* event_viewer_data, LttTime start, }else if(pid != -1 && tmpPid == -1){ for(i=0;iraw_trace_data_queue_tmp->length;i++){ data = (RawTraceData*)g_list_nth_data(tmpList,i); - if(data->pid == -1) data->pid = tmpPid; + if(data->pid == -1) data->pid = pid; } } } @@ -1494,425 +1477,3 @@ void remove_all_items_from_queue(GQueue *q) } - - - -/* Imported code from LTT 0.9.6pre2 tracevisualizer */ -#ifdef DEBUG - -/****************************************************************** - * Function : - * WDI_gtk_clist_set_last_row_data_full() - * Description : - * Appends data to the last row of a GtkClist. - * Parameters : - * Return values : - * NONE. - * History : - * J.H.D., 27/08/99, Initial typing. - * Note : - * Based on gtk_clist_set_row_data_full() version 1.2.3. - * Much faster than using gtk_clist_set_row_data_full(). - ******************************************************************/ -static void WDI_gtk_clist_set_last_row_data_full(GtkCList* pmClist, - gpointer pmData, - GtkDestroyNotify pmDestroy) -{ - GtkCListRow *pClistRow; - - g_return_if_fail (pmClist != NULL); - g_return_if_fail (GTK_IS_CLIST (pmClist)); - g_return_if_fail (pmClist->row_list_end != NULL); - - pClistRow = pmClist->row_list_end->data; - pClistRow->data = pmData; - pClistRow->destroy = pmDestroy; -} - - -/****************************************************************** - * Function : - * SHRTEventSelect() - * Description : - * Parameters : - * Return values : - * History : - * Note : - ******************************************************************/ -static void SHRTEventSelect(GtkWidget* pmCList, - gint pmRow, - gint pmColumn, - GdkEventButton* pmEvent, - gpointer pmData) -{ - systemView* pSysView; /* The system being displayed */ - - /* Do we have anything meaningfull */ - if((pSysView = (systemView*) pmData) == NULL) - return; - - /* Store the selected event */ - pSysView->Window->LastSelectedEvent = *(event*) gtk_clist_get_row_data(GTK_CLIST(pmCList), pmRow); - pSysView->Window->EventSelected = TRUE; -} - -/****************************************************************** - * Function : - * SHRTEventButtonPress() - * Description : - * Parameters : - * Return values : - * History : - * Note : - ******************************************************************/ -static void SHRTEventButtonPress(GtkWidget* pmCList, - GdkEventButton* pmEvent, - gpointer pmData) -{ - systemView* pSysView; /* The system being displayed */ - gint row, column; /* The clicked row and column */ - - /* Do we have anything meaningfull */ - if((pSysView = (systemView*) pmData) == NULL) - return; - - /* if we have a right-click event */ - if(pmEvent->button == 3) - /* If we clicked on an item, get its row and column values */ - if(gtk_clist_get_selection_info(GTK_CLIST(pmCList), pmEvent->x, pmEvent->y, &row, &column)) - { - /* Highlight the selected row */ - gtk_clist_select_row(GTK_CLIST(pmCList), row, column); - - /* Store the selected event */ - pSysView->Window->LastSelectedEvent = *(event*) gtk_clist_get_row_data(GTK_CLIST(pmCList), row); - pSysView->Window->EventSelected = TRUE; - - /* Display the popup menu */ - gtk_menu_popup(GTK_MENU(pSysView->Window->RawEventPopup), - NULL, NULL, NULL, NULL, - pmEvent->button, GDK_CURRENT_TIME); - } -} - - -/****************************************************************** - * Function : - * SHRTVAdjustValueChanged() - * Description : - * Parameters : - * Return values : - * History : - * Note : - ******************************************************************/ -static void SHRTVAdjustValueChanged(GtkAdjustment* pmVAdjust, - gpointer pmData) -{ - event lEvent; /* Event used for searching */ - guint32 lPosition; /* The position to scroll to */ - systemView* pSysView; /* The system being displayed */ - - /* Do we have anything meaningfull */ - if((pSysView = (systemView*) pmData) == NULL) - return; - - /* Is there an event database? */ - if(pSysView->EventDB == NULL) - return; - - /* Set the pointer to the first event */ - if(pSysView->EventDB->TraceStart == NULL) - return; - - /* Are we closer to the beginning? */ - if((pmVAdjust->value - (pmVAdjust->upper / 2)) < 0) - { - /* Set the navigation pointer to the beginning of the list */ - lEvent = pSysView->EventDB->FirstEvent; - - /* Calculate distance from beginning */ - lPosition = (guint32) pmVAdjust->value; - - /* Find the event in the event database */ - while(lPosition > 0) - { - lPosition--; - if(DBEventNext(pSysView->EventDB, &lEvent) != TRUE) - break; - } - } - else - { - /* Set the navigation pointer to the end of the list */ - lEvent = pSysView->EventDB->LastEvent; - - /* Calculate distance from end */ - lPosition = (guint32) (pmVAdjust->upper - pmVAdjust->value); - - /* Find the event in the event database */ - while(lPosition > 0) - { - lPosition--; - if(DBEventPrev(pSysView->EventDB, &lEvent) != TRUE) - break; - } - } - - /* Fill the event list according to what was found */ - WDFillEventList(pSysView->Window->RTCList, - pSysView->EventDB, - pSysView->System, - &lEvent, - &(pSysView->Window->LastSelectedEvent)); -} - - - -/****************************************************************** - * Function : - * WDConnectSignals() - * Description : - * Attaches signal handlers to the window items. - * Parameters : - * pmSysView, System view for which signals have to be connected - * Return values : - * NONE - * History : - * Note : - * This function attaches a pointer to the main window during - * the connect. This means that the handlers will get a pointer - * to the window in the data argument. - ******************************************************************/ -static void WDConnectSignals(systemView* pmSysView) -{ - /* Raw event Popup menu */ - gtk_signal_connect(GTK_OBJECT(pmSysView->Window->RawGotoProcess), - "activate", - GTK_SIGNAL_FUNC(SHGotoProcAnalysis), - pmSysView); - gtk_signal_connect(GTK_OBJECT(pmSysView->Window->RawViewEvent), - "activate", - GTK_SIGNAL_FUNC(SHViewEventInEG), - pmSysView); - - /* Set event list callbacks */ - gtk_signal_connect(GTK_OBJECT(pmSysView->Window->RTCList), - "select_row", - GTK_SIGNAL_FUNC(SHRTEventSelect), - pmSysView); - gtk_signal_connect(GTK_OBJECT(pmSysView->Window->RTCList), - "button-press-event", - GTK_SIGNAL_FUNC(SHRTEventButtonPress), - pmSysView); - gtk_signal_connect(GTK_OBJECT(pmSysView->Window->RTVAdjust), - "value-changed", - GTK_SIGNAL_FUNC(SHRTVAdjustValueChanged), - pmSysView); - - -} - - -/****************************************************************** - * Function : - * WDFillEventList() - * Description : - * Fills the window's event list using the trace database. - * Parameters : - * pmList, The list to be filled. - * pmTraceDB, The database of events. - * pmSystem, The system to which this list belongs. - * pmEvent, Event from which we start drawing. - * pmSelectedEvent, Event selected if any. - * Return values : - * NONE. - * History : - * K.Y., 18/06/99, Initial typing. - * Note : - ******************************************************************/ -static void WDFillEventList(GtkWidget* pmList, - db* pmTraceDB, - systemInfo* pmSystem, - event* pmEvent, - event* pmSelectedEvent) -{ - gint i = 0; /* Generic index */ - event lEvent; /* Generic event */ - gchar lTimeStr[TIME_STR_LEN]; /* Time of event */ - static gchar* lString[RTCLIST_NB_COLUMNS]={'\0'}; /* Strings describing event */ - process* pProcess; /* Generic process pointer */ -#if SUPP_RTAI - RTAItask* pTask = NULL; /* Generic task pointer */ -#endif /* SUPP_RTAI */ - eventDescription lEventDesc; /* Description of event */ - - /* Did we allocate space for strings */ - if(lString[0] == NULL) - /* Allocate space for strings */ - for (i = 0; i < RTCLIST_NB_COLUMNS - 1; i++) - lString[i] = (char*) g_malloc(MW_DEFAULT_STRLEN); - - /* Allocate space for description string */ - lString[RTCLIST_NB_COLUMNS - 1] = (char*) g_malloc(MW_LONG_STRLEN); - - /* If no event was supplied, start at the beginning */ - if(pmEvent == NULL) - lEvent = pmTraceDB->FirstEvent; - else - lEvent = *pmEvent; - - /* Freeze and clear clist */ - gtk_clist_freeze(GTK_CLIST(pmList)); - gtk_clist_clear(GTK_CLIST(pmList)); - - /* Reset index */ - i = 0; - - /* Go through the event list */ - do - { - /* Get the event description */ - DBEventDescription(pmTraceDB, &lEvent, TRUE, &lEventDesc); - - /* Get the event's process */ - pProcess = DBEventProcess(pmTraceDB, &lEvent, pmSystem, FALSE); - -#if SUPP_RTAI - /* Does this trace contain RTAI information */ - if(pmTraceDB->SystemType == TRACE_SYS_TYPE_RTAI_LINUX) - /* Get the RTAI task to which this event belongs */ - pTask = RTAIDBEventTask(pmTraceDB, &lEvent, pmSystem, FALSE); -#endif /* SUPP_RTAI */ - - /* Set the event's entry in the list of raw events displayed */ - sRawEventsDisplayed[i] = lEvent; - - /* Add text describing the event */ - /* The CPU ID */ - if(pmTraceDB->LogCPUID == TRUE) - snprintf(lString[0], MW_DEFAULT_STRLEN, "%d", lEventDesc.CPUID); - else - snprintf(lString[0], MW_DEFAULT_STRLEN, "0"); - - /* The event ID */ - snprintf(lString[1], MW_DEFAULT_STRLEN, "%s", pmTraceDB->EventString(pmTraceDB, lEventDesc.ID, &lEvent)); - - /* The event's time of occurence */ - DBFormatTimeInReadableString(lTimeStr, - lEventDesc.Time.tv_sec, - lEventDesc.Time.tv_usec); - snprintf(lString[2], MW_DEFAULT_STRLEN, "%s", lTimeStr); - - /* Is this an RT event */ - if(lEventDesc.ID <= TRACE_MAX) - { - /* The PID of the process to which the event belongs */ - if(pProcess != NULL) - snprintf(lString[3], MW_DEFAULT_STRLEN, "%d", pProcess->PID); - else - snprintf(lString[3], MW_DEFAULT_STRLEN, "N/A"); - } -#if SUPP_RTAI - else - { - /* The TID of the task to which the event belongs */ - if(pTask != NULL) - snprintf(lString[3], MW_DEFAULT_STRLEN, "RT:%d", pTask->TID); - else - snprintf(lString[3], MW_DEFAULT_STRLEN, "RT:N/A"); - } -#endif /* SUPP_RTAI */ - - /* The size of the entry */ - snprintf(lString[4], MW_DEFAULT_STRLEN, "%d", lEventDesc.Size); - - /* The string describing the event */ - snprintf(lString[5], MW_LONG_STRLEN, "%s", lEventDesc.String); - - /* Insert the entry into the list */ - gtk_clist_append(GTK_CLIST(pmList), lString); - - /* Set the row's data to point to the current event */ - WDI_gtk_clist_set_last_row_data_full(GTK_CLIST(pmList), (gpointer) &(sRawEventsDisplayed[i]), NULL); - - /* Was this the last selected event */ - if(DBEventsEqual(lEvent, (*pmSelectedEvent))) - gtk_clist_select_row(GTK_CLIST(pmList), i, 0); - - /* Go to next row */ - i++; - } while((DBEventNext(pmTraceDB, &lEvent) == TRUE) && (i < RTCLIST_NB_ROWS)); - - /* Resize the list's length */ - gtk_widget_queue_resize(pmList); - - /* Thaw the clist */ - gtk_clist_thaw(GTK_CLIST(pmList)); -} - -#endif //DEBUG - -static void destroy_cb( GtkWidget *widget, - gpointer data ) -{ - gtk_main_quit (); -} - - -/* -int main(int argc, char **argv) -{ - GtkWidget *Window; - GtkWidget *ListViewer; - GtkWidget *VBox_V; - EventViewerData *event_viewer_data; - guint ev_sel = 444 ; - - // Initialize i18n support - gtk_set_locale (); - - // Initialize the widget set - gtk_init (&argc, &argv); - - init(); - - Window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (Window), ("Test Window")); - - g_signal_connect (G_OBJECT (Window), "destroy", - G_CALLBACK (destroy_cb), NULL); - - - VBox_V = gtk_vbox_new(0, 0); - gtk_container_add (GTK_CONTAINER (Window), VBox_V); - - //ListViewer = h_gui_events(Window); - //gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, TRUE, TRUE, 0); - - //ListViewer = h_gui_events(Window); - //gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, FALSE, TRUE, 0); - - event_viewer_data = gui_events(g_new(mainWindow,1)); - ListViewer = event_viewer_data->hbox_v; - gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, TRUE, TRUE, 0); - - gtk_widget_show (VBox_V); - gtk_widget_show (Window); - - // event_selected_hook(event_viewer_data, &ev_sel); - - gtk_main (); - - g_critical("main loop finished"); - - //hGuiEvents_Destructor(ListViewer); - - //g_critical("GuiEvents Destructor finished"); - destroy(); - - return 0; -} -*/ - -/*\@}*/ -