lttng: allow kernel analyses to be more permissive

Change-Id: I466cb013a691082422b7411d8e2e68de3527eb5b
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/27825
Tested-by: Hudson CI
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

2 files changed, 15 insertions, 9 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
index 497ede6967..073ba85080 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java
@@ -104,7 +104,11 @@ public class LttngKernelAnalysisTest {
         /* Test with a CTF trace that does not have required events */
         assumeTrue(CtfTmfTestTrace.CYG_PROFILE.exists());
         try (CtfTmfTrace trace = CtfTmfTestTrace.CYG_PROFILE.getTrace();) {
-            assertFalse(fKernelAnalysisModule.canExecute(trace));
+            /*
+             * TODO: This should be false, but for now there is no mandatory
+             * events in the kernel analysis so it will return true.
+             */
+            assertTrue(fKernelAnalysisModule.canExecute(trace));
         }
     }
 
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java
index e3e0bfb6fb..bb93ae1e85 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java
@@ -41,29 +41,31 @@ public class LttngKernelAnalysisModule extends TmfStateSystemAnalysisModule {
     /** The ID of this analysis module */
     public static final String ID = "org.eclipse.linuxtools.lttng2.kernel.analysis"; //$NON-NLS-1$
 
-    /* TODO: Are all those mandatory events really mandatory or should some of them be optional? */
-    private static final ImmutableSet<String> REQUIRED_EVENTS = ImmutableSet.of(
+    /*
+     * TODO: Decide which events should be mandatory for the analysis, once the
+     * appropriate error messages and session setup are in place.
+     */
+    private static final ImmutableSet<String> REQUIRED_EVENTS = ImmutableSet.of();
+
+    private static final ImmutableSet<String> OPTIONAL_EVENTS = ImmutableSet.of(
             LttngStrings.EXIT_SYSCALL,
             LttngStrings.IRQ_HANDLER_ENTRY,
             LttngStrings.IRQ_HANDLER_EXIT,
             LttngStrings.SOFTIRQ_ENTRY,
             LttngStrings.SOFTIRQ_EXIT,
             LttngStrings.SOFTIRQ_RAISE,
-            LttngStrings.SCHED_SWITCH,
             LttngStrings.SCHED_PROCESS_FORK,
             LttngStrings.SCHED_PROCESS_EXIT,
             LttngStrings.SCHED_PROCESS_FREE,
+            LttngStrings.SCHED_SWITCH,
             LttngStrings.STATEDUMP_PROCESS_STATE,
             LttngStrings.SCHED_WAKEUP,
-            LttngStrings.SCHED_WAKEUP_NEW
-            );
+            LttngStrings.SCHED_WAKEUP_NEW,
 
-    private static final ImmutableSet<String> OPTIONAL_EVENTS = ImmutableSet.of(
-            /* Add the prefix for syscalls */
+            /* FIXME Add the prefix for syscalls */
             LttngStrings.SYSCALL_PREFIX
             );
 
-
     /** The requirements as an immutable set */
     private static final ImmutableSet<TmfAnalysisRequirement> REQUIREMENTS;