X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FAPI%2FgtkTraceSet.c;h=8aeca549af2ef66ebc3175a741eb1e97c989b2b7;hb=daecc161cdd7a5931dc553307e3509010076ac35;hp=8d0c4d35a701e61f1c46d3d577b6f96a5deeed75;hpb=308711e5772586ce8ecc22ce04e571b175309b8e;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c index 8d0c4d35..8aeca549 100644 --- a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c +++ b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c @@ -26,39 +26,18 @@ * Internal function parts */ -/** - * Function to remove toolbar from the GUI - * @param view_constructor constructor of the viewer. - */ - -void RemoveToolbar(lttv_constructor view_constructor) -{ - g_printf("Toolbar for the viewer will be removed\n"); -} - -/** - * Function to remove menu entry from the GUI - * @param view_constructor constructor of the viewer. - */ - -void RemoveMenu(lttv_constructor view_constructor) -{ - g_printf("Menu entry for the viewer will be removed\n"); -} - - /** * Function to set/update traceset for the viewers * @param main_win main window * @param traceset traceset of the main window. */ -void SetTraceset(mainWindow * main_win, gpointer traceset) +void SetTraceset(MainWindow * main_win, gpointer traceset) { LttvHooks * tmp; LttvAttributeValue value; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatetraceset", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL)return; @@ -72,12 +51,12 @@ void SetTraceset(mainWindow * main_win, gpointer traceset) * @param filter filter of the main window. */ -void SetFilter(mainWindow * main_win, gpointer filter) +void SetFilter(MainWindow * main_win, gpointer filter) { LttvHooks * tmp; LttvAttributeValue value; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatefilter", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); @@ -100,7 +79,7 @@ void SetFilter(mainWindow * main_win, gpointer filter) * @param view_constructor constructor of the viewer. */ -void ToolbarItemReg(char ** pixmap, char *tooltip, lttv_constructor view_constructor) +void toolbar_item_reg(char ** pixmap, char *tooltip, lttv_constructor view_constructor) { LttvIAttribute *attributes_global = LTTV_IATTRIBUTE(lttv_global_attributes()); LttvToolbars * toolbar; @@ -126,7 +105,7 @@ void ToolbarItemReg(char ** pixmap, char *tooltip, lttv_constructor view_constru * a reference to find out where the pixmap and tooltip are. */ -void ToolbarItemUnreg(lttv_constructor view_constructor) +void toolbar_item_unreg(lttv_constructor view_constructor) { LttvIAttribute *attributes_global = LTTV_IATTRIBUTE(lttv_global_attributes()); LttvToolbars * toolbar; @@ -136,8 +115,9 @@ void ToolbarItemUnreg(lttv_constructor view_constructor) "viewers/toolbar", LTTV_POINTER, &value)); toolbar = (LttvToolbars*)*(value.v_pointer); - if(lttv_toolbars_remove(toolbar, view_constructor)) - RemoveToolbar(view_constructor); + main_window_remove_toolbar_item(view_constructor); + + lttv_toolbars_remove(toolbar, view_constructor); } @@ -150,7 +130,7 @@ void ToolbarItemUnreg(lttv_constructor view_constructor) * @param view_constructor constructor of the viewer. */ -void MenuItemReg(char *menu_path, char *menu_text, lttv_constructor view_constructor) +void menu_item_reg(char *menu_path, char *menu_text, lttv_constructor view_constructor) { LttvIAttribute *attributes_global = LTTV_IATTRIBUTE(lttv_global_attributes()); LttvMenus * menu; @@ -175,7 +155,7 @@ void MenuItemReg(char *menu_path, char *menu_text, lttv_constructor view_constru * a reference to find out where the menu_path and menu_text are. */ -void MenuItemUnreg(lttv_constructor view_constructor) +void menu_item_unreg(lttv_constructor view_constructor) { LttvIAttribute *attributes_global = LTTV_IATTRIBUTE(lttv_global_attributes()); LttvMenus * menu; @@ -185,8 +165,9 @@ void MenuItemUnreg(lttv_constructor view_constructor) "viewers/menu", LTTV_POINTER, &value)); menu = (LttvMenus*)*(value.v_pointer); - if(lttv_menus_remove(menu, view_constructor)) - RemoveMenu(view_constructor); + main_window_remove_menu_item(view_constructor); + + lttv_menus_remove(menu, view_constructor); } @@ -196,7 +177,7 @@ void MenuItemUnreg(lttv_constructor view_constructor) * @param info the message which will be shown in the status bar. */ -void UpdateStatus(mainWindow *main_win, char *info) +void update_status(MainWindow *main_win, char *info) { } @@ -210,11 +191,11 @@ void UpdateStatus(mainWindow *main_win, char *info) * @param time_interval a pointer where time interval will be stored. */ -void GetTimeWindow(mainWindow *main_win, TimeWindow *Time_Window) +void get_time_window(MainWindow *main_win, TimeWindow *time_window) { - //Time_Window->startTime = main_win->CurrentTab->Time_Window.startTime; - //Time_Window->Time_Width = main_win->CurrentTab->Time_Window.Time_Width; - *Time_Window = main_win->CurrentTab->Time_Window; + //time_window->start_time = main_win->current_tab->time_window.start_time; + //time_window->time_width = main_win->current_tab->time_window.time_width; + *time_window = main_win->current_tab->time_window; } /** @@ -226,11 +207,12 @@ void GetTimeWindow(mainWindow *main_win, TimeWindow *Time_Window) * @param time_interval a pointer where time interval will be stored. */ -void getTracesetTimeSpan(mainWindow *main_win, TimeInterval *Time_Interval) +void get_traceset_time_span(MainWindow *main_win, TimeInterval *time_interval) { - //Time_Window->startTime = main_win->CurrentTab->Time_Window.startTime; - //Time_Window->Time_Width = main_win->CurrentTab->Time_Window.Time_Width; - *Time_Interval = *(LTTV_TRACESET_CONTEXT(main_win->Traceset_Info->TracesetContext)->Time_Span); + //time_window->start_time = main_win->current_tab->time_window.start_time; + //time_window->time_width = main_win->current_tab->time_window.time_width; + *time_interval = *(LTTV_TRACESET_CONTEXT(main_win->current_tab->traceset_info-> + traceset_context)->Time_Span); } @@ -243,16 +225,16 @@ void getTracesetTimeSpan(mainWindow *main_win, TimeInterval *Time_Interval) * @param time_interval a pointer where time interval is stored. */ -void SetTimeWindow(mainWindow *main_win, TimeWindow *Time_Window) +void set_time_window(MainWindow *main_win, TimeWindow *time_window) { LttvAttributeValue value; LttvHooks * tmp; - main_win->CurrentTab->Time_Window = *Time_Window; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + main_win->current_tab->time_window = *time_window; + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatetimewindow", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; - lttv_hooks_call(tmp, Time_Window); + lttv_hooks_call(tmp, time_window); } @@ -264,9 +246,9 @@ void SetTimeWindow(mainWindow *main_win, TimeWindow *Time_Window) * @param time a pointer where time will be stored. */ -void GetCurrentTime(mainWindow *main_win, LttTime *time) +void get_current_time(MainWindow *main_win, LttTime *time) { - time = &main_win->CurrentTab->currentTime; + time = &main_win->current_tab->current_time; } @@ -278,12 +260,12 @@ void GetCurrentTime(mainWindow *main_win, LttTime *time) * @param time a pointer where time is stored. */ -void SetCurrentTime(mainWindow *main_win, LttTime *time) +void set_current_time(MainWindow *main_win, LttTime *time) { LttvAttributeValue value; LttvHooks * tmp; - main_win->CurrentTab->currentTime = *time; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + main_win->current_tab->current_time = *time; + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatecurrenttime", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); @@ -300,7 +282,7 @@ void SetCurrentTime(mainWindow *main_win, LttTime *time) * @param traceset a pointer to a traceset. */ /* -void GetTraceset(mainWindow *main_win, Traceset *traceset) +void get_traceset(MainWindow *main_win, Traceset *traceset) { } */ @@ -313,7 +295,7 @@ void GetTraceset(mainWindow *main_win, Traceset *traceset) * @param filter, a pointer to a filter. */ /* -void GetFilter(mainWindow *main_win, Filter *filter) +void get_filter(MainWindow *main_win, Filter *filter) { } */ @@ -327,12 +309,12 @@ void GetFilter(mainWindow *main_win, Filter *filter) * @param main_win the main window the viewer belongs to. */ -void RegUpdateTimeWindow(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void reg_update_time_window(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatetimewindow", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL){ @@ -352,12 +334,12 @@ void RegUpdateTimeWindow(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTimeWindow(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void unreg_update_time_window(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatetimewindow", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -374,12 +356,12 @@ void UnregUpdateTimeWindow(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateTraceset(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void reg_update_traceset(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatetraceset", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL){ @@ -399,12 +381,12 @@ void RegUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void unreg_update_traceset(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatetraceset", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -421,12 +403,12 @@ void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateFilter(LttvHook hook, gpointer hook_data, - mainWindow *main_win) +void reg_update_filter(LttvHook hook, gpointer hook_data, + MainWindow *main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatefilter", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL){ @@ -446,12 +428,12 @@ void RegUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateFilter(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void unreg_update_filter(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->attributes, "hooks/updatefilter", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -468,12 +450,12 @@ void UnregUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, - mainWindow *main_win) +void reg_update_current_time(LttvHook hook, gpointer hook_data, + MainWindow *main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatecurrenttime", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL){ @@ -493,12 +475,12 @@ void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateCurrentTime(LttvHook hook, gpointer hook_data, - mainWindow * main_win) +void unreg_update_current_time(LttvHook hook, gpointer hook_data, + MainWindow * main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/updatecurrenttime", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -514,9 +496,9 @@ void UnregUpdateCurrentTime(LttvHook hook, gpointer hook_data, * @param paned a pointer to a pane where the viewer is contained. */ -void SetFocusedPane(mainWindow *main_win, gpointer paned) +void set_focused_pane(MainWindow *main_win, gpointer paned) { - gtk_custom_set_focus((GtkWidget*)main_win->CurrentTab->custom,paned); + gtk_multi_vpaned_set_focus((GtkWidget*)main_win->current_tab->multi_vpaned,paned); } @@ -529,12 +511,12 @@ void SetFocusedPane(mainWindow *main_win, gpointer paned) * @param main_win the main window the viewer belongs to. */ -void RegUpdateDividor(LttvHook hook, gpointer hook_data, - mainWindow *main_win) +void reg_update_dividor(LttvHook hook, gpointer hook_data, + MainWindow *main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/hpanedividor", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL){ @@ -554,12 +536,12 @@ void RegUpdateDividor(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateDividor(LttvHook hook, gpointer hook_data, - mainWindow *main_win) +void unreg_update_dividor(LttvHook hook, gpointer hook_data, + MainWindow *main_win) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/hpanedividor", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -575,11 +557,11 @@ void UnregUpdateDividor(LttvHook hook, gpointer hook_data, * @param position position of the hpane's dividor. */ -void SetHPaneDividor(mainWindow *main_win, gint position) +void set_hpane_dividor(MainWindow *main_win, gint position) { LttvAttributeValue value; LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(main_win->CurrentTab->Attributes, + g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes, "hooks/hpanedividor", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); if(tmp == NULL) return; @@ -595,11 +577,13 @@ void SetHPaneDividor(mainWindow *main_win, gint position) * @param end the end time of the last event to be processed. */ -void processTraceset(mainWindow *main_win, LttTime start, - LttTime end, unsigned maxNumEvents) +void process_traceset_api(MainWindow *main_win, LttTime start, + LttTime end, unsigned maxNumEvents) { - lttv_process_traceset_seek_time(main_win->Traceset_Info->TracesetContext, start); - lttv_process_trace(main_win->Traceset_Info->TracesetContext, end, maxNumEvents); + lttv_process_traceset_seek_time(main_win->current_tab->traceset_info-> + traceset_context, start); + lttv_process_traceset(main_win->current_tab->traceset_info-> + traceset_context, end, maxNumEvents); } /** @@ -610,21 +594,22 @@ void processTraceset(mainWindow *main_win, LttTime start, * @param LttvHooks hooks to be registered. */ -void contextAddHooks(mainWindow *main_win , - LttvHooks *before_traceset, - LttvHooks *after_traceset, - LttvHooks *check_trace, - LttvHooks *before_trace, - LttvHooks *after_trace, - LttvHooks *check_tracefile, - LttvHooks *before_tracefile, - LttvHooks *after_tracefile, - LttvHooks *check_event, - LttvHooks *before_event, - LttvHooks *after_event) +void context_add_hooks_api(MainWindow *main_win , + LttvHooks *before_traceset, + LttvHooks *after_traceset, + LttvHooks *check_trace, + LttvHooks *before_trace, + LttvHooks *after_trace, + LttvHooks *check_tracefile, + LttvHooks *before_tracefile, + LttvHooks *after_tracefile, + LttvHooks *check_event, + LttvHooks *before_event, + LttvHooks *after_event) { LttvTracesetContext * tsc = - LTTV_TRACESET_CONTEXT(main_win->Traceset_Info->TracesetContext); + LTTV_TRACESET_CONTEXT(main_win->current_tab->traceset_info-> + traceset_context); lttv_traceset_context_add_hooks(tsc,before_traceset,after_traceset, check_trace,before_trace,after_trace, check_tracefile,before_tracefile,after_tracefile, @@ -640,21 +625,21 @@ void contextAddHooks(mainWindow *main_win , * @param LttvHooks hooks to be registered. */ -void contextRemoveHooks(mainWindow *main_win , - LttvHooks *before_traceset, - LttvHooks *after_traceset, - LttvHooks *check_trace, - LttvHooks *before_trace, - LttvHooks *after_trace, - LttvHooks *check_tracefile, - LttvHooks *before_tracefile, - LttvHooks *after_tracefile, - LttvHooks *check_event, - LttvHooks *before_event, - LttvHooks *after_event) +void context_remove_hooks_api(MainWindow *main_win , + LttvHooks *before_traceset, + LttvHooks *after_traceset, + LttvHooks *check_trace, + LttvHooks *before_trace, + LttvHooks *after_trace, + LttvHooks *check_tracefile, + LttvHooks *before_tracefile, + LttvHooks *after_tracefile, + LttvHooks *check_event, + LttvHooks *before_event, + LttvHooks *after_event) { LttvTracesetContext * tsc = - LTTV_TRACESET_CONTEXT(main_win->Traceset_Info->TracesetContext); + LTTV_TRACESET_CONTEXT(main_win->current_tab->traceset_info->traceset_context); lttv_traceset_context_remove_hooks(tsc,before_traceset,after_traceset, check_trace,before_trace,after_trace, check_tracefile,before_tracefile,after_tracefile, @@ -667,16 +652,16 @@ void contextRemoveHooks(mainWindow *main_win , * @param main_win the main window the viewer belongs to. */ -void stateAddEventHooks(mainWindow *main_win ) +void state_add_event_hooks_api(MainWindow *main_win ) { lttv_state_add_event_hooks( - (LttvTracesetState*)main_win->Traceset_Info->TracesetContext); + (LttvTracesetState*)main_win->current_tab->traceset_info->traceset_context); } -void stateRemoveEventHooks(mainWindow *main_win ) +void state_remove_event_hooks_api(MainWindow *main_win ) { lttv_state_remove_event_hooks( - (LttvTracesetState*)main_win->Traceset_Info->TracesetContext); + (LttvTracesetState*)main_win->current_tab->traceset_info->traceset_context); } @@ -685,16 +670,16 @@ void stateRemoveEventHooks(mainWindow *main_win ) * @param main_win the main window the viewer belongs to. */ -void statsAddEventHooks(mainWindow *main_win ) +void stats_add_event_hooks_api(MainWindow *main_win ) { lttv_stats_add_event_hooks( - (LttvTracesetStats*)main_win->Traceset_Info->TracesetContext); + (LttvTracesetStats*)main_win->current_tab->traceset_info->traceset_context); } -void statsRemoveEventHooks(mainWindow *main_win ) +void stats_remove_event_hooks_api(MainWindow *main_win ) { lttv_stats_remove_event_hooks( - (LttvTracesetStats*)main_win->Traceset_Info->TracesetContext); + (LttvTracesetStats*)main_win->current_tab->traceset_info->traceset_context); } /** @@ -702,7 +687,7 @@ void statsRemoveEventHooks(mainWindow *main_win ) * @param main_win the main window the viewer belongs to. */ -LttvTracesetStats* getTracesetStats(mainWindow *main_win) +LttvTracesetStats* get_traceset_stats_api(MainWindow *main_win) { - return main_win->Traceset_Info->TracesetContext; + return main_win->current_tab->traceset_info->traceset_context; }