From: Jean-Christian Kouame Date: Fri, 20 May 2016 15:22:27 +0000 (-0400) Subject: tmf: fix bug 489217. Use of ArrayListStore instead of TreeMapStore X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=af507eff2be26d7de99c3ec37740944443ee1bdc tmf: fix bug 489217. Use of ArrayListStore instead of TreeMapStore Use of ArrayListStore instead of TreeMapStore for the pattern analysis Change-Id: Ie247297936a4cf89b8bdf7b53b48625ce3cf34cd Signed-off-by: Jean-Christian Kouame Reviewed-on: https://git.eclipse.org/r/73306 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Bernd Hufmann Reviewed-by: Bernd Hufmann --- diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF index 595fc4ab6d..9a5489390f 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.ui, Export-Package: org.eclipse.tracecompass.analysis.timing.core.segmentstore, org.eclipse.tracecompass.analysis.timing.core.segmentstore.statistics, org.eclipse.tracecompass.internal.analysis.timing.core, - org.eclipse.tracecompass.internal.analysis.timing.core.store;x-friends:="org.eclipse.tracecompass.analysis.timing.core.tests" + org.eclipse.tracecompass.internal.analysis.timing.core.store;x-friends:="org.eclipse.tracecompass.analysis.timing.core.tests,org.eclipse.tracecompass.tmf.analysis.xml.core" Import-Package: com.google.common.collect, com.google.common.hash diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/pattern/stateprovider/XmlPatternSegmentStoreModule.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/pattern/stateprovider/XmlPatternSegmentStoreModule.java index aac5d322c1..c3654f9308 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/pattern/stateprovider/XmlPatternSegmentStoreModule.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/pattern/stateprovider/XmlPatternSegmentStoreModule.java @@ -19,9 +19,9 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.timing.core.segmentstore.AbstractSegmentStoreAnalysisModule; import org.eclipse.tracecompass.analysis.timing.core.segmentstore.IAnalysisProgressListener; +import org.eclipse.tracecompass.internal.analysis.timing.core.store.ArrayListStore; import org.eclipse.tracecompass.segmentstore.core.ISegment; import org.eclipse.tracecompass.segmentstore.core.ISegmentStore; -import org.eclipse.tracecompass.segmentstore.core.treemap.TreeMapStore; import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; @@ -38,7 +38,7 @@ public class XmlPatternSegmentStoreModule extends AbstractSegmentStoreAnalysisMo * Fake segment indicated that the last segment have been received */ public static final @NonNull EndSegment END_SEGMENT = new EndSegment(); - private final ISegmentStore<@NonNull ISegment> fSegments = new TreeMapStore<>(); + private final ISegmentStore<@NonNull ISegment> fSegments = new ArrayListStore<>(); private final CountDownLatch fFinished = new CountDownLatch(1); private final @NonNull XmlPatternAnalysis fParent; private boolean fSegmentStoreCompleted;