From 41a769851adc36c024821e859ed6569409f71d8f Mon Sep 17 00:00:00 2001 From: yangxx Date: Tue, 21 Oct 2003 19:58:44 +0000 Subject: [PATCH] git-svn-id: http://ltt.polymtl.ca/svn@319 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/include/lttv/common.h | 1 - ltt/branches/poly/include/lttv/gtkTraceSet.h | 144 +++++++----------- .../poly/lttv/modules/gui/API/gtkTraceSet.c | 110 ++++++------- .../lttv/modules/gui/mainWin/src/callbacks.c | 2 +- .../lttv/modules/gui/mainWin/src/gtkcustom.c | 6 +- .../poly/lttv/modules/guiControlFlow/CFV.c | 4 +- .../lttv/modules/guiControlFlow/Event_Hooks.c | 8 +- .../poly/lttv/modules/guiControlFlow/module.c | 8 +- ltt/branches/poly/lttv/modules/guiEvents.c | 36 ++--- .../lttv/modules/guiStatistic/guiStatistic.c | 22 +-- 10 files changed, 155 insertions(+), 186 deletions(-) diff --git a/ltt/branches/poly/include/lttv/common.h b/ltt/branches/poly/include/lttv/common.h index a408bb4c..0da0ccd7 100644 --- a/ltt/branches/poly/include/lttv/common.h +++ b/ltt/branches/poly/include/lttv/common.h @@ -6,7 +6,6 @@ #include typedef struct _MainWindow MainWindow; -//typedef struct _systemView systemView; typedef struct _Tab Tab; /* constructor of the viewer */ diff --git a/ltt/branches/poly/include/lttv/gtkTraceSet.h b/ltt/branches/poly/include/lttv/gtkTraceSet.h index ce2a37ef..f1df3436 100644 --- a/ltt/branches/poly/include/lttv/gtkTraceSet.h +++ b/ltt/branches/poly/include/lttv/gtkTraceSet.h @@ -25,7 +25,7 @@ * @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); /** @@ -36,7 +36,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); /** @@ -48,7 +48,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); /** @@ -59,32 +59,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); - - -/** - * Attach a viewer to the current tab. - * It will be called in the constructor of the viewer. - * @param main_win the main window the viewer belongs to. - * @param viewer viewer to be attached to the current tab - */ - -// Not Needed : Main window add widget returned by constructor -//void AttachViewer(MainWindow *main_win, GtkWidget *viewer); - - -/* ?? Maybe we do not need this function, when a widget is destroyed, - * it will be removed automatically from its container - */ -// Not needed -/** - * Detach a viewer from the current tab. - * It will be called in the destructor of the viewer. - * @param main_win the main window the viewer belongs to. - * @param viewer viewer to be detached from the current tab. - */ - -//void DetachViewer(MainWindow *main_win, GtkWidget *viewer); +void menu_item_unreg(lttv_constructor view_constructor); /** @@ -93,7 +68,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); /** @@ -105,7 +80,7 @@ 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); /** @@ -116,12 +91,7 @@ void GetTimeWindow(MainWindow *main_win, TimeWindow *time_window); * @param time_interval a pointer where time interval is stored. */ -void SetTimeWindow(MainWindow *main_win, TimeWindow *time_window); - -/** - * Function to get the time span of the main window's traceset. - */ -void GetTracesetTimeSpan(MainWindow *main_win, TimeInterval *time_interval); +void set_time_window(MainWindow *main_win, TimeWindow *time_window); /** * Function to get the current time/event of the current tab. @@ -131,7 +101,7 @@ void GetTracesetTimeSpan(MainWindow *main_win, TimeInterval *time_interval); * @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); /** @@ -142,7 +112,7 @@ 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); /** @@ -153,7 +123,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); /** @@ -164,7 +134,7 @@ void SetCurrentTime(MainWindow *main_win, LttTime *time); * @param filter, a pointer to a filter. */ -//void GetFilter(MainWindow *main_win, Filter *filter); +//void get_filter(MainWindow *main_win, Filter *filter); /** @@ -176,8 +146,8 @@ void SetCurrentTime(MainWindow *main_win, LttTime *time); * @param main_win the main window the viewer belongs to. */ -void RegUpdateTimeInterval(LttvHook hook, gpointer hook_data, - MainWindow * main_win); +void reg_update_time_window(LttvHook hook, gpointer hook_data, + MainWindow * main_win); /** @@ -189,8 +159,8 @@ void RegUpdateTimeInterval(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTimeInterval(LttvHook hook, gpointer hook_data, - MainWindow * main_win); +void unreg_update_time_window(LttvHook hook, gpointer hook_data, + MainWindow * main_win); /** @@ -202,7 +172,7 @@ void UnregUpdateTimeInterval(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateTraceset(LttvHook hook, gpointer hook_data, +void reg_update_traceset(LttvHook hook, gpointer hook_data, MainWindow * main_win); @@ -215,7 +185,7 @@ void RegUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, +void unreg_update_traceset(LttvHook hook, gpointer hook_data, MainWindow * main_win); @@ -228,7 +198,7 @@ void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateFilter(LttvHook hook, gpointer hook_data, +void reg_update_filter(LttvHook hook, gpointer hook_data, MainWindow *main_win); @@ -241,7 +211,7 @@ void RegUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateFilter(LttvHook hook, gpointer hook_data, +void unreg_update_filter(LttvHook hook, gpointer hook_data, MainWindow * main_win); @@ -254,7 +224,7 @@ void UnregUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, +void reg_update_current_time(LttvHook hook, gpointer hook_data, MainWindow *main_win); @@ -267,7 +237,7 @@ void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateCurrentTime(LttvHook hook, gpointer hook_data, +void unreg_update_current_time(LttvHook hook, gpointer hook_data, MainWindow * main_win); @@ -279,7 +249,7 @@ 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); /** @@ -291,7 +261,7 @@ void SetFocusedPane(MainWindow *main_win, gpointer paned); * @param main_win the main window the viewer belongs to. */ -void RegUpdateDividor(LttvHook hook, gpointer hook_data, +void reg_update_dividor(LttvHook hook, gpointer hook_data, MainWindow *main_win); @@ -304,7 +274,7 @@ void RegUpdateDividor(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateDividor(LttvHook hook, gpointer hook_data, +void unreg_update_dividor(LttvHook hook, gpointer hook_data, MainWindow *main_win); @@ -316,7 +286,7 @@ 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); /** @@ -327,8 +297,8 @@ 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); /** @@ -339,18 +309,18 @@ 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); /** @@ -361,18 +331,18 @@ 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); /** @@ -382,7 +352,7 @@ void contextRemoveHooks(MainWindow *main_win , * @param end end time of the traceset. */ -void getTracesetTimeSpan(MainWindow *main_win, TimeInterval *time_span); +void get_traceset_time_span(MainWindow *main_win, TimeInterval *time_span); /** @@ -390,8 +360,8 @@ void getTracesetTimeSpan(MainWindow *main_win, TimeInterval *time_span); * @param main_win the main window the viewer belongs to. */ -void stateAddEventHooks(MainWindow *main_win ); -void stateRemoveEventHooks(MainWindow *main_win ); +void state_add_event_hooks_api(MainWindow *main_win ); +void state_remove_event_hooks_api(MainWindow *main_win ); /** @@ -399,8 +369,8 @@ void stateRemoveEventHooks(MainWindow *main_win ); * @param main_win the main window the viewer belongs to. */ -void statsAddEventHooks(MainWindow *main_win ); -void statsRemoveEventHooks(MainWindow *main_win ); +void stats_add_event_hooks_api(MainWindow *main_win ); +void stats_remove_event_hooks_api(MainWindow *main_win ); /** @@ -408,4 +378,4 @@ 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); diff --git a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c index ee8748db..4eb1d3e6 100644 --- a/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c +++ b/ltt/branches/poly/lttv/modules/gui/API/gtkTraceSet.c @@ -79,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; @@ -105,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; @@ -130,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; @@ -155,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; @@ -177,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) { } @@ -191,7 +191,7 @@ 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->start_time = main_win->current_tab->time_window.start_time; //time_window->time_width = main_win->current_tab->time_window.time_width; @@ -207,7 +207,7 @@ 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->start_time = main_win->current_tab->time_window.start_time; //time_window->time_width = main_win->current_tab->time_window.time_width; @@ -224,7 +224,7 @@ 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; @@ -245,7 +245,7 @@ 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->current_tab->current_time; } @@ -259,7 +259,7 @@ 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; @@ -281,7 +281,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) { } */ @@ -294,7 +294,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) { } */ @@ -308,7 +308,7 @@ void GetFilter(MainWindow *main_win, Filter *filter) * @param main_win the main window the viewer belongs to. */ -void RegUpdateTimeWindow(LttvHook hook, gpointer hook_data, +void reg_update_time_window(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -333,7 +333,7 @@ void RegUpdateTimeWindow(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTimeWindow(LttvHook hook, gpointer hook_data, +void unreg_update_time_window(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -355,7 +355,7 @@ void UnregUpdateTimeWindow(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateTraceset(LttvHook hook, gpointer hook_data, +void reg_update_traceset(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -380,7 +380,7 @@ void RegUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, +void unreg_update_traceset(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -402,7 +402,7 @@ void UnregUpdateTraceset(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateFilter(LttvHook hook, gpointer hook_data, +void reg_update_filter(LttvHook hook, gpointer hook_data, MainWindow *main_win) { LttvAttributeValue value; @@ -427,7 +427,7 @@ void RegUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateFilter(LttvHook hook, gpointer hook_data, +void unreg_update_filter(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -449,7 +449,7 @@ void UnregUpdateFilter(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, +void reg_update_current_time(LttvHook hook, gpointer hook_data, MainWindow *main_win) { LttvAttributeValue value; @@ -474,7 +474,7 @@ void RegUpdateCurrentTime(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateCurrentTime(LttvHook hook, gpointer hook_data, +void unreg_update_current_time(LttvHook hook, gpointer hook_data, MainWindow * main_win) { LttvAttributeValue value; @@ -495,7 +495,7 @@ 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->current_tab->custom,paned); } @@ -510,7 +510,7 @@ void SetFocusedPane(MainWindow *main_win, gpointer paned) * @param main_win the main window the viewer belongs to. */ -void RegUpdateDividor(LttvHook hook, gpointer hook_data, +void reg_update_dividor(LttvHook hook, gpointer hook_data, MainWindow *main_win) { LttvAttributeValue value; @@ -535,7 +535,7 @@ void RegUpdateDividor(LttvHook hook, gpointer hook_data, * @param main_win the main window the viewer belongs to. */ -void UnregUpdateDividor(LttvHook hook, gpointer hook_data, +void unreg_update_dividor(LttvHook hook, gpointer hook_data, MainWindow *main_win) { LttvAttributeValue value; @@ -556,7 +556,7 @@ 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; @@ -576,8 +576,8 @@ 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->traceset_context, start); lttv_process_traceset(main_win->traceset_info->traceset_context, end, maxNumEvents); @@ -591,18 +591,18 @@ 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->traceset_context); @@ -621,18 +621,18 @@ 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->traceset_context); @@ -648,13 +648,13 @@ 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->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->traceset_context); @@ -666,13 +666,13 @@ 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->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->traceset_context); @@ -683,7 +683,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->traceset_context; } diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c index 3328582b..cbac07a4 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c @@ -1134,7 +1134,7 @@ void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label) }else{ // Will have to read directly at the main window level, as we want // to be able to modify a traceset on the fly. - // getTracesetTimeSpan(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime); + // get_traceset_time_span(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime); tmp_tab->time_window.start_time = LTTV_TRACESET_CONTEXT(mw_data->traceset_info->traceset_context)->Time_Span->startTime; if(DEFAULT_TIME_WIDTH_S < diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c index e2d32179..cd914cd8 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/gtkcustom.c @@ -122,8 +122,8 @@ void gtk_custom_widget_add(GtkCustom * custom, GtkWidget * widget1) gtk_widget_show(custom->hscrollbar); custom->hadjust = gtk_range_get_adjustment(GTK_RANGE(custom->hscrollbar)); - GetTimeWindow(custom->mw,&Time_Window); - GetCurrentTime(custom->mw,&time); + get_time_window(custom->mw,&Time_Window); + get_current_time(custom->mw,&time); Time_Span = LTTV_TRACESET_CONTEXT(custom->mw->traceset_info->traceset_context)->Time_Span ; custom->hadjust->lower = ltt_time_to_double(Time_Span->startTime) * @@ -310,7 +310,7 @@ void gtk_custom_scroll_value_changed(GtkRange *range, gpointer custom_arg) GtkCustom * custom = (GtkCustom*)custom_arg; gdouble value = gtk_range_get_value(range); time = ltt_time_from_double(value / NANOSECONDS_PER_SECOND); - SetCurrentTime(custom->mw, &time); + set_current_time(custom->mw, &time); g_warning("The current time is second :%d, nanosecond : %d\n", time.tv_sec, time.tv_nsec); } diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c index 032a7f50..d49bd131 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c @@ -146,11 +146,11 @@ GuiControlFlow_Destructor(ControlFlowData *Control_Flow_Data) /* Process List is removed with it's widget */ //ProcessList_destroy(Control_Flow_Data->Process_List); - UnregUpdateTimeWindow(Update_Time_Window_Hook, + unreg_update_time_window(Update_Time_Window_Hook, Control_Flow_Data, Control_Flow_Data->Scrolled_Window_VC->parent); - UnregUpdateCurrentTime(Update_Current_Time_Hook, + unreg_update_current_time(Update_Current_Time_Hook, Control_Flow_Data, Control_Flow_Data->Scrolled_Window_VC->parent); diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c index 8a08c90c..ba123f41 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -307,15 +307,15 @@ hGuiControlFlow(MainWindow *pmParentWindow) g_critical("hGuiControlFlow"); ControlFlowData *Control_Flow_Data = GuiControlFlow() ; - GetTimeWindow(pmParentWindow, + get_time_window(pmParentWindow, GuiControlFlow_get_Time_Window(Control_Flow_Data)); - GetCurrentTime(pmParentWindow, + get_current_time(pmParentWindow, GuiControlFlow_get_Current_Time(Control_Flow_Data)); // Unreg done in the GuiControlFlow_Destructor - RegUpdateTimeWindow(Update_Time_Window_Hook, Control_Flow_Data, + reg_update_time_window(Update_Time_Window_Hook, Control_Flow_Data, pmParentWindow); - RegUpdateCurrentTime(Update_Current_Time_Hook, Control_Flow_Data, + reg_update_current_time(Update_Current_Time_Hook, Control_Flow_Data, pmParentWindow); return GuiControlFlow_get_Widget(Control_Flow_Data) ; diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c index 7d47e9d1..458bfeb9 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/module.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/module.c @@ -58,11 +58,11 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { g_critical("GUI ControlFlow Viewer init()"); /* Register the toolbar insert button */ - ToolbarItemReg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer", + toolbar_item_reg(hGuiControlFlowInsert_xpm, "Insert Control Flow Viewer", hGuiControlFlow); /* Register the menu item insert entry */ - MenuItemReg("/", "Insert Control Flow Viewer", hGuiControlFlow); + menu_item_reg("/", "Insert Control Flow Viewer", hGuiControlFlow); } @@ -89,9 +89,9 @@ G_MODULE_EXPORT void destroy() { g_slist_free(gControl_Flow_Data_List); /* Unregister the toolbar insert button */ - ToolbarItemUnreg(hGuiControlFlow); + toolbar_item_unreg(hGuiControlFlow); /* Unregister the menu item insert entry */ - MenuItemUnreg(hGuiControlFlow); + menu_item_unreg(hGuiControlFlow); } diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c index 78717859..5386fe41 100644 --- a/ltt/branches/poly/lttv/modules/guiEvents.c +++ b/ltt/branches/poly/lttv/modules/guiEvents.c @@ -178,10 +178,10 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { } /* 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); } @@ -207,10 +207,10 @@ G_MODULE_EXPORT void destroy() { } /* 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 */ @@ -262,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); @@ -271,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); @@ -428,7 +428,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; @@ -669,7 +669,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"); } @@ -1089,8 +1089,8 @@ 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_free(event_viewer_data); @@ -1191,7 +1191,7 @@ 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)); + set_focused_pane(mw, gtk_widget_get_parent(event_viewer_data->hbox_v)); } void get_events(EventViewerData* event_viewer_data, LttTime start, @@ -1199,11 +1199,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; diff --git a/ltt/branches/poly/lttv/modules/guiStatistic/guiStatistic.c b/ltt/branches/poly/lttv/modules/guiStatistic/guiStatistic.c index 64c17188..e23227f2 100644 --- a/ltt/branches/poly/lttv/modules/guiStatistic/guiStatistic.c +++ b/ltt/branches/poly/lttv/modules/guiStatistic/guiStatistic.c @@ -99,10 +99,10 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { } /* Register the toolbar insert button */ - ToolbarItemReg(hGuiStatisticInsert_xpm, "Insert Statistic Viewer", h_gui_statistic); + toolbar_item_reg(hGuiStatisticInsert_xpm, "Insert Statistic Viewer", h_gui_statistic); /* Register the menu item insert entry */ - MenuItemReg("/", "Insert Statistic Viewer", h_gui_statistic); + menu_item_reg("/", "Insert Statistic Viewer", h_gui_statistic); } @@ -126,10 +126,10 @@ G_MODULE_EXPORT void destroy() { } /* Unregister the toolbar insert button */ - ToolbarItemUnreg(h_gui_statistic); + toolbar_item_unreg(h_gui_statistic); /* Unregister the menu item insert entry */ - MenuItemUnreg(h_gui_statistic); + menu_item_unreg(h_gui_statistic); } @@ -189,7 +189,7 @@ gui_statistic(MainWindow *parent_window) StatisticViewerData* statistic_viewer_data = g_new(StatisticViewerData,1); statistic_viewer_data->mw = parent_window; - statistic_viewer_data->stats = getTracesetStats(statistic_viewer_data->mw); + statistic_viewer_data->stats = get_traceset_stats_api(statistic_viewer_data->mw); statistic_viewer_data->statistic_hash = g_hash_table_new_full(g_str_hash, g_str_equal, statistic_destroy_hash_key, @@ -271,7 +271,7 @@ void grab_focus(GtkWidget *widget, gpointer data) { StatisticViewerData *statistic_viewer_data = (StatisticViewerData *)data; MainWindow * mw = statistic_viewer_data->mw; - SetFocusedPane(mw, gtk_widget_get_parent(statistic_viewer_data->hpaned_v)); + set_focused_pane(mw, gtk_widget_get_parent(statistic_viewer_data->hpaned_v)); } static void @@ -328,13 +328,13 @@ void get_traceset_stats(StatisticViewerData * statistic_viewer_data) end.tv_sec = G_MAXULONG; end.tv_nsec = G_MAXULONG; - stateAddEventHooks(statistic_viewer_data->mw); - statsAddEventHooks(statistic_viewer_data->mw); + state_add_event_hooks_api(statistic_viewer_data->mw); + stats_add_event_hooks_api(statistic_viewer_data->mw); - processTraceset(statistic_viewer_data->mw, start, end, G_MAXULONG); + process_traceset_api(statistic_viewer_data->mw, start, end, G_MAXULONG); - stateRemoveEventHooks(statistic_viewer_data->mw); - statsRemoveEventHooks(statistic_viewer_data->mw); + state_remove_event_hooks_api(statistic_viewer_data->mw); + stats_remove_event_hooks_api(statistic_viewer_data->mw); //establish tree view for stats show_traceset_stats(statistic_viewer_data); -- 2.34.1