profiling.core: make callstack api

This commit makes the new callstack api, moving necessary classes to provisional packages and adding it to the API. Signed-off-by: Arnaud Fiorini <fiorini.arnaud@gmail.com>
eclipse-tracecompass · Mar 26, 2024 · a0c8f83 · a0c8f83
1 parent 791195f
commit a0c8f83
Show file tree

Hide file tree

Showing 82 changed files with 323 additions and 329 deletions.
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
@@ -47,7 +47,8 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.core.contextswitch,
   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.analysis.profiling.core.tests",
+   org.eclipse.tracecompass.analysis.profiling.core.tests,
+   org.eclipse.tracecompass.analysis.profiling.core",
  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.kernelmemoryusage;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui",
  org.eclipse.tracecompass.internal.analysis.os.linux.core.latency;

diff --git a/.../src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackStateSystemTest.java b/.../src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackStateSystemTest.java
@@ -22,12 +22,12 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackGroupDescriptor;
 import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallStackAnalysisStub;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.callstack.CallStackSeries;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedGroupDescriptor;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackGroupDescriptor;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;

diff --git a/....core.tests/src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackTest.java b/....core.tests/src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackTest.java
@@ -25,15 +25,15 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICalledFunction;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStack;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallStackAnalysisStub;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CalledFunctionFactory;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.callstack.CallStackSeries;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackElement;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackElement;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICalledFunction;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callstack.CallStack;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.junit.Test;
 

diff --git a/....tests/src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackTestBase2.java b/....tests/src/org/eclipse/tracecompass/analysis/profiling/core/tests/CallStackTestBase2.java
@@ -18,12 +18,12 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackSymbol;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallStackAnalysisStub;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.KernelAnalysisModuleStub;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCallSite;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackSymbol;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal;

diff --git a/...pass/analysis/profiling/core/tests/callgraph2/AggregatedCalledFunctionStatisticsTest.java b/...pass/analysis/profiling/core/tests/callgraph2/AggregatedCalledFunctionStatisticsTest.java
@@ -20,13 +20,13 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICallGraphProvider2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.CallStackTestBase2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallGraphAnalysisStub;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCalledFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCalledFunctionStatistics;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackElement;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICallGraphProvider;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.statesystem.core.StateSystemFactory;
 import org.eclipse.tracecompass.statesystem.core.backend.IStateHistoryBackend;
@@ -88,7 +88,7 @@ private static List<ICallStackElement> getLeafElements(ICallStackElement group)
         return leafGroups;
     }
 
-    private static @NonNull List<ICallStackElement> getLeafElements(ICallGraphProvider cga) {
+    private static @NonNull List<ICallStackElement> getLeafElements(ICallGraphProvider2 cga) {
         @SuppressWarnings("null")
         Collection<ICallStackElement> elements = cga.getCallGraph().getElements();
         List<ICallStackElement> leafGroups = new ArrayList<>();

diff --git a/...rg/eclipse/tracecompass/analysis/profiling/core/tests/callgraph2/AggregationTreeTest.java b/...rg/eclipse/tracecompass/analysis/profiling/core/tests/callgraph2/AggregationTreeTest.java
@@ -24,14 +24,14 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.CallGraph;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICallGraphProvider2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.ActivatorTest;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.CallStackTestBase2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallGraphAnalysisStub;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCalledFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackElement;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.CallGraph;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICallGraphProvider;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.statesystem.core.StateSystemFactory;
 import org.eclipse.tracecompass.statesystem.core.backend.IStateHistoryBackend;
@@ -106,7 +106,7 @@ private static List<ICallStackElement> getLeafElements(ICallStackElement group)
         return leafGroups;
     }
 
-    private static @NonNull List<ICallStackElement> getLeafElements(ICallGraphProvider cga) {
+    private static @NonNull List<ICallStackElement> getLeafElements(ICallGraphProvider2 cga) {
         @SuppressWarnings("null")
         Collection<ICallStackElement> elements = cga.getCallGraph().getElements();
         List<ICallStackElement> leafGroups = new ArrayList<>();

diff --git a/...acecompass/analysis/profiling/core/tests/callgraph2/CallGraphGroupByInstrumentedTest.java b/...acecompass/analysis/profiling/core/tests/callgraph2/CallGraphGroupByInstrumentedTest.java
@@ -21,18 +21,18 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackSymbol;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.CallGraph;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.CallStackTestBase2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallStackAnalysisStub;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeGroupBy;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeSet;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCalledFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.WeightedTree;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.WeightedTreeGroupBy;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.WeightedTreeSet;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackElement;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackSymbol;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.CallGraph;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.tree.ITree;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;

diff --git a/...ecompass/analysis/profiling/core/tests/callgraph2/CallGraphWithCallStackAnalysisTest.java b/...ecompass/analysis/profiling/core/tests/callgraph2/CallGraphWithCallStackAnalysisTest.java
@@ -22,18 +22,18 @@
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.CallGraph;
+import org.eclipse.tracecompass.analysis.profiling.core.model.ICpuTimeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.CallStackTestBase2;
 import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2.CallStackAnalysisStub;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCallSite;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.AggregatedCalledFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CallGraphAnalysis;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackElement;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.CompositeHostModel;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.base.ICallStackElement;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.CallGraph;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.model.ICpuTimeProvider;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp;
 import org.junit.After;

diff --git a/...org/eclipse/tracecompass/analysis/profiling/core/tests/callgraph2/CalledFunctionTest.java b/...org/eclipse/tracecompass/analysis/profiling/core/tests/callgraph2/CalledFunctionTest.java
@@ -19,12 +19,12 @@
 import java.util.ArrayList;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICalledFunction;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CalledFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CalledFunctionFactory;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CalledStringFunction;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICalledFunction;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.model.IHostModel;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...g/eclipse/tracecompass/analysis/profiling/core/tests/perf/CallStackAndGraphBenchmark.java b/...g/eclipse/tracecompass/analysis/profiling/core/tests/perf/CallStackAndGraphBenchmark.java
@@ -25,13 +25,13 @@
 import org.eclipse.test.performance.Dimension;
 import org.eclipse.test.performance.Performance;
 import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.CallGraph;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICallGraphProvider2;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.IFlameChartProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeGroupBy;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.WeightedTreeGroupBy;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.CallGraph;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICallGraphProvider;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.instrumented.IFlameChartProvider;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
@@ -49,7 +49,7 @@
  * partial callgraph for time ranges and group by of call graph.
  *
  * This base class can be extended by any performance test for analysis that
- * implement {@link ICallGraphProvider}, whether or not it also implements
+ * implement {@link ICallGraphProvider2}, whether or not it also implements
  * {@link IFlameChartProvider}.
  *
  * @author Geneviève Bastien
@@ -114,8 +114,8 @@ public void runCpuBenchmark() throws TmfTraceException {
                 trace = getTrace();
                 trace.traceOpened(new TmfTraceOpenedSignal(this, trace, null));
                 IAnalysisModule analysisModule = TmfTraceUtils.getAnalysisModuleOfClass(trace, IAnalysisModule.class, fAnalysisId);
-                assertTrue(analysisModule instanceof ICallGraphProvider);
-                ICallGraphProvider callGraphModule = (ICallGraphProvider) analysisModule;
+                assertTrue(analysisModule instanceof ICallGraphProvider2);
+                ICallGraphProvider2 callGraphModule = (ICallGraphProvider2) analysisModule;
 
                 if (analysisModule instanceof IFlameChartProvider) {
                     // Do the performance test for the instrumented call stack,
@@ -183,7 +183,7 @@ public void runCpuBenchmark() throws TmfTraceException {
         callgraphGroupByPm.commit();
     }
 
-    private static void benchmarkCallGraphProvider(ICallGraphProvider callGraphModule, PerformanceMeter callgraphBuildPm) {
+    private static void benchmarkCallGraphProvider(ICallGraphProvider2 callGraphModule, PerformanceMeter callgraphBuildPm) {
         // Do the performance test for building the callgraph only
         callgraphBuildPm.start();
         TmfTestHelper.executeAnalysis((IAnalysisModule) callGraphModule);
@@ -219,7 +219,7 @@ private static void benchmarkInstrumented(IFlameChartProvider analysisModule, Pe
         // Getting the callgraph will schedule the analysis and wait for its
         // completion
         callgraphBuildPm.start();
-        CallGraph callGraph = ((ICallGraphProvider) analysisModule).getCallGraph();
+        CallGraph callGraph = ((ICallGraphProvider2) analysisModule).getCallGraph();
         callgraphBuildPm.stop();
 
         assertTrue(!callGraph.getElements().isEmpty());

diff --git a/.../org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CallGraphAnalysisStub.java b/.../org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CallGraphAnalysisStub.java
@@ -16,12 +16,11 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.IFlameChartProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.internal.analysis.profiling.core.callgraph2.CallGraphAnalysis;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.callstack.CallStackSeries;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callstack.CallStackHostUtils;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.instrumented.IFlameChartProvider;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
@@ -129,7 +128,7 @@ public void iterate() {
         if (callStackSeries == null) {
             throw new IllegalArgumentException();
         }
-        iterateOverCallstackSerie(callStackSeries, ModelManager.getModelFor(""), getCallGraph(), 0, Long.MAX_VALUE, new NullProgressMonitor());
+        iterateOverCallstackSerie(callStackSeries, getCallGraph(), 0, Long.MAX_VALUE, new NullProgressMonitor());
     }
 
     @Override

diff --git a/.../org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CallStackAnalysisStub.java b/.../org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CallStackAnalysisStub.java
@@ -12,13 +12,14 @@
 package org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.EdgeStateValue;
-import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.statesystem.core.tests.shared.utils.StateIntervalStub;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
@@ -52,7 +53,9 @@ public List<String[]> getPatterns() {
 
     @Override
     public List<ITmfStateInterval> getLinks(long start, long end, IProgressMonitor monitor) {
-        String hostId = getHostId();
+        ITmfTrace trace = Objects.requireNonNull(getTrace());
+        String hostId = trace.getHostId();
+
         HostThread tid2 = new HostThread(hostId, 2);
         HostThread tid3 = new HostThread(hostId, 3);
         HostThread tid6 = new HostThread(hostId, 6);

diff --git a/...ubs/org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CalledFunctionStub.java b/...ubs/org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/CalledFunctionStub.java
@@ -12,7 +12,7 @@
 package org.eclipse.tracecompass.analysis.profiling.core.tests.stubs2;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.provisional.analysis.profiling.core.callgraph.ICalledFunction;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICalledFunction;
 
 /**
  * A Stub for the CalledFunction segment.