From b21c82b6a990f6be7fee4db796e593b407101863 Mon Sep 17 00:00:00 2001 From: compudj Date: Tue, 4 May 2004 23:10:03 +0000 Subject: [PATCH] remove all _api functions and calls git-svn-id: http://ltt.polymtl.ca/svn@514 04897980-b3bd-0310-b5e0-8ef037075253 --- .../poly/lttv/modules/gui/controlflow/drawing.c | 5 +++-- .../poly/lttv/modules/gui/detailedevents/events.c | 12 ++++-------- .../poly/lttv/modules/gui/statistics/statistics.c | 10 +++------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 9092f958..15fbf239 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "drawing.h" @@ -138,7 +139,7 @@ void drawing_data_request(Drawing_t *drawing, lttv_hooks_add(after_traceset, after_data_request, &event_request); lttv_hooks_add(event, draw_event_hook, &event_request); //Modified by xiangxiu: state update hooks are added by the main window - //state_add_event_hooks_api(control_flow_data->mw); + //lttv_state_add_event_hooks(tsc); lttv_hooks_add(after_event, draw_after_hook, &event_request); //lttv_process_traceset_seek_time(tsc, start); @@ -156,7 +157,7 @@ void drawing_data_request(Drawing_t *drawing, // NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, event, after_event); //Modified by xiangxiu: state update hooks are removed by the main window - //state_remove_event_hooks_api(control_flow_data->mw); + //lttv_state_remove_event_hooks(tsc); lttv_hooks_destroy(after_traceset); lttv_hooks_destroy(event); diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index d20efa8c..1b6c4225 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -55,7 +55,6 @@ #include #include -//#include "mw_api.h" #include "gtktreeprivate.h" #include "hGuiEventsInsert.xpm" @@ -1283,7 +1282,7 @@ void add_context_hooks(EventViewerData * event_viewer_data, } //add hooks for process_traceset - // context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // lttv_traceset_context_add_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL, // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); } @@ -1350,7 +1349,7 @@ void remove_context_hooks(EventViewerData * event_viewer_data, } } //remove hooks from context - // context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, + // lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL, // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); } @@ -1619,15 +1618,12 @@ void get_events(EventViewerData* event_viewer_data, LttTime start, int size; LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw); - // context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL, - // NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL); add_context_hooks(event_viewer_data,tsc); - process_traceset_api(event_viewer_data->mw, start, end, max_num_events); + lttv_process_traceset_seek_time(tsc, start); + lttv_process_traceset(tsc, end, max_num_events); remove_context_hooks(event_viewer_data,tsc); - // 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/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index cf49beb7..9f3889fa 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -194,7 +194,7 @@ gui_statistic(MainWindow *parent_window, LttvTracesetSelector * s, char* key) StatisticViewerData* statistic_viewer_data = g_new(StatisticViewerData,1); statistic_viewer_data->mw = parent_window; - statistic_viewer_data->stats = get_traceset_stats_api(statistic_viewer_data->mw); + statistic_viewer_data->stats = get_traceset_stats(statistic_viewer_data->mw); statistic_viewer_data->calculate_stats = statistic_insert_traceset_stats((void *)statistic_viewer_data->stats); reg_update_time_window(statistic_update_time_window,statistic_viewer_data, statistic_viewer_data->mw); @@ -586,9 +586,7 @@ void statistic_add_context_hooks(StatisticViewerData * statistic_viewer_data, } } - //add state and stats hooks - //state_add_event_hooks_api(statistic_viewer_data->mw); //it will be added in the main window - stats_add_event_hooks_api(statistic_viewer_data->mw); + lttv_stats_add_event_hooks(tsc); } @@ -633,9 +631,7 @@ void statistic_remove_context_hooks(StatisticViewerData * statistic_viewer_data, } } - //remove state and stats hooks - //state_remove_event_hooks_api(statistic_viewer_data->mw); //it will be done in the main window - stats_remove_event_hooks_api(statistic_viewer_data->mw); + lttv_stats_remove_event_hooks(tsc); } -- 2.34.1