lttng.ust: Add the build-ID to the key of cache of addr2line calls

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.analysis.xml.ui / src / org / eclipse / tracecompass / tmf / analysis / xml / ui / views / timegraph / XmlTimeGraphView.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
index 1027ee4d6f341dd601c6630feaedec24d30c18df..b8af05b079731687cb543e3aee3372873cf20a32 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 École Polytechnique de Montréal
+ * Copyright (c) 2014, 2016 École Polytechnique de Montréal
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -51,7 +51,6 @@ import org.eclipse.tracecompass.tmf.analysis.xml.core.module.XmlUtils;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.stateprovider.TmfXmlStrings;
 import org.eclipse.tracecompass.tmf.analysis.xml.ui.views.timegraph.XmlEntry.EntryDisplayType;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfAnalysisModuleWithStateSystems;
-import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
@@ -222,7 +221,7 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
     // ------------------------------------------------------------------------
 
     @Override
-    protected void buildEventList(ITmfTrace trace, ITmfTrace parentTrace, IProgressMonitor monitor) {
+    protected void buildEntryList(ITmfTrace trace, ITmfTrace parentTrace, IProgressMonitor monitor) {
 
         /*
          * Get the view element from the XML file. If the element can't be
@@ -254,7 +253,7 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
             return;
         }
 
-        Set<ITmfAnalysisModuleWithStateSystems> stateSystemModules = new HashSet<>();
+        Set<@NonNull ITmfAnalysisModuleWithStateSystems> stateSystemModules = new HashSet<>();
         if (analysisIds.isEmpty()) {
             /*
              * No analysis specified, take all state system analysis modules
@@ -275,8 +274,8 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
             if (!status.isOK()) {
                 return;
             }
-            if (module instanceof TmfStateSystemAnalysisModule) {
-                ((TmfStateSystemAnalysisModule) module).waitForInitialization();
+            if (!module.waitForInitialization()) {
+                return;
             }
             for (ITmfStateSystem ssq : module.getStateSystems()) {
                 ssq.waitUntilBuilt();
@@ -295,7 +294,7 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
             }
         }
 
-        putEntryList(trace, new ArrayList<TimeGraphEntry>(entryList));
+        addToEntryList(parentTrace, new ArrayList<TimeGraphEntry>(entryList));
 
         if (parentTrace.equals(getTrace())) {
             refresh();
@@ -384,7 +383,7 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
          * attribute
          */
         ITmfXmlStateAttribute display = fFactory.createStateAttribute(displayEl, parentEntry);
-        int displayQuark = display.getAttributeQuark(quark);
+        int displayQuark = display.getAttributeQuark(quark, null);
         if (displayQuark == IXmlStateSystemContainer.ERROR_QUARK) {
             return new XmlEntry(quark, parentEntry.getTrace(),
                     String.format("Unknown display quark for %s", ss.getAttributeName(quark)), ss); //$NON-NLS-1$