callstack: Move these to new callstack.core.model

As a way to keep reducing the size of callstack.core's WIP flat list. Base this early packaging on the current relationships among these objects, as started with the base commit. Change-Id: Ie6f1fd82f32581909135dd501eeea51cc2e39708 Signed-off-by: Marco Miller <marco.miller@ericsson.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/199465 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 · a0927cc · a0927cc
1 parent fa737e3
commit a0927cc
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 9 deletions.
diff --git a/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/AbstractCalledFunction.java b/...src/org/eclipse/tracecompass/internal/analysis/callstack/core/AbstractCalledFunction.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.IHostModel;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.SegmentComparators;
 

diff --git a/...c/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCalledFunction.java b/...c/org/eclipse/tracecompass/internal/analysis/callstack/core/AggregatedCalledFunction.java
@@ -22,6 +22,8 @@
 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.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ProcessStatusInterval;
 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
@@ -13,6 +13,7 @@
 
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
 import org.eclipse.tracecompass.internal.analysis.callstack.core.base.StringSymbol;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ProcessStatusInterval;
 
 /**
  * Class to calculate statistics for an aggregated function.

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
@@ -27,6 +27,9 @@
 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.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ModelManager;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ProcessStatusInterval;
 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
@@ -24,6 +24,9 @@
 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.internal.analysis.callstack.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ModelManager;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ProcessStatusInterval;
 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/...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
@@ -29,6 +29,8 @@
 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.internal.analysis.callstack.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ModelManager;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;

diff --git a/...ck.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledFunction.java b/...ck.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledFunction.java
@@ -13,6 +13,7 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.IHostModel;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 
 /**

diff --git a/.../src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledFunctionFactory.java b/.../src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledFunctionFactory.java
@@ -12,6 +12,7 @@
 package org.eclipse.tracecompass.internal.analysis.callstack.core;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.IHostModel;
 
 /**
  * Factory to create {@link ICalledFunction}s.

diff --git a/...e/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledStringFunction.java b/...e/src/org/eclipse/tracecompass/internal/analysis/callstack/core/CalledStringFunction.java
@@ -13,6 +13,7 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.IHostModel;
 
 /**
  * Called Function with the symbol being a string, useful for name resolved

diff --git a/...k.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/ICalledFunction.java b/...k.core/src/org/eclipse/tracecompass/internal/analysis/callstack/core/ICalledFunction.java
@@ -12,6 +12,7 @@
 package org.eclipse.tracecompass.internal.analysis.callstack.core;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.IHostModel;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.segment.interfaces.INamedSegment;
 

diff --git a/...is/callstack/core/CompositeHostModel.java → ...lstack/core/model/CompositeHostModel.java b/...is/callstack/core/CompositeHostModel.java → ...lstack/core/model/CompositeHostModel.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.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,7 +27,8 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelThreadInformationProvider;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
-import org.eclipse.tracecompass.internal.analysis.callstack.core.ModelListener.IModuleWrapper;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.AggregatedCallSite;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.model.ModelListener.IModuleWrapper;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler;

diff --git a/...ysis/callstack/core/ICpuTimeProvider.java → ...allstack/core/model/ICpuTimeProvider.java b/...ysis/callstack/core/ICpuTimeProvider.java → ...allstack/core/model/ICpuTimeProvider.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.model;
 
 import java.util.Collection;
 

diff --git a/...l/analysis/callstack/core/IHostModel.java → ...ysis/callstack/core/model/IHostModel.java b/...l/analysis/callstack/core/IHostModel.java → ...ysis/callstack/core/model/IHostModel.java
@@ -9,12 +9,13 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.model;
 
 import java.util.Collection;
 import java.util.EnumSet;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.analysis.callstack.core.AggregatedCallSite;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 
 /**

diff --git a/...callstack/core/ISamplingDataProvider.java → ...ack/core/model/ISamplingDataProvider.java b/...callstack/core/ISamplingDataProvider.java → ...ack/core/model/ISamplingDataProvider.java
@@ -9,10 +9,12 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.analysis.callstack.core;
+package org.eclipse.tracecompass.internal.analysis.callstack.core.model;
 
 import java.util.Collection;
 
+import org.eclipse.tracecompass.internal.analysis.callstack.core.AggregatedCallSite;
+
 /**
  * Interfaces that classes providing sampling data for threads can implement
  *

diff --git a/.../callstack/core/IThreadOnCpuProvider.java → ...tack/core/model/IThreadOnCpuProvider.java b/.../callstack/core/IThreadOnCpuProvider.java → ...tack/core/model/IThreadOnCpuProvider.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.model;
 
 import java.util.Collection;
 

diff --git a/...nalysis/callstack/core/ModelListener.java → ...s/callstack/core/model/ModelListener.java b/...nalysis/callstack/core/ModelListener.java → ...s/callstack/core/model/ModelListener.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.model;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;

diff --git a/...analysis/callstack/core/ModelManager.java → ...is/callstack/core/model/ModelManager.java b/...analysis/callstack/core/ModelManager.java → ...is/callstack/core/model/ModelManager.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.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...callstack/core/ProcessStatusInterval.java → ...ack/core/model/ProcessStatusInterval.java b/...callstack/core/ProcessStatusInterval.java → ...ack/core/model/ProcessStatusInterval.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.model;
 
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;

diff --git a/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/model/package-info.java b/...ore/src/org/eclipse/tracecompass/internal/analysis/callstack/core/model/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.model;