Fix event storm on EMF transaction finish

2 files changed, 24 insertions, 3 deletions

diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/SolutionTrajectory.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/SolutionTrajectory.java
index d1a41065..500dd7d2 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/SolutionTrajectory.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/SolutionTrajectory.java
@@ -206,7 +206,14 @@ public class SolutionTrajectory {
                                                 }
                                         };
                                         long start = System.nanoTime();
-                                        editingDomain.getCommandStack().execute(cc);
+                                        try {
+                                                ((AdvancedViatraQueryEngine) engine).delayUpdatePropagation(() -> {
+                                                        editingDomain.getCommandStack().execute(cc);
+                                                        return null;
+                                                });
+                                        } catch (InvocationTargetException e) {
+                                                throw new RuntimeException(e);
+                                        }
                                         listener.forwardWorked(System.nanoTime() - start);
                                 }
 
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
index 4c6b4097..7e7a6e51 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
@@ -151,7 +151,14 @@ public class DesignSpaceManager implements IBacktrackListener {
                 Object previousState = trajectory.getCurrentStateId();
 
                 long start = System.nanoTime();
-                domain.getCommandStack().execute(rc);
+                try {
+                        engine.delayUpdatePropagation(() -> {
+                                domain.getCommandStack().execute(rc);
+                                return null;
+                        });
+                } catch (InvocationTargetException e) {
+                        throw new RuntimeException(e);
+                }
                 forwardTime += System.nanoTime() - start;
 
                 Object newStateId = stateCoder.createStateCode();
@@ -270,7 +277,14 @@ public class DesignSpaceManager implements IBacktrackListener {
                         };
                         
                         long start = System.nanoTime();
-                        domain.getCommandStack().execute(rc);
+                        try {
+                                engine.delayUpdatePropagation(() -> {
+                                        domain.getCommandStack().execute(rc);
+                                        return null;
+                                });
+                        } catch (InvocationTargetException e) {
+                                throw new RuntimeException(e);
+                        }
                         forwardTime += System.nanoTime() - start;
 
                         Object newStateId = null;