Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / timeline / Timeline.java

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java
index 4e3146b..9dbc31d 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/timeline/Timeline.java
@@ -18,6 +18,7 @@ public class Timeline
        private PriorityQueue<InnerEvent> events;
        private LongSupplier time;
        private long lastTimeUpdated = 0;
+       private long eventCounter = 0;
 
        private final List<Consumer<TimelineEvent>> eventAddedListener;
 
@@ -93,17 +94,19 @@ public class Timeline
                        return ExecutionResult.NOTHING_DONE;
                }
                int checkStop = 0;
-               InnerEvent first = events.peek();
                while (hasNext() && !condition.getAsBoolean())
                {
-                       events.remove();
-                       lastTimeUpdated = first.getTiming();
-                       first.run();
+                       InnerEvent event;
+                       synchronized (events)
+                       {
+                               event = events.remove();
+                       }
+                       lastTimeUpdated = event.getTiming();
+                       event.run();
                        // Don't check after every run
                        checkStop = (checkStop + 1) % 10;
                        if (checkStop == 0 && System.currentTimeMillis() >= stopMillis)
                                return ExecutionResult.EXEC_OUT_OF_TIME;
-                       first = events.peek();
                }
                lastTimeUpdated = getSimulationTime();
                return hasNext() ? ExecutionResult.EXEC_UNTIL_EMPTY : ExecutionResult.EXEC_UNTIL_CONDITION;
@@ -146,7 +149,10 @@ public class Timeline
         */
        public void reset()
        {
-               events.clear();
+               synchronized (events)
+               {
+                       events.clear();
+               }
                lastTimeUpdated = 0;
        }
 
@@ -176,7 +182,10 @@ public class Timeline
        {
                long timing = getSimulationTime() + relativeTiming;
                TimelineEvent event = new TimelineEvent(timing);
-               events.add(new InnerEvent(function, event));
+               synchronized (events)
+               {
+                       events.add(new InnerEvent(function, event, eventCounter++));
+               }
                eventAddedListener.forEach(l -> l.accept(event));
        }
 
@@ -184,6 +193,7 @@ public class Timeline
        {
                private final TimelineEventHandler function;
                private final TimelineEvent event;
+               private final long id;
 
                /**
                 * Creates an {@link InnerEvent}
@@ -191,10 +201,11 @@ public class Timeline
                 * @param function {@link TimelineEventHandler} to be executed when the {@link InnerEvent} occurs
                 * @param timing   Point in the MI simulation {@link Timeline}, at which the {@link InnerEvent} is executed;
                 */
-               InnerEvent(TimelineEventHandler function, TimelineEvent event)
+               InnerEvent(TimelineEventHandler function, TimelineEvent event, long id)
                {
                        this.function = function;
                        this.event = event;
+                       this.id = id;
                }
 
                public long getTiming()
@@ -217,7 +228,8 @@ public class Timeline
                @Override
                public int compareTo(InnerEvent o)
                {
-                       return timeCmp(getTiming(), o.getTiming());
+                       int c1;
+                       return (c1 = timeCmp(getTiming(), o.getTiming())) == 0 ? timeCmp(id, o.id) : c1;
                }
        }
 
@@ -229,7 +241,12 @@ public class Timeline
        @Override
        public String toString()
        {
-               return String.format("Simulation time: %s, Last update: %d, Events: %s", getSimulationTime(), lastTimeUpdated, events.toString());
+               String eventsString;
+               synchronized (events)
+               {
+                       eventsString = events.toString();
+               }
+               return String.format("Simulation time: %s, Last update: %d, Events: %s", getSimulationTime(), lastTimeUpdated, eventsString);
        }
 
        public enum ExecutionResult