From b3a90d79faffdef2202d32c02326baf610773590 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 27 Feb 2020 11:22:52 +0100
Subject: [PATCH] Resolving ticket 247
---
src/main/java/tmltranslator/TMLModeling.java | 4 ++++
.../ui/interactivesimulation/JFrameInteractiveSimulation.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/tmltranslator/TMLModeling.java b/src/main/java/tmltranslator/TMLModeling.java
index f658673242..20ea427e90 100755
--- a/src/main/java/tmltranslator/TMLModeling.java
+++ b/src/main/java/tmltranslator/TMLModeling.java
@@ -2363,6 +2363,10 @@ public class TMLModeling<E> {
_ch.getDestinationTasks().get(i).replaceReadChannelWith(_ch, chans[i]);
}
+ // Reworking _ch type: it cannot be non blocking on reading
+ if (_ch.getType() == TMLChannel.NBRNBW) {
+ _ch.setType(TMLChannel.BRNBW);
+ }
// Transform the original channel into a basic channel
_ch.setTasks(_ch.getOriginTasks().get(0), forkTask);
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 9f877241f7..2153f4b4e8 100644
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1984,7 +1984,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
String val = node0.getTextContent();
TraceManager.addDev("Sim time=" + val);
int valueCycle = Integer.decode(val);
- long timeP = (long)((long)(valueCycle) * 1000 / frequency);
+ long timeP = ((long)(valueCycle) * 1000 / frequency);
val = formatString(val);
String timePS = formatString(""+timeP);
val = val + " cycles / " + timePS + " ns";
--
GitLab