callstack: Move these to new callstack.core.base

As a way to start reducing the size of callstack.core's WIP flat list. Base this early packaging on the existing relationships among these callstack objects from Incubator and the sibling analysis.profiling plugin. Also base this on which objects use each, blending all of these informal criteria together, balanced yet for an eventual clean plugin. Move IDataPalette from core.tree to core.base, as it became used by objects beyond core.tree centric ones. Change-Id: I4b0f08f76fc070ae7eaaca74c55aa6629b70f444 Signed-off-by: Marco Miller <marco.miller@ericsson.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/199464 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
eclipse-tracecompass · Mar 31, 2023 · fa737e3 · fa737e3
1 parent c04e58f
commit fa737e3
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 15 deletions.
diff --git a/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCallSite.java b/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCallSite.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 
 import org.eclipse.tracecompass.analysis.timing.core.statistics.IStatistics;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.WeightedTree;
 
 import com.google.common.annotations.VisibleForTesting;

diff --git a/...c/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCalledFunction.java b/...c/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCalledFunction.java
@@ -21,6 +21,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
 import org.eclipse.tracecompass.analysis.timing.core.statistics.IStatistics;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.WeightedTree;
 
 import com.google.common.collect.ImmutableList;

diff --git a/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedThreadStatus.java b/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedThreadStatus.java
@@ -12,6 +12,7 @@
 package org.eclipse.tracecompass.internal.analysis.callstack.core;
 
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.StringSymbol;
 
 /**
  * Class to calculate statistics for an aggregated function.

diff --git a/...llstack.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallGraph.java b/...llstack.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallGraph.java
@@ -16,6 +16,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeSet;
 
 import com.google.common.collect.HashMultimap;

diff --git a/...core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallGraphAnalysis.java b/...core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallGraphAnalysis.java
@@ -23,7 +23,10 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IDataPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.FlameWithKernelPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.IDataPalette;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;

diff --git a/...llstack.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStack.java b/...llstack.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStack.java
@@ -23,6 +23,7 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackHostUtils.IHostIdProvider;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackSeries.IThreadIdProvider;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.StateSystemUtils;
 import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException;

diff --git a/....core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackElement.java b/....core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackElement.java
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.ITree;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;
 

diff --git a/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackHostUtils.java b/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackHostUtils.java
@@ -19,6 +19,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;

diff --git a/...k.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackSeries.java b/...k.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackSeries.java
@@ -27,6 +27,8 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackHostUtils.IHostIdProvider;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackHostUtils.IHostIdResolver;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackGroupDescriptor;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;

diff --git a/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackSymbolFactory.java b/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/CallStackSymbolFactory.java
@@ -13,6 +13,11 @@
 
 import java.util.regex.Pattern;
 
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ResolvableSymbol;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.StringSymbol;
+
 /**
  * A factory that creates the appropriate symbol for a given element
  *

diff --git a/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/ICallGraphProvider.java b/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/ICallGraphProvider.java
@@ -15,7 +15,10 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IDataPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.FlameDefaultPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackSymbol;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.IDataPalette;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeProvider;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeSet;

diff --git a/.../eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedCallStackAnalysis.java b/.../eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedCallStackAnalysis.java
@@ -23,7 +23,8 @@
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.IAnalysisProgressListener;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackHostUtils.TraceHostIdResolver;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackSeries.IThreadIdResolver;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IDataPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.EdgeStateValue;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.IDataPalette;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;

diff --git a/...g/eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedCallStackElement.java b/...g/eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedCallStackElement.java
@@ -28,6 +28,7 @@
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackHostUtils.IHostIdResolver;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackSeries.IThreadIdProvider;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.CallStackSeries.IThreadIdResolver;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.ICallStackElement;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;

diff --git a/...rg/eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedGroupDescriptor.java b/...rg/eclipse/tracecompass/internal/analysis/callstack/core/InstrumentedGroupDescriptor.java
@@ -14,6 +14,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.CallStackGroupDescriptor;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 
 /**

diff --git a/...lstack/core/CallStackGroupDescriptor.java → ...k/core/base/CallStackGroupDescriptor.java b/...lstack/core/CallStackGroupDescriptor.java → ...k/core/base/CallStackGroupDescriptor.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import org.eclipse.jdt.annotation.Nullable;
 

diff --git a/...alysis/callstack/core/EdgeStateValue.java → ...s/callstack/core/base/EdgeStateValue.java b/...alysis/callstack/core/EdgeStateValue.java → ...s/callstack/core/base/EdgeStateValue.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Comparator;

diff --git a/...s/callstack/core/FlameDefaultPalette.java → ...lstack/core/base/FlameDefaultPalette.java b/...s/callstack/core/FlameDefaultPalette.java → ...lstack/core/base/FlameDefaultPalette.java
@@ -9,14 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IDataPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.AggregatedCallSite;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.ICalledFunction;
 import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
 import org.eclipse.tracecompass.tmf.core.model.StyleProperties;

diff --git a/...allstack/core/FlameWithKernelPalette.java → ...ack/core/base/FlameWithKernelPalette.java b/...allstack/core/FlameWithKernelPalette.java → ...ack/core/base/FlameWithKernelPalette.java
@@ -9,14 +9,14 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IDataPalette;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.AggregatedThreadStatus;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.StateValues;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.registry.LinuxStyle;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;

diff --git a/...sis/callstack/core/ICallStackElement.java → ...allstack/core/base/ICallStackElement.java b/...sis/callstack/core/ICallStackElement.java → ...allstack/core/base/ICallStackElement.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collection;
 

diff --git a/...stack/core/ICallStackGroupDescriptor.java → .../core/base/ICallStackGroupDescriptor.java b/...stack/core/ICallStackGroupDescriptor.java → .../core/base/ICallStackGroupDescriptor.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.tree.IWeightedTreeGroupDescriptor;

diff --git a/...ysis/callstack/core/ICallStackSymbol.java → ...callstack/core/base/ICallStackSymbol.java b/...ysis/callstack/core/ICallStackSymbol.java → ...callstack/core/base/ICallStackSymbol.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collection;
 

diff --git a/...sis/callstack/core/tree/IDataPalette.java → ...sis/callstack/core/base/IDataPalette.java b/...sis/callstack/core/tree/IDataPalette.java → ...sis/callstack/core/base/IDataPalette.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core.tree;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Map;
 

diff --git a/...ysis/callstack/core/ResolvableSymbol.java → ...callstack/core/base/ResolvableSymbol.java b/...ysis/callstack/core/ResolvableSymbol.java → ...callstack/core/base/ResolvableSymbol.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collection;
 

diff --git a/...analysis/callstack/core/StringSymbol.java → ...sis/callstack/core/base/StringSymbol.java b/...analysis/callstack/core/StringSymbol.java → ...sis/callstack/core/base/StringSymbol.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
 
 import java.util.Collection;
 import java.util.Objects;

diff --git a/...core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/base/package-info.java b/...core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/base/package-info.java
@@ -0,0 +1,12 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Ericsson
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which accompanies
+ * this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.internal.analysis.callstack.core.base;
diff --git a/...rc/org/eclipse/tracecompass/internal/analysis/callstack/core/tree/DefaultDataPalette.java b/...rc/org/eclipse/tracecompass/internal/analysis/callstack/core/tree/DefaultDataPalette.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.IDataPalette;
 import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
 import org.eclipse.tracecompass.tmf.core.model.StyleProperties;

diff --git a/...org/eclipse/tracecompass/internal/analysis/callstack/core/tree/IWeightedTreeProvider.java b/...org/eclipse/tracecompass/internal/analysis/callstack/core/tree/IWeightedTreeProvider.java
@@ -26,6 +26,7 @@
 import org.eclipse.tracecompass.common.core.format.DataSpeedWithUnitFormat;
 import org.eclipse.tracecompass.common.core.format.DecimalUnitFormat;
 import org.eclipse.tracecompass.common.core.format.SubSecondTimeWithUnitFormat;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.base.IDataPalette;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 
 /**