From ccf1db700d7477f4cd825ac435e2632443ee51f2 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 29 Jan 2010 08:22:22 -0500 Subject: [PATCH] Disable sync/ completely, build OK Signed-off-by: Mathieu Desnoyers --- configure.ac | 5 +-- doc/developer/lttng-lttv-compatibility.html | 5 ++- lttv/lttv/Makefile.am | 3 +- lttv/lttv/sync/Makefile.am | 47 +++++++++++++++------ lttv/modules/text/batchAnalysis.c | 6 ++- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index e004efe4..e3d7e5a0 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([lttv], [0.12.26-28012010], [ltt-dev@lists.casi.polymtl.ca]) +AC_INIT([lttv], [0.12.27-29012010], [ltt-dev@lists.casi.polymtl.ca]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL @@ -214,11 +214,10 @@ AC_SUBST(lttctlincludedir) #lttv/modules/gui/tutorial/Makefile #lttv/modules/gui/diskperformance/Makefile - #FIXME: disabled by Mathieu Desnoyers, does not build on x86_64 - #lttv/lttv/sync/Makefile AC_CONFIG_FILES([Makefile lttv/Makefile lttv/lttv/Makefile + lttv/lttv/sync/Makefile lttv/modules/Makefile lttv/modules/text/Makefile lttv/modules/gui/Makefile diff --git a/doc/developer/lttng-lttv-compatibility.html b/doc/developer/lttng-lttv-compatibility.html index fb98e9a7..060d898c 100644 --- a/doc/developer/lttng-lttv-compatibility.html +++ b/doc/developer/lttng-lttv-compatibility.html @@ -3695,6 +3695,7 @@ powerpc64, s390, sparc, sparc64.
0.12.24
0.12.25
0.12.26
+0.12.27
0.173
@@ -3772,8 +3773,10 @@ state.c (experienced on a ARM trace).
LTTng 0.185 coexists peacefully with trace event.
LTTng 0.186 and 0.186o fixes !CPUFREQ config for arm omap3 tracing.
LTTng 0.187 and 0.188, for kernel 2.6.32.4, fixes x86-32 apm cpu idle instrumentation.
-LTTng 0.12.26 fixes a backward position seek wrap-around (time underflow) issue +LTTV 0.12.26 fixes a backward position seek wrap-around (time underflow) issue with the detailed event list.
+LTTV 0.12.27 temporarily disables the new network sync module, which causes a +build failure on 64-bit.
diff --git a/lttv/lttv/Makefile.am b/lttv/lttv/Makefile.am index 6bc11e08..fbf6d6aa 100644 --- a/lttv/lttv/Makefile.am +++ b/lttv/lttv/Makefile.am @@ -1,5 +1,4 @@ -#Disabled by Mathieu Desnoyers: Build issue on x86_64 (FIXME) -#SUBDIRS= sync +SUBDIRS= sync AM_CFLAGS= $(PACKAGE_CFLAGS) LDADD = $(POPT_LIBS) $(M_LIBS) $(GLPK_LIBS) ${top_builddir}/ltt/liblttvtraceread.la diff --git a/lttv/lttv/sync/Makefile.am b/lttv/lttv/sync/Makefile.am index a6b0b8a3..fa9ac579 100644 --- a/lttv/lttv/sync/Makefile.am +++ b/lttv/lttv/sync/Makefile.am @@ -1,17 +1,38 @@ AM_CFLAGS= $(PACKAGE_CFLAGS) LDADD = $(M_LIBS) $(GLPK_LIBS) -check_PROGRAMS = unittest +#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 -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 +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 diff --git a/lttv/modules/text/batchAnalysis.c b/lttv/modules/text/batchAnalysis.c index 4b02f332..e150f4d1 100644 --- a/lttv/modules/text/batchAnalysis.c +++ b/lttv/modules/text/batchAnalysis.c @@ -91,7 +91,8 @@ static gboolean process_traceset(void *hook_data, void *call_data) lttv_context_init(tc, traceset); - syncTraceset(tc); + /* Disabled by Mathieu, does not build on x86_64 */ + /* syncTraceset(tc); */ lttv_state_add_event_hooks(tc); if(a_stats) lttv_stats_add_event_hooks(tscs); @@ -276,4 +277,5 @@ 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", "sync") */ + init, destroy, "state", "stats", "option","textFilter") -- 2.34.1