X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicExecuter.java;h=52adeba0b44968fced83828086fcb2681171de1a;hb=13577856cd85c46f2cd4ad956332697bc820f425;hp=eb67f8dc13d61b5e4f81ce70ad873a793356452f;hpb=46d4c053db9a363185a9dce28fcefbc3bf9d6afd;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
index eb67f8dc..52adeba0 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicExecuter.java
@@ -5,6 +5,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import net.mograsim.logic.core.timeline.PauseableTimeFunction;
 import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.timeline.Timeline.ExecutionResult;
 
 //TODO maybe move to logic core?
 public class LogicExecuter
@@ -41,17 +42,21 @@ public class LogicExecuter
 			{
 				while (shouldBeRunningLive.get())
 				{
-					// always execute to keep timeline from "hanging behind" for too long
-					long current = tf.getAsLong();
-					timeline.executeUntil(timeline.laterThan(current), current + 10);
+					long current = tf.getTime();
+					// The tf.isPaused() condition is justified, because timeline.getSimulationTime() returns the timestamp of the last
+					// processed event during executeUntil()
+					if (timeline.executeUntil(() -> timeline.laterThan(current).getAsBoolean() || tf.isPaused(),
+							System.currentTimeMillis() + 10) == ExecutionResult.EXEC_OUT_OF_TIME)
+						timeline.synchTime(); // TODO: should this also be called if tf.isPaused() condition is met?
+					long nextEventTime = timeline.nextEventTime();
 					long sleepTime;
 					if (timeline.hasNext())
-						sleepTime = timeline.nextEventTime() - current;
+						sleepTime = (long) ((nextEventTime - current) * tf.getSimulTimeToRealTimeFactor());
 					else
 						sleepTime = 10000;
 					try
 					{
-						nextExecSimulTime.set(current + sleepTime);
+						nextExecSimulTime.set(nextEventTime);
 						if (sleepTime > 0)
 							Thread.sleep(sleepTime);
 
@@ -81,6 +86,8 @@ public class LogicExecuter
 				if (Timeline.timeCmp(event.getTiming(), nextExecSimulTime.get()) < 0)
 					simulationThread.interrupt();
 		});
+		// not optimal; but we don't expect this to happen very often
+		tf.addSimulTimeToRealTimeFactorChangedListener(d -> simulationThread.interrupt());
 	}
 
 	public void executeNextStep()
@@ -130,9 +137,14 @@ public class LogicExecuter
 		return isPaused.get();
 	}
 
-	public void setSpeedPercentage(int percentage)
+	public double getSpeedFactor()
 	{
-		tf.setSpeedPercentage(percentage);
+		return tf.getSpeedFactor();
+	}
+
+	public void setSpeedFactor(double factor)
+	{
+		tf.setSpeedFactor(factor);
 	}
 
 	private void waitForIsRunning(boolean expectedState)