lttng.ust: Use the data size formatter for UST memory view

Change-Id: Ie904826b7261b65671bff054b57f0764569f5087
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/70289
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/META-INF/MANIFEST.MF
index 852dcd5c1380c2b3b7207ae4025b7d4f5c35cca0..0470553792a47310815a180d89426f059c272b30 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.core.resources,
 Export-Package: org.eclipse.tracecompass.internal.lttng2.ust.ui;x-friends:="org.eclipse.tracecompass.lttng2.ust.ui.tests",
  org.eclipse.tracecompass.internal.lttng2.ust.ui.views.memusage;x-friends:="org.eclipse.tracecompass.lttng2.ust.ui.tests,org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests",
  org.eclipse.tracecompass.lttng2.ust.ui.analysis.callstack
+Import-Package: org.swtchart

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
index ff3cf944a9216c8b088fcd33273f0f2298b24add..7df090489275c44012b159d6aa9289a120bca95d 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.tracecompass.common.core.format.DataSizeWithUnitFormat;
 import org.eclipse.tracecompass.internal.lttng2.ust.core.analysis.memory.UstMemoryStrings;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.memory.UstMemoryAnalysisModule;
@@ -34,6 +35,7 @@ import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModul
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.eclipse.tracecompass.tmf.ui.viewers.xycharts.linecharts.TmfCommonXLineChartViewer;
+import org.swtchart.Chart;
 
 /**
  * Memory usage view
@@ -49,8 +51,6 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
     private final Map<Integer, Integer> fMemoryQuarks = new HashMap<>();
     private final Map<Integer, String> fSeriesName = new HashMap<>();
 
-    private static final int BYTES_TO_KB = 1024;
-
     // Timeout between updates in the updateData thread
     private static final long BUILD_UPDATE_TIMEOUT = 500;
 
@@ -62,6 +62,8 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
      */
     public MemoryUsageViewer(Composite parent) {
         super(parent, Messages.MemoryUsageViewer_Title, Messages.MemoryUsageViewer_XAxis, Messages.MemoryUsageViewer_YAxis);
+        Chart chart = getSwtChart();
+        chart.getAxisSet().getYAxis(0).getTick().setFormat(new DataSizeWithUnitFormat());
     }
 
     @Override
@@ -154,7 +156,7 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
                         double[] values = checkNotNull(fYValues.get(quark));
                         try {
                             Integer memQuark = checkNotNull(fMemoryQuarks.get(quark));
-                            yvalue = ss.querySingleState(time, memQuark.intValue()).getStateValue().unboxLong() / BYTES_TO_KB;
+                            yvalue = ss.querySingleState(time, memQuark.intValue()).getStateValue().unboxLong();
                             values[i] = yvalue;
                         } catch (TimeRangeException e) {
                             values[i] = 0;

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/messages.properties b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/messages.properties
index 2de2271a0ba167d20333e6fe93c293dbc6dbaef9..2bc2b04979e70765313049b7295445098ffecce4 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/messages.properties
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/messages.properties
@@ -12,4 +12,4 @@
 MemoryUsageView_Title=Memory Usage
 MemoryUsageViewer_Title=Memory Allocation vs Time
 MemoryUsageViewer_XAxis=Time
-MemoryUsageViewer_YAxis=Usage (KB)
+MemoryUsageViewer_YAxis=Usage