control: Bug 486586: Allow snapshots in inactive state

Change-Id: Iee0e5a53169f5d573865df4a634da900eaad71cc
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/65215
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTest.java
index b124a31a76d50ad2a8fbfd60b35b118e6ce60497..9e7f83b2647dec182428dc4925ad59f852ae2ea6 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTest.java
@@ -191,6 +191,11 @@ public class TraceControlSnapshotSessionTest {
         fFacility.stopSession(session);
         assertEquals(TraceSessionState.INACTIVE, session.getSessionState());
 
+        // ------------------------------------------------------------------------
+        // Record snapshot in inactive mode
+        // ------------------------------------------------------------------------
+        fFacility.executeCommand(session, "snapshot");
+
         // ------------------------------------------------------------------------
         // Destroy session
         // ------------------------------------------------------------------------

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java
index c5854b4c48b5439974708765cf032e8c0382d4a0..a233df4cef5f6faf669337fde08e41366bf5fc42 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.tracecompass.internal.lttng2.control.core.model.TraceSessionState;
 import org.eclipse.tracecompass.internal.lttng2.control.ui.Activator;
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.ControlView;
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.messages.Messages;
@@ -108,9 +107,7 @@ public class SnaphshotHandler extends BaseControlViewHandler {
                 if (element instanceof TraceSessionComponent) {
                     // Add only if corresponding TraceSessionComponent is an active snapshot session and not destroyed
                     TraceSessionComponent session = (TraceSessionComponent) element;
-                    if(session.isSnapshotSession() &&
-                            session.getSessionState() == TraceSessionState.ACTIVE &&
-                            !session.isDestroyed()) {
+                    if(session.isSnapshotSession() && !session.isDestroyed()) {
                         sessions.add(session);
                     }
                 }