From 665fdbb70138df57711a6d90924836952add7ff1 Mon Sep 17 00:00:00 2001 From: Benjamin Poirier Date: Fri, 29 Jan 2010 12:54:30 -0500 Subject: [PATCH] Partial revert "Disable sync/" This partially reverts commits 86d5459b882f9874a61c1266c8c12478e1448377 5b96c742719728543bb067b8b154f294243c1c18 c73a133267f0de33bd7303de34a8f3e0ef90422a ccf1db700d7477f4cd825ac435e2632443ee51f2 Signed-off-by: Benjamin Poirier --- lttv/lttv/Makefile.am | 30 ++++++------ lttv/lttv/sync/Makefile.am | 47 +++++-------------- .../gui/lttvwindow/lttvwindow/callbacks.c | 5 +- .../gui/lttvwindow/lttvwindow/init_module.c | 3 +- lttv/modules/text/batchAnalysis.c | 6 +-- 5 files changed, 31 insertions(+), 60 deletions(-) diff --git a/lttv/lttv/Makefile.am b/lttv/lttv/Makefile.am index fbf6d6aa..e98dcbf4 100644 --- a/lttv/lttv/Makefile.am +++ b/lttv/lttv/Makefile.am @@ -54,22 +54,20 @@ lttv_real_SOURCES = \ tracecontext.c\ traceset.c\ filter.c\ - print.c - -#Disabled by Mathieu Desnoyers (does not build on x86_64) -# sync/sync_chain.c\ -# sync/sync_chain_lttv.c\ -# sync/graph_functions.c\ -# sync/data_structures.c\ -# sync/event_processing_lttng_common.c\ -# sync/event_processing_lttng_standard.c\ -# sync/event_processing_lttng_null.c\ -# sync/event_matching_broadcast.c\ -# sync/event_matching_distributor.c\ -# sync/event_matching_tcp.c\ -# sync/event_analysis_chull.c\ -# sync/event_analysis_eval.c\ -# sync/event_analysis_linreg.c + print.c\ + sync/sync_chain.c\ + sync/sync_chain_lttv.c\ + sync/graph_functions.c\ + sync/data_structures.c\ + sync/event_processing_lttng_common.c\ + sync/event_processing_lttng_standard.c\ + sync/event_processing_lttng_null.c\ + sync/event_matching_broadcast.c\ + sync/event_matching_distributor.c\ + sync/event_matching_tcp.c\ + sync/event_analysis_chull.c\ + sync/event_analysis_eval.c\ + sync/event_analysis_linreg.c lttvinclude_HEADERS = \ attribute.h\ diff --git a/lttv/lttv/sync/Makefile.am b/lttv/lttv/sync/Makefile.am index fa9ac579..a6b0b8a3 100644 --- a/lttv/lttv/sync/Makefile.am +++ b/lttv/lttv/sync/Makefile.am @@ -1,38 +1,17 @@ AM_CFLAGS= $(PACKAGE_CFLAGS) LDADD = $(M_LIBS) $(GLPK_LIBS) -#Mathieu: does not build on x86 64, disable. -#check_PROGRAMS = unittest -# -#unittest_SOURCES = \ -# data_structures.c\ -# graph_functions.c\ -# sync_chain.c\ -# sync_chain_unittest.c\ -# event_processing_text.c\ -# event_matching_broadcast.c\ -# event_matching_distributor.c\ -# event_matching_tcp.c\ -# event_analysis_chull.c\ -# event_analysis_eval.c\ -# event_analysis_linreg.c +check_PROGRAMS = unittest -noinst_HEADERS = \ - data_structures.h \ - event_analysis_chull.h \ - event_analysis_eval.h \ - event_analysis.h \ - event_analysis_linreg.h \ - event_matching_broadcast.h \ - event_matching_distributor.h \ - event_matching.h \ - event_matching_tcp.h \ - event_processing.h \ - event_processing_lttng_common.h \ - event_processing_lttng_null.h \ - event_processing_lttng_standard.h \ - event_processing_text.h \ - graph_functions.h \ - lookup3.h \ - sync_chain.h \ - sync_chain_lttv.h +unittest_SOURCES = \ + data_structures.c\ + graph_functions.c\ + sync_chain.c\ + sync_chain_unittest.c\ + event_processing_text.c\ + event_matching_broadcast.c\ + event_matching_distributor.c\ + event_matching_tcp.c\ + event_analysis_chull.c\ + event_analysis_eval.c\ + event_analysis_linreg.c diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index 5499da30..d58c3137 100644 --- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -455,7 +455,6 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor) } } - /** * Function to set/update traceset for the viewers * @param tab viewer's tab @@ -475,9 +474,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); // Perform time synchronization on the traces - /* Mathieu Desnoyers: temporarily disable syncTraceset */ - //if (syncTraceset(tsc)) - if (0) + if (syncTraceset(tsc)) { /* There is some time-dependant information that was calculated during * context initialization. Destroy the old contexts and initialize new diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c index 7878eecc..99ab15f7 100644 --- a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c +++ b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c @@ -259,5 +259,4 @@ static void destroy() { LTTV_MODULE("lttvwindow", "Viewer main window", \ "Viewer with multiple windows, tabs and panes for graphical modules", \ - //init, destroy, "stats", "option", "sync") - init, destroy, "stats", "option") + init, destroy, "stats", "option", "sync") diff --git a/lttv/modules/text/batchAnalysis.c b/lttv/modules/text/batchAnalysis.c index e150f4d1..4b02f332 100644 --- a/lttv/modules/text/batchAnalysis.c +++ b/lttv/modules/text/batchAnalysis.c @@ -91,8 +91,7 @@ static gboolean process_traceset(void *hook_data, void *call_data) lttv_context_init(tc, traceset); - /* Disabled by Mathieu, does not build on x86_64 */ - /* syncTraceset(tc); */ + syncTraceset(tc); lttv_state_add_event_hooks(tc); if(a_stats) lttv_stats_add_event_hooks(tscs); @@ -277,5 +276,4 @@ static void destroy() LTTV_MODULE("batchAnalysis", "Batch processing of a trace", \ "Run through a trace calling all the registered hooks", \ - /* init, destroy, "state", "stats", "option","textFilter", "sync") */ - init, destroy, "state", "stats", "option","textFilter") + init, destroy, "state", "stats", "option","textFilter", "sync") -- 2.34.1