From 1b3ebb097fa1358413b6a1d910ffeb712a9b6df6 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 7 Jun 2016 17:35:13 -0400 Subject: [PATCH] analysis.lami: Correctly reject lttng-analyses > 0.4 Trace Compass does not currently support the LAMI 1.0 protocol, which means lttng-analyses 0.5 and up should not be available and should be striked out. Correctly update the max version number to make it so. Change-Id: I65a33db732dba7725284840b2bcd0b2ecaab9d3a Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/74839 Reviewed-by: Mathieu Desnoyers Reviewed-by: Hudson CI Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien Reviewed-by: Matthew Khouzam --- .../testfiles/test-metadata.json | 4 ++-- .../analysis/lami/core/module/LamiAnalysis.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.core.tests/testfiles/test-metadata.json b/analysis/org.eclipse.tracecompass.analysis.lami.core.tests/testfiles/test-metadata.json index 412fb40a9b..e1fcf7f1c1 100644 --- a/analysis/org.eclipse.tracecompass.analysis.lami.core.tests/testfiles/test-metadata.json +++ b/analysis/org.eclipse.tracecompass.analysis.lami.core.tests/testfiles/test-metadata.json @@ -110,8 +110,8 @@ "test" ], "mi-version": { - "minor": 0, - "major": 1 + "minor": 1, + "major": 0 }, "url": "http://perdu.com" } diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/module/LamiAnalysis.java b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/module/LamiAnalysis.java index 200c4e15fc..53e6e95d33 100644 --- a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/module/LamiAnalysis.java +++ b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/module/LamiAnalysis.java @@ -78,8 +78,12 @@ import com.google.common.collect.Multimap; */ public class LamiAnalysis implements IOnDemandAnalysis { - /** Maximum major version of the LAMI protocol we support */ - private static final int MAX_SUPPORTED_MAJOR_VERSION = 1; + /** + * Maximum major version of the LAMI protocol we support. + * + * Currently only 0.x/unversioned MI, outputted by lttng-analyses 0.4.x + */ + private static final int MAX_SUPPORTED_MAJOR_VERSION = 0; private static final String DOUBLE_QUOTES = "\""; //$NON-NLS-1$ -- 2.34.1