Disable sync/ completely, build OK

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/configure.ac b/configure.ac
index e004efe49aa2961d57139dac042b48284e598290..e3d7e5a057e5558670740ad6005a7441667a7310 100644 (file)
--- 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 fb98e9a79df6970978a02c2212fba1fd782d15a7..060d898cc85c7dc0ad55213acc6b4e5a0446f093 100644 (file)
--- a/doc/developer/lttng-lttv-compatibility.html
+++ b/doc/developer/lttng-lttv-compatibility.html
@@ -3695,6 +3695,7 @@ powerpc64, s390, sparc, sparc64.<br>
 0.12.24<br>
 0.12.25<br>
 0.12.26<br>
+0.12.27<br>
 </td>
 <td style="vertical-align: top;">
 0.173<br>
@@ -3772,8 +3773,10 @@ state.c (experienced on a ARM trace).<br>
 LTTng 0.185 coexists peacefully with trace event.<br>
 LTTng 0.186 and 0.186o fixes !CPUFREQ config for arm omap3 tracing.<br>
 LTTng 0.187 and 0.188, for kernel 2.6.32.4, fixes x86-32 apm cpu idle instrumentation.<br>
-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.<br>
+LTTV 0.12.27 temporarily disables the new network sync module, which causes a
+build failure on 64-bit.<br>
 </td>
 <td style="vertical-align: top;">
 </td>

diff --git a/lttv/lttv/Makefile.am b/lttv/lttv/Makefile.am
index 6bc11e0860bbf577e24b39763b0176452b5d2c32..fbf6d6aad21d789f6588be9747787384d4288fe9 100644 (file)
--- 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 a6b0b8a35b8a8e54e893573f0db9554d7dadfe7d..fa9ac579e02319fe28727f9fadd6b894c8d6d431 100644 (file)
--- 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 4b02f33250f886c17082ed4e18537355e7627b5f..e150f4d18db9c473dc113c45e1f50dfd17529eda 100644 (file)
--- 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")