lttng.ust: Update lib load/unload events for LTTng 2.9

[deliverable/tracecompass.git] / lttng / org.eclipse.tracecompass.lttng2.ust.core / src / org / eclipse / tracecompass / lttng2 / ust / core / trace / LttngUstTrace.java

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
index de923a12ecb7c69044e9d0b84e04997c28bb6ea7..8660c255d3bf5c969e1e3ba25e2929d2eb8a0e67 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
@@ -27,7 +27,9 @@ import org.eclipse.tracecompass.internal.lttng2.ust.core.Activator;
 import org.eclipse.tracecompass.internal.lttng2.ust.core.trace.layout.LttngUst20EventLayout;
 import org.eclipse.tracecompass.internal.lttng2.ust.core.trace.layout.LttngUst27EventLayout;
 import org.eclipse.tracecompass.internal.lttng2.ust.core.trace.layout.LttngUst28EventLayout;
+import org.eclipse.tracecompass.internal.lttng2.ust.core.trace.layout.LttngUst29EventLayout;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoBinaryAspect;
+import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoFunctionAspect;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.debuginfo.UstDebugInfoSourceAspect;
 import org.eclipse.tracecompass.lttng2.ust.core.trace.layout.ILttngUstEventLayout;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
@@ -63,6 +65,7 @@ public class LttngUstTrace extends CtfTmfTrace {
         ImmutableSet.Builder<ITmfEventAspect<?>> builder = ImmutableSet.builder();
         builder.addAll(CtfTmfTrace.CTF_ASPECTS);
         builder.add(UstDebugInfoBinaryAspect.INSTANCE);
+        builder.add(UstDebugInfoFunctionAspect.INSTANCE);
         builder.add(UstDebugInfoSourceAspect.INSTANCE);
         LTTNG_UST_ASPECTS = builder.build();
     }
@@ -107,7 +110,9 @@ public class LttngUstTrace extends CtfTmfTrace {
 
         if (TRACER_NAME.equals(tracerName)) {
             if (tracerMajor >= 2) {
-                if (tracerMinor >= 8) {
+                if (tracerMinor >= 9) {
+                    return LttngUst29EventLayout.getInstance();
+                } else if (tracerMinor >= 8) {
                     return LttngUst28EventLayout.getInstance();
                 } else if (tracerMinor >= 7) {
                     return LttngUst27EventLayout.getInstance();