lttng2.ust: remove deprecated code

Change-Id: I7f8e1e9e502a67cb77873e578c96d0c6d0e8e5c4
Signed-off-by: Loïc Prieur-Drevon <loic.prieurdrevon@gmail.com>
Reviewed-on: https://git.eclipse.org/r/96685
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.tracecompass.lttng2.ust.core/META-INF/MANIFEST.MF
index 67ed9e5129ab9a5959c8cdc4fb46adef03f509ec..f91d4984dc727fbfe01eda4d929d26cb15f5ac80 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.lttng2.ust.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.lttng2.ust.core.Activator

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/SourceCallsite.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/SourceCallsite.java
deleted file mode 100644 (file)
index 12ddbb5..0000000
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/SourceCallsite.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 EfficiOS Inc., Alexandre Montplaisir
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo;
-
-import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
-
-/**
- * Extension of {@link TmfCallsite} specifically for the debug-info analysis,
- * which will not print the function name in the event table. This name will be
- * available by a separate aspect.
- *
- * @author Alexandre Montplaisir
- * @since 2.0
- * @deprecated No need for this anymore, use {@link TmfCallsite} directly.
- */
-@Deprecated
-public class SourceCallsite extends TmfCallsite {
-
-    /**
-     * Constructor
-     *
-     * @param fileName
-     *            File name
-     * @param functionName
-     *            Function name
-     * @param lineNumber
-     *            Line number
-     */
-    public SourceCallsite(String fileName, @Nullable String functionName, long lineNumber) {
-        super(fileName, lineNumber);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append(getFileName()).append(':');
-        builder.append(getLineNo());
-        return builder.toString();
-    }
-
-}

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
index 01ec4b7200de4843cffa907c1424ef5f3d8bcd00..d6d02ed27a44e749af7ecd070cf9f401eff3edf6 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
@@ -67,7 +67,7 @@ public class UstDebugInfoAnalysisModule extends TmfStateSystemAnalysisModule {
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     @Nullable

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
index 0bc78f0237ea08fb08a3be84f21212e5b3195421..71e39e25e25d3adf8817142811f4880de11611ed 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
@@ -25,7 +25,7 @@ import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
  * info analysis and the IP (instruction pointer) context.
  *
  * @author Alexandre Montplaisir
- * @since 2.0
+ * @since 3.0
  */
 public class UstDebugInfoSourceAspect implements ITmfEventAspect<TmfCallsite> {
 
@@ -84,45 +84,4 @@ public class UstDebugInfoSourceAspect implements ITmfEventAspect<TmfCallsite> {
         String fullFileName = (pathPrefix + callsite.getFileName());
         return new TmfCallsite(fullFileName, callsite.getLineNo());
     }
-
-    /**
-     * Get the source callsite (the full {@link TmfCallsite} information) from a
-     * binary callsite.
-     *
-     * @param trace
-     *            The trace, which may contain trace-specific configuration
-     * @param bc
-     *            The binary callsite
-     * @return The source callsite, which sould include file name, function name
-     *         and line number
-     * @since 2.0
-     * @deprecated Should not be needed anymore, call aspects's resolve() method
-     *             directly. The SourceAspect does not include the function name
-     *             anymore.
-     */
-    @Deprecated
-    public static @Nullable SourceCallsite getSourceCallsite(LttngUstTrace trace, BinaryCallsite bc) {
-        TmfCallsite callsite = FileOffsetMapper.getCallsiteFromOffset(
-                new File(bc.getBinaryFilePath()),
-                bc.getBuildId(),
-                bc.getOffset());
-        if (callsite == null) {
-            return null;
-        }
-
-        Long callsiteLineNo = callsite.getLineNo();
-        long lineNo = (callsiteLineNo == null ? -1 : callsiteLineNo.longValue());
-
-        /*
-         * Apply the path prefix again, this time on the path given from
-         * addr2line. If applicable.
-         */
-        String pathPrefix = trace.getSymbolProviderConfig().getActualRootDirPath();
-        if (pathPrefix.isEmpty()) {
-            return new SourceCallsite(callsite.getFileName(), null, lineNo);
-        }
-
-        String fullFileName = (pathPrefix + callsite.getFileName());
-        return new SourceCallsite(fullFileName, null, lineNo);
-    }
 }

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
index ae7f2feed3641e657fdf6845ce227b58ba4a9c38..50a4a4bd76adba1888f7a37235df982f922c09d0 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
@@ -66,7 +66,7 @@ public class UstMemoryAnalysisModule extends TmfStateSystemAnalysisModule {
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public LttngUstTrace getTrace() {

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
index ab98e513d77db3b9af3f6a4f4ba2dc4eb83669bb..8160ba0638bdc7d188f30a41a8fd797de93ce4ab 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
@@ -88,7 +88,7 @@ public class LttngUstTrace extends CtfTmfTrace {
      *
      * @param factory
      *            The event factory for this specific trace
-     * @since 2.2
+     * @since 3.0
      */
     protected LttngUstTrace(@NonNull CtfTmfEventFactory factory) {
         super(factory);

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/analysis/debuginfo/UstDebugInfoSymbolProvider.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/analysis/debuginfo/UstDebugInfoSymbolProvider.java
index f3416028d33d4ae28b1b2eba4a41d1eff1ae8ae6..704d131884395ad2385d680e2fe4828abef43a43 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/analysis/debuginfo/UstDebugInfoSymbolProvider.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/analysis/debuginfo/UstDebugInfoSymbolProvider.java
@@ -13,7 +13,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.BinaryCallsite;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.FunctionLocation;
-import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoAnalysisModule;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoBinaryAspect;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoFunctionAspect;
 import org.eclipse.tracecompass.lttng2.ust.core.trace.LttngUstTrace;