From 660d4ed9bd22ac357b49953bad1f11f5893747de Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Tue, 17 May 2016 11:01:03 -0400 Subject: [PATCH] linux.core: internalize System Call Analysis This analysis is an implementation of the segment store, it should be internal Change-Id: Ifc246608b65c5f09ae11ac2386ee31d462bce825 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/72938 Reviewed-by: Genevieve Bastien Reviewed-by: Hudson CI Tested-by: Genevieve Bastien Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../META-INF/MANIFEST.MF | 7 ++-- .../plugin.xml | 2 +- .../os/linux/core/latency/Messages.java | 4 +-- .../os/linux/core/latency/SystemCall.java | 2 +- .../latency/SystemCallLatencyAnalysis.java | 2 +- .../os/linux/core/latency/messages.properties | 0 .../os/linux/core/latency/package-info.java | 2 +- ...emCallLatencyStatisticsAnalysisModule.java | 4 +-- .../SystemCallLatencyTableAnalysisTest.java | 28 +++++++-------- .../plugin.xml | 8 ++--- .../latency/SystemCallDensityViewer.java | 2 +- .../SystemCallLatencyScatterGraphViewer.java | 2 +- .../latency/SystemCallLatencyTableViewer.java | 2 +- .../OfflineStatisticsCalculator.java | 6 ++-- .../SegmentStoreStatisticsTest.java | 36 +++++++++---------- 15 files changed, 50 insertions(+), 57 deletions(-) rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/latency/Messages.java (89%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/latency/SystemCall.java (97%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java (99%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/latency/messages.properties (100%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/latency/package-info.java (86%) diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF index 981f8f62fc..df25f432dd 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF @@ -25,7 +25,6 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.core.contextswitch, org.eclipse.tracecompass.analysis.os.linux.core.inputoutput;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui,org.eclipse.tracecompass.analysis.os.linux.core.tests", org.eclipse.tracecompass.analysis.os.linux.core.kernel, org.eclipse.tracecompass.analysis.os.linux.core.kernelmemoryusage, - org.eclipse.tracecompass.analysis.os.linux.core.latency, org.eclipse.tracecompass.analysis.os.linux.core.model, org.eclipse.tracecompass.analysis.os.linux.core.signals, org.eclipse.tracecompass.analysis.os.linux.core.tid, @@ -33,9 +32,7 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.core.contextswitch, org.eclipse.tracecompass.internal.analysis.os.linux.core;x-internal:=true, org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui,org.eclipse.tracecompass.analysis.os.linux.core.tests", org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.handlers;x-internal:=true, - org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel; - x-friends:="org.eclipse.tracecompass.analysis.os.linux.core.tests, - org.eclipse.tracecompass.analysis.os.linux.ui, - org.eclipse.tracecompass.lttng2.kernel.core.tests", + org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel;x-friends:="org.eclipse.tracecompass.analysis.os.linux.core.tests,org.eclipse.tracecompass.analysis.os.linux.ui,org.eclipse.tracecompass.lttng2.kernel.core.tests", org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.handlers;x-friends:="org.eclipse.tracecompass.analysis.os.linux.core.tests", + org.eclipse.tracecompass.internal.analysis.os.linux.core.latency;x-friends:="org.eclipse.tracecompass.analysis.os.linux.core.tests,org.eclipse.tracecompass.analysis.os.linux.ui", org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.statistics;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui,org.eclipse.tracecompass.analysis.os.linux.core.tests" diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml index 300647bcae..d6c7816b56 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml @@ -24,7 +24,7 @@ diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/Messages.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/Messages.java similarity index 89% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/Messages.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/Messages.java index dabf9ea34b..99a7ea7f74 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/Messages.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/Messages.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.core.latency; +package org.eclipse.tracecompass.internal.analysis.os.linux.core.latency; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.osgi.util.NLS; @@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS; */ public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.tracecompass.analysis.os.linux.core.latency.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.messages"; //$NON-NLS-1$ /** System Call latency analysis aspect name */ public static @Nullable String SegmentAspectName_SystemCall; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCall.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCall.java similarity index 97% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCall.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCall.java index 0ccaadc8d0..5c6c04be21 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCall.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCall.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.core.latency; +package org.eclipse.tracecompass.internal.analysis.os.linux.core.latency; import java.io.Serializable; import java.util.Map; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java similarity index 99% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java index e324337cf8..133a6ea130 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/SystemCallLatencyAnalysis.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.core.latency; +package org.eclipse.tracecompass.internal.analysis.os.linux.core.latency; import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/messages.properties b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/messages.properties similarity index 100% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/messages.properties rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/messages.properties diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/package-info.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/package-info.java similarity index 86% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/package-info.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/package-info.java index 2ad2c43b26..9e258cbba1 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/latency/package-info.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/package-info.java @@ -8,4 +8,4 @@ *******************************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.tracecompass.analysis.os.linux.core.latency; +package org.eclipse.tracecompass.internal.analysis.os.linux.core.latency; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java index 46da158bbe..2b4c1525a2 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java @@ -13,10 +13,10 @@ package org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.statist import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCall; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCallLatencyAnalysis; import org.eclipse.tracecompass.analysis.timing.core.segmentstore.ISegmentStoreProvider; import org.eclipse.tracecompass.analysis.timing.core.segmentstore.statistics.AbstractSegmentStatisticsAnalysis; +import org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCall; +import org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCallLatencyAnalysis; import org.eclipse.tracecompass.segmentstore.core.ISegment; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java index 9e29c56866..9a0ab4c5c1 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java @@ -17,7 +17,6 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Random; @@ -35,10 +34,9 @@ import org.eclipse.swtbot.swt.finder.results.BoolResult; import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCall; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCall.InitialInfo; import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency.SystemCallLatencyView; +import org.eclipse.tracecompass.segmentstore.core.BasicSegment; import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; @@ -160,9 +158,9 @@ public class SystemCallLatencyTableAnalysisTest { */ @Test public void climbTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 0; i < 100; i++) { - fixture.add(new SystemCall(new InitialInfo(i, "", Collections.EMPTY_MAP), 2 * i, 0)); + fixture.add(new BasicSegment(i, 2 * i)); } assertNotNull(fTable); @@ -181,9 +179,9 @@ public class SystemCallLatencyTableAnalysisTest { */ @Test public void decrementingTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 100; i >= 0; i--) { - fixture.add(new SystemCall(new InitialInfo(i, "", Collections.EMPTY_MAP), 2 * i, 0)); + fixture.add(new BasicSegment(i, 2 * i)); } assertNotNull(fTable); fTable.updateModel(fixture); @@ -201,9 +199,9 @@ public class SystemCallLatencyTableAnalysisTest { */ @Test public void smallTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i >= 0; i--) { - fixture.add(new SystemCall(new InitialInfo(i, "", Collections.EMPTY_MAP), 2 * i, 0)); + fixture.add(new BasicSegment(i, 2 * i)); } assertNotNull(fTable); fTable.updateModel(fixture); @@ -222,9 +220,9 @@ public class SystemCallLatencyTableAnalysisTest { @Test public void largeTest() { final int size = 1000000; - SystemCall[] fixture = new SystemCall[size]; + BasicSegment[] fixture = new BasicSegment[size]; for (int i = 0; i < size; i++) { - fixture[i] = (new SystemCall(new InitialInfo(i, "", Collections.EMPTY_MAP), 2 * i, 0)); + fixture[i] = (new BasicSegment(i, 2 * i)); } assertNotNull(fTable); fTable.updateModel(fixture); @@ -245,11 +243,11 @@ public class SystemCallLatencyTableAnalysisTest { Random rnd = new Random(); rnd.setSeed(1234); final int size = 1000000; - SystemCall[] fixture = new SystemCall[size]; + BasicSegment[] fixture = new BasicSegment[size]; for (int i = 0; i < size; i++) { int start = Math.abs(rnd.nextInt(100000000)); int end = start + Math.abs(rnd.nextInt(1000000)); - fixture[i] = (new SystemCall(new InitialInfo(start, "", Collections.EMPTY_MAP), end, 0)); + fixture[i] = (new BasicSegment(start, end)); } assertNotNull(fTable); fTable.updateModel(fixture); @@ -269,12 +267,12 @@ public class SystemCallLatencyTableAnalysisTest { public void gaussianNoiseTest() { Random rnd = new Random(); rnd.setSeed(1234); - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i <= 1000000; i++) { int start = Math.abs(rnd.nextInt(100000000)); final int delta = Math.abs(rnd.nextInt(1000)); int end = start + delta * delta; - fixture.add(new SystemCall(new InitialInfo(start, "", Collections.EMPTY_MAP), end, 0)); + fixture.add(new BasicSegment(start, end)); } assertNotNull(fTable); fTable.updateModel(fixture); diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml index 2cbb49cc07..fb1abc9d8d 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml @@ -109,28 +109,28 @@ class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput" id="org.eclipse.tracecompass.analysis.os.linux.views.latency"> + class="org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCallLatencyAnalysis"> + class="org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCallLatencyAnalysis"> + class="org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCallLatencyAnalysis"> + class="org.eclipse.tracecompass.internal.analysis.os.linux.core.latency.SystemCallLatencyAnalysis"> fSs; + private final Collection<@NonNull BasicSegment> fSs; /** * Constructor @@ -31,7 +31,7 @@ public class OfflineStatisticsCalculator { * @param ss * segment store, fully build */ - public OfflineStatisticsCalculator(Collection<@NonNull SystemCall> ss) { + public OfflineStatisticsCalculator(Collection<@NonNull BasicSegment> ss) { fSs = ss; } diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core.tests/src/org/eclipse/tracecompass/analysis/timing/core/tests/segmentstore/statistics/SegmentStoreStatisticsTest.java b/analysis/org.eclipse.tracecompass.analysis.timing.core.tests/src/org/eclipse/tracecompass/analysis/timing/core/tests/segmentstore/statistics/SegmentStoreStatisticsTest.java index c48a233ac6..893d123248 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.core.tests/src/org/eclipse/tracecompass/analysis/timing/core/tests/segmentstore/statistics/SegmentStoreStatisticsTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.timing.core.tests/src/org/eclipse/tracecompass/analysis/timing/core/tests/segmentstore/statistics/SegmentStoreStatisticsTest.java @@ -12,14 +12,12 @@ package org.eclipse.tracecompass.analysis.timing.core.tests.segmentstore.statist import static org.junit.Assert.assertEquals; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Random; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCall; -import org.eclipse.tracecompass.analysis.os.linux.core.latency.SystemCall.InitialInfo; import org.eclipse.tracecompass.analysis.timing.core.segmentstore.statistics.SegmentStoreStatistics; +import org.eclipse.tracecompass.segmentstore.core.BasicSegment; import org.eclipse.tracecompass.segmentstore.core.ISegment; import org.junit.Test; @@ -42,7 +40,7 @@ public class SegmentStoreStatisticsTest { private static final double NO_ERROR = 0.0; private static final double ERROR = 0.000001; - private static void testOnlineVsOffline(List<@NonNull SystemCall> fixture) { + private static void testOnlineVsOffline(List<@NonNull BasicSegment> fixture) { SegmentStoreStatistics sss = getSegStoreStat(fixture); OfflineStatisticsCalculator osc = new OfflineStatisticsCalculator(fixture); assertEquals("Average", osc.getAvg(), sss.getAverage(), ERROR); @@ -58,9 +56,9 @@ public class SegmentStoreStatisticsTest { */ @Test public void climbTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 0; i < MEDIUM_AMOUNT_OF_SEGMENTS; i++) { - fixture.add(createAnonSyscall(i, i * 2)); + fixture.add(createDummySegment(i, i * 2)); } SegmentStoreStatistics sss = getSegStoreStat(fixture); assertEquals("Average", 49.5, sss.getAverage(), ERROR); @@ -72,7 +70,7 @@ public class SegmentStoreStatisticsTest { testOnlineVsOffline(fixture); } - private static SegmentStoreStatistics getSegStoreStat(List<@NonNull SystemCall> fixture) { + private static SegmentStoreStatistics getSegStoreStat(List<@NonNull BasicSegment> fixture) { SegmentStoreStatistics sss = new SegmentStoreStatistics(); for (ISegment seg : fixture) { sss.update(seg); @@ -85,9 +83,9 @@ public class SegmentStoreStatisticsTest { */ @Test public void decrementingTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = MEDIUM_AMOUNT_OF_SEGMENTS; i >= 0; i--) { - fixture.add(createAnonSyscall(i, i * 2)); + fixture.add(createDummySegment(i, i * 2)); } SegmentStoreStatistics sss = getSegStoreStat(fixture); assertEquals("Average", 50, sss.getAverage(), NO_ERROR); @@ -104,9 +102,9 @@ public class SegmentStoreStatisticsTest { */ @Test public void smallTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i >= 0; i--) { - fixture.add(createAnonSyscall(i, i * 2)); + fixture.add(createDummySegment(i, i * 2)); } testOnlineVsOffline(fixture); } @@ -116,9 +114,9 @@ public class SegmentStoreStatisticsTest { */ @Test public void largeTest() { - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i <= LARGE_AMOUNT_OF_SEGMENTS; i++) { - fixture.add(createAnonSyscall(i, i * 2)); + fixture.add(createDummySegment(i, i * 2)); } testOnlineVsOffline(fixture); } @@ -130,11 +128,11 @@ public class SegmentStoreStatisticsTest { public void noiseTest() { Random rnd = new Random(); rnd.setSeed(1234); - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i <= LARGE_AMOUNT_OF_SEGMENTS; i++) { int start = Math.abs(rnd.nextInt(100000000)); int end = start + Math.abs(rnd.nextInt(1000000)); - fixture.add(createAnonSyscall(start, end)); + fixture.add(createDummySegment(start, end)); } testOnlineVsOffline(fixture); } @@ -146,17 +144,17 @@ public class SegmentStoreStatisticsTest { public void gaussianNoiseTest() { Random rnd = new Random(); rnd.setSeed(1234); - List<@NonNull SystemCall> fixture = new ArrayList<>(); + List<@NonNull BasicSegment> fixture = new ArrayList<>(); for (int i = 1; i <= LARGE_AMOUNT_OF_SEGMENTS; i++) { int start = Math.abs(rnd.nextInt(100000000)); final int delta = Math.abs(rnd.nextInt(1000)); int end = start + delta * delta; - fixture.add(createAnonSyscall(start, end)); + fixture.add(createDummySegment(start, end)); } testOnlineVsOffline(fixture); } - private static @NonNull SystemCall createAnonSyscall(int start, int end) { - return new SystemCall(new InitialInfo(start, "", Collections.EMPTY_MAP), end, 0); + private static @NonNull BasicSegment createDummySegment(int start, int end) { + return new BasicSegment(start, end); } } -- 2.34.1