analysis.os: New kernel memory usage view with Unit tests

[deliverable/tracecompass.git] / lttng / org.eclipse.tracecompass.lttng2.kernel.core / src / org / eclipse / tracecompass / internal / lttng2 / kernel / core / trace / layout / LttngEventLayout.java

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/LttngEventLayout.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/LttngEventLayout.java
index 80dcf265e9b3f1a3d996ffeb0daeeb9d813af1de..af7b1796a124c72e3c11c5c905fb57a5784787c9 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/LttngEventLayout.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/LttngEventLayout.java
@@ -12,8 +12,6 @@
 
 package org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout;
 
-import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
-
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -51,7 +49,7 @@ public class LttngEventLayout implements IKernelAnalysisEventLayout {
     private static final String SCHED_WAKEUP = "sched_wakeup";
     private static final String SCHED_WAKEUP_NEW = "sched_wakeup_new";
     private static final Collection<String> SCHED_WAKEUP_EVENTS =
-            checkNotNull(ImmutableList.of(SCHED_WAKEUP, SCHED_WAKEUP_NEW));
+            ImmutableList.of(SCHED_WAKEUP, SCHED_WAKEUP_NEW);
 
     private static final String SCHED_PROCESS_FORK = "sched_process_fork";
     private static final String SCHED_PROCESS_EXIT = "sched_process_exit";
@@ -87,6 +85,8 @@ public class LttngEventLayout implements IKernelAnalysisEventLayout {
     private static final String HRTIMER_EXPIRES = "expires";
     private static final String HRTIMER_NOW = "now";
     private static final String HRTIMER_SOFT_EXPIRES = "softexpires";
+    private static final String KMEM_ALLOC = "mm_page_alloc";
+    private static final String KMEM_FREE = "mm_page_free";
 
     /** All instances are the same. Only provide a static instance getter */
     protected LttngEventLayout() {
@@ -194,6 +194,22 @@ public class LttngEventLayout implements IKernelAnalysisEventLayout {
         return SYSCALL_EXIT_PREFIX;
     }
 
+    /**
+     * @since 2.0
+     */
+    @Override
+    public String eventKmemPageAlloc() {
+        return KMEM_ALLOC;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public String eventKmemPageFree() {
+        return KMEM_FREE;
+    }
+
     // ------------------------------------------------------------------------
     // Event field names
     // ------------------------------------------------------------------------