lttng: Fix intermittent MemoryUsageViewTest failure

[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 6e932a08bf8ff6f5482a5bf402116dc8d367cf7d..ff3cf944a9216c8b088fcd33273f0f2298b24add 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
@@ -82,7 +82,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) {
@@ -111,17 +113,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();
                         }
-                        String seriesName = procname + ' ' + '(' + ss.getAttributeName(quark) + ')';
-                        fSeriesName.put(quark, seriesName.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);
                 }
 
                 /*