From 1996f5714b8186b48a1efb8b3a6e4f53f17ce4b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= <gbastien+lttng@versatic.net>
Date: Wed, 5 Mar 2014 09:29:10 -0500
Subject: [PATCH] TMF: Move the LTTng ust memory usage analysis to the core
 plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

And use the analysis output extension point to hook the view to it

Change-Id: I5a4a77e3870e5311ca5bf9efb3a7a655c4fdd9f0
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/22935
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 .../META-INF/MANIFEST.MF                       |  1 +
 .../plugin.xml                                 | 12 +++++++++++-
 .../memory/UstMemoryAnalysisModule.java        | 14 ++------------
 .../META-INF/MANIFEST.MF                       |  3 +--
 .../plugin.xml                                 | 18 +++++++-----------
 .../ui/views/memusage/MemoryUsageViewer.java   |  2 +-
 6 files changed, 23 insertions(+), 27 deletions(-)
 rename {org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/lttng2/ust/ui => org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/lttng2/ust/core}/analysis/memory/UstMemoryAnalysisModule.java (82%)

diff --git a/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
index 156182f69d..ef2d96c496 100644
--- a/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.core;x-internal:=true,
  org.eclipse.linuxtools.internal.lttng2.ust.core.memoryusage;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui",
  org.eclipse.linuxtools.internal.lttng2.ust.core.trace.callstack;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui,org.eclipse.linuxtools.lttng2.ust.core.tests",
+ org.eclipse.linuxtools.lttng2.ust.core.analysis.memory,
  org.eclipse.linuxtools.lttng2.ust.core.trace
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/org.eclipse.linuxtools.lttng2.ust.core/plugin.xml b/org.eclipse.linuxtools.lttng2.ust.core/plugin.xml
index 5bcebafc86..8be297fb10 100644
--- a/org.eclipse.linuxtools.lttng2.ust.core/plugin.xml
+++ b/org.eclipse.linuxtools.lttng2.ust.core/plugin.xml
@@ -12,5 +12,15 @@
             trace_type="org.eclipse.linuxtools.lttng2.ust.core.trace.LttngUstTrace">
       </type>
    </extension>
-
+   <extension
+         point="org.eclipse.linuxtools.tmf.core.analysis">
+      <module
+            analysis_module="org.eclipse.linuxtools.lttng2.ust.core.analysis.memory.UstMemoryAnalysisModule"
+            id="org.eclipse.linuxtools.lttng2.ust.analysis.memory"
+            name="Ust Memory">
+         <tracetype
+               class="org.eclipse.linuxtools.lttng2.ust.core.trace.LttngUstTrace">
+         </tracetype>
+      </module>
+   </extension>
 </plugin>
diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/lttng2/ust/ui/analysis/memory/UstMemoryAnalysisModule.java b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
similarity index 82%
rename from org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/lttng2/ust/ui/analysis/memory/UstMemoryAnalysisModule.java
rename to org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
index 2a92fcf7dd..50856d0eb3 100644
--- a/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/lttng2/ust/ui/analysis/memory/UstMemoryAnalysisModule.java
+++ b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/lttng2/ust/core/analysis/memory/UstMemoryAnalysisModule.java
@@ -10,20 +10,18 @@
  *   Geneviève Bastien - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.lttng2.ust.ui.analysis.memory;
+package org.eclipse.linuxtools.lttng2.ust.core.analysis.memory;
 
 import org.eclipse.linuxtools.internal.lttng2.ust.core.memoryusage.MemoryUsageStateProvider;
-import org.eclipse.linuxtools.internal.lttng2.ust.ui.views.memusage.MemoryUsageView;
 import org.eclipse.linuxtools.lttng2.ust.core.trace.LttngUstTrace;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateProvider;
 import org.eclipse.linuxtools.tmf.core.statesystem.TmfStateSystemAnalysisModule;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.ui.analysis.TmfAnalysisViewOutput;
 
 /**
  * This analysis build a state system from the libc memory instrumentation on a
- * ust trace
+ * UST trace
  *
  * @author Geneviève Bastien
  * @since 3.0
@@ -35,14 +33,6 @@ public class UstMemoryAnalysisModule extends TmfStateSystemAnalysisModule {
      */
     public static String ID = "org.eclipse.linuxtools.lttng2.ust.analysis.memory"; //$NON-NLS-1$
 
-    /**
-     * Constructor
-     */
-    public UstMemoryAnalysisModule() {
-        super();
-        registerOutput(new TmfAnalysisViewOutput(MemoryUsageView.ID));
-    }
-
     @Override
     protected
     ITmfStateProvider createStateProvider() {
diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
index 1b78306d29..0b2c6871d8 100644
--- a/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
@@ -16,5 +16,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0"
 Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.ui;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui.tests",
  org.eclipse.linuxtools.internal.lttng2.ust.ui.views.memusage;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui.tests",
- org.eclipse.linuxtools.lttng2.ust.ui.analysis.callstack,
- org.eclipse.linuxtools.lttng2.ust.ui.analysis.memory
+ org.eclipse.linuxtools.lttng2.ust.ui.analysis.callstack
diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.ust.ui/plugin.xml
index fb339882d5..35df526b5b 100644
--- a/org.eclipse.linuxtools.lttng2.ust.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng2.ust.ui/plugin.xml
@@ -18,17 +18,6 @@
             restorable="true">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.linuxtools.tmf.core.analysis">
-      <module
-            analysis_module="org.eclipse.linuxtools.lttng2.ust.ui.analysis.memory.UstMemoryAnalysisModule"
-            id="org.eclipse.linuxtools.lttng2.ust.analysis.memory"
-            name="Ust Memory">
-         <tracetype
-               class="org.eclipse.linuxtools.lttng2.ust.core.trace.LttngUstTrace">
-         </tracetype>
-      </module>
-   </extension>
    <extension
          point="org.eclipse.linuxtools.tmf.core.analysis">
       <module
@@ -41,5 +30,12 @@
                class="org.eclipse.linuxtools.lttng2.ust.core.trace.LttngUstTrace">
          </tracetype>
       </module>
+      <output
+            class="org.eclipse.linuxtools.tmf.ui.analysis.TmfAnalysisViewOutput"
+            id="org.eclipse.linuxtools.lttng2.ust.memoryusage">
+         <analysisId
+               id="org.eclipse.linuxtools.lttng2.ust.analysis.memory">
+         </analysisId>
+      </output>
    </extension>
 </plugin>
diff --git a/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java b/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
index b804951d00..6734f2083b 100644
--- a/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
+++ b/org.eclipse.linuxtools.lttng2.ust.ui/src/org/eclipse/linuxtools/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.linuxtools.internal.lttng2.ust.core.memoryusage.UstMemoryStrings;
 import org.eclipse.linuxtools.internal.tmf.core.Activator;
-import org.eclipse.linuxtools.lttng2.ust.ui.analysis.memory.UstMemoryAnalysisModule;
+import org.eclipse.linuxtools.lttng2.ust.core.analysis.memory.UstMemoryAnalysisModule;
 import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException;
 import org.eclipse.linuxtools.tmf.core.exceptions.StateSystemDisposedException;
 import org.eclipse.linuxtools.tmf.core.exceptions.StateValueTypeException;
-- 
2.34.1