From c1b7a91922938222badd13f5a5b31bce2c27d212 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 10:59:27 -0400 Subject: [PATCH 01/11] scripting: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 2 +- .../callstack/CallStackScriptingModule.java | 22 +++++++++---------- .../META-INF/MANIFEST.MF | 5 ++--- .../callstack/CallStackUiScriptingModule.java | 4 ++-- .../scripting/ui/views/ViewModule.java | 4 ++-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF b/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF index a6731e32f..97af6b779 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.incubator.filters.core;resolution:=optional, org.eclipse.tracecompass.tmf.cli.core, org.eclipse.tracecompass.incubator.analysis.core;resolution:=optional, - org.eclipse.tracecompass.incubator.callstack.core;resolution:=optional, + org.eclipse.tracecompass.analysis.profiling.core, org.eclipse.tracecompass.analysis.timing.core;resolution:=optional Export-Package: org.eclipse.tracecompass.incubator.internal.scripting.core;x-friends:="org.eclipse.tracecompass.incubator.scripting.core.tests,org.eclipse.tracecompass.incubator.scripting.ui.tests", org.eclipse.tracecompass.incubator.internal.scripting.core.analysis;x-friends:="org.eclipse.tracecompass.incubator.scripting.core.tests,org.eclipse.tracecompass.incubator.scripting.ui", diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java index 01921cfeb..5fb49c9f2 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java @@ -15,16 +15,16 @@ import org.eclipse.ease.modules.WrapToScript; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.AllGroupDescriptor; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor; -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.WeightedTreeGroupBy; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor; +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.WeightedTreeGroupBy; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider; -import org.eclipse.tracecompass.incubator.internal.callstack.core.flamegraph.FlameGraphDataProvider; import org.eclipse.tracecompass.incubator.internal.scripting.core.data.provider.ScriptingDataProviderManager; +import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider; +import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; /** @@ -33,14 +33,14 @@ * trace by requesting an analysis that implements the interface. *

* For example, the following scriptlet would get the LTTng-UST CallStack - * (Incubator) analysis, which implements the weighted tree provider, for the - * active LTTng UST trace. The object can then be used as parameter for the - * methods of this module. + * analysis, which implements the weighted tree provider, for the active LTTng + * UST trace. The object can then be used as parameter for the methods of this + * module. *

* * 
  * trace = getActiveTrace()
- * wtProvider = getTraceAnalysis(trace, "org.eclipse.tracecompass.incubator.callstack.core.lttng.ust");
+ * wtProvider = getTraceAnalysis(trace, "org.eclipse.tracecompass.lttng2.ust.core.analysis.callstack");
  *
* * @author Geneviève Bastien diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF index 3c4a33ae5..228c8ecdd 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF @@ -24,9 +24,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ease.ui, org.eclipse.core.expressions, org.eclipse.tracecompass.rcp.ui;resolution:=optional, - org.eclipse.tracecompass.incubator.analysis.core;resolution:=optional, - org.eclipse.tracecompass.incubator.callstack.core;resolution:=optional, - org.eclipse.tracecompass.incubator.callstack.ui;resolution:=optional + org.eclipse.tracecompass.analysis.profiling.core, + org.eclipse.tracecompass.analysis.profiling.ui Export-Package: org.eclipse.tracecompass.incubator.internal.scripting.ui;x-friends:="org.eclipse.tracecompass.incubator.scripting.ui.tests", org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;x-internal:=true, org.eclipse.tracecompass.incubator.internal.scripting.ui.tracemarker;x-internal:=true, diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java index 0afb80c9a..1bbb36c5b 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java @@ -14,10 +14,10 @@ import org.eclipse.ease.modules.WrapToScript; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.swt.widgets.Display; -import org.eclipse.tracecompass.incubator.internal.callstack.core.flamegraph.FlameGraphDataProvider; -import org.eclipse.tracecompass.incubator.internal.callstack.ui.flamegraph.FlameGraphView; import org.eclipse.tracecompass.incubator.internal.scripting.ui.views.timegraph.ScriptedTimeGraphView; import org.eclipse.tracecompass.incubator.scripting.core.callstack.CallStackScriptingModule; +import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider; +import org.eclipse.tracecompass.internal.analysis.profiling.ui.flamegraph2.FlameGraphView; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.IWorkbench; diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java index c10b9ecda..e8903065f 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java @@ -89,10 +89,10 @@ public void openTimeGraphView(ITimeGraphDataProvider dataPr * that will be the source of the view and looking in the 'Properties' view * for the ID property. * - * For example, to open a table view for the LTTng-UST CallStack (Incubator) analysis, the follow call can be make + * For example, to open a table view for the LTTng-UST CallStack analysis, the follow call can be made * * 
-     * showView(org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.SegmentStoreTableView.ID, "org.eclipse.tracecompass.incubator.callstack.core.lttng.ust");
+     * showView(org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.SegmentStoreTableView.ID, "org.eclipse.tracecompass.lttng2.ust.core.analysis.callstack");
      *
* * @param viewId From d8a552f8daea5f45c40c7643d53d8813cf4a6c96 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:05:58 -0400 Subject: [PATCH 02/11] traceevent: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 2 +- .../tests/CallStackStateProviderTest.java | 2 +- .../InstrumentedCallStackArrowsTest.java | 2 +- .../META-INF/MANIFEST.MF | 1 - .../TraceEventCallStackProvider.java | 27 ++++++++++--------- .../TraceEventCallstackAnalysis.java | 2 +- .../feature.xml | 12 ++------- 7 files changed, 21 insertions(+), 27 deletions(-) diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF index 62f212f98..d92b866cc 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF @@ -12,12 +12,12 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.incubator.traceevent.core, org.junit, org.eclipse.tracecompass.tmf.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.tracecompass.jsontrace.core, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, org.eclipse.tracecompass.statesystem.core.tests, org.eclipse.tracecompass.tmf.core.tests, org.eclipse.tracecompass.incubator.analysis.core, + org.eclipse.tracecompass.analysis.profiling.core, org.eclipse.tracecompass.analysis.timing.core Export-Package: org.eclipse.tracecompass.incubator.traceevent.core.tests Import-Package: com.google.common.base, diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java index 99ece46a9..82032ccb5 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; -import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue; import org.eclipse.tracecompass.incubator.internal.traceevent.core.analysis.callstack.TraceEventCallstackAnalysis; import org.eclipse.tracecompass.incubator.internal.traceevent.core.trace.TraceEventTrace; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java index 87d7c8f86..9c71e0aba 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue; import org.eclipse.tracecompass.incubator.internal.traceevent.core.analysis.callstack.TraceEventCallstackAnalysis; import org.eclipse.tracecompass.incubator.internal.traceevent.core.trace.TraceEventTrace; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF index 717a8bec2..f5de52ef9 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.common.core, org.eclipse.tracecompass.tmf.core, org.eclipse.tracecompass.segmentstore.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.tracecompass.analysis.os.linux.core, org.eclipse.tracecompass.incubator.analysis.core, org.eclipse.tracecompass.analysis.counters.core, diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java index 576050ee4..332e6081f 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java @@ -28,10 +28,10 @@ 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.analysis.os.linux.core.model.HostThread; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.ITraceEventConstants; import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.TraceEventAspects; import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.TraceEventField; @@ -41,6 +41,8 @@ import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval; +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.event.aspect.ITmfEventAspect; import org.eclipse.tracecompass.tmf.core.statesystem.TmfAttributePool; @@ -223,9 +225,9 @@ protected boolean considerEvent(@NonNull ITmfEvent event) { } @Override - protected @Nullable Object functionEntry(@NonNull ITmfEvent event) { + protected @Nullable ITmfStateValue functionEntry(@NonNull ITmfEvent event) { if (isEntry(event)) { - return event.getName(); + return TmfStateValue.newValueString(event.getName()); } return null; } @@ -236,9 +238,9 @@ private static boolean isEntry(ITmfEvent event) { } @Override - protected @Nullable Object functionExit(@NonNull ITmfEvent event) { + protected @Nullable ITmfStateValue functionExit(@NonNull ITmfEvent event) { if (isExit(event)) { - return event.getName(); + return TmfStateValue.newValueString(event.getName()); } return null; } @@ -477,7 +479,7 @@ private static int getAvailableEdgeQuark(ITmfStateSystemBuilder ssb, long startT } private void handleStart(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, long timestamp, String processName) { - Object functionBeginName = functionEntry(event); + ITmfStateValue functionBeginName = functionEntry(event); if (functionBeginName != null) { int processQuark = ss.getQuarkAbsoluteAndAdd(PROCESSES, processName); int pid = getProcessId(event); @@ -492,7 +494,7 @@ private void handleStart(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, lo ss.modifyAttribute(timestamp, threadId, threadQuark); int callStackQuark = ss.getQuarkRelativeAndAdd(threadQuark, InstrumentedCallStackAnalysis.CALL_STACK); - ss.pushAttribute(timestamp, functionBeginName, callStackQuark); + ss.pushAttribute(timestamp, functionBeginName.unboxValue(), callStackQuark); prepareNextSlice(ss, callStackQuark, timestamp); } } @@ -505,8 +507,9 @@ private static void prepareNextSlice(ITmfStateSystemBuilder ss, int quark, long private void handleEnd(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, long timestamp, String processName) { /* Check if the event is a function exit */ - Object functionExitName = functionExit(event); - if (functionExitName != null) { + ITmfStateValue functionExitState = functionExit(event); + if (functionExitState != null) { + String functionExitName = functionExitState.unboxStr(); String pName = processName; if (pName == null) { diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java index 53012fc0f..d59da042a 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java @@ -16,7 +16,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.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.tmf.core.analysis.requirements.TmfAbstractAnalysisRequirement; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml index dd5abe185..8cd58f890 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml +++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml @@ -25,7 +25,6 @@ - @@ -40,22 +39,15 @@ - + version="0.0.0"/> + version="0.0.0"/> From 1e33597c4713a15e0ea8982685a77fb6f3f1b145 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:11:18 -0400 Subject: [PATCH 03/11] uftrace: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 2 +- .../uftrace/core/analysis/UfCallstackAnalysis.java | 2 +- .../uftrace/core/analysis/UfCallstackProvider.java | 12 +++++++----- .../feature.xml | 10 ++-------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF index dc56645b7..c3846feac 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.tracecompass.common.core, org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0", - 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, diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java index 61f0fb9d1..333dd4371 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java @@ -14,7 +14,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.uftrace.core.trace.Uftrace; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java index 0de4b49a4..a544b4a71 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java @@ -14,10 +14,12 @@ 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.callstack.core.instrumented.statesystem.CallStackStateProvider; +import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider; import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.DatEvent; import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.UfEventType; import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.Uftrace.PidAspect; +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.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect; @@ -64,26 +66,26 @@ protected boolean considerEvent(@NonNull ITmfEvent event) { } @Override - protected @Nullable Object functionEntry(@NonNull ITmfEvent event) { + protected @Nullable ITmfStateValue functionEntry(@NonNull ITmfEvent event) { ITmfEventField content = event.getContent(); Object payload = content.getValue(); if (payload instanceof DatEvent) { DatEvent ev = (DatEvent) payload; if (event.getType().equals(UfEventType.ENTRY)) { - return ev.getAddress(); + return TmfStateValue.newValueLong(ev.getAddress()); } } return null; } @Override - protected @Nullable Object functionExit(@NonNull ITmfEvent event) { + protected @Nullable ITmfStateValue functionExit(@NonNull ITmfEvent event) { ITmfEventField content = event.getContent(); Object payload = content.getValue(); if (payload instanceof DatEvent) { DatEvent ev = (DatEvent) payload; if (event.getType().equals(UfEventType.EXIT)) { - return ev.getAddress(); + return TmfStateValue.newValueLong(ev.getAddress()); } } return null; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml index e9184d63c..47f64bcc9 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml +++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml @@ -23,26 +23,20 @@ - - + + version="0.0.0"/> From 6df2b8ddbffdbcf0d7f3ceeb53a49f6bec3683c4 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:15:00 -0400 Subject: [PATCH 04/11] inandout: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 3 +-- .../core/analysis/InAndOutAnalysisModule.java | 2 +- .../core/analysis/InAndOutAnalysisStateProvider.java | 12 +++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF index 2e81936c4..38be2341d 100644 --- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF +++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF @@ -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, diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java index 890c02dd0..849bede33 100644 --- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java +++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java index 5a22f81f3..fc8861336 100644 --- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java +++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java @@ -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; @@ -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; } @@ -116,7 +118,7 @@ protected boolean considerEvent(ITmfEvent event) { map.remove(fLast.getContext(), victim.get()); } } - return fLast.getLabel(); + return TmfStateValue.newValueString(fLast.getLabel()); } @Override From c5d227b66173a35174098b8ed9b4714043135059 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:17:42 -0400 Subject: [PATCH 05/11] otf2: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 7 +++---- .../callstack/Otf2CallStackStateProvider.java | 4 ++-- .../callstack/Otf2CallstackAnalysis.java | 8 ++++---- .../analysis/flows/Otf2FlowsDataProvider.java | 2 +- .../Otf2SummaryTimelineDataProvider.java | 2 +- .../feature.xml | 18 ++++-------------- 6 files changed, 15 insertions(+), 26 deletions(-) diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF index b8b22182c..ff8180b97 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF @@ -14,12 +14,11 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0", org.eclipse.tracecompass.tmf.ctf.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.tracecompass.analysis.os.linux.core, org.eclipse.tracecompass.analysis.counters.core, - org.eclipse.tracecompass.incubator.analysis.core;bundle-version="0.0.1", - org.eclipse.tracecompass.analysis.timing.core;bundle-version="5.2.1", - org.eclipse.tracecompass.segmentstore.core;bundle-version="3.0.1" + org.eclipse.tracecompass.analysis.timing.core, + org.eclipse.tracecompass.analysis.profiling.core, + org.eclipse.tracecompass.segmentstore.core Export-Package: org.eclipse.tracecompass.incubator.internal.otf2.core;x-friends:="org.eclipse.tracecompass.incubator.otf2.core.tests", org.eclipse.tracecompass.incubator.internal.otf2.core.analysis;x-friends:="org.eclipse.tracecompass.incubator.otf2.ui", org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.callstack;x-friends:="org.eclipse.tracecompass.incubator.otf2.ui", diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java index b15e9f1a3..0211802b8 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java @@ -22,8 +22,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; -import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.AbstractOtf2StateProvider; import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Constants; import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Events; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java index 3121f2404..8966b8a43 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java @@ -17,10 +17,10 @@ import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdResolver; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; +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.callstack2.CallStackSeries.IThreadIdResolver; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.AbstractOtf2Analysis; import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Constants; import org.eclipse.tracecompass.incubator.otf2.core.trace.Otf2Trace; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java index a3bcb8136..7865f17cf 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator; +import org.eclipse.tracecompass.incubator.internal.otf2.core.Activator; 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; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java index ff640cacc..eb4ff6ed4 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator; +import org.eclipse.tracecompass.incubator.internal.otf2.core.Activator; import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.IODataPalette; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml index 5c43ba338..33118d936 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml +++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml @@ -25,32 +25,22 @@ - - + + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> From 04968e45208d4b1091278f7d548e875a93bfebbd Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:20:49 -0400 Subject: [PATCH 06/11] perf: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 3 +-- .../core/tests/callgraph/PerfCallGraphTest.java | 4 ++-- .../META-INF/MANIFEST.MF | 5 ++--- .../callgraph/PerfCallchainAnalysisModule.java | 14 +++++++------- .../feature.xml | 11 ++--------- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF index f9a72708d..0ff7ac469 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF @@ -15,9 +15,8 @@ Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.tracecompass.tmf.core, org.eclipse.tracecompass.tmf.core.tests, - org.eclipse.tracecompass.incubator.analysis.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, + org.eclipse.tracecompass.analysis.profiling.core, org.eclipse.tracecompass.analysis.timing.core Export-Package: org.eclipse.tracecompass.incubator.perf.profiling.core.tests, org.eclipse.tracecompass.incubator.perf.profiling.core.tests.callgraph diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java index 7c5faa13b..abe911be6 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite; -import org.eclipse.tracecompass.incubator.analysis.core.concepts.ISamplingDataProvider; +import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite; +import org.eclipse.tracecompass.analysis.profiling.core.model.ISamplingDataProvider; import org.eclipse.tracecompass.incubator.internal.perf.profiling.core.callgraph.PerfCallchainAnalysisModule; import org.eclipse.tracecompass.incubator.perf.profiling.core.tests.ActivatorTest; import org.eclipse.tracecompass.tmf.core.event.TmfEvent; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF index a7bde56f9..5e020998f 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF @@ -13,13 +13,12 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.common.core, org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0", org.eclipse.tracecompass.tmf.ctf.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.tracecompass.lttng2.kernel.core, org.eclipse.tracecompass.lttng2.common.core, org.eclipse.tracecompass.analysis.os.linux.core, - org.eclipse.cdt.core, - org.eclipse.tracecompass.incubator.analysis.core, org.eclipse.tracecompass.analysis.timing.core, + org.eclipse.tracecompass.analysis.profiling.core, + org.eclipse.cdt.core, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Export-Package: org.eclipse.tracecompass.incubator.internal.perf.profiling.core;x-friends:="org.eclipse.tracecompass.incubator.perf.profiling.core.tests", org.eclipse.tracecompass.incubator.internal.perf.profiling.core.callgraph;x-friends:="org.eclipse.tracecompass.incubator.perf.profiling.core.tests", diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java index a8c73efba..fbe549348 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java @@ -20,13 +20,13 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite; -import org.eclipse.tracecompass.incubator.analysis.core.concepts.ISamplingDataProvider; -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.model.ISamplingDataProvider; +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.TmfEvent; diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml index dccc663bb..844b8ba48 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml +++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml @@ -24,30 +24,23 @@ - - - + + version="0.0.0"/> From 32a24e3e198bc261efd9ad8a1b424acd8e39a26b Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 11:56:12 -0400 Subject: [PATCH 07/11] kernel: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 3 +-- .../context/ContextCallStackAnalysis.java | 12 +++++------ .../CriticalPathAggregatedModule.java | 8 ++++---- .../CriticalPathAggregatedPalette.java | 20 +++++++++---------- .../criticalpath/CriticalPathWeighted.java | 4 ++-- .../fileaccess/FileAccessDataProvider.java | 2 +- .../core/io/IoPerProcessDataProvider.java | 4 ++-- .../META-INF/MANIFEST.MF | 5 ++--- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF index 0bd6fed4b..55df1ad3c 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF @@ -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, diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java index d263d0705..cebf88ac1 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java index 1c78758cd..2e1062e81 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java index d16b4b204..2cd912577 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java @@ -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; @@ -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 */ @@ -47,7 +47,7 @@ public class CriticalPathAggregatedPalette implements IDataPalette { static { ImmutableMap.Builder 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()) { @@ -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 diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java index da4be3cf0..d836fdfb2 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java index 4050e4e6a..d9bfb40d9 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java index d8341d98c..15f10903a 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java @@ -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; diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF index e3327de06..1bbbae749 100644 --- a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF +++ b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF @@ -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 From 36c8e4204ce4d5a7b97f015ab8004210c000a9dc Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 12:16:11 -0400 Subject: [PATCH 08/11] vm: remove dependency on incubator callstack Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 3 +- .../core/model/qemukvm/QemuKvmVmModel.java | 4 +-- .../core/overhead/VmOverheadAnalysis.java | 31 ++++++++++--------- .../overhead/VmOverheadStateProvider.java | 6 ++-- .../handlers/QemuKvmEventHandler.java | 6 ++-- .../handlers/SchedSwitchEventHandler.java | 6 ++-- .../feature.xml | 16 ++-------- 8 files changed, 33 insertions(+), 43 deletions(-) diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF index 782f655e5..e78c7c186 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF @@ -19,8 +19,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.analysis.os.linux.core.tests, org.eclipse.tracecompass.tmf.core.tests, org.eclipse.tracecompass.statesystem.core.tests, - org.eclipse.tracecompass.incubator.callstack.core, - org.eclipse.tracecompass.incubator.analysis.core, + org.eclipse.tracecompass.analysis.timing.core, + org.eclipse.tracecompass.analysis.profiling.core, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Export-Package: org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests, org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests.fused, diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF index cc2b1f863..0a77b8e8e 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF @@ -14,10 +14,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.tmf.core, org.eclipse.tracecompass.analysis.os.linux.core, org.eclipse.tracecompass.tmf.ctf.core, - org.eclipse.tracecompass.incubator.analysis.core, org.eclipse.tracecompass.segmentstore.core, org.eclipse.tracecompass.analysis.timing.core, - org.eclipse.tracecompass.incubator.callstack.core, + org.eclipse.tracecompass.analysis.profiling.core, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Export-Package: org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core;x-internal:=true, org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.data;x-friends:="org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests,org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui", diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java index a14199391..e92de43bc 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java @@ -27,11 +27,11 @@ import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelThreadInformationProvider; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; -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.incubator.internal.virtual.machine.analysis.core.model.IVirtualMachineModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine; +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.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.TmfEventField; diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java index 9f9fd06ea..db799572e 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java @@ -17,19 +17,20 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.callstack.core.base.ICallStackElement; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils.IHostIdProvider; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils.TraceHostIdResolver; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdProvider; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdResolver; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; -import org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.InstrumentedCallStackElement; +import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.IHostIdProvider; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.IHostIdResolver; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.TraceHostIdResolver; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries.IThreadIdProvider; +import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries.IThreadIdResolver; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.FusedVMInformationProvider; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.FusedVirtualMachineAnalysis; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.analysis.VirtualMachineModelAnalysis; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.virtual.resources.VirtualResourcesAnalysis; +import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackElement; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval; @@ -202,30 +203,30 @@ protected TraceHostIdResolver getCallStackHostResolver(ITmfTrace trace) { } @Override - public @NonNull String getHostId() { + public IHostIdResolver getHostIdResolver() { // The host ID is the one from the host ITmfTrace trace = getTrace(); if (trace == null) { - return super.getHostId(); + return super.getHostIdResolver(); } // FIXME: There should be a better way to get the host ID FusedVirtualMachineAnalysis analysisModule = TmfTraceUtils.getAnalysisModuleOfClass(trace, FusedVirtualMachineAnalysis.class, FusedVirtualMachineAnalysis.ID); if (analysisModule == null) { - return super.getHostId(); + return super.getHostIdResolver(); } analysisModule.schedule(); analysisModule.waitForCompletion(); ITmfStateSystem stateSystem = analysisModule.getStateSystem(); if (stateSystem == null) { - return super.getHostId(); + return super.getHostIdResolver(); } Optional hostTrace = TmfTraceManager.getTraceSet(trace).stream() .filter(t -> FusedVMInformationProvider.getParentMachineHostId(stateSystem, t.getHostId()).isEmpty()) .findFirst(); if (hostTrace.isPresent()) { - return hostTrace.get().getHostId(); + return new CallStackHostUtils.TraceHostIdResolver(hostTrace.get()); } - return super.getHostId(); + return super.getHostIdResolver(); } /** diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java index f5334023e..4b7bd0ea9 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java @@ -24,13 +24,13 @@ import org.eclipse.tracecompass.analysis.os.linux.core.trace.DefaultEventLayout; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace; -import org.eclipse.tracecompass.incubator.analysis.core.concepts.ProcessStatusInterval; -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.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.handlers.QemuKvmEventHandler; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.handlers.SchedSwitchEventHandler; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ProcessStatusInterval; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java index 2441b0c5f..0381e5599 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java @@ -19,14 +19,14 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadStateProvider; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java index 4c52927d3..49a257899 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java @@ -19,15 +19,15 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; -import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadAnalysis; import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadStateProvider; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml index e8f7964d5..b08054e36 100644 --- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml +++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml @@ -20,7 +20,6 @@ - @@ -37,23 +36,14 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> From aa642e065a4134f59f2c1c19c2ea800b5191b50d Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 12:17:07 -0400 Subject: [PATCH 09/11] trace-server: remove incubator callstack and analysis Signed-off-by: Arnaud Fiorini --- .../legacy/traceserver.product | 16 +++++++--------- .../traceserver.product | 2 -- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product index 546f44d52..e6afbf35e 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product @@ -1,7 +1,7 @@ - + @@ -141,8 +141,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - + + @@ -151,9 +151,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - - + + + @@ -164,7 +164,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + @@ -179,10 +179,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product index 80525646b..f31e4c14b 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product @@ -187,10 +187,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - From 090de229a5525811c98f7e88baffb693a883402d Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 12:17:29 -0400 Subject: [PATCH 10/11] tracecompass: remove incubator callstack and analysis Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 2 -- .../feature.xml | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF index cd880d737..9d271f00c 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF +++ b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF @@ -14,8 +14,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.tmf.ctf.core, org.eclipse.tracecompass.tmf.core, org.eclipse.tracecompass.ctf.core, - org.eclipse.tracecompass.incubator.analysis.core, - org.eclipse.tracecompass.incubator.callstack.core, org.eclipse.tracecompass.segmentstore.core, org.eclipse.tracecompass.analysis.os.linux.core, org.eclipse.tracecompass.analysis.timing.core, diff --git a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml index dccf49356..2b0a48061 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml +++ b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml @@ -26,8 +26,6 @@ - - @@ -40,9 +38,6 @@ + version="0.0.0"/> From 1f704ebdb0378994218ce2acd59370545d5ffd71 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 14:12:30 -0400 Subject: [PATCH 11/11] analysis: remove dependency to deprecated classes Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 4 +++- .../weighted/diff/DifferentialPaletteTest.java | 2 +- .../{ => diff}/WeightedTreeUtilsTest.java | 18 +++++++++--------- .../META-INF/MANIFEST.MF | 3 ++- .../core/aspects/AnalysisPidAspect.java | 4 ++-- .../aspects/AnalysisProcessNameAspect.java | 4 ++-- .../core/aspects/AnalysisThreadNameAspect.java | 4 ++-- .../core/aspects/AnalysisTidAspect.java | 4 ++-- .../tree/diff/DifferentialWeightedTree.java | 2 +- .../diff/DifferentialWeightedTreeProvider.java | 8 ++++---- .../tree/diff/DifferentialWeightedTreeSet.java | 4 ++-- .../tree/{ => diff}/WeightedTreeUtils.java | 9 +++++---- .../weighted/tree/DifferentialPalette.java | 2 +- .../callstack/CallStackScriptingModule.java | 2 +- 14 files changed, 37 insertions(+), 33 deletions(-) rename callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/{ => diff}/WeightedTreeUtilsTest.java (97%) rename callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/{ => diff}/WeightedTreeUtils.java (96%) diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF index 5679a1a03..6f4589201 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF @@ -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, diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java index 2c8adc0c1..cc62cf764 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java similarity index 97% rename from callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java rename to callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java index 540381d21..a5a7bb10d 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java @@ -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; @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF index aa8160260..4f2281a78 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF @@ -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, diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java index 5ec20fa81..57ea9e9c3 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java index c1ac03f98..7ebad83dc 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java index 835e72860..8ae63342b 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java index b4b45c036..015b97b9f 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java @@ -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; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java index 73088bfb6..b9ed3733e 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java @@ -12,7 +12,7 @@ package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; /** * A class that represents a differential weighted tree. The weight is the base diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java index 637d976fc..06dd36400 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java @@ -22,10 +22,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -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.incubator.internal.analysis.core.weighted.tree.DifferentialPalette; /** diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java index 72f6315d6..469f87cb3 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java @@ -17,8 +17,8 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java similarity index 96% rename from callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java rename to callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java index a279c77ab..91afdc798 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree; +package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff; import java.util.ArrayList; import java.util.Collection; @@ -18,9 +18,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -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.DifferentialWeightedTreeSet; +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.tmf.core.util.Pair; import com.google.common.collect.ImmutableList; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java index 307c471d5..977991623 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java @@ -16,7 +16,7 @@ import java.util.Map; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette; +import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree; import org.eclipse.tracecompass.incubator.internal.analysis.core.Activator; import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils; diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java index 5fb49c9f2..070493189 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java @@ -20,8 +20,8 @@ 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.WeightedTreeGroupBy; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider; +import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils; import org.eclipse.tracecompass.incubator.internal.scripting.core.data.provider.ScriptingDataProviderManager; import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider; import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor;