Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick changes in master to 2021-06 branch #23

Merged
merged 14 commits into from
Apr 18, 2024
Merged

Cherry-pick changes in master to 2021-06 branch #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f35656b
scripting: remove dependency on incubator callstack
arfio Apr 4, 2024
0612f6f
traceevent: remove dependency on incubator callstack
arfio Apr 4, 2024
d748125
uftrace: remove dependency on incubator callstack
arfio Apr 4, 2024
a532261
inandout: remove dependency on incubator callstack
arfio Apr 4, 2024
ee8672c
otf2: remove dependency on incubator callstack
arfio Apr 4, 2024
a00c66f
perf: remove dependency on incubator callstack
arfio Apr 4, 2024
3d52c5e
kernel: remove dependency on incubator callstack
arfio Apr 4, 2024
425d80b
vm: remove dependency on incubator callstack
arfio Apr 4, 2024
8c8959e
trace-server: remove incubator callstack and analysis
arfio Apr 4, 2024
fd43659
tracecompass: remove incubator callstack and analysis
arfio Apr 4, 2024
f60fce2
analysis: remove dependency to deprecated classes
arfio Apr 4, 2024
4665905
xml-analysis: remove reference to nashorn
arfio Apr 11, 2024
9501beb
callstack: remove xml analysis
arfio Apr 16, 2024
d794a09
callstack: deprecate all classes that were moved to core
arfio Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.tracecompass.common.core,
org.eclipse.tracecompass.tmf.core,
org.eclipse.tracecompass.incubator.callstack.core,
org.eclipse.tracecompass.incubator.analysis.core,
org.eclipse.tracecompass.analysis.profiling.core,
org.eclipse.tracecompass.analysis.os.linux.core,
org.eclipse.tracecompass.analysis.timing.core,
org.eclipse.tracecompass.segmentstore.core,
Expand Down
2 changes: 1 addition & 1 deletion ...clipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Objects;

import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
import org.eclipse.tracecompass.incubator.internal.inandout.core.Activator;
import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
Expand Down
12 changes: 7 additions & 5 deletions ...tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@

import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider;
import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
import org.eclipse.tracecompass.incubator.internal.inandout.core.analysis.SegmentSpecifier.SegmentContext;
import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;

Expand Down Expand Up @@ -96,16 +98,16 @@ protected boolean considerEvent(ITmfEvent event) {
}

@Override
protected @Nullable String functionEntry(ITmfEvent event) {
protected @Nullable ITmfStateValue functionEntry(ITmfEvent event) {
SegmentContext segmentContext = fFirst;
if (segmentContext == null) {
return null;
}
return segmentContext.getLabel();
return TmfStateValue.newValueString(segmentContext.getLabel());
}

@Override
protected @Nullable String functionExit(ITmfEvent event) {
protected @Nullable ITmfStateValue functionExit(ITmfEvent event) {
if (fLast == null) {
return null;
}
Expand All @@ -116,7 +118,7 @@ protected boolean considerEvent(ITmfEvent event) {
map.remove(fLast.getContext(), victim.get());
}
}
return fLast.getLabel();
return TmfStateValue.newValueString(fLast.getLabel());
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.tracecompass.common.core,
org.eclipse.tracecompass.tmf.core,
org.eclipse.tracecompass.analysis.os.linux.core,
org.eclipse.tracecompass.incubator.analysis.core,
org.eclipse.tracecompass.incubator.callstack.core,
org.eclipse.tracecompass.analysis.timing.core,
org.eclipse.tracecompass.analysis.graph.core,
org.eclipse.tracecompass.analysis.profiling.core,
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.tracecompass.segmentstore.core,
org.eclipse.tracecompass.datastore.core,
Expand Down
12 changes: 6 additions & 6 deletions ...acecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor;
import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackElement;
import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackGroupDescriptor;
import org.eclipse.tracecompass.incubator.callstack.core.base.ICallStackElement;
import org.eclipse.tracecompass.incubator.callstack.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
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.callstack2.CallStackElement;
import org.eclipse.tracecompass.analysis.profiling.core.instrumented.CallStackGroupDescriptor;
import org.eclipse.tracecompass.analysis.profiling.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
Expand Down
8 changes: 4 additions & 4 deletions ...racecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.graph.core.criticalpath.AbstractCriticalPathModule;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
import org.eclipse.tracecompass.tmf.core.TmfStrings;
import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;
Expand Down
20 changes: 10 additions & 10 deletions ...acecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import java.util.Map;

import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge.EdgeType;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
import org.eclipse.tracecompass.internal.analysis.graph.core.base.CriticalPathPalette;
import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
import org.eclipse.tracecompass.internal.analysis.graph.core.base.OSCriticalPathPalette;
import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.OSEdgeContextState.OSEdgeContextEnum;
import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils;
import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
import org.eclipse.tracecompass.tmf.core.model.StyleProperties;
Expand All @@ -31,7 +31,7 @@

/**
* The palette for the critical path aggregated. The critical path states will
* use the {@link CriticalPathPalette} and threads and processes will use a qualitative palette.
* use the {@link OSCriticalPathPalette} and threads and processes will use a qualitative palette.
*
* @author gbastien
*/
Expand All @@ -47,7 +47,7 @@ public class CriticalPathAggregatedPalette implements IDataPalette {

static {
ImmutableMap.Builder<String, OutputElementStyle> builder = new ImmutableMap.Builder<>();
builder.putAll(CriticalPathPalette.getStyles());
builder.putAll(OSCriticalPathPalette.getStyles());
IPaletteProvider palette = new QualitativePaletteProvider.Builder().setNbColors(NUM_COLORS).build();
int i = 0;
for (RGBAColor color : palette.get()) {
Expand Down Expand Up @@ -85,12 +85,12 @@ public OutputElementStyle getStyleFor(Object object) {
if (object instanceof WeightedTree) {
WeightedTree<?> tree = (WeightedTree<?>) object;
Object treeObject = tree.getObject();
if (treeObject instanceof EdgeType) {
return STYLE_MAP.computeIfAbsent(((EdgeType) treeObject).name(), style -> new OutputElementStyle(style));
if (treeObject instanceof OSEdgeContextEnum) {
return STYLE_MAP.computeIfAbsent(((OSEdgeContextEnum) treeObject).name(), OutputElementStyle::new);
}
return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(treeObject.hashCode(), NUM_COLORS)), style -> new OutputElementStyle(style));
return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(treeObject.hashCode(), NUM_COLORS)), OutputElementStyle::new);
}
return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(object.hashCode(), NUM_COLORS)), style -> new OutputElementStyle(style));
return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(object.hashCode(), NUM_COLORS)), OutputElementStyle::new);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...clipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex;
import org.eclipse.tracecompass.analysis.graph.core.graph.TmfEdgeState;
import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;

import com.google.common.collect.ImmutableList;

Expand Down
2 changes: 1 addition & 1 deletion ...clipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.incubator.internal.kernel.core.fileaccess.FileEntryModel.Type;
import org.eclipse.tracecompass.incubator.internal.kernel.core.io.IoAnalysis;
import org.eclipse.tracecompass.incubator.internal.kernel.core.io.IoStateProvider;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
Expand Down
4 changes: 2 additions & 2 deletions .../org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.model.OsStrings;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.Disk;
import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.IODataPalette;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.internal.tmf.core.model.TmfXyResponseFactory;
import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
Expand Down
5 changes: 2 additions & 3 deletions analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.tracecompass.analysis.os.linux.core,
org.eclipse.tracecompass.analysis.os.linux.ui,
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.tracecompass.incubator.analysis.core,
org.eclipse.tracecompass.incubator.callstack.core,
org.eclipse.tracecompass.incubator.callstack.ui,
org.eclipse.tracecompass.analysis.timing.ui,
org.eclipse.tracecompass.analysis.timing.core,
org.eclipse.tracecompass.analysis.profiling.core,
org.eclipse.tracecompass.analysis.profiling.ui,
org.eclipse.tracecompass.segmentstore.core,
org.eclipse.tracecompass.datastore.core,
org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui
Expand Down
2 changes: 1 addition & 1 deletion analyses/org.eclipse.tracecompass.incubator.rocm.core/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
org.eclipse.jdt.core.compiler.problem.deadCode=error
org.eclipse.jdt.core.compiler.problem.deprecation=error
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
Expand Down
2 changes: 1 addition & 1 deletion ...g.eclipse.tracecompass.incubator.analysis.core.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
org.eclipse.jdt.core.compiler.problem.deadCode=error
org.eclipse.jdt.core.compiler.problem.deprecation=error
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
Expand Down
4 changes: 3 additions & 1 deletion callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.tracecompass.lttng2.kernel.core.tests,
org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf,
org.eclipse.tracecompass.analysis.timing.core,
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.tracecompass.analysis.profiling.core,
org.eclipse.tracecompass.analysis.profiling.core.tests
Export-Package: org.eclipse.tracecompass.incubator.analysis.core.tests,
org.eclipse.tracecompass.incubator.analysis.core.tests.aspects,
org.eclipse.tracecompass.incubator.analysis.core.tests.model,
Expand Down
2 changes: 1 addition & 1 deletion ...pse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.util.Map;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
import org.eclipse.tracecompass.incubator.internal.analysis.core.weighted.tree.DifferentialPalette;
import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
Expand Down
18 changes: 9 additions & 9 deletions ...tests/weighted/WeightedTreeUtilsTest.java → .../weighted/diff/WeightedTreeUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/

package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted;
package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted.diff;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand All @@ -24,16 +24,16 @@

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.SimpleTree;
import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.WeightedTreeProviderStub;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeSet;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils;
import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.SimpleTree;
import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.WeightedTreeProviderStub;
import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeSet;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider;
import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils;
import org.junit.Before;
import org.junit.Test;

Expand Down
3 changes: 2 additions & 1 deletion callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.tracecompass.analysis.timing.core,
org.eclipse.tracecompass.segmentstore.core,
org.eclipse.tracecompass.datastore.core,
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.tracecompass.analysis.profiling.core
Export-Package: org.eclipse.tracecompass.incubator.analysis.core.aspects,
org.eclipse.tracecompass.incubator.analysis.core.concepts,
org.eclipse.tracecompass.incubator.analysis.core.model,
Expand Down
4 changes: 2 additions & 2 deletions ....core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
Expand Down
4 changes: 2 additions & 2 deletions ...c/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
Expand Down
4 changes: 2 additions & 2 deletions ...rc/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
Expand Down
4 changes: 2 additions & 2 deletions ....core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
Expand Down
1 change: 1 addition & 0 deletions ...ore/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*
* @author Geneviève Bastien
*/
@Deprecated(since="0.10.0", forRemoval=true)
public class AggregatedCallSite extends WeightedTree<ICallStackSymbol> {

/**
Expand Down
1 change: 1 addition & 0 deletions ....core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/**
* @author Geneviève Bastien
*/
@Deprecated(since="0.10.0", forRemoval=true)
public interface ICallStackSymbol {

/**
Expand Down
Loading
Loading