lttng: Make use of "is_pic" event field in debug info analysis

[deliverable/tracecompass.git] / lttng / org.eclipse.tracecompass.lttng2.ust.core / src / org / eclipse / tracecompass / lttng2 / ust / core / analysis / debuginfo / UstDebugInfoAnalysisModule.java

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
index 4953d989f942c17f34e435ab732ad0e0aeadd4ce..8f9cf5115134ab59ff51f1fe057553697c383e09 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoAnalysisModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 EfficiOS Inc., Alexandre Montplaisir
+ * Copyright (c) 2015, 2016 EfficiOS Inc., Alexandre Montplaisir
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -119,44 +119,53 @@ public class UstDebugInfoAnalysisModule extends TmfStateSystemAnalysisModule {
         ITmfStateSystem ss = checkNotNull(getStateSystem());
 
         Set<UstDebugInfoBinaryFile> files = new TreeSet<>();
-        try {
-            ImmutableList.Builder<Integer> builder = ImmutableList.builder();
-            List<Integer> vpidQuarks = ss.getSubAttributes(-1, false);
-            for (Integer vpidQuark : vpidQuarks) {
-                builder.addAll(ss.getSubAttributes(vpidQuark, false));
-            }
-            List<Integer> baddrQuarks = builder.build();
+        ImmutableList.Builder<Integer> builder = ImmutableList.builder();
+        List<Integer> vpidQuarks = ss.getSubAttributes(-1, false);
+        for (Integer vpidQuark : vpidQuarks) {
+            builder.addAll(ss.getSubAttributes(vpidQuark, false));
+        }
+        List<Integer> baddrQuarks = builder.build();
 
-            /*
-             * For each "baddr" attribute, get the "buildId" sub-attribute,
-             * whose value is the file path.
-             */
+        /*
+         * For each "baddr" attribute, get the "buildId" sub-attribute,
+         * whose value is the file path.
+         */
 
-            for (Integer baddrQuark : baddrQuarks) {
+        for (Integer baddrQuark : baddrQuarks) {
 
-                List<Integer> buildIdQuarks = ss.getSubAttributes(baddrQuark, false);
-                for (Integer buildIdQuark : buildIdQuarks) {
-                    String buildId = ss.getAttributeName(buildIdQuark);
+            List<Integer> buildIdQuarks = ss.getSubAttributes(baddrQuark, false);
+            for (Integer buildIdQuark : buildIdQuarks) {
+                String buildId = ss.getAttributeName(buildIdQuark);
 
+                /*
+                 * Explore the history of this attribute "horizontally",
+                 * even though there should only be one valid interval.
+                 */
+                ITmfStateInterval interval = StateSystemUtils.queryUntilNonNullValue(ss, buildIdQuark, ss.getStartTime(), Long.MAX_VALUE);
+                if (interval == null) {
                     /*
-                     * Explore the history of this attribute "horizontally",
-                     * even though there should only be one valid interval.
+                     * If we created the attribute, we should have assigned
+                     * a value to it!
                      */
-                    ITmfStateInterval interval = StateSystemUtils.queryUntilNonNullValue(ss, buildIdQuark, ss.getStartTime(), Long.MAX_VALUE);
-                    if (interval == null) {
-                        /*
-                         * If we created the attribute, we should have assigned
-                         * a value to it!
-                         */
-                        throw new IllegalStateException();
-                    }
-                    String filePath = interval.getStateValue().unboxStr();
-
-                    files.add(new UstDebugInfoBinaryFile(filePath, buildId));
+                    throw new IllegalStateException();
+                }
+                String filePath = interval.getStateValue().unboxStr();
+
+                /* Retrieve the value of "is_pic" at that time */
+                try {
+                    int isPicQuark = ss.getQuarkRelative(buildIdQuark, UstDebugInfoStateProvider.IS_PIC_ATTRIB);
+                    int isPicVal = ss.querySingleState(interval.getStartTime(), isPicQuark).getStateValue().unboxInt();
+                    boolean isPic = (isPicVal != 0);
+
+                    files.add(new UstDebugInfoBinaryFile(filePath, buildId, isPic));
+
+                } catch (AttributeNotFoundException e) {
+                    /* We should have built "is_pic" sub-attributes */
+                    throw new IllegalStateException("Missing expected \"is_pic\" attribute"); //$NON-NLS-1$
+                } catch (StateSystemDisposedException e) {
+                    /* We're closing down, ignore */
                 }
             }
-        } catch (AttributeNotFoundException e) {
-            throw new IllegalStateException(e);
         }
         return files;
     }
@@ -233,7 +242,12 @@ public class UstDebugInfoAnalysisModule extends TmfStateSystemAnalysisModule {
             int buildIdQuark = potentialBuildIdQuark.get().intValue();
             String buildId = ss.getAttributeName(buildIdQuark);
             String filePath = fullState.get(buildIdQuark).getStateValue().unboxStr();
-            return new UstDebugInfoLoadedBinaryFile(baddr, filePath, buildId);
+
+            int isPicQuark = ss.getQuarkRelative(buildIdQuark, UstDebugInfoStateProvider.IS_PIC_ATTRIB);
+            int isPicVal = fullState.get(isPicQuark).getStateValue().unboxInt();
+            boolean isPic = (isPicVal != 0);
+
+            return new UstDebugInfoLoadedBinaryFile(baddr, filePath, buildId, isPic);
 
         } catch (AttributeNotFoundException e) {
             /* We're only using quarks we've checked for. */