lttng.ui: move UST memory legend to left

[deliverable/tracecompass.git] / lttng / org.eclipse.tracecompass.lttng2.ust.ui / src / org / eclipse / tracecompass / internal / lttng2 / ust / ui / views / memusage / MemoryUsageViewer.java

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 a1694bbcd3152d1e3cf4d2252aa1524fa0b722f0..ceb849352e02b24d866e4f1005596dfb9b8896bc 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
@@ -13,12 +13,16 @@
 
 package org.eclipse.tracecompass.internal.lttng2.ust.ui.views.memusage;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.swt.SWT;
 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;
@@ -32,6 +36,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
@@ -47,8 +52,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;
 
@@ -60,6 +63,9 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
      */
     public MemoryUsageViewer(Composite parent) {
         super(parent, Messages.MemoryUsageViewer_Title, Messages.MemoryUsageViewer_XAxis, Messages.MemoryUsageViewer_YAxis);
+        Chart chart = getSwtChart();
+        chart.getLegend().setPosition(SWT.LEFT);
+        chart.getAxisSet().getYAxis(0).getTick().setFormat(new DataSizeWithUnitFormat());
     }
 
     @Override
@@ -80,7 +86,9 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
             if (getTrace() == null || fModule == null) {
                 return;
             }
-            fModule.waitForInitialization();
+            if (!fModule.waitForInitialization()) {
+                return;
+            }
             ITmfStateSystem ss = fModule.getStateSystem();
             /* Don't wait for the module completion, when it's ready, we'll know */
             if (ss == null) {
@@ -109,16 +117,23 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
                     fYValues.put(quark, new double[xvalues.length]);
                     fMemoryQuarks.put(quark, ss.getQuarkRelative(quark, UstMemoryStrings.UST_MEMORY_MEMORY_ATTRIBUTE));
                     int procNameQuark = ss.getQuarkRelative(quark, UstMemoryStrings.UST_MEMORY_PROCNAME_ATTRIBUTE);
+                    String oldSeriesName = fSeriesName.get(quark);
+                    String seriesName = null;
                     try {
                         ITmfStateValue procnameValue = ss.querySingleState(start, procNameQuark).getStateValue();
                         String procname = ""; //$NON-NLS-1$
                         if (!procnameValue.isNull()) {
                             procname = procnameValue.unboxStr();
                         }
-                        fSeriesName.put(quark, new String(procname + ' ' + '(' + ss.getAttributeName(quark) + ')').trim());
+                        seriesName = (procname + ' ' + '(' + ss.getAttributeName(quark) + ')').trim();
                     } catch (TimeRangeException e) {
-                        fSeriesName.put(quark, '(' + ss.getAttributeName(quark) + ')');
+                        seriesName = '(' + ss.getAttributeName(quark) + ')';
+                    }
+
+                    if (oldSeriesName != null && !oldSeriesName.equals(seriesName)) {
+                        deleteSeries(oldSeriesName);
                     }
+                    fSeriesName.put(quark, seriesName);
                 }
 
                 /*
@@ -140,11 +155,13 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
                     time = time > traceEnd ? traceEnd : time;
 
                     for (int quark : tidQuarks) {
+                        double[] values = checkNotNull(fYValues.get(quark));
                         try {
-                            yvalue = ss.querySingleState(time, fMemoryQuarks.get(quark)).getStateValue().unboxLong() / BYTES_TO_KB;
-                            fYValues.get(quark)[i] = yvalue;
+                            Integer memQuark = checkNotNull(fMemoryQuarks.get(quark));
+                            yvalue = ss.querySingleState(time, memQuark.intValue()).getStateValue().unboxLong();
+                            values[i] = yvalue;
                         } catch (TimeRangeException e) {
-                            fYValues.get(quark)[i] = 0;
+                            values[i] = 0;
                         }
                     }
                 }