tmf: Cancel modules when disposed

When running org.eclipse.linuxtools.lttng.alltests, the uml tests wait
forever because an analysis is running and never gets canceled. I think
modules should get canceled when disposed.

Change-Id: I745c32eae93ffad41e107ef8c29d02001d76e288
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/23168
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
IP-Clean: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/analysis/TmfAbstractAnalysisModule.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/analysis/TmfAbstractAnalysisModule.java
index ceee326a9984a8b5e86c5d6d2eafc839593191c2..bfce8baf8b4ae170a0e742ce843c2da688c3860a 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/analysis/TmfAbstractAnalysisModule.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/analysis/TmfAbstractAnalysisModule.java
@@ -233,6 +233,12 @@ public abstract class TmfAbstractAnalysisModule extends TmfComponent implements
         }
     }
 
+    @Override
+    public void dispose() {
+        super.dispose();
+        cancel();
+    }
+
     private void execute() {
 
         /*

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/TmfStateSystemAnalysisModule.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
index 34d5b85b531178e75ba65c0e1425ae4cbf394c89..0766ee0af87a0253944e09102f8b8271ed4ff415 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
@@ -188,10 +188,10 @@ public abstract class TmfStateSystemAnalysisModule extends TmfAbstractAnalysisMo
 
     @Override
     public void dispose() {
+        super.dispose();
         if (fStateSystem != null) {
             fStateSystem.dispose();
         }
-        super.dispose();
     }
 
     // ------------------------------------------------------------------------